PYTHON-3367 Add support for GCP attached service accounts when using GCP KMS #467
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
blink1073
commented
Sep 26, 2022
| {'aws': {'secretAccessKey': 'foo'}}]: | ||
| with self.assertRaisesRegex( | ||
| ValueError, "kms_providers\['aws'\] must contain " | ||
| ValueError, r"kms_providers\['aws'\] must contain " |
Member
Author
There was a problem hiding this comment.
These changes address warnings seen while running the tests:
test/test_mongocrypt.py:139
/Users/steve.silvester/workspace/libmongocrypt/bindings/python/test/test_mongocrypt.py:139: DeprecationWarning: invalid escape sequence '\('
"instance of bytes or str \(unicode in Python 2\)"):
ShaneHarvey
requested changes
Oct 4, 2022
| """Get on-demand GCP credentials""" | ||
| metadata_host = "metadata.google.internal" | ||
| if os.getenv("GCE_METADATA_HOST"): | ||
| metadata_host = os.environ["GCE_METADATA_HOST"] |
Member
There was a problem hiding this comment.
Suggest:
metadata_host = os.getenv("GCE_METADATA_HOST") or "metadata.google.internal"
| url = "http://%s/computeMetadata/v1/instance/service-accounts/default/token" % metadata_host | ||
|
|
||
| headers = {"Metadata-Flavor": "Google"} | ||
| response = requests.get(url, headers=headers) |
Member
There was a problem hiding this comment.
Do we need exception handling here?
| raise ValueError(msg) | ||
| try: | ||
| data = response.json() | ||
| except Exception : |
| response = requests.get(url, headers=headers) | ||
| if response.status_code != 200: | ||
| msg = "Unable to retrieve GCP credentials: expected StatusCode 200, got StatusCode: %s. Response body:\n%s" % (response.status_code, response.content) | ||
| raise ValueError(msg) |
Member
There was a problem hiding this comment.
ValueError is usually used to indicate an invalid argument was passed whereas here the problem is elsewhere. Perhaps MongoCryptError would be more appropriate here and below?
| {'aws': {'secretAccessKey': 'foo'}}]: | ||
| with self.assertRaisesRegex( | ||
| ValueError, "kms_providers\['aws'\] must contain " | ||
| ValueError, r"kms_providers\['aws'\] must contain " |
ShaneHarvey
requested changes
Oct 6, 2022
|
|
||
| # The libmongocrypt git revision release to embed in our wheels. | ||
| REVISION=$(git rev-list -n 1 1.5.2) | ||
| REVISION=$(git rev-list -n 1 1.6.0) |
Member
There was a problem hiding this comment.
Oh I see 1.6.1 had no code changes so 1.6.0 is fine.
ShaneHarvey
approved these changes
Oct 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Integration tests are in mongodb/mongo-python-driver#1064