Feat/enable git app #1

AndreasAugustin · 2023-01-01T17:08:46Z

Description

Hi @msiebeneicher could you please review the solution and test in your setup?
It is working with a PAT if the source repository is public. I was not able to make it work with a private repoitory.
Funny details:

testing from my local machine the script is working even with a private repository (I made the tests within docker container without my git credentials, only using the PAT).
when I make the test repo public, the whole setup is working

Remark

For automation please see closing-issues-using-keywords

… repo

fix(): small fix for private repos 🐛

# This is the 1st commit message: parent 9b74224 author Andy Augustin <[email protected]> 1672219390 +0100 committer Andy Augustin <[email protected]> 1672592292 +0100 gpgsig -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEApgnwt2TStNZl6Y9UpE0XzZ/UkgFAmOxu6QACgkQUpE0XzZ/ UkjAzgv/cWh9hE7VLkLM1nVmra945WUkOfWXHnCUnrsOWsxxSOkH1r2mLxZdnWtg BlFc4RciJAB39Nv1WBUt+hGBGOdYWcV1lxgSIpn+vNXd9/5xciEThRk9T1piHj+x xnZU2rW0dLlnEnFlIX1qkKeD+rjclXw46umjMgqwIF0vQSx5cR9y8sDCiqRGg2Fv G/k/xLoQwah0Ve8nwqd6dLwNYXl8cFBfvuZaGV/dt1+5BDl4J5mPYg4trxKx5xnB fTxTQ0G/qOa1OInW04EReJWZwQaGvyx5PqEFk0ESk8MuzFytfVVRCnHwdP/QvLO7 S7Y79wUBAQfHvSlwOgBtlQc5eFOiKoxahUhJIcCMLw1r2+nRjuPAA0j07v6nmjDM sfxyVSpnYnKGAfGrYGboOHuEjqKegKdY3oIQFL/Ivln7kmLxGrFcpQ+QMTEJUsLw 2AB+Yf+tJyQXnx8AiGQRnVlXW3FRCOQhCxK2zXMUpzwAsKcKYNnaKoM6jDN7EzRQ fZrB76EK =yGb3 -----END PGP SIGNATURE----- feat(): make gh auth login conditional for separate source repo token 🚀 style(lint): fix lint issues 🐛 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 doc(): update docs 📝 feat(): add option for PAT 🚀 feat(): add option for PAT 🚀 # This is the commit message #2: feat(): add option for PAT 🚀 # This is the commit message #3: feat(): add option for PAT 🚀 # This is the commit message #4: feat(): add option for PAT 🚀 # This is the commit message #5: feat(): add option for PAT 🚀 # This is the commit message #6: trial(): add permissions 🐛

author Andy Augustin <[email protected]> 1672219390 +0100 committer Andy Augustin <[email protected]> 1672592292 +0100 gpgsig -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEApgnwt2TStNZl6Y9UpE0XzZ/UkgFAmOxu6QACgkQUpE0XzZ/ UkjAzgv/cWh9hE7VLkLM1nVmra945WUkOfWXHnCUnrsOWsxxSOkH1r2mLxZdnWtg BlFc4RciJAB39Nv1WBUt+hGBGOdYWcV1lxgSIpn+vNXd9/5xciEThRk9T1piHj+x xnZU2rW0dLlnEnFlIX1qkKeD+rjclXw46umjMgqwIF0vQSx5cR9y8sDCiqRGg2Fv G/k/xLoQwah0Ve8nwqd6dLwNYXl8cFBfvuZaGV/dt1+5BDl4J5mPYg4trxKx5xnB fTxTQ0G/qOa1OInW04EReJWZwQaGvyx5PqEFk0ESk8MuzFytfVVRCnHwdP/QvLO7 S7Y79wUBAQfHvSlwOgBtlQc5eFOiKoxahUhJIcCMLw1r2+nRjuPAA0j07v6nmjDM sfxyVSpnYnKGAfGrYGboOHuEjqKegKdY3oIQFL/Ivln7kmLxGrFcpQ+QMTEJUsLw 2AB+Yf+tJyQXnx8AiGQRnVlXW3FRCOQhCxK2zXMUpzwAsKcKYNnaKoM6jDN7EzRQ fZrB76EK =yGb3 -----END PGP SIGNATURE----- feat(): make gh auth login conditional for separate source repo token 🚀 style(lint): fix lint issues 🐛 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 feat(): add PAT 🚀 doc(): update docs 📝 feat(): add option for PAT 🚀 feat(): add option for PAT 🚀 feat(): add option for PAT 🚀 feat(): add option for PAT 🚀 feat(): add option for PAT 🚀 feat(): add option for PAT 🚀 trial(): add permissions 🐛 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙 trial(): new trial for accessing private repo with PAT 🆙

