Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boto actually returns a base64 encoded string of <user>:<password>

Browse Source 
Fix the mock to do the same thing
This commit is contained in:
William Richard 2017-07-26 12:03:20 -04:00
parent 025e975e44
commit aeefc8056d
No known key found for this signature in database
GPG Key ID: F7F8BA4DDBE1ABED
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/ecr/responses.py
View File

@ -1,5 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json import json
from base64 import b64encode
from datetime import datetime from datetime import datetime
import time import time
@ -117,8 +118,10 @@ class ECRResponse(BaseResponse):
registry_ids = [self.region] registry_ids = [self.region]
auth_data = [] auth_data = []
for registry_id in registry_ids: for registry_id in registry_ids:
password = '{}-auth-token'.format(registry_id)
auth_token = b64encode("AWS:{}".format(password).encode('ascii')).decode()
auth_data.append({ auth_data.append({
'authorizationToken': '{}-auth-token'.format(registry_id), 'authorizationToken': auth_token,
'expiresAt': time.mktime(datetime(2015, 1, 1).timetuple()), 'expiresAt': time.mktime(datetime(2015, 1, 1).timetuple()),
'proxyEndpoint': 'https://012345678910.dkr.ecr.{}.amazonaws.com'.format(registry_id) 'proxyEndpoint': 'https://012345678910.dkr.ecr.{}.amazonaws.com'.format(registry_id)
}) })

6
tests/test_ecr/test_ecr_boto3.py
View File

@ -380,7 +380,7 @@ def test_get_authorization_token_assume_region():
list(auth_token_response.keys()).should.equal(['authorizationData', 'ResponseMetadata']) list(auth_token_response.keys()).should.equal(['authorizationData', 'ResponseMetadata'])
auth_token_response['authorizationData'].should.equal([ auth_token_response['authorizationData'].should.equal([
{ {
'authorizationToken': 'us-east-1-auth-token', 'authorizationToken': 'QVdTOnVzLWVhc3QtMS1hdXRoLXRva2Vu',
'proxyEndpoint': 'https://012345678910.dkr.ecr.us-east-1.amazonaws.com', 'proxyEndpoint': 'https://012345678910.dkr.ecr.us-east-1.amazonaws.com',
'expiresAt': datetime(2015, 1, 1, tzinfo=tzlocal()) 'expiresAt': datetime(2015, 1, 1, tzinfo=tzlocal())
}, },
@ -395,12 +395,12 @@ def test_get_authorization_token_explicit_regions():
list(auth_token_response.keys()).should.equal(['authorizationData', 'ResponseMetadata']) list(auth_token_response.keys()).should.equal(['authorizationData', 'ResponseMetadata'])
auth_token_response['authorizationData'].should.equal([ auth_token_response['authorizationData'].should.equal([
{ {
'authorizationToken': 'us-east-1-auth-token', 'authorizationToken': 'QVdTOnVzLWVhc3QtMS1hdXRoLXRva2Vu',
'proxyEndpoint': 'https://012345678910.dkr.ecr.us-east-1.amazonaws.com', 'proxyEndpoint': 'https://012345678910.dkr.ecr.us-east-1.amazonaws.com',
'expiresAt': datetime(2015, 1, 1, tzinfo=tzlocal()), 'expiresAt': datetime(2015, 1, 1, tzinfo=tzlocal()),
}, },
{ {
'authorizationToken': 'us-west-1-auth-token', 'authorizationToken': 'QVdTOnVzLXdlc3QtMS1hdXRoLXRva2Vu',
'proxyEndpoint': 'https://012345678910.dkr.ecr.us-west-1.amazonaws.com', 'proxyEndpoint': 'https://012345678910.dkr.ecr.us-west-1.amazonaws.com',
'expiresAt': datetime(2015, 1, 1, tzinfo=tzlocal()) 'expiresAt': datetime(2015, 1, 1, tzinfo=tzlocal())