Fix issue #60: keyFile in config (#60) #61
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
Fix logic if keyFile is null
ralfiannor
changed the title
phroggyy
approved these changes
May 9, 2019
| return new StorageClient([ | ||
| 'projectId' => $config['project_id'], | ||
| 'keyFilePath' => $keyFile, | ||
| 'keyFile' => array_merge(["project_id" => $config['project_id']], $keyFile) |
There was a problem hiding this comment.
we can actually skip this whole is_array check entirely and just remove the array_merge. The key file should already contain project_id, so I'm not sure why it needs to be merged in the first place?
|
@nicja thoughts on trying to get some tests in here? I'm wondering if @ralfiannor should perhaps at least add a test for the config merging, but that would require some setup on your side to get a pipeline running. |
|
Confirmed that this fix works for a GKE-powered environment with creds provided at the instance level. Had the same issue mentioned in #68. I'll fork off of this branch and a test that fails prior to this commit and succeeds with the commit if that's what it takes to get this merged. |
superchairon
approved these changes
Aug 16, 2019
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.
Fix logic if keyFile is null