msiebeneicher · 2023-01-02T10:29:47Z

Hi @AndreasAugustin. This PR had conflicts - I merged and rebased your main branch now - could you solve the last conflicts in your branch or point me out the necessary changes to cherry-pick?

…it_app Signed-off-by: andy Augustin <[email protected]>

AndreasAugustin · 2023-01-02T11:55:17Z

Hi @AndreasAugustin. This PR had conflicts - I merged and rebased your main branch now - could you solve the last conflicts in your branch or point me out the necessary changes to cherry-pick?

done

Signed-off-by: andy Augustin <[email protected]>

src/entrypoint.sh

src/sync_template.sh

AndreasAugustin · 2023-01-02T16:00:59Z

@msiebeneicher hopefully this is now resolving your feature request.
Because only GITHUB_TOKEN is sued, I need to remove the whole gh auth login part.
Not sure why you did not get this error message? Are you using another gh cli version?

AndreasAugustin · 2023-01-02T16:16:18Z

src/entrypoint.sh

 if [[ -n "${SSH_PRIVATE_KEY_SRC}" ]] &>/dev/null; then
  ssh_setup
+else
+  # gh auth login --git-protocol "https" --hostname "${SOURCE_REPO_HOSTNAME}"


not working, if GITHUB_TOKEN env variable is set, the command throws.
@msiebeneicher is it possible that you use another gh version? I do not understand why this is happening

The order here looks mandatory. Also it is not possible to use gh auth status here because gh wants to check a github.com auth by default which is not possible in a github enterprise setup. A working solution for my setup is this:

else git config --global "credential.https://${SOURCE_REPO_HOSTNAME}.helper" "!gh auth git-credential" gh auth login --git-protocol "https" --hostname "${SOURCE_REPO_HOSTNAME}" --with-token <<< "${GITHUB_TOKEN}" fi

related to docs gh auth status should also work on other hosts (GitHub enterprise), but seems not?

Related to your working solution

n. Sad but it does not work on github.com https://github.com/AndreasAugustin/actions-template-sync/actions/runs/3823961230/jobs/6505672841

hmmm if it is not a gh --version issue, I guess it is a runner issue (or some magic with the former github app to token action)

Tested on https://github.com/AndreasAugustin/actions-template-sync/tree/chore/auto_test_2
with

Update
we need to change gh auth status --hostname <hostname>

weird - for me it's running fine with gh 2.15.0:

So back to the idea of unsetting the default github_token and using an own env var for it?

Yes weird, just tested on my machine within a docker container also with version 2.15.0 (actually within the sync action 2.21.1 is used).

It is an alpine image, but also on my arch based system I receive the same error with that small test. Hmmm maybe the hostname?

aha! maybe the hostname is the issue. Related to https://cli.github.com/manual/gh_help_environment
GH_TOKEN, GITHUB_TOKEN (in order of precedence): an authentication token for github.com API requests. Setting this avoids being prompted to authenticate and takes precedence over previously stored credentials.

It states there explicitly github.com.

UPDATE
confirmed! It is the hostname variable

@msiebeneicher with the changes I just made, the tests are working within github.com. Can you please test them in your env?
Hopefully finally it is a working solution!

The last solution works also in my environment 🥳
good catch! Do you want to clean up the code before merge?

The last solution works also in my environment partying_face good catch! Do you want to clean up the code before merge?

