Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Use CredsStore for GoogleCloudCreds #12391

Merged
merged 1 commit into from Mar 6, 2023
Merged

fix: Use CredsStore for GoogleCloudCreds #12391

merged 1 commit into from Mar 6, 2023

Conversation

david-becher
Copy link
Contributor

@david-becher david-becher commented Feb 10, 2023 •
edited

git-ask-pass.sh is not longer supported for credentials

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Fixes #12390

@david-becher david-becher force-pushed the fix-gcp-creds-not-using-argocd-git-ask-pass branch from d1d1b3a to be2ea75 Compare February 10, 2023 06:53
@david-becher
Copy link
Contributor Author

Hi guys, please accept my bug fix pull request. When merging and rebasing the feature, I think you forgot to use the credsStore mechanism. When I initially wrote my Feature Request, this was not being used.

The feature as is is currently not usable.

@alexef @crenshaw-dev

@david-becher
Copy link
Contributor Author

@erdenayates This is why you might have trouble to connect your repo.

@david-becher
Copy link
Contributor Author

david-becher commented Feb 13, 2023 •
edited

Once again, please review this PR.

The current Google Cloud Support you merged into the current release does not work, since it was overlooked to refactor the argocd-git-ask-pass binary for credentials. My PR here fixes that.

@alexef @alexmt

@david-becher
fix: Use CredsStore for GoogleCloudCreds
6c2ef6e 
git-ask-pass.sh is no longer supported for credentials

Signed-off-by: David Becher <becher.david@googlemail.com>
@david-becher david-becher force-pushed the fix-gcp-creds-not-using-argocd-git-ask-pass branch from bff8f6c to 6c2ef6e Compare February 13, 2023 12:27
@alexef
Copy link
Member

alexef commented Feb 26, 2023 •
edited

hey @david-becher. sorry for the delay answering here.

after rebasing your PR I remember testing it end to end, and being able to connect to a google cloud account I've created just for testing the feature.

not sure on the timeline of removing git-ask-pass, and why I was convinced it worked.

however your changes make a lot of sense 🙏 and are in line with other providers

@alexef alexef added the component:git Interaction with GitHub, Gitlab etc label Feb 26, 2023
@ademariag
Copy link

@david-becher can workload identity be used to authenticated with Cloud Source Repositories ?

@crenshaw-dev
Copy link
Collaborator

/cherry-pick release-2.6

crenshaw-dev
crenshaw-dev approved these changes Mar 6, 2023
View reviewed changes
Copy link
Collaborator

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @david-becher for the fix and @alexef for the review!

@crenshaw-dev crenshaw-dev merged commit 6dad9bc into argoproj:master Mar 6, 2023
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Mar 6, 2023
@david-becher
fix: Use CredsStore for GoogleCloudCreds (#12391)
3a4f1f7 
git-ask-pass.sh is no longer supported for credentials

Signed-off-by: David Becher <becher.david@googlemail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Mar 6, 2023
Merged
crenshaw-dev pushed a commit that referenced this pull request Mar 6, 2023
@gcp-cherry-pick-bot @david-becher
fix: Use CredsStore for GoogleCloudCreds (#12391) (#12741)
1e7aab1 
git-ask-pass.sh is no longer supported for credentials

Signed-off-by: David Becher <becher.david@googlemail.com>
Co-authored-by: david-becher <becher.david@googlemail.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
@david-becher
fix: Use CredsStore for GoogleCloudCreds (argoproj#12391)
fcc32d3 
git-ask-pass.sh is no longer supported for credentials

Signed-off-by: David Becher <becher.david@googlemail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexef alexef alexef approved these changes

@crenshaw-dev crenshaw-dev crenshaw-dev approved these changes

Assignees
No one assigned
Labels
cherry-pick/2.6 component:git Interaction with GitHub, Gitlab etc ready-for-review
Projects
Argo CD Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

GoogleCloud Credentials currently not working (uses old git-ask-pass.sh hack)
5 participants
@david-becher @alexef @ademariag @crenshaw-dev @34fathombelow