-
Notifications
You must be signed in to change notification settings - Fork 359
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.
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
Add "User Service Account Impersonation" as an auth mode for GCP #7224
Open
harrismendell
wants to merge
7
commits into
broadinstitute:develop
Choose a base branch
from
harrismendell:hmendell/add-sa-impersonation-auth
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f336774
Add UserServiceAccountImpersonationMode
harrismendell 9414940
Add unit tests and override isEmpty
harrismendell 4859f14
Update validateCredentials to optionally take scopes instead of require
harrismendell 0892600
add support for source credentials coming from json file"
harrismendell 32f8839
Update how options are sent
harrismendell a26ef90
Add GoogleConfigurationSpec test
harrismendell ee6758c
Remove override on isEmpty
harrismendell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
24 changes: 24 additions & 0 deletions
24
...c/test/scala/cromwell/cloudsupport/gcp/auth/UserServiceAccountImpersonationModeSpec.scala
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package cromwell.cloudsupport.gcp.auth | ||
|
||
import common.assertion.CromwellTimeoutSpec | ||
import org.scalatest.flatspec.AnyFlatSpec | ||
import org.scalatest.matchers.should.Matchers | ||
|
||
class UserServiceAccountImpersonationModeSpec extends AnyFlatSpec with CromwellTimeoutSpec with Matchers { | ||
|
||
behavior of "UserServiceAccountImpersonationMode" | ||
|
||
it should "generate a non-validated credential" in { | ||
val impersonationMode = UserServiceAccountImpersonationMode("user-service-account-impersonation") | ||
val workflowOptions = GoogleAuthModeSpec.userServiceAccountImpersonationOptions | ||
impersonationMode.credentialsValidation = GoogleAuthMode.NoCredentialsValidation | ||
val credentials = impersonationMode.credentials(workflowOptions) | ||
credentials.getAuthenticationType should be("OAuth2") | ||
} | ||
|
||
it should "fail to generate credentials without a user_service_account_email workflow option" in { | ||
val impersonationMode = UserServiceAccountImpersonationMode("user-service-account-impersonation") | ||
val exception = intercept[OptionLookupException](impersonationMode.credentials()) | ||
exception.getMessage should be("user_service_account_email") | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compiler was breaking without this, not related to PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Out of curiosity, what is your Java version?
I believe Cromwell is usually compiled with Java 11, and
CharSequence::isEmpty
is "Since: 15"This override will need to be fixed, but maybe not right now?
Btw, I use SDKMAN! to keep all my Java SDKs under control. The JDK referenced by Cromwell's config isn't available for my M2 mac. I've just changed it on my machine to a newer 11 Temurin release.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! That was the issue. Have you had a moment to review the PR otherwise?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@harrismendell
I've glanced at it, but I'm not an official committer at the moment. I've got multiple of own PRs in the queue to get reviewed 😅
In the meantime I've just coalesced my commits into a fork and just compile and run that melange to keep moving.