From 4cb848be9b1e3b6da1d8d18c30104f77cfbd81a6 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Tue, 2 Nov 2021 18:25:26 -0700 Subject: [PATCH] Only output the AccessKey part --- s3_credentials/cli.py | 2 +- tests/test_s3_credentials.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/s3_credentials/cli.py b/s3_credentials/cli.py index e62df6d..3283c6b 100644 --- a/s3_credentials/cli.py +++ b/s3_credentials/cli.py @@ -159,7 +159,7 @@ def create( UserName=username, ) log("Created access key for user: {}".format(username)) - click.echo(json.dumps(response, indent=4, default=str)) + click.echo(json.dumps(response["AccessKey"], indent=4, default=str)) @cli.command() diff --git a/tests/test_s3_credentials.py b/tests/test_s3_credentials.py index 1bd51d0..95c4ae7 100644 --- a/tests/test_s3_credentials.py +++ b/tests/test_s3_credentials.py @@ -43,8 +43,10 @@ def test_create(mocker): boto3 = mocker.patch("boto3.client") boto3.return_value = Mock() boto3.return_value.create_access_key.return_value = { - "Key": "key", - "Secret": "secret", + "AccessKey": { + "AccessKeyId": "access", + "SecretAccessKey": "secret", + } } runner = CliRunner() with runner.isolated_filesystem(): @@ -53,7 +55,7 @@ def test_create(mocker): assert result.output == ( "Attached policy s3.read-write.pytest-bucket-simonw-1 to user s3.read-write.pytest-bucket-simonw-1\n" "Created access key for user: s3.read-write.pytest-bucket-simonw-1\n" - '{\n "Key": "key",\n "Secret": "secret"\n}\n' + '{\n "AccessKeyId": "access",\n "SecretAccessKey": "secret"\n}\n' ) assert [str(c) for c in boto3.mock_calls] == [ "call('s3')",