Upgrade localstack (#1604)

GrahamCampbell · stof · web-flow · commit c56fdf69eee5 · 2023-11-22T18:35:47.000+01:00
* Upgrade localstack

* Fix the dynamodb integration tests

The new localstack version emulates AWS better, returning a consumed
capacity only when the request asks for it.

* Update the Sts integration test for the new localstack return values

* Update the route53 expectation for the listing endpoint

In the new localstack version, creating a zone automatically creates the
NS and SOA records for that zone, emulating what actually happens on
AWS.

* Switch to 3.0.0

* Skip bad test for now

---------

Co-authored-by: Christophe Coevoet &lt;stof@notk.org&gt;
diff --git a/Makefile b/Makefile
@@ -4,8 +4,8 @@ initialize: start-docker
 start-docker:
 	docker start async_aws_localstack && exit 0 || \
 	docker start async_aws_localstack-sts && exit 0 || \
-	docker pull localstack/localstack:0.14.2 && \
-	docker run -d -p 4566:4566 -e SERVICES=sts -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-sts localstack/localstack:0.14.2 && \
+	docker pull localstack/localstack:3.0.0 && \
+	docker run -d -p 4566:4566 -e SERVICES=sts -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-sts localstack/localstack:3.0.0 && \
 	docker run --rm --link async_aws_localstack-sts:localstack martin/wait -c localstack:4566
 
 test: initialize
diff --git a/tests/Integration/StsClientTest.php b/tests/Integration/StsClientTest.php
@@ -65,7 +65,7 @@ public function testAssumeRoleWithWebIdentity(): void
         self::assertNotNull($result->getCredentials());
         self::assertLessThanOrEqual(new \DateTime('+5min'), $result->getCredentials()->getExpiration());
         self::assertNotNull($result->getAssumedRoleUser());
-        self::assertSame('arn:aws:sts::000000000000:assumed-role/FederatedWebIdentityRole/app1', $result->getAssumedRoleUser()->getArn());
+        self::assertSame('arn:aws:sts::123456789012:assumed-role/FederatedWebIdentityRole/app1', $result->getAssumedRoleUser()->getArn());
         self::assertSame(6, $result->getPackedPolicySize());
     }
 
@@ -78,7 +78,7 @@ public function testGetCallerIdentity(): void
 
         self::assertNotNull($result->getUserId());
         self::assertStringContainsString('000000000000', $result->getAccount());
-        self::assertStringContainsString('arn:aws:sts::000000000000:user/localstack', $result->getArn());
+        self::assertStringContainsString('arn:aws:iam::000000000000:root', $result->getArn());
     }
 
     public function testNonAwsRegionWithCustomEndpoint(): void

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function testAssumeRoleWithWebIdentity(): void`
`65`	`65`	`self::assertNotNull($result->getCredentials());`
`66`	`66`	`self::assertLessThanOrEqual(new \DateTime('+5min'), $result->getCredentials()->getExpiration());`
`67`	`67`	`self::assertNotNull($result->getAssumedRoleUser());`
`68`		`- self::assertSame('arn:aws:sts::000000000000:assumed-role/FederatedWebIdentityRole/app1', $result->getAssumedRoleUser()->getArn());`
	`68`	`+ self::assertSame('arn:aws:sts::123456789012:assumed-role/FederatedWebIdentityRole/app1', $result->getAssumedRoleUser()->getArn());`
`69`	`69`	`self::assertSame(6, $result->getPackedPolicySize());`
`70`	`70`	`}`
`71`	`71`
`@@ -78,7 +78,7 @@ public function testGetCallerIdentity(): void`
`78`	`78`
`79`	`79`	`self::assertNotNull($result->getUserId());`
`80`	`80`	`self::assertStringContainsString('000000000000', $result->getAccount());`
`81`		`- self::assertStringContainsString('arn:aws:sts::000000000000:user/localstack', $result->getArn());`
	`81`	`+ self::assertStringContainsString('arn:aws:iam::000000000000:root', $result->getArn());`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function testNonAwsRegionWithCustomEndpoint(): void`