Skip to content

chore: bump AWS sdk versions #1784

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

Open
Jtango18 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore: bump AWS sdk versions #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4bce39
chore: bump AWS SDK libraries to latest
Jtango18 Feb 17, 2026
403bc60
test: fix breaking change
Jtango18 Feb 17, 2026
d8f2661
test: Fix outdated assert
Jtango18 Feb 17, 2026
7e3aba4
test: match nullable value in SDK Update
Jtango18 Feb 17, 2026
d250319
test: handle outputs being nullable
Jtango18 Feb 17, 2026
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
12 changes: 6 additions & 6 deletions source/Calamari.Aws/Calamari.Aws.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.EKS" Version="3.7.13.24" />
<PackageReference Include="AWSSDK.CloudFormation" Version="3.7.9.14" />
<PackageReference Include="AWSSDK.Core" Version="3.7.400.62" />
<PackageReference Include="AWSSDK.IdentityManagement" Version="3.7.2.116" />
<PackageReference Include="AWSSDK.S3" Version="3.7.8.8" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.11" />
<PackageReference Include="AWSSDK.EKS" Version="4.0.13" />
<PackageReference Include="AWSSDK.CloudFormation" Version="4.0.8.8" />
<PackageReference Include="AWSSDK.Core" Version="4.0.3.14" />
<PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.9.7" />
<PackageReference Include="AWSSDK.S3" Version="4.0.18.6" />
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions source/Calamari.Aws/Deployment/Conventions/CloudFormationOutputsAsVariablesConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Task InstallAsync(RunningDeployment deployment)
Guard.NotNull(query, "Query for stack may not be null");

List<VariableOutput> ConvertStackOutputs(Stack stack) =>
stack.Outputs.Select(p => new VariableOutput(p.OutputKey, p.OutputValue)).ToList();
stack.Outputs?.Select(p => new VariableOutput(p.OutputKey, p.OutputValue)).ToList() ?? new List<VariableOutput>();

return (await query()).Select(ConvertStackOutputs)
.Map(result => (result: result.SomeOr(new List<VariableOutput>()), success: true));
Expand Down Expand Up @@ -89,4 +89,4 @@ async Task GetAndPipeOutputVariablesWithRetry(Func<Task<Maybe<Stack>>> query, IV
}
}
}
}
}
6 changes: 3 additions & 3 deletions source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.400.62" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.11" />
<PackageReference Include="AWSSDK.ECR" Version="3.7.100.0" />
<PackageReference Include="AWSSDK.Core" Version="4.0.3.14" />
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.9" />
<PackageReference Include="AWSSDK.ECR" Version="4.0.9.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari.Shared/Calamari.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<ItemGroup>
<ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj" />
<ProjectReference Include="..\Calamari.Common\Calamari.Common.csproj" />
<PackageReference Include="AWSSDK.S3" Version="3.7.8.8" />
<PackageReference Include="AWSSDK.S3" Version="4.0.18.6" />
<PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.10.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari.Terraform/Calamari.Terraform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.11" />
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.9" />
<PackageReference Include="NuGet.Versioning" Version="7.0.1" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions source/Calamari.Tests/AWS/AwsEnvironmentGenerationFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public class AwsEnvironmentGenerationFixture
{
[Test]
[TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", "900", 900)]
[TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", null, 0)]
[TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", "", 0)]
[TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", null, null)]
[TestCase("arn:aws:iam::0123456789AB:role/test-role", "My session name", "", null)]
public void CreatesAssumeRoleRequestWithExpectedParams(string arn, string sessionName, string duration, int? expectedDuration)
{
IVariables variables = new CalamariVariables();
Expand Down
10 changes: 2 additions & 8 deletions source/Calamari.Tests/AWS/UploadAwsS3CommandFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,7 @@ public async Task UploadPackageWithMetadata()
CannedAcl = "private",
BucketKeyBehaviour = BucketKeyBehaviourType.Filename,
Metadata = specialHeaders.Concat(userDefinedMetadata).ToList(),
Tags = new List<KeyValuePair<string, string>>()
{
new KeyValuePair<string, string>("Environment", "Test")
}
Tags = [new KeyValuePair<string, string>("Environment", "Test")]
}
};

Expand All @@ -287,10 +284,7 @@ await Validate(async client =>
{
if (specialHeader.Key == "Expires")
{
//There's a serialization bug in Json.Net that ends up changing the time to local.
//Fix this assertion once that's done.
var expectedDate = DateTime.Parse(specialHeader.Value.TrimEnd('Z')).ToUniversalTime();
response.Expires.Should().Be(expectedDate);
response.ExpiresString.Should().Be(specialHeader.Value);
}
else if (specialHeader.Key == "x-amz-website-redirect-location")
{
Expand Down