think the code is cleaned up, but I will check.
That was a funny and hard issue...

Signed-off-by: andy Augustin <[email protected]>

msiebeneicher · 2023-01-02T16:37:07Z

actions-template-sync/src/sync_template.sh

Line 66 in abd4251

    
           gh auth login --git-protocol "https" --hostname "${SOURCE_REPO_HOSTNAME}" --with-token <<< "${SOURCE_REPO_GITHUB_TOKEN}"

we need to remove this line also

Signed-off-by: andy Augustin <[email protected]>

Marc Siebeneicher and others added 6 commits January 1, 2023 17:52

feat(gh-auth): add gh auth login and credential helper

d1717e2

feat(gh-auth): add own source_repo_github_token handling for template…

4c18507

… repo

chore(): add test for PAT 🚀

3590d73

fix(): small fix for private repos 🐛

chore(gh-cli): update gh cli version to latest 🚀

9b74224

msiebeneicher force-pushed the feat/use_gh_auth_for_authentication branch 2 times, most recently from d05baaf to a06016d Compare January 2, 2023 10:16

Merge branch 'feat/use_gh_auth_for_authentication' into feat/enable_g…

561434a

…it_app Signed-off-by: andy Augustin <[email protected]>

AndreasAugustin added 2 commits January 2, 2023 13:03

fix(): small logic fix in script

1b2dd57

Signed-off-by: andy Augustin <[email protected]>

fix(): small logic fix in script

f274056

Signed-off-by: andy Augustin <[email protected]>

msiebeneicher reviewed Jan 2, 2023

View reviewed changes

src/entrypoint.sh Outdated Show resolved Hide resolved

AndreasAugustin commented Jan 2, 2023

View reviewed changes

src/entrypoint.sh Outdated Show resolved Hide resolved

AndreasAugustin commented Jan 2, 2023

View reviewed changes

src/entrypoint.sh Outdated Show resolved Hide resolved

AndreasAugustin commented Jan 2, 2023

View reviewed changes

src/sync_template.sh Outdated Show resolved Hide resolved

AndreasAugustin added 2 commits January 2, 2023 16:57

feat(): #238 hopefully a final version 🚀

42728fc

feat(): #238 hopefully a final version 🚀

abd4251

AndreasAugustin added 3 commits January 2, 2023 17:05

feat(): #238 hopefully a final version 🚀

7f15131

feat(): #238 hopefully a final version 🚀

0419389

feat(): #238 hopefully a final version 🚀

69f59a2

AndreasAugustin commented Jan 2, 2023

View reviewed changes

AndreasAugustin added 2 commits January 2, 2023 17:18

Update test_ssh.yml

0264978

Signed-off-by: andy Augustin <[email protected]>

Update test.yml

33baa75

Signed-off-by: andy Augustin <[email protected]>

AndreasAugustin and others added 3 commits January 2, 2023 17:43

Update entrypoint.sh

ed6009a

Signed-off-by: andy Augustin <[email protected]>

fix(): fix for GITHUB_TOKEN env variable 🐛

a2527a0

fix(): fix for GITHUB_TOKEN env variable 🐛

1435ce1

msiebeneicher approved these changes Jan 3, 2023

View reviewed changes

msiebeneicher merged commit ad14823 into msiebeneicher:feat/use_gh_auth_for_authentication Jan 3, 2023

AndreasAugustin deleted the feat/enable_git_app branch January 3, 2023 11:18

Feat/enable git app #1

Feat/enable git app #1

Uh oh!

Conversation

AndreasAugustin commented Jan 1, 2023

Description

Remark

Uh oh!

msiebeneicher commented Jan 2, 2023

Uh oh!

AndreasAugustin commented Jan 2, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AndreasAugustin commented Jan 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AndreasAugustin Jan 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AndreasAugustin Jan 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

msiebeneicher commented Jan 2, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

AndreasAugustin commented Jan 2, 2023 •

edited

Loading

AndreasAugustin Jan 2, 2023 •

edited

Loading

AndreasAugustin Jan 3, 2023 •

edited

Loading