Commit49b5a01

committed

fix recent config change

1 parent43452a3 commit49b5a01Copy full SHA for 49b5a01

File tree

+18

-9

lines changed

+18

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ def register_in_instance(self):`
`145`	`145`	`ifnotport:`
`146`	`146`	`raiseException("Proxy currently not running")`
`147`	`147`	`url=f"{external_service_url()}{HANDLER_PATH_PROXIES}"`
`148`		`-data=AddProxyRequest(port=port,config=self.config)`
	`148`	`+data=AddProxyRequest(port=port,config=self.config,env_vars={})`
`149`	`149`	`LOG.debug("Registering new proxy in main container via: %s",url)`
`150`	`150`	`try:`
`151`	`151`	`response=requests.post(url,json=data)`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,14 @@`
`6`	`6`	`importrequests`
`7`	`7`	`fromlocalstack.aws.apiimportRequestContext`
`8`	`8`	`fromlocalstack.aws.chainimportHandler,HandlerChain`
`9`		`-fromlocalstack.constantsimport (`
`10`		`-APPLICATION_JSON,`
`11`		`-LOCALHOST,`
`12`		`-LOCALHOST_HOSTNAME,`
`13`		`-TEST_AWS_ACCESS_KEY_ID,`
`14`		`-)`
	`9`	`+fromlocalstack.constantsimportAPPLICATION_JSON,LOCALHOST,LOCALHOST_HOSTNAME`
`15`	`10`	`fromlocalstack.httpimportResponse`
	`11`	`+`
	`12`	`+try:`
	`13`	`+fromlocalstack.constantsimportTEST_AWS_ACCOUNT_ID`
	`14`	`+exceptImportError:`
	`15`	`+# compatibility with localstack 3.5`
	`16`	`+fromlocalstack.testing.configimportTEST_AWS_ACCOUNT_ID`
`16`	`17`	`fromlocalstack.utils.awsimportarns`
`17`	`18`	`fromlocalstack.utils.aws.arnsimportsqs_queue_arn`
`18`	`19`	`fromlocalstack.utils.aws.aws_stackimportget_valid_regions`
`@@ -192,6 +193,7 @@ def _extract_region_from_domain(self, context: RequestContext):`
`192`	`193`	`context.request.headers["Authorization"]=mock_aws_request_headers(`
`193`	`194`	`context.service.service_name,`
`194`	`195`	`region_name=part,`
	`196`	`+# FIXME: TEST_AWS_ACCESS_KEY_ID should only be used in testing`
`195`	`197`	`aws_access_key_id=TEST_AWS_ACCESS_KEY_ID,`
`196`	`198`	`)`
`197`	`199`	`return`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,13 @@`
`6`	`6`	`importpytest`
`7`	`7`	`frombotocore.exceptionsimportClientError`
`8`	`8`	`fromlocalstack.aws.connectimportconnect_to`
`9`		`-fromlocalstack.constantsimportTEST_AWS_ACCOUNT_ID`
	`9`	`+`
	`10`	`+try:`
	`11`	`+fromlocalstack.constantsimportTEST_AWS_ACCOUNT_ID`
	`12`	`+exceptImportError:`
	`13`	`+# compatibility with localstack 3.5`
	`14`	`+fromlocalstack.testing.configimportTEST_AWS_ACCOUNT_ID`
	`15`	`+`
`10`	`16`	`fromlocalstack.utils.aws.arnsimportsqs_queue_arn,sqs_queue_url_for_arn`
`11`	`17`	`fromlocalstack.utils.syncimportretry`
`12`	`18`
`@@ -23,7 +29,8 @@ def start_aws_proxy():`
`23`	`29`
`24`	`30`	`def_start(config:dict=None):`
`25`	`31`	`proxy=start_aws_auth_proxy(config)`
`26`		`-proxy.wait_is_up()`
	`32`	`+ifnotproxy.wait_is_up(timeout=10):`
	`33`	`+raiseTimeoutError(f"Gave up waiting for proxy to start on{proxy.url}")`
`27`	`34`	`proxies.append(proxy)`
`28`	`35`	`returnproxy`
`29`	`36`

Comments

(0)