extract GCP project ID from creds file, remove from config #345
+32
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ncdc
reviewed
Mar 2, 2018
pkg/cloudprovider/gcp/block_store.go
Outdated
| return "", errors.WithStack(err) | ||
| } | ||
|
|
||
| var data map[string]interface{} |
There was a problem hiding this comment.
You can do this with an inline (or top level) struct:
type credentials struct {
ProjectID string `json:"project_id"`
}
var c credentials
if err := json.Unmarshal(credsBytes, &c); err != nil {
// ...
}
if c.ProjectID == "" {
// error
}
return c.ProjectIDThere was a problem hiding this comment.
oh, yeah, nice - i'll do this
Signed-off-by: Steve Kriss <steve@heptio.com>
|
Gotta actually test this on GCP before merge. |
|
OK, tested and works for me! |
|
LGTM |
weshayutin
pushed a commit
to weshayutin/velero
that referenced
this pull request
Jan 15, 2025
…u#345) The rework of Makefile to make it more readable and inclusion of lint as a target as well extract golangci-lint version from the upstream Dockerfile, so we test in PROW or locally on the same version as upstream. Signed-off-by: Michal Pryc <mpryc@redhat.com> Co-authored-by: Michal Pryc <mpryc@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Steve Kriss steve@heptio.com
As discussed this AM - this pulls the project ID from the (required) credentials file rather than requiring it to be provided in the config. I used this code in diluvian.