Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .autover/changes/820ce536-653c-4f85-ba25-38489fd67ff2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "AWS.Deploy.CLI",
"Type": "Patch",
"ChangelogMessages": [
"Added AWSSDK.Signin dependency to resolve AWS credentials when authenticated using the AWS CLI v2 'aws login' SSO flow"
]
}
]
}
11 changes: 11 additions & 0 deletions .autover/changes/86fe5d64-aa64-4878-8325-76885b519fe8.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Projects": [
{
"Name": "AWS.Deploy.CLI",
"Type": "Patch",
"ChangelogMessages": [
"Update CDK Bootstrap template to version 32"
]
}
]
}
1 change: 1 addition & 0 deletions src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<PackageReference Include="AWSSDK.IdentityManagement" Version="4.0.9.10" />
<PackageReference Include="AWSSDK.CloudFormation" Version="4.0.8.11" />
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.5.12" />
<PackageReference Include="AWSSDK.Signin" Version="4.0.1.1" />
<PackageReference Include="AWSSDK.SSO" Version="4.0.2.16" />
<PackageReference Include="AWSSDK.SSOOIDC" Version="4.0.3.17" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
Expand Down
19 changes: 5 additions & 14 deletions src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -593,14 +593,11 @@ Resources:
Policies:
- PolicyDocument:
Statement:
- Sid: CloudFormationPermissions
- Sid: DeployPermissions
Effect: Allow
Action:
- cloudformation:CreateChangeSet
- cloudformation:DeleteChangeSet
- cloudformation:DescribeChangeSet
- cloudformation:DescribeStacks
- cloudformation:DescribeEvents
- cloudformation:ExecuteChangeSet
- cloudformation:CreateStack
- cloudformation:UpdateStack
Expand Down Expand Up @@ -640,13 +637,9 @@ Resources:
Effect: Allow
- Sid: CliPermissions
Action:
- cloudformation:DescribeStackEvents
- cloudformation:GetTemplate
- cloudformation:DeleteStack
- cloudformation:UpdateTerminationProtection
- sts:GetCallerIdentity
- cloudformation:GetTemplateSummary
- cloudformation:GetHookResult
Resource: "*"
Effect: Allow
- Sid: CliStagingBucket
Expand All @@ -669,14 +662,12 @@ Resources:
Effect: Allow
Action:
- cloudformation:CreateStackRefactor
- cloudformation:DescribeStackRefactor
- cloudformation:ExecuteStackRefactor
- cloudformation:ListStackRefactorActions
- cloudformation:ListStackRefactors
- cloudformation:ListStacks
Resource: "*"
Version: "2012-10-17"
PolicyName: default
ManagedPolicyArns:
- Fn::Sub: arn:${AWS::Partition}:iam::aws:policy/AWSCloudFormationReadOnlyAccess
RoleName:
Fn::Sub: cdk-${Qualifier}-deploy-role-${AWS::AccountId}-${AWS::Region}
Tags:
Expand Down Expand Up @@ -756,7 +747,7 @@ Resources:
Type: String
Name:
Fn::Sub: /cdk-bootstrap/${Qualifier}/version
Value: "31"
Value: "32"
Outputs:
BucketName:
Description: The name of the S3 bucket owned by the CDK toolkit stack
Expand All @@ -782,4 +773,4 @@ Outputs:
Fn::Sub: ${ContainerAssetsRepository}
BootstrapVersion:
Description: The version of the bootstrap resources that are currently mastered in this stack
Value: "31"
Value: "32"
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

namespace AWS.Deploy.CLI.IntegrationTests.ConfigFileDeployment
{
[Collection(nameof(ElasticBeanstalkTestCollection))]
public class ElasticBeanStalkDeploymentTest : IDisposable
{
private readonly IServiceCollection _serviceCollection;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

using Xunit;

namespace AWS.Deploy.CLI.IntegrationTests
{
// Serializes web app deploy/session tests so parallel runs don't throttle Elastic Beanstalk APIs.
[CollectionDefinition(nameof(ElasticBeanstalkTestCollection), DisableParallelization = true)]
public class ElasticBeanstalkTestCollection
{
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

namespace AWS.Deploy.CLI.IntegrationTests.ServerMode
{
[Collection(nameof(ElasticBeanstalkTestCollection))]
public class DependencyValidationOptionSettings : IDisposable
{
private bool _isDisposed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

namespace AWS.Deploy.CLI.IntegrationTests.ServerMode
{
[Collection(nameof(ElasticBeanstalkTestCollection))]
public class GetApplyOptionSettings : IDisposable
{
private bool _isDisposed;
Expand Down
Loading