This repository was archived by the owner on Jul 12, 2023. It is now read-only.
Handle GCP project not found #1092
Merged
Conversation
This file contains hidden or 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
honnix
commented
Jul 5, 2023
| // GCP returns 403 in case of project not found for security reason, but that makes it impossible | ||
| // to differentiate that from missing permission; we take the risk here assuming Styx service account does have | ||
| // proper permissions | ||
| if (e.getStatusCode() == FORBIDDEN.code()) { |
honnix
commented
Jul 5, 2023
| if (cause instanceof GoogleJsonResponseException | ||
| && ((GoogleJsonResponseException) cause).getStatusCode() == 404) { | ||
| && ((GoogleJsonResponseException) cause).getStatusCode() == FORBIDDEN.code()) { |
honnix
commented
Jul 5, 2023
| @@ -37,7 +39,7 @@ | |||
| import static org.mockito.Mockito.reset; | |||
| import static org.mockito.Mockito.times; | |||
| import static org.mockito.Mockito.verify; | |||
| import static org.mockito.Mockito.verifyZeroInteractions; | |||
Codecov Report
@@ Coverage Diff @@
## master #1092 +/- ##
============================================
+ Coverage 92.33% 92.37% +0.03%
- Complexity 2150 2152 +2
============================================
Files 200 200
Lines 8326 8325 -1
Branches 504 504
============================================
+ Hits 7688 7690 +2
+ Misses 522 521 -1
+ Partials 116 114 -2 |
sonjaer
reviewed
Jul 5, 2023
styx-service-common/src/main/java/com/spotify/styx/api/Authenticator.java
Outdated
Show resolved
Hide resolved
sonjaer
reviewed
Jul 6, 2023
styx-service-common/src/main/java/com/spotify/styx/api/Authenticator.java
Outdated
Show resolved
Hide resolved
…icator.java Co-authored-by: sonjaer <[email protected]>
honnix
commented
Jul 6, 2023
styx-service-common/src/main/java/com/spotify/styx/api/ServiceAccountUsageAuthorizer.java
Outdated
Show resolved
Hide resolved
…AccountUsageAuthorizer.java
sonjaer
reviewed
Jul 6, 2023
styx-service-common/src/test/java/com/spotify/styx/api/ServiceAccountUsageAuthorizerTest.java
Show resolved
Hide resolved
sonjaer
reviewed
Jul 6, 2023
| @@ -20,6 +20,8 @@ | |||
|
|
|||
There was a problem hiding this comment.
Is there no test we need to change for the 404->403 code change in styx-service-common/src/main/java/com/spotify/styx/api/Authenticator.java ?
There was a problem hiding this comment.
https://github.com/spotify/styx/pull/1092/files#diff-6d62dc7647527de82216a154436bab32cb014d6a27fc005028168031ea1a95f2R313-R332f those are the changes. There is no externally observable difference though because we treat exceptions the same except the logging.
sonjaer
approved these changes
Jul 6, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Hey, I just made a Pull Request!
Description
Handle GCP project not found correctly.
Motivation and Context
GCP will never return 404 in case of project not found, due to security reason. So we need to treat 403 as 404 for some case.
I also did some small refactorings along the way.
Have you tested this? If so, how?
I updated existing tests to reflect this change.
Checklist for PR author(s)
Checklist for PR reviewer(s)