shunping commented on code in PR #40547:
URL: https://github.com/apache/beam/pull/40547#discussion_r4262420682
##########
sdks/python/apache_beam/io/aws/clients/s3/boto3_client_test.py:
##########
@@ -111,8 +115,123 @@ def test_no_options_uses_boto3_defaults(self):
kwargs = self._client_kwargs()
self.assertIsNone(kwargs['aws_access_key_id'])
self.assertIsNone(kwargs['aws_secret_access_key'])
+ self.assertIsNone(kwargs['aws_session_token'])
self.assertTrue(kwargs['use_ssl'])
+ @mock.patch('apache_beam.utils.secret.Secret.from_json')
+ def test_credentials_parsed_by_secret_manager(self, mock_from_json):
+ key_id_spec = json.dumps({'name': 'key-id', 'project': 'p'})
+ secret_key_spec = json.dumps({'name': 'secret-key', 'project': 'p'})
+ token_spec = json.dumps({'name': 'token', 'project': 'p'})
+ resolved = {
+ key_id_spec: 'AKIDEXAMPLE',
+ secret_key_spec: 'SECRETEXAMPLE',
+ token_spec: 'TOKEN',
+ }
+ mock_from_json.side_effect = lambda spec, manager:
RawSecret(resolved[spec])
+
+ boto3_client.Client(
+ PipelineOptions([
+ '--aws_credentials_secret_manager=GoogleCloudSecretManager',
+ f'--aws_access_key_id={key_id_spec}',
+ f'--aws_secret_access_key={secret_key_spec}',
+ f'--aws_session_token={token_spec}',
+ ]))
+
+ kwargs = self._client_kwargs()
+ self.assertEqual(kwargs['aws_access_key_id'], 'AKIDEXAMPLE')
+ self.assertEqual(kwargs['aws_secret_access_key'], 'SECRETEXAMPLE')
+ self.assertEqual(kwargs['aws_session_token'], 'TOKEN')
+ mock_from_json.assert_has_calls([
+ mock.call(key_id_spec, 'GoogleCloudSecretManager'),
+ mock.call(secret_key_spec, 'GoogleCloudSecretManager'),
+ mock.call(token_spec, 'GoogleCloudSecretManager'),
+ ])
+
+ @mock.patch('apache_beam.utils.secret.Secret.from_json')
+ def test_secret_manager_applies_to_s3_credential_overrides(
+ self, mock_from_json):
+ resolved = {
+ 'projects/p/secrets/key-id/versions/1': 'AKIDEXAMPLE',
+ 'projects/p/secrets/secret-key/versions/1': 'SECRETEXAMPLE',
+ }
+ mock_from_json.side_effect = lambda spec, manager:
RawSecret(resolved[spec])
+
+ boto3_client.Client({
+ 'aws_credentials_secret_manager': 'GoogleCloudSecretManager',
+ 's3_access_key_id': 'projects/p/secrets/key-id/versions/1',
+ 's3_secret_access_key': 'projects/p/secrets/secret-key/versions/1',
+ })
+
+ kwargs = self._client_kwargs()
+ self.assertEqual(kwargs['aws_access_key_id'], 'AKIDEXAMPLE')
+ self.assertEqual(kwargs['aws_secret_access_key'], 'SECRETEXAMPLE')
+
+ @mock.patch('google.cloud.secretmanager.SecretManagerServiceClient')
+ def test_gcp_secret_manager_end_to_end(self, mock_gcp_client):
Review Comment:
Good call. Added a condition to skip this test.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
