Skip to content

Upgrade localstack #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 22, 2023
Merged

Upgrade localstack #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62b04cc
Upgrade localstack
stof Oct 24, 2023
23fdb64
Fix the dynamodb integration tests
stof Oct 26, 2023
7294366
Update the Sts integration test for the new localstack return values
stof Oct 26, 2023
3ea9a4a
Update the route53 expectation for the listing endpoint
stof Oct 26, 2023
ebacdf2
Switch to 3.0.0
GrahamCampbell Nov 21, 2023
6469fd0
Skip bad test for now
GrahamCampbell Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ $(SUBINITIALIZE): %.initialize:

start-docker: start-docker-s3 start-docker-kms start-docker-localstack
start-docker-localstack:
docker pull localstack/localstack:0.14.2
docker pull localstack/localstack:3.0.0
docker start async_aws_localstack && exit 0 || \
docker run -d -p 4566:4566 -p 4567:4566 -p 4568:4566 -p 4571:4566 -p 4572:4566 -p 4573:4566 -p 4574:4566 -p 4575:4566 -p 4576:4566 -p 4577:4566 -p 4578:4566 -e SERVICES=sts,cloudformation,logs,events,iam,sns,ssm,dynamodb,route53,kinesis,secretsmanager -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack localstack/localstack:0.14.2 && \
docker run -d -p 4566:4566 -p 4567:4566 -p 4568:4566 -p 4571:4566 -p 4572:4566 -p 4573:4566 -p 4574:4566 -p 4575:4566 -p 4576:4566 -p 4577:4566 -p 4578:4566 -e SERVICES=sts,cloudformation,logs,events,iam,sns,ssm,dynamodb,route53,kinesis,secretsmanager -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack:localstack martin/wait -c localstack:4566
start-docker-s3:
docker pull asyncaws/testing-s3
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Core/tests/Integration/StsClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Service/CloudFormation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-cloudformation && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4567:4566 -e SERVICES=cloudformation -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-cloudformation localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4567:4566 -e SERVICES=cloudformation -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-cloudformation localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-cloudformation:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/CloudWatchLogs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-logs && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4568:4566 -e SERVICES=logs -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-logs localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4568:4566 -e SERVICES=logs -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-logs localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-logs:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/DynamoDb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-dynamodb && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4575:4566 -e SERVICES=dynamodb -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-dynamodb localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4575:4566 -e SERVICES=dynamodb -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-dynamodb localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-dynamodb:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
3 changes: 3 additions & 0 deletions src/Service/DynamoDb/tests/Integration/DynamoDbClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use AsyncAws\DynamoDb\DynamoDbClient;
use AsyncAws\DynamoDb\Enum\KeyType;
use AsyncAws\DynamoDb\Enum\ProjectionType;
use AsyncAws\DynamoDb\Enum\ReturnConsumedCapacity;
use AsyncAws\DynamoDb\Input\BatchGetItemInput;
use AsyncAws\DynamoDb\Input\BatchWriteItemInput;
use AsyncAws\DynamoDb\Input\CreateTableInput;
Expand Down Expand Up @@ -348,9 +349,11 @@ public function testPutItem(): void
'Subject' => ['S' => 'How do I update multiple items?'],
'LastPostedBy' => ['S' => '[email protected]'],
],
'ReturnConsumedCapacity' => ReturnConsumedCapacity::INDEXES,
]);

$result = $client->putItem($input);
self::assertNotNull($result->getConsumedCapacity());
self::assertSame(1.0, $result->getConsumedCapacity()->getCapacityUnits());
}

Expand Down
4 changes: 2 additions & 2 deletions src/Service/EventBridge/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-events && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4571:4566 -e SERVICES=events -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-events localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4571:4566 -e SERVICES=events -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-events localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-events:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/Iam/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-iam && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4572:4566 -e SERVICES=iam -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-iam localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4572:4566 -e SERVICES=iam -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-iam localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-iam:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/Kinesis/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-kinesis && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4578:4566 -e SERVICES=kinesis -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-kinesis localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4578:4566 -e SERVICES=kinesis -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-kinesis localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-kinesis:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/Route53/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-route53 && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4576:4566 -e SERVICES=route53 -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-route53 localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4576:4566 -e SERVICES=route53 -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-route53 localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-route53:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
5 changes: 4 additions & 1 deletion src/Service/Route53/tests/Integration/Route53ClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public function testChangeResourceRecordSets(): void

public function testCreateHostedZone(): void
{
self::markTestSkipped('Localstack does not implement this operation correctly');

$client = $this->getClient();

$this->deleteZone('test-domain.com.');
Expand Down Expand Up @@ -221,7 +223,8 @@ public function testListResourceRecordSets(): void

$result->resolve();

self::assertCount(2, iterator_to_array($result->getResourceRecordSets()));
// Creating a zone automatically creates NS and SOA records, and we added 2 records above.
self::assertCount(4, iterator_to_array($result->getResourceRecordSets()));
self::assertFalse($result->getIsTruncated());
self::assertNull($result->getNextRecordName());
}
Expand Down
4 changes: 2 additions & 2 deletions src/Service/SecretsManager/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-secretsmanager && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4577:4566 -e SERVICES=secretsmanager -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-secretsmanager localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4577:4566 -e SERVICES=secretsmanager -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-secretsmanager localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-secretsmanager:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/Sns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-sns && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4573:4566 -e SERVICES=sns -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-sns localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4573:4566 -e SERVICES=sns -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-sns localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-sns:localstack martin/wait -c localstack:4566

test: initialize
Expand Down
4 changes: 2 additions & 2 deletions src/Service/Ssm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ initialize: start-docker
start-docker:
docker start async_aws_localstack && exit 0 || \
docker start async_aws_localstack-ssm && exit 0 || \
docker pull localstack/localstack:0.14.2 && \
docker run -d -p 4574:4566 -e SERVICES=ssm -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-ssm localstack/localstack:0.14.2 && \
docker pull localstack/localstack:3.0.0 && \
docker run -d -p 4574:4566 -e SERVICES=ssm -v /var/run/docker.sock:/var/run/docker.sock --name async_aws_localstack-ssm localstack/localstack:3.0.0 && \
docker run --rm --link async_aws_localstack-ssm:localstack martin/wait -c localstack:4566

test: initialize
Expand Down