diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index 075eab42ab599..d4bb0f0503d9e 100644 --- a/CHANGELOG.v2.alpha.md +++ b/CHANGELOG.v2.alpha.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.59.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.58.1-alpha.0...v2.59.0-alpha.0) (2023-01-03) + ## [2.58.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.58.0-alpha.0...v2.58.1-alpha.0) (2022-12-30) ## [2.58.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.57.0-alpha.0...v2.58.0-alpha.0) (2022-12-28) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index ac36a3122ab72..6748407a0c2f4 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,6 +2,21 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [2.59.0](https://github.com/aws/aws-cdk/compare/v2.58.1...v2.59.0) (2023-01-03) + + +### Features + +* **cfnspec:** cloudformation spec v105.0.0 ([#23501](https://github.com/aws/aws-cdk/issues/23501)) ([72bd3a0](https://github.com/aws/aws-cdk/commit/72bd3a0ce96c9fd98bbf2f3eb76db1336c8a3029)) +* **s3:** use Bucket Policy for Server Access Logging grant (under feature flag) ([#23386](https://github.com/aws/aws-cdk/issues/23386)) ([6975a7e](https://github.com/aws/aws-cdk/commit/6975a7ea06a5680bebd38ad5c26ab5bd566d33b1)), closes [#22183](https://github.com/aws/aws-cdk/issues/22183) +* **servicecatalog:** Add Product Stack Asset Support ([#22857](https://github.com/aws/aws-cdk/issues/22857)) ([ceaac3a](https://github.com/aws/aws-cdk/commit/ceaac3ad49fcfdb89ec80c2784934589542e80b6)), closes [#20690](https://github.com/aws/aws-cdk/issues/20690) + + +### Bug Fixes + +* **lambda-nodejs:** unable to use `nodeModules` with pnpm ([#21911](https://github.com/aws/aws-cdk/issues/21911)) ([7c752db](https://github.com/aws/aws-cdk/commit/7c752db4aa83b242098483fc006c1100d1be11a9)), closes [#21910](https://github.com/aws/aws-cdk/issues/21910) +* **servicecatalog:** make assetBuckets a required property ([#23507](https://github.com/aws/aws-cdk/issues/23507)) ([10b6b96](https://github.com/aws/aws-cdk/commit/10b6b96f35ac32a60aa2bf4ea1856158392ae8ad)) + ## [2.58.1](https://github.com/aws/aws-cdk/compare/v2.58.0...v2.58.1) (2022-12-30) diff --git a/LICENSE b/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/test/publish-subscribe.integ.snapshot/aws-ecs-integ.template.json b/packages/@aws-cdk-containers/ecs-service-extensions/test/publish-subscribe.integ.snapshot/aws-ecs-integ.template.json deleted file mode 100644 index 56b3d569d5be4..0000000000000 --- a/packages/@aws-cdk-containers/ecs-service-extensions/test/publish-subscribe.integ.snapshot/aws-ecs-integ.template.json +++ /dev/null @@ -1,1343 +0,0 @@ -{ - "Resources": { - "productionenvironmentvpcAEB47DF7": { - "Type": "AWS::EC2::VPC", - "Properties": { - "CidrBlock": "10.0.0.0/16", - "EnableDnsHostnames": true, - "EnableDnsSupport": true, - "InstanceTenancy": "default", - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet1Subnet8D92C089": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "AvailabilityZone": { - "Fn::Select": [ - 0, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.0.0/18", - "MapPublicIpOnLaunch": true, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Public" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Public" - }, - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet1" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet1RouteTable6E9ABC21": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet1" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet1RouteTableAssociationA8117374": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPublicSubnet1RouteTable6E9ABC21" - }, - "SubnetId": { - "Ref": "productionenvironmentvpcPublicSubnet1Subnet8D92C089" - } - } - }, - "productionenvironmentvpcPublicSubnet1DefaultRoute524C894D": { - "Type": "AWS::EC2::Route", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPublicSubnet1RouteTable6E9ABC21" - }, - "DestinationCidrBlock": "0.0.0.0/0", - "GatewayId": { - "Ref": "productionenvironmentvpcIGWE7C39890" - } - }, - "DependsOn": [ - "productionenvironmentvpcVPCGW1B428D07" - ] - }, - "productionenvironmentvpcPublicSubnet1EIP54BA88DB": { - "Type": "AWS::EC2::EIP", - "Properties": { - "Domain": "vpc", - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet1" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet1NATGateway6075E4CA": { - "Type": "AWS::EC2::NatGateway", - "Properties": { - "SubnetId": { - "Ref": "productionenvironmentvpcPublicSubnet1Subnet8D92C089" - }, - "AllocationId": { - "Fn::GetAtt": [ - "productionenvironmentvpcPublicSubnet1EIP54BA88DB", - "AllocationId" - ] - }, - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet1" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet2Subnet298E6C31": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "AvailabilityZone": { - "Fn::Select": [ - 1, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.64.0/18", - "MapPublicIpOnLaunch": true, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Public" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Public" - }, - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet2" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet2RouteTable842A68D7": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet2" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet2RouteTableAssociation0A7549F3": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPublicSubnet2RouteTable842A68D7" - }, - "SubnetId": { - "Ref": "productionenvironmentvpcPublicSubnet2Subnet298E6C31" - } - } - }, - "productionenvironmentvpcPublicSubnet2DefaultRoute92CD697D": { - "Type": "AWS::EC2::Route", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPublicSubnet2RouteTable842A68D7" - }, - "DestinationCidrBlock": "0.0.0.0/0", - "GatewayId": { - "Ref": "productionenvironmentvpcIGWE7C39890" - } - }, - "DependsOn": [ - "productionenvironmentvpcVPCGW1B428D07" - ] - }, - "productionenvironmentvpcPublicSubnet2EIP14CA46AA": { - "Type": "AWS::EC2::EIP", - "Properties": { - "Domain": "vpc", - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet2" - } - ] - } - }, - "productionenvironmentvpcPublicSubnet2NATGatewayE1850FCC": { - "Type": "AWS::EC2::NatGateway", - "Properties": { - "SubnetId": { - "Ref": "productionenvironmentvpcPublicSubnet2Subnet298E6C31" - }, - "AllocationId": { - "Fn::GetAtt": [ - "productionenvironmentvpcPublicSubnet2EIP14CA46AA", - "AllocationId" - ] - }, - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PublicSubnet2" - } - ] - } - }, - "productionenvironmentvpcPrivateSubnet1Subnet53F632E6": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "AvailabilityZone": { - "Fn::Select": [ - 0, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.128.0/18", - "MapPublicIpOnLaunch": false, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Private" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Private" - }, - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PrivateSubnet1" - } - ] - } - }, - "productionenvironmentvpcPrivateSubnet1RouteTable2C6DFF0C": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PrivateSubnet1" - } - ] - } - }, - "productionenvironmentvpcPrivateSubnet1RouteTableAssociation8BA32463": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPrivateSubnet1RouteTable2C6DFF0C" - }, - "SubnetId": { - "Ref": "productionenvironmentvpcPrivateSubnet1Subnet53F632E6" - } - } - }, - "productionenvironmentvpcPrivateSubnet1DefaultRouteFBB3DE6C": { - "Type": "AWS::EC2::Route", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPrivateSubnet1RouteTable2C6DFF0C" - }, - "DestinationCidrBlock": "0.0.0.0/0", - "NatGatewayId": { - "Ref": "productionenvironmentvpcPublicSubnet1NATGateway6075E4CA" - } - } - }, - "productionenvironmentvpcPrivateSubnet2Subnet756FB93C": { - "Type": "AWS::EC2::Subnet", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "AvailabilityZone": { - "Fn::Select": [ - 1, - { - "Fn::GetAZs": "" - } - ] - }, - "CidrBlock": "10.0.192.0/18", - "MapPublicIpOnLaunch": false, - "Tags": [ - { - "Key": "aws-cdk:subnet-name", - "Value": "Private" - }, - { - "Key": "aws-cdk:subnet-type", - "Value": "Private" - }, - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PrivateSubnet2" - } - ] - } - }, - "productionenvironmentvpcPrivateSubnet2RouteTable2F77D0D2": { - "Type": "AWS::EC2::RouteTable", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc/PrivateSubnet2" - } - ] - } - }, - "productionenvironmentvpcPrivateSubnet2RouteTableAssociation09188261": { - "Type": "AWS::EC2::SubnetRouteTableAssociation", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPrivateSubnet2RouteTable2F77D0D2" - }, - "SubnetId": { - "Ref": "productionenvironmentvpcPrivateSubnet2Subnet756FB93C" - } - } - }, - "productionenvironmentvpcPrivateSubnet2DefaultRoute5F9AB6C1": { - "Type": "AWS::EC2::Route", - "Properties": { - "RouteTableId": { - "Ref": "productionenvironmentvpcPrivateSubnet2RouteTable2F77D0D2" - }, - "DestinationCidrBlock": "0.0.0.0/0", - "NatGatewayId": { - "Ref": "productionenvironmentvpcPublicSubnet2NATGatewayE1850FCC" - } - } - }, - "productionenvironmentvpcIGWE7C39890": { - "Type": "AWS::EC2::InternetGateway", - "Properties": { - "Tags": [ - { - "Key": "Name", - "Value": "aws-ecs-integ/production-environment-vpc" - } - ] - } - }, - "productionenvironmentvpcVPCGW1B428D07": { - "Type": "AWS::EC2::VPCGatewayAttachment", - "Properties": { - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - }, - "InternetGatewayId": { - "Ref": "productionenvironmentvpcIGWE7C39890" - } - } - }, - "productionenvironmentclusterC6599D2D": { - "Type": "AWS::ECS::Cluster" - }, - "signupD2AAA171": { - "Type": "AWS::SNS::Topic" - }, - "delete1CCE71FF": { - "Type": "AWS::SNS::Topic" - }, - "PublishertaskdefinitionTaskRoleE8655AA5": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "ecs-tasks.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PublishertaskdefinitionTaskRoleDefaultPolicyD6E49F15": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": "sns:Publish", - "Effect": "Allow", - "Resource": [ - { - "Ref": "delete1CCE71FF" - }, - { - "Ref": "signupD2AAA171" - } - ] - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PublishertaskdefinitionTaskRoleDefaultPolicyD6E49F15", - "Roles": [ - { - "Ref": "PublishertaskdefinitionTaskRoleE8655AA5" - } - ] - } - }, - "PublishertaskdefinitionA4324C64": { - "Type": "AWS::ECS::TaskDefinition", - "Properties": { - "ContainerDefinitions": [ - { - "Cpu": 256, - "Environment": [ - { - "Name": "PORT", - "Value": "80" - }, - { - "Name": "SIGN-UP_TOPIC_ARN", - "Value": { - "Ref": "signupD2AAA171" - } - }, - { - "Name": "DELETE_TOPIC_ARN", - "Value": { - "Ref": "delete1CCE71FF" - } - } - ], - "Essential": true, - "Image": "nathanpeck/name", - "LogConfiguration": { - "LogDriver": "awslogs", - "Options": { - "awslogs-group": { - "Ref": "PublisherlogsDF0C1067" - }, - "awslogs-stream-prefix": "Publisher", - "awslogs-region": { - "Ref": "AWS::Region" - } - } - }, - "Memory": 512, - "Name": "app", - "PortMappings": [ - { - "ContainerPort": 80, - "Protocol": "tcp" - } - ], - "Ulimits": [ - { - "HardLimit": 1024000, - "Name": "nofile", - "SoftLimit": 1024000 - } - ] - } - ], - "Cpu": "256", - "ExecutionRoleArn": { - "Fn::GetAtt": [ - "PublishertaskdefinitionExecutionRole5C00C542", - "Arn" - ] - }, - "Family": "awsecsintegPublishertaskdefinitionD50610D0", - "Memory": "512", - "NetworkMode": "awsvpc", - "RequiresCompatibilities": [ - "EC2", - "FARGATE" - ], - "TaskRoleArn": { - "Fn::GetAtt": [ - "PublishertaskdefinitionTaskRoleE8655AA5", - "Arn" - ] - } - } - }, - "PublishertaskdefinitionExecutionRole5C00C542": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "ecs-tasks.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PublishertaskdefinitionExecutionRoleDefaultPolicy681FD8E6": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "logs:CreateLogStream", - "logs:PutLogEvents" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PublisherlogsDF0C1067", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PublishertaskdefinitionExecutionRoleDefaultPolicy681FD8E6", - "Roles": [ - { - "Ref": "PublishertaskdefinitionExecutionRole5C00C542" - } - ] - } - }, - "PublisherlogsDF0C1067": { - "Type": "AWS::Logs::LogGroup", - "Properties": { - "LogGroupName": "Publisher-logs", - "RetentionInDays": 30 - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "PublisherserviceService9EB00F60": { - "Type": "AWS::ECS::Service", - "Properties": { - "Cluster": { - "Ref": "productionenvironmentclusterC6599D2D" - }, - "DeploymentConfiguration": { - "MaximumPercent": 200, - "MinimumHealthyPercent": 100 - }, - "DesiredCount": 1, - "EnableECSManagedTags": false, - "LaunchType": "FARGATE", - "NetworkConfiguration": { - "AwsvpcConfiguration": { - "AssignPublicIp": "DISABLED", - "SecurityGroups": [ - { - "Fn::GetAtt": [ - "PublisherserviceSecurityGroupC7B0C0D0", - "GroupId" - ] - } - ], - "Subnets": [ - { - "Ref": "productionenvironmentvpcPrivateSubnet1Subnet53F632E6" - }, - { - "Ref": "productionenvironmentvpcPrivateSubnet2Subnet756FB93C" - } - ] - } - }, - "TaskDefinition": { - "Ref": "PublishertaskdefinitionA4324C64" - } - } - }, - "PublisherserviceSecurityGroupC7B0C0D0": { - "Type": "AWS::EC2::SecurityGroup", - "Properties": { - "GroupDescription": "aws-ecs-integ/Publisher-service/SecurityGroup", - "SecurityGroupEgress": [ - { - "CidrIp": "0.0.0.0/0", - "Description": "Allow all outbound traffic by default", - "IpProtocol": "-1" - } - ], - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - } - } - }, - "signupqueue33AFF2E6": { - "Type": "AWS::SQS::Queue", - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "signupqueuePolicy185ADC00": { - "Type": "AWS::SQS::QueuePolicy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": "sqs:SendMessage", - "Condition": { - "ArnEquals": { - "aws:SourceArn": { - "Ref": "signupD2AAA171" - } - } - }, - "Effect": "Allow", - "Principal": { - "Service": "sns.amazonaws.com" - }, - "Resource": { - "Fn::GetAtt": [ - "signupqueue33AFF2E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "Queues": [ - { - "Ref": "signupqueue33AFF2E6" - } - ] - } - }, - "signupqueueawsecsintegsignup8DE00B29CE828029": { - "Type": "AWS::SNS::Subscription", - "DependsOn": "signupqueuePolicy185ADC00", - "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "signupD2AAA171" - }, - "Endpoint": { - "Fn::GetAtt": [ - "signupqueue33AFF2E6", - "Arn" - ] - } - } - }, - "EventsDeadLetterQueue404572C7": { - "Type": "AWS::SQS::Queue", - "Properties": { - "MessageRetentionPeriod": 1209600 - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "EventsQueueB96EB0D2": { - "Type": "AWS::SQS::Queue", - "Properties": { - "RedrivePolicy": { - "deadLetterTargetArn": { - "Fn::GetAtt": [ - "EventsDeadLetterQueue404572C7", - "Arn" - ] - }, - "maxReceiveCount": 3 - } - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "EventsQueuePolicyF3E925EC": { - "Type": "AWS::SQS::QueuePolicy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": "sqs:SendMessage", - "Condition": { - "ArnEquals": { - "aws:SourceArn": { - "Ref": "delete1CCE71FF" - } - } - }, - "Effect": "Allow", - "Principal": { - "Service": "sns.amazonaws.com" - }, - "Resource": { - "Fn::GetAtt": [ - "EventsQueueB96EB0D2", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "Queues": [ - { - "Ref": "EventsQueueB96EB0D2" - } - ] - } - }, - "EventsQueueawsecsintegdeleteF56807768162F4C0": { - "Type": "AWS::SNS::Subscription", - "DependsOn": "EventsQueuePolicyF3E925EC", - "Properties": { - "Protocol": "sqs", - "TopicArn": { - "Ref": "delete1CCE71FF" - }, - "Endpoint": { - "Fn::GetAtt": [ - "EventsQueueB96EB0D2", - "Arn" - ] - } - } - }, - "WorkertaskdefinitionTaskRole1EBF20D6": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "ecs-tasks.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "WorkertaskdefinitionTaskRoleDefaultPolicy45EAFD8C": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "sqs:ChangeMessageVisibility", - "sqs:DeleteMessage", - "sqs:GetQueueAttributes", - "sqs:GetQueueUrl", - "sqs:ReceiveMessage" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::GetAtt": [ - "EventsQueueB96EB0D2", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "signupqueue33AFF2E6", - "Arn" - ] - } - ] - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "WorkertaskdefinitionTaskRoleDefaultPolicy45EAFD8C", - "Roles": [ - { - "Ref": "WorkertaskdefinitionTaskRole1EBF20D6" - } - ] - } - }, - "WorkertaskdefinitionBF93A675": { - "Type": "AWS::ECS::TaskDefinition", - "Properties": { - "ContainerDefinitions": [ - { - "Cpu": 256, - "Environment": [ - { - "Name": "PORT", - "Value": "80" - }, - { - "Name": "WORKER_QUEUE_URI", - "Value": { - "Ref": "EventsQueueB96EB0D2" - } - } - ], - "Essential": true, - "Image": "nathanpeck/name", - "LogConfiguration": { - "LogDriver": "awslogs", - "Options": { - "awslogs-group": { - "Ref": "Workerlogs2994AC4D" - }, - "awslogs-stream-prefix": "Worker", - "awslogs-region": { - "Ref": "AWS::Region" - } - } - }, - "Memory": 512, - "Name": "app", - "PortMappings": [ - { - "ContainerPort": 80, - "Protocol": "tcp" - } - ], - "Ulimits": [ - { - "HardLimit": 1024000, - "Name": "nofile", - "SoftLimit": 1024000 - } - ] - } - ], - "Cpu": "256", - "ExecutionRoleArn": { - "Fn::GetAtt": [ - "WorkertaskdefinitionExecutionRole3C1A1848", - "Arn" - ] - }, - "Family": "awsecsintegWorkertaskdefinition32B60762", - "Memory": "512", - "NetworkMode": "awsvpc", - "RequiresCompatibilities": [ - "EC2", - "FARGATE" - ], - "TaskRoleArn": { - "Fn::GetAtt": [ - "WorkertaskdefinitionTaskRole1EBF20D6", - "Arn" - ] - } - } - }, - "WorkertaskdefinitionExecutionRole3C1A1848": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "ecs-tasks.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - } - } - }, - "WorkertaskdefinitionExecutionRoleDefaultPolicy6E199B19": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "logs:CreateLogStream", - "logs:PutLogEvents" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "Workerlogs2994AC4D", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "WorkertaskdefinitionExecutionRoleDefaultPolicy6E199B19", - "Roles": [ - { - "Ref": "WorkertaskdefinitionExecutionRole3C1A1848" - } - ] - } - }, - "Workerlogs2994AC4D": { - "Type": "AWS::Logs::LogGroup", - "Properties": { - "LogGroupName": "Worker-logs", - "RetentionInDays": 30 - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "WorkerserviceService68C5A5C3": { - "Type": "AWS::ECS::Service", - "Properties": { - "Cluster": { - "Ref": "productionenvironmentclusterC6599D2D" - }, - "DeploymentConfiguration": { - "MaximumPercent": 200, - "MinimumHealthyPercent": 100 - }, - "EnableECSManagedTags": false, - "LaunchType": "FARGATE", - "NetworkConfiguration": { - "AwsvpcConfiguration": { - "AssignPublicIp": "DISABLED", - "SecurityGroups": [ - { - "Fn::GetAtt": [ - "WorkerserviceSecurityGroup1CDDB904", - "GroupId" - ] - } - ], - "Subnets": [ - { - "Ref": "productionenvironmentvpcPrivateSubnet1Subnet53F632E6" - }, - { - "Ref": "productionenvironmentvpcPrivateSubnet2Subnet756FB93C" - } - ] - } - }, - "TaskDefinition": { - "Ref": "WorkertaskdefinitionBF93A675" - } - } - }, - "WorkerserviceSecurityGroup1CDDB904": { - "Type": "AWS::EC2::SecurityGroup", - "Properties": { - "GroupDescription": "aws-ecs-integ/Worker-service/SecurityGroup", - "SecurityGroupEgress": [ - { - "CidrIp": "0.0.0.0/0", - "Description": "Allow all outbound traffic by default", - "IpProtocol": "-1" - } - ], - "VpcId": { - "Ref": "productionenvironmentvpcAEB47DF7" - } - } - }, - "WorkerserviceTaskCountTarget6636D808": { - "Type": "AWS::ApplicationAutoScaling::ScalableTarget", - "Properties": { - "MaxCapacity": 10, - "MinCapacity": 1, - "ResourceId": { - "Fn::Join": [ - "", - [ - "service/", - { - "Ref": "productionenvironmentclusterC6599D2D" - }, - "/", - { - "Fn::GetAtt": [ - "WorkerserviceService68C5A5C3", - "Name" - ] - } - ] - ] - }, - "RoleARN": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":role/aws-service-role/ecs.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_ECSService" - ] - ] - }, - "ScalableDimension": "ecs:service:DesiredCount", - "ServiceNamespace": "ecs" - } - }, - "WorkerserviceTaskCountTargetEventsQueueautoscalingpolicyD12B62ED": { - "Type": "AWS::ApplicationAutoScaling::ScalingPolicy", - "Properties": { - "PolicyName": "awsecsintegWorkerserviceTaskCountTargetEventsQueueautoscalingpolicyDBD40B57", - "PolicyType": "TargetTrackingScaling", - "ScalingTargetId": { - "Ref": "WorkerserviceTaskCountTarget6636D808" - }, - "TargetTrackingScalingPolicyConfiguration": { - "CustomizedMetricSpecification": { - "Dimensions": [ - { - "Name": "QueueName", - "Value": { - "Fn::GetAtt": [ - "EventsQueueB96EB0D2", - "QueueName" - ] - } - } - ], - "MetricName": "BacklogPerTask", - "Namespace": "production-Worker", - "Statistic": "Average", - "Unit": "Count" - }, - "TargetValue": 15 - } - } - }, - "WorkerserviceTaskCountTargetsignupqueueautoscalingpolicyB7321DB7": { - "Type": "AWS::ApplicationAutoScaling::ScalingPolicy", - "Properties": { - "PolicyName": "awsecsintegWorkerserviceTaskCountTargetsignupqueueautoscalingpolicyDF93FC37", - "PolicyType": "TargetTrackingScaling", - "ScalingTargetId": { - "Ref": "WorkerserviceTaskCountTarget6636D808" - }, - "TargetTrackingScalingPolicyConfiguration": { - "CustomizedMetricSpecification": { - "Dimensions": [ - { - "Name": "QueueName", - "Value": { - "Fn::GetAtt": [ - "signupqueue33AFF2E6", - "QueueName" - ] - } - } - ], - "MetricName": "BacklogPerTask", - "Namespace": "production-Worker", - "Statistic": "Average", - "Unit": "Count" - }, - "TargetValue": 30 - } - } - }, - "BackLogPerTaskCalculatorFunctionServiceRoleEFA723A4": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "ManagedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "BackLogPerTaskCalculatorFunctionServiceRoleDefaultPolicyB6B10266": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": "ecs:DescribeServices", - "Condition": { - "ArnEquals": { - "ecs:cluster": { - "Fn::GetAtt": [ - "productionenvironmentclusterC6599D2D", - "Arn" - ] - } - } - }, - "Effect": "Allow", - "Resource": { - "Ref": "WorkerserviceService68C5A5C3" - } - }, - { - "Action": [ - "sqs:GetQueueAttributes", - "sqs:GetQueueUrl" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::GetAtt": [ - "EventsQueueB96EB0D2", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "signupqueue33AFF2E6", - "Arn" - ] - } - ] - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "BackLogPerTaskCalculatorFunctionServiceRoleDefaultPolicyB6B10266", - "Roles": [ - { - "Ref": "BackLogPerTaskCalculatorFunctionServiceRoleEFA723A4" - } - ] - } - }, - "BackLogPerTaskCalculatorFunction95AA21D5": { - "Type": "AWS::Lambda::Function", - "Properties": { - "Code": { - "S3Bucket": { - "Ref": "AssetParametersa820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91S3Bucket1FFDEA8D" - }, - "S3Key": { - "Fn::Join": [ - "", - [ - { - "Fn::Select": [ - 0, - { - "Fn::Split": [ - "||", - { - "Ref": "AssetParametersa820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91S3VersionKeyA60C027B" - } - ] - } - ] - }, - { - "Fn::Select": [ - 1, - { - "Fn::Split": [ - "||", - { - "Ref": "AssetParametersa820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91S3VersionKeyA60C027B" - } - ] - } - ] - } - ] - ] - } - }, - "Role": { - "Fn::GetAtt": [ - "BackLogPerTaskCalculatorFunctionServiceRoleEFA723A4", - "Arn" - ] - }, - "Environment": { - "Variables": { - "CLUSTER_NAME": { - "Ref": "productionenvironmentclusterC6599D2D" - }, - "SERVICE_NAME": { - "Fn::GetAtt": [ - "WorkerserviceService68C5A5C3", - "Name" - ] - }, - "NAMESPACE": "production-Worker", - "QUEUE_NAMES": { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "EventsQueueB96EB0D2", - "QueueName" - ] - }, - ",", - { - "Fn::GetAtt": [ - "signupqueue33AFF2E6", - "QueueName" - ] - } - ] - ] - } - } - }, - "Handler": "index.queue_handler", - "Runtime": "python3.9" - }, - "DependsOn": [ - "BackLogPerTaskCalculatorFunctionServiceRoleDefaultPolicyB6B10266", - "BackLogPerTaskCalculatorFunctionServiceRoleEFA723A4" - ] - }, - "BacklogPerTaskScheduledRuleB871DD15": { - "Type": "AWS::Events::Rule", - "Properties": { - "ScheduleExpression": "rate(1 minute)", - "State": "ENABLED", - "Targets": [ - { - "Arn": { - "Fn::GetAtt": [ - "BackLogPerTaskCalculatorFunction95AA21D5", - "Arn" - ] - }, - "Id": "Target0" - } - ] - } - }, - "BacklogPerTaskScheduledRuleAllowEventRuleawsecsintegBackLogPerTaskCalculatorFunctionEB2B91C7CCD725BB": { - "Type": "AWS::Lambda::Permission", - "Properties": { - "Action": "lambda:InvokeFunction", - "FunctionName": { - "Fn::GetAtt": [ - "BackLogPerTaskCalculatorFunction95AA21D5", - "Arn" - ] - }, - "Principal": "events.amazonaws.com", - "SourceArn": { - "Fn::GetAtt": [ - "BacklogPerTaskScheduledRuleB871DD15", - "Arn" - ] - } - } - }, - "WorkerBackLogPerTaskCalculatorLogsA4B5AF42": { - "Type": "AWS::Logs::LogGroup", - "Properties": { - "LogGroupName": { - "Fn::Join": [ - "", - [ - "/aws/lambda/", - { - "Ref": "BackLogPerTaskCalculatorFunction95AA21D5" - } - ] - ] - }, - "RetentionInDays": 3 - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - } - }, - "Parameters": { - "AssetParametersa820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91S3Bucket1FFDEA8D": { - "Type": "String", - "Description": "S3 bucket for asset \"a820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91\"" - }, - "AssetParametersa820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91S3VersionKeyA60C027B": { - "Type": "String", - "Description": "S3 key for asset version \"a820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91\"" - }, - "AssetParametersa820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91ArtifactHashC1953821": { - "Type": "String", - "Description": "Artifact hash for asset \"a820140ad8525b8ed56ad2a7bcd9da99d6afc2490e8c91e34620886c011bdc91\"" - } - } -} \ No newline at end of file diff --git a/packages/@aws-cdk/alexa-ask/LICENSE b/packages/@aws-cdk/alexa-ask/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/alexa-ask/LICENSE +++ b/packages/@aws-cdk/alexa-ask/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/alexa-ask/NOTICE b/packages/@aws-cdk/alexa-ask/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/alexa-ask/NOTICE +++ b/packages/@aws-cdk/alexa-ask/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/app-delivery/LICENSE b/packages/@aws-cdk/app-delivery/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/app-delivery/LICENSE +++ b/packages/@aws-cdk/app-delivery/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/app-delivery/NOTICE b/packages/@aws-cdk/app-delivery/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/app-delivery/NOTICE +++ b/packages/@aws-cdk/app-delivery/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/assert-internal/LICENSE b/packages/@aws-cdk/assert-internal/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/assert-internal/LICENSE +++ b/packages/@aws-cdk/assert-internal/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/assert-internal/NOTICE b/packages/@aws-cdk/assert-internal/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/assert-internal/NOTICE +++ b/packages/@aws-cdk/assert-internal/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/assert/LICENSE b/packages/@aws-cdk/assert/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/assert/LICENSE +++ b/packages/@aws-cdk/assert/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/assert/NOTICE b/packages/@aws-cdk/assert/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/assert/NOTICE +++ b/packages/@aws-cdk/assert/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/assertions/LICENSE b/packages/@aws-cdk/assertions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/assertions/LICENSE +++ b/packages/@aws-cdk/assertions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/assertions/NOTICE b/packages/@aws-cdk/assertions/NOTICE index 1ed908383e334..2684ad262c0db 100644 --- a/packages/@aws-cdk/assertions/NOTICE +++ b/packages/@aws-cdk/assertions/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/assets/LICENSE b/packages/@aws-cdk/assets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/assets/LICENSE +++ b/packages/@aws-cdk/assets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/assets/NOTICE b/packages/@aws-cdk/assets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/assets/NOTICE +++ b/packages/@aws-cdk/assets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-accessanalyzer/LICENSE b/packages/@aws-cdk/aws-accessanalyzer/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-accessanalyzer/LICENSE +++ b/packages/@aws-cdk/aws-accessanalyzer/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-accessanalyzer/NOTICE b/packages/@aws-cdk/aws-accessanalyzer/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-accessanalyzer/NOTICE +++ b/packages/@aws-cdk/aws-accessanalyzer/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-acmpca/LICENSE b/packages/@aws-cdk/aws-acmpca/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-acmpca/LICENSE +++ b/packages/@aws-cdk/aws-acmpca/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-acmpca/NOTICE b/packages/@aws-cdk/aws-acmpca/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-acmpca/NOTICE +++ b/packages/@aws-cdk/aws-acmpca/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-amazonmq/LICENSE b/packages/@aws-cdk/aws-amazonmq/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-amazonmq/LICENSE +++ b/packages/@aws-cdk/aws-amazonmq/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-amazonmq/NOTICE b/packages/@aws-cdk/aws-amazonmq/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-amazonmq/NOTICE +++ b/packages/@aws-cdk/aws-amazonmq/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-amplify/LICENSE b/packages/@aws-cdk/aws-amplify/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-amplify/LICENSE +++ b/packages/@aws-cdk/aws-amplify/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-amplify/NOTICE b/packages/@aws-cdk/aws-amplify/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-amplify/NOTICE +++ b/packages/@aws-cdk/aws-amplify/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-amplifyuibuilder/LICENSE b/packages/@aws-cdk/aws-amplifyuibuilder/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-amplifyuibuilder/LICENSE +++ b/packages/@aws-cdk/aws-amplifyuibuilder/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-amplifyuibuilder/NOTICE b/packages/@aws-cdk/aws-amplifyuibuilder/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-amplifyuibuilder/NOTICE +++ b/packages/@aws-cdk/aws-amplifyuibuilder/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-apigateway/LICENSE b/packages/@aws-cdk/aws-apigateway/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-apigateway/LICENSE +++ b/packages/@aws-cdk/aws-apigateway/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-apigateway/NOTICE b/packages/@aws-cdk/aws-apigateway/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-apigateway/NOTICE +++ b/packages/@aws-cdk/aws-apigateway/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers/LICENSE b/packages/@aws-cdk/aws-apigatewayv2-authorizers/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-authorizers/LICENSE +++ b/packages/@aws-cdk/aws-apigatewayv2-authorizers/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers/NOTICE b/packages/@aws-cdk/aws-apigatewayv2-authorizers/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-authorizers/NOTICE +++ b/packages/@aws-cdk/aws-apigatewayv2-authorizers/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/LICENSE b/packages/@aws-cdk/aws-apigatewayv2-integrations/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-integrations/LICENSE +++ b/packages/@aws-cdk/aws-apigatewayv2-integrations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/NOTICE b/packages/@aws-cdk/aws-apigatewayv2-integrations/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-apigatewayv2-integrations/NOTICE +++ b/packages/@aws-cdk/aws-apigatewayv2-integrations/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-apigatewayv2/LICENSE b/packages/@aws-cdk/aws-apigatewayv2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-apigatewayv2/LICENSE +++ b/packages/@aws-cdk/aws-apigatewayv2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-apigatewayv2/NOTICE b/packages/@aws-cdk/aws-apigatewayv2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-apigatewayv2/NOTICE +++ b/packages/@aws-cdk/aws-apigatewayv2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-appconfig/LICENSE b/packages/@aws-cdk/aws-appconfig/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-appconfig/LICENSE +++ b/packages/@aws-cdk/aws-appconfig/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-appconfig/NOTICE b/packages/@aws-cdk/aws-appconfig/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-appconfig/NOTICE +++ b/packages/@aws-cdk/aws-appconfig/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-appflow/LICENSE b/packages/@aws-cdk/aws-appflow/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-appflow/LICENSE +++ b/packages/@aws-cdk/aws-appflow/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-appflow/NOTICE b/packages/@aws-cdk/aws-appflow/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-appflow/NOTICE +++ b/packages/@aws-cdk/aws-appflow/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-appintegrations/LICENSE b/packages/@aws-cdk/aws-appintegrations/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-appintegrations/LICENSE +++ b/packages/@aws-cdk/aws-appintegrations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-appintegrations/NOTICE b/packages/@aws-cdk/aws-appintegrations/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-appintegrations/NOTICE +++ b/packages/@aws-cdk/aws-appintegrations/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-applicationautoscaling/LICENSE b/packages/@aws-cdk/aws-applicationautoscaling/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/LICENSE +++ b/packages/@aws-cdk/aws-applicationautoscaling/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-applicationautoscaling/NOTICE b/packages/@aws-cdk/aws-applicationautoscaling/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-applicationautoscaling/NOTICE +++ b/packages/@aws-cdk/aws-applicationautoscaling/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-applicationinsights/LICENSE b/packages/@aws-cdk/aws-applicationinsights/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-applicationinsights/LICENSE +++ b/packages/@aws-cdk/aws-applicationinsights/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-applicationinsights/NOTICE b/packages/@aws-cdk/aws-applicationinsights/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-applicationinsights/NOTICE +++ b/packages/@aws-cdk/aws-applicationinsights/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-appmesh/LICENSE b/packages/@aws-cdk/aws-appmesh/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-appmesh/LICENSE +++ b/packages/@aws-cdk/aws-appmesh/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-appmesh/NOTICE b/packages/@aws-cdk/aws-appmesh/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-appmesh/NOTICE +++ b/packages/@aws-cdk/aws-appmesh/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-apprunner/LICENSE b/packages/@aws-cdk/aws-apprunner/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-apprunner/LICENSE +++ b/packages/@aws-cdk/aws-apprunner/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-apprunner/NOTICE b/packages/@aws-cdk/aws-apprunner/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-apprunner/NOTICE +++ b/packages/@aws-cdk/aws-apprunner/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-appstream/LICENSE b/packages/@aws-cdk/aws-appstream/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-appstream/LICENSE +++ b/packages/@aws-cdk/aws-appstream/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-appstream/NOTICE b/packages/@aws-cdk/aws-appstream/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-appstream/NOTICE +++ b/packages/@aws-cdk/aws-appstream/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-appsync/LICENSE b/packages/@aws-cdk/aws-appsync/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-appsync/LICENSE +++ b/packages/@aws-cdk/aws-appsync/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-appsync/NOTICE b/packages/@aws-cdk/aws-appsync/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-appsync/NOTICE +++ b/packages/@aws-cdk/aws-appsync/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-aps/LICENSE b/packages/@aws-cdk/aws-aps/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-aps/LICENSE +++ b/packages/@aws-cdk/aws-aps/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-aps/NOTICE b/packages/@aws-cdk/aws-aps/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-aps/NOTICE +++ b/packages/@aws-cdk/aws-aps/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-athena/LICENSE b/packages/@aws-cdk/aws-athena/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-athena/LICENSE +++ b/packages/@aws-cdk/aws-athena/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-athena/NOTICE b/packages/@aws-cdk/aws-athena/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-athena/NOTICE +++ b/packages/@aws-cdk/aws-athena/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-auditmanager/LICENSE b/packages/@aws-cdk/aws-auditmanager/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-auditmanager/LICENSE +++ b/packages/@aws-cdk/aws-auditmanager/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-auditmanager/NOTICE b/packages/@aws-cdk/aws-auditmanager/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-auditmanager/NOTICE +++ b/packages/@aws-cdk/aws-auditmanager/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-autoscaling-common/LICENSE b/packages/@aws-cdk/aws-autoscaling-common/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-autoscaling-common/LICENSE +++ b/packages/@aws-cdk/aws-autoscaling-common/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-autoscaling-common/NOTICE b/packages/@aws-cdk/aws-autoscaling-common/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-autoscaling-common/NOTICE +++ b/packages/@aws-cdk/aws-autoscaling-common/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/LICENSE b/packages/@aws-cdk/aws-autoscaling-hooktargets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/LICENSE +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/NOTICE b/packages/@aws-cdk/aws-autoscaling-hooktargets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-autoscaling-hooktargets/NOTICE +++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-autoscaling/LICENSE b/packages/@aws-cdk/aws-autoscaling/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-autoscaling/LICENSE +++ b/packages/@aws-cdk/aws-autoscaling/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-autoscaling/NOTICE b/packages/@aws-cdk/aws-autoscaling/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-autoscaling/NOTICE +++ b/packages/@aws-cdk/aws-autoscaling/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-autoscalingplans/LICENSE b/packages/@aws-cdk/aws-autoscalingplans/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-autoscalingplans/LICENSE +++ b/packages/@aws-cdk/aws-autoscalingplans/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-autoscalingplans/NOTICE b/packages/@aws-cdk/aws-autoscalingplans/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-autoscalingplans/NOTICE +++ b/packages/@aws-cdk/aws-autoscalingplans/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-backup/LICENSE b/packages/@aws-cdk/aws-backup/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-backup/LICENSE +++ b/packages/@aws-cdk/aws-backup/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-backup/NOTICE b/packages/@aws-cdk/aws-backup/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-backup/NOTICE +++ b/packages/@aws-cdk/aws-backup/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-batch/LICENSE b/packages/@aws-cdk/aws-batch/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-batch/LICENSE +++ b/packages/@aws-cdk/aws-batch/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-batch/NOTICE b/packages/@aws-cdk/aws-batch/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-batch/NOTICE +++ b/packages/@aws-cdk/aws-batch/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-billingconductor/LICENSE b/packages/@aws-cdk/aws-billingconductor/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-billingconductor/LICENSE +++ b/packages/@aws-cdk/aws-billingconductor/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-billingconductor/NOTICE b/packages/@aws-cdk/aws-billingconductor/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-billingconductor/NOTICE +++ b/packages/@aws-cdk/aws-billingconductor/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-budgets/LICENSE b/packages/@aws-cdk/aws-budgets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-budgets/LICENSE +++ b/packages/@aws-cdk/aws-budgets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-budgets/NOTICE b/packages/@aws-cdk/aws-budgets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-budgets/NOTICE +++ b/packages/@aws-cdk/aws-budgets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cassandra/LICENSE b/packages/@aws-cdk/aws-cassandra/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cassandra/LICENSE +++ b/packages/@aws-cdk/aws-cassandra/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cassandra/NOTICE b/packages/@aws-cdk/aws-cassandra/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cassandra/NOTICE +++ b/packages/@aws-cdk/aws-cassandra/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ce/LICENSE b/packages/@aws-cdk/aws-ce/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ce/LICENSE +++ b/packages/@aws-cdk/aws-ce/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ce/NOTICE b/packages/@aws-cdk/aws-ce/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ce/NOTICE +++ b/packages/@aws-cdk/aws-ce/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-certificatemanager/LICENSE b/packages/@aws-cdk/aws-certificatemanager/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-certificatemanager/LICENSE +++ b/packages/@aws-cdk/aws-certificatemanager/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-certificatemanager/NOTICE b/packages/@aws-cdk/aws-certificatemanager/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-certificatemanager/NOTICE +++ b/packages/@aws-cdk/aws-certificatemanager/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/LICENSE b/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/LICENSE +++ b/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/NOTICE b/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/NOTICE +++ b/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-chatbot/LICENSE b/packages/@aws-cdk/aws-chatbot/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-chatbot/LICENSE +++ b/packages/@aws-cdk/aws-chatbot/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-chatbot/NOTICE b/packages/@aws-cdk/aws-chatbot/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-chatbot/NOTICE +++ b/packages/@aws-cdk/aws-chatbot/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloud9/LICENSE b/packages/@aws-cdk/aws-cloud9/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloud9/LICENSE +++ b/packages/@aws-cdk/aws-cloud9/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloud9/NOTICE b/packages/@aws-cdk/aws-cloud9/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloud9/NOTICE +++ b/packages/@aws-cdk/aws-cloud9/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloudformation/LICENSE b/packages/@aws-cdk/aws-cloudformation/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloudformation/LICENSE +++ b/packages/@aws-cdk/aws-cloudformation/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloudformation/NOTICE b/packages/@aws-cdk/aws-cloudformation/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloudformation/NOTICE +++ b/packages/@aws-cdk/aws-cloudformation/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloudfront-origins/LICENSE b/packages/@aws-cdk/aws-cloudfront-origins/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloudfront-origins/LICENSE +++ b/packages/@aws-cdk/aws-cloudfront-origins/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloudfront-origins/NOTICE b/packages/@aws-cdk/aws-cloudfront-origins/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloudfront-origins/NOTICE +++ b/packages/@aws-cdk/aws-cloudfront-origins/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloudfront/LICENSE b/packages/@aws-cdk/aws-cloudfront/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloudfront/LICENSE +++ b/packages/@aws-cdk/aws-cloudfront/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloudfront/NOTICE b/packages/@aws-cdk/aws-cloudfront/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloudfront/NOTICE +++ b/packages/@aws-cdk/aws-cloudfront/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloudtrail/LICENSE b/packages/@aws-cdk/aws-cloudtrail/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloudtrail/LICENSE +++ b/packages/@aws-cdk/aws-cloudtrail/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloudtrail/NOTICE b/packages/@aws-cdk/aws-cloudtrail/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloudtrail/NOTICE +++ b/packages/@aws-cdk/aws-cloudtrail/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/LICENSE b/packages/@aws-cdk/aws-cloudwatch-actions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/LICENSE +++ b/packages/@aws-cdk/aws-cloudwatch-actions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/NOTICE b/packages/@aws-cdk/aws-cloudwatch-actions/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloudwatch-actions/NOTICE +++ b/packages/@aws-cdk/aws-cloudwatch-actions/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cloudwatch/LICENSE b/packages/@aws-cdk/aws-cloudwatch/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cloudwatch/LICENSE +++ b/packages/@aws-cdk/aws-cloudwatch/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cloudwatch/NOTICE b/packages/@aws-cdk/aws-cloudwatch/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cloudwatch/NOTICE +++ b/packages/@aws-cdk/aws-cloudwatch/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codeartifact/LICENSE b/packages/@aws-cdk/aws-codeartifact/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codeartifact/LICENSE +++ b/packages/@aws-cdk/aws-codeartifact/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codeartifact/NOTICE b/packages/@aws-cdk/aws-codeartifact/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codeartifact/NOTICE +++ b/packages/@aws-cdk/aws-codeartifact/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codebuild/LICENSE b/packages/@aws-cdk/aws-codebuild/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codebuild/LICENSE +++ b/packages/@aws-cdk/aws-codebuild/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codebuild/NOTICE b/packages/@aws-cdk/aws-codebuild/NOTICE index ee9b8119d893f..91f398efbcb4a 100644 --- a/packages/@aws-cdk/aws-codebuild/NOTICE +++ b/packages/@aws-cdk/aws-codebuild/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/aws-codecommit/LICENSE b/packages/@aws-cdk/aws-codecommit/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codecommit/LICENSE +++ b/packages/@aws-cdk/aws-codecommit/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codecommit/NOTICE b/packages/@aws-cdk/aws-codecommit/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codecommit/NOTICE +++ b/packages/@aws-cdk/aws-codecommit/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codedeploy/LICENSE b/packages/@aws-cdk/aws-codedeploy/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codedeploy/LICENSE +++ b/packages/@aws-cdk/aws-codedeploy/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codedeploy/NOTICE b/packages/@aws-cdk/aws-codedeploy/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codedeploy/NOTICE +++ b/packages/@aws-cdk/aws-codedeploy/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codedeploy/README.md b/packages/@aws-cdk/aws-codedeploy/README.md index fda0f72ee5c69..25c04775ed723 100644 --- a/packages/@aws-cdk/aws-codedeploy/README.md +++ b/packages/@aws-cdk/aws-codedeploy/README.md @@ -26,6 +26,7 @@ - [ECS Applications](#ecs-applications) - [ECS Deployment Groups](#ecs-deployment-groups) - [ECS Deployment Configurations](#ecs-deployment-configurations) + - [ECS Deployments](#ecs-deployments) ## Introduction @@ -663,3 +664,55 @@ const deploymentConfig = codedeploy.EcsDeploymentConfig.fromEcsDeploymentConfigN 'MyExistingDeploymentConfiguration', ); ``` + +## ECS Deployments + +[![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg)](https://constructs.dev/packages/@cdklabs/cdk-ecs-codedeploy) + +An experimental construct is available on the Construct Hub called [@cdklabs/cdk-ecs-codedeploy](https://constructs.dev/packages/@cdklabs/cdk-ecs-codedeploy) that manages ECS CodeDeploy deployments. + +```ts +declare const deploymentGroup: codeDeploy.IEcsDeploymentGroup; +declare const taskDefinition: ecs.ITaskDefinition; + +new EcsDeployment({ + deploymentGroup, + targetService: { + taskDefinition, + containerName: 'mycontainer', + containerPort: 80, + }, +}); +``` + +The deployment will use the AutoRollbackConfig for the EcsDeploymentGroup unless it is overridden in the deployment: + +```ts +new EcsDeployment({ + deploymentGroup, + targetService: { + taskDefinition, + containerName: 'mycontainer', + containerPort: 80, + }, + autoRollback: { + failedDeployment: true, + deploymentInAlarm: true, + stoppedDeployment: false, + }, +}); +``` + +By default, the CodeDeploy Deployment will timeout after 30 minutes. The timeout value can be overridden: + +```ts +new EcsDeployment({ + deploymentGroup, + targetService: { + taskDefinition, + containerName: 'mycontainer', + containerPort: 80, + }, + timeout: Duration.minutes(60), +}); +``` diff --git a/packages/@aws-cdk/aws-codeguruprofiler/LICENSE b/packages/@aws-cdk/aws-codeguruprofiler/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codeguruprofiler/LICENSE +++ b/packages/@aws-cdk/aws-codeguruprofiler/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codeguruprofiler/NOTICE b/packages/@aws-cdk/aws-codeguruprofiler/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codeguruprofiler/NOTICE +++ b/packages/@aws-cdk/aws-codeguruprofiler/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codegurureviewer/LICENSE b/packages/@aws-cdk/aws-codegurureviewer/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codegurureviewer/LICENSE +++ b/packages/@aws-cdk/aws-codegurureviewer/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codegurureviewer/NOTICE b/packages/@aws-cdk/aws-codegurureviewer/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codegurureviewer/NOTICE +++ b/packages/@aws-cdk/aws-codegurureviewer/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codepipeline-actions/LICENSE b/packages/@aws-cdk/aws-codepipeline-actions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/LICENSE +++ b/packages/@aws-cdk/aws-codepipeline-actions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codepipeline-actions/NOTICE b/packages/@aws-cdk/aws-codepipeline-actions/NOTICE index 25fb963014c56..822895dc2b759 100644 --- a/packages/@aws-cdk/aws-codepipeline-actions/NOTICE +++ b/packages/@aws-cdk/aws-codepipeline-actions/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/aws-codepipeline/LICENSE b/packages/@aws-cdk/aws-codepipeline/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codepipeline/LICENSE +++ b/packages/@aws-cdk/aws-codepipeline/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codepipeline/NOTICE b/packages/@aws-cdk/aws-codepipeline/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codepipeline/NOTICE +++ b/packages/@aws-cdk/aws-codepipeline/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codestar/LICENSE b/packages/@aws-cdk/aws-codestar/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codestar/LICENSE +++ b/packages/@aws-cdk/aws-codestar/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codestar/NOTICE b/packages/@aws-cdk/aws-codestar/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codestar/NOTICE +++ b/packages/@aws-cdk/aws-codestar/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codestarconnections/LICENSE b/packages/@aws-cdk/aws-codestarconnections/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codestarconnections/LICENSE +++ b/packages/@aws-cdk/aws-codestarconnections/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codestarconnections/NOTICE b/packages/@aws-cdk/aws-codestarconnections/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codestarconnections/NOTICE +++ b/packages/@aws-cdk/aws-codestarconnections/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-codestarnotifications/LICENSE b/packages/@aws-cdk/aws-codestarnotifications/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-codestarnotifications/LICENSE +++ b/packages/@aws-cdk/aws-codestarnotifications/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-codestarnotifications/NOTICE b/packages/@aws-cdk/aws-codestarnotifications/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-codestarnotifications/NOTICE +++ b/packages/@aws-cdk/aws-codestarnotifications/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cognito-identitypool/LICENSE b/packages/@aws-cdk/aws-cognito-identitypool/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool/LICENSE +++ b/packages/@aws-cdk/aws-cognito-identitypool/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cognito-identitypool/NOTICE b/packages/@aws-cdk/aws-cognito-identitypool/NOTICE index 1e8442b37b61d..5efb94182cd88 100644 --- a/packages/@aws-cdk/aws-cognito-identitypool/NOTICE +++ b/packages/@aws-cdk/aws-cognito-identitypool/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file diff --git a/packages/@aws-cdk/aws-cognito/LICENSE b/packages/@aws-cdk/aws-cognito/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cognito/LICENSE +++ b/packages/@aws-cdk/aws-cognito/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cognito/NOTICE b/packages/@aws-cdk/aws-cognito/NOTICE index 5e8766253a5e2..88523779a2ff1 100644 --- a/packages/@aws-cdk/aws-cognito/NOTICE +++ b/packages/@aws-cdk/aws-cognito/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/aws-config/LICENSE b/packages/@aws-cdk/aws-config/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-config/LICENSE +++ b/packages/@aws-cdk/aws-config/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-config/NOTICE b/packages/@aws-cdk/aws-config/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-config/NOTICE +++ b/packages/@aws-cdk/aws-config/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-connect/LICENSE b/packages/@aws-cdk/aws-connect/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-connect/LICENSE +++ b/packages/@aws-cdk/aws-connect/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-connect/NOTICE b/packages/@aws-cdk/aws-connect/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-connect/NOTICE +++ b/packages/@aws-cdk/aws-connect/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-connectcampaigns/LICENSE b/packages/@aws-cdk/aws-connectcampaigns/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-connectcampaigns/LICENSE +++ b/packages/@aws-cdk/aws-connectcampaigns/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-connectcampaigns/NOTICE b/packages/@aws-cdk/aws-connectcampaigns/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-connectcampaigns/NOTICE +++ b/packages/@aws-cdk/aws-connectcampaigns/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-controltower/LICENSE b/packages/@aws-cdk/aws-controltower/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-controltower/LICENSE +++ b/packages/@aws-cdk/aws-controltower/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-controltower/NOTICE b/packages/@aws-cdk/aws-controltower/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-controltower/NOTICE +++ b/packages/@aws-cdk/aws-controltower/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-cur/LICENSE b/packages/@aws-cdk/aws-cur/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-cur/LICENSE +++ b/packages/@aws-cdk/aws-cur/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-cur/NOTICE b/packages/@aws-cdk/aws-cur/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-cur/NOTICE +++ b/packages/@aws-cdk/aws-cur/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-customerprofiles/LICENSE b/packages/@aws-cdk/aws-customerprofiles/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-customerprofiles/LICENSE +++ b/packages/@aws-cdk/aws-customerprofiles/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-customerprofiles/NOTICE b/packages/@aws-cdk/aws-customerprofiles/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-customerprofiles/NOTICE +++ b/packages/@aws-cdk/aws-customerprofiles/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-databrew/LICENSE b/packages/@aws-cdk/aws-databrew/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-databrew/LICENSE +++ b/packages/@aws-cdk/aws-databrew/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-databrew/NOTICE b/packages/@aws-cdk/aws-databrew/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-databrew/NOTICE +++ b/packages/@aws-cdk/aws-databrew/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-datapipeline/LICENSE b/packages/@aws-cdk/aws-datapipeline/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-datapipeline/LICENSE +++ b/packages/@aws-cdk/aws-datapipeline/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-datapipeline/NOTICE b/packages/@aws-cdk/aws-datapipeline/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-datapipeline/NOTICE +++ b/packages/@aws-cdk/aws-datapipeline/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-datasync/LICENSE b/packages/@aws-cdk/aws-datasync/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-datasync/LICENSE +++ b/packages/@aws-cdk/aws-datasync/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-datasync/NOTICE b/packages/@aws-cdk/aws-datasync/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-datasync/NOTICE +++ b/packages/@aws-cdk/aws-datasync/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-dax/LICENSE b/packages/@aws-cdk/aws-dax/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-dax/LICENSE +++ b/packages/@aws-cdk/aws-dax/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-dax/NOTICE b/packages/@aws-cdk/aws-dax/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-dax/NOTICE +++ b/packages/@aws-cdk/aws-dax/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-detective/LICENSE b/packages/@aws-cdk/aws-detective/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-detective/LICENSE +++ b/packages/@aws-cdk/aws-detective/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-detective/NOTICE b/packages/@aws-cdk/aws-detective/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-detective/NOTICE +++ b/packages/@aws-cdk/aws-detective/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-devopsguru/LICENSE b/packages/@aws-cdk/aws-devopsguru/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-devopsguru/LICENSE +++ b/packages/@aws-cdk/aws-devopsguru/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-devopsguru/NOTICE b/packages/@aws-cdk/aws-devopsguru/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-devopsguru/NOTICE +++ b/packages/@aws-cdk/aws-devopsguru/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-directoryservice/LICENSE b/packages/@aws-cdk/aws-directoryservice/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-directoryservice/LICENSE +++ b/packages/@aws-cdk/aws-directoryservice/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-directoryservice/NOTICE b/packages/@aws-cdk/aws-directoryservice/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-directoryservice/NOTICE +++ b/packages/@aws-cdk/aws-directoryservice/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-dlm/LICENSE b/packages/@aws-cdk/aws-dlm/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-dlm/LICENSE +++ b/packages/@aws-cdk/aws-dlm/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-dlm/NOTICE b/packages/@aws-cdk/aws-dlm/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-dlm/NOTICE +++ b/packages/@aws-cdk/aws-dlm/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-dms/LICENSE b/packages/@aws-cdk/aws-dms/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-dms/LICENSE +++ b/packages/@aws-cdk/aws-dms/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-dms/NOTICE b/packages/@aws-cdk/aws-dms/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-dms/NOTICE +++ b/packages/@aws-cdk/aws-dms/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-docdb/LICENSE b/packages/@aws-cdk/aws-docdb/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-docdb/LICENSE +++ b/packages/@aws-cdk/aws-docdb/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-docdb/NOTICE b/packages/@aws-cdk/aws-docdb/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-docdb/NOTICE +++ b/packages/@aws-cdk/aws-docdb/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-docdbelastic/LICENSE b/packages/@aws-cdk/aws-docdbelastic/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-docdbelastic/LICENSE +++ b/packages/@aws-cdk/aws-docdbelastic/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-docdbelastic/NOTICE b/packages/@aws-cdk/aws-docdbelastic/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-docdbelastic/NOTICE +++ b/packages/@aws-cdk/aws-docdbelastic/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-dynamodb-global/LICENSE b/packages/@aws-cdk/aws-dynamodb-global/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/LICENSE +++ b/packages/@aws-cdk/aws-dynamodb-global/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-dynamodb-global/NOTICE b/packages/@aws-cdk/aws-dynamodb-global/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/NOTICE +++ b/packages/@aws-cdk/aws-dynamodb-global/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/LICENSE b/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/LICENSE +++ b/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/NOTICE b/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/NOTICE +++ b/packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-dynamodb/LICENSE b/packages/@aws-cdk/aws-dynamodb/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-dynamodb/LICENSE +++ b/packages/@aws-cdk/aws-dynamodb/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-dynamodb/NOTICE b/packages/@aws-cdk/aws-dynamodb/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-dynamodb/NOTICE +++ b/packages/@aws-cdk/aws-dynamodb/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ec2/LICENSE b/packages/@aws-cdk/aws-ec2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ec2/LICENSE +++ b/packages/@aws-cdk/aws-ec2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ec2/NOTICE b/packages/@aws-cdk/aws-ec2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ec2/NOTICE +++ b/packages/@aws-cdk/aws-ec2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ecr-assets/LICENSE b/packages/@aws-cdk/aws-ecr-assets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ecr-assets/LICENSE +++ b/packages/@aws-cdk/aws-ecr-assets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ecr-assets/NOTICE b/packages/@aws-cdk/aws-ecr-assets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ecr-assets/NOTICE +++ b/packages/@aws-cdk/aws-ecr-assets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ecr/LICENSE b/packages/@aws-cdk/aws-ecr/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ecr/LICENSE +++ b/packages/@aws-cdk/aws-ecr/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ecr/NOTICE b/packages/@aws-cdk/aws-ecr/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ecr/NOTICE +++ b/packages/@aws-cdk/aws-ecr/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ecs-patterns/LICENSE b/packages/@aws-cdk/aws-ecs-patterns/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/LICENSE +++ b/packages/@aws-cdk/aws-ecs-patterns/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ecs-patterns/NOTICE b/packages/@aws-cdk/aws-ecs-patterns/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ecs-patterns/NOTICE +++ b/packages/@aws-cdk/aws-ecs-patterns/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ecs/LICENSE b/packages/@aws-cdk/aws-ecs/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ecs/LICENSE +++ b/packages/@aws-cdk/aws-ecs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ecs/NOTICE b/packages/@aws-cdk/aws-ecs/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ecs/NOTICE +++ b/packages/@aws-cdk/aws-ecs/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-efs/LICENSE b/packages/@aws-cdk/aws-efs/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-efs/LICENSE +++ b/packages/@aws-cdk/aws-efs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-efs/NOTICE b/packages/@aws-cdk/aws-efs/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-efs/NOTICE +++ b/packages/@aws-cdk/aws-efs/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-eks/LICENSE b/packages/@aws-cdk/aws-eks/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-eks/LICENSE +++ b/packages/@aws-cdk/aws-eks/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-eks/NOTICE b/packages/@aws-cdk/aws-eks/NOTICE index 0e8abc9945a17..a5a290d6cbe2e 100644 --- a/packages/@aws-cdk/aws-eks/NOTICE +++ b/packages/@aws-cdk/aws-eks/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/aws-elasticache/LICENSE b/packages/@aws-cdk/aws-elasticache/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticache/LICENSE +++ b/packages/@aws-cdk/aws-elasticache/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticache/NOTICE b/packages/@aws-cdk/aws-elasticache/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticache/NOTICE +++ b/packages/@aws-cdk/aws-elasticache/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/LICENSE b/packages/@aws-cdk/aws-elasticbeanstalk/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticbeanstalk/LICENSE +++ b/packages/@aws-cdk/aws-elasticbeanstalk/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/NOTICE b/packages/@aws-cdk/aws-elasticbeanstalk/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticbeanstalk/NOTICE +++ b/packages/@aws-cdk/aws-elasticbeanstalk/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/LICENSE b/packages/@aws-cdk/aws-elasticloadbalancing/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/LICENSE +++ b/packages/@aws-cdk/aws-elasticloadbalancing/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/NOTICE b/packages/@aws-cdk/aws-elasticloadbalancing/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancing/NOTICE +++ b/packages/@aws-cdk/aws-elasticloadbalancing/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/LICENSE b/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/LICENSE +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/NOTICE b/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/NOTICE +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/LICENSE b/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/LICENSE +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/NOTICE b/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/NOTICE +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/LICENSE b/packages/@aws-cdk/aws-elasticloadbalancingv2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/LICENSE +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/NOTICE b/packages/@aws-cdk/aws-elasticloadbalancingv2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticloadbalancingv2/NOTICE +++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-elasticsearch/LICENSE b/packages/@aws-cdk/aws-elasticsearch/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-elasticsearch/LICENSE +++ b/packages/@aws-cdk/aws-elasticsearch/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-elasticsearch/NOTICE b/packages/@aws-cdk/aws-elasticsearch/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-elasticsearch/NOTICE +++ b/packages/@aws-cdk/aws-elasticsearch/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-emr/LICENSE b/packages/@aws-cdk/aws-emr/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-emr/LICENSE +++ b/packages/@aws-cdk/aws-emr/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-emr/NOTICE b/packages/@aws-cdk/aws-emr/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-emr/NOTICE +++ b/packages/@aws-cdk/aws-emr/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-emrcontainers/LICENSE b/packages/@aws-cdk/aws-emrcontainers/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-emrcontainers/LICENSE +++ b/packages/@aws-cdk/aws-emrcontainers/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-emrcontainers/NOTICE b/packages/@aws-cdk/aws-emrcontainers/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-emrcontainers/NOTICE +++ b/packages/@aws-cdk/aws-emrcontainers/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-emrserverless/LICENSE b/packages/@aws-cdk/aws-emrserverless/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-emrserverless/LICENSE +++ b/packages/@aws-cdk/aws-emrserverless/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-emrserverless/NOTICE b/packages/@aws-cdk/aws-emrserverless/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-emrserverless/NOTICE +++ b/packages/@aws-cdk/aws-emrserverless/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-events-targets/LICENSE b/packages/@aws-cdk/aws-events-targets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-events-targets/LICENSE +++ b/packages/@aws-cdk/aws-events-targets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-events-targets/NOTICE b/packages/@aws-cdk/aws-events-targets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-events-targets/NOTICE +++ b/packages/@aws-cdk/aws-events-targets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-events/LICENSE b/packages/@aws-cdk/aws-events/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-events/LICENSE +++ b/packages/@aws-cdk/aws-events/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-events/NOTICE b/packages/@aws-cdk/aws-events/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-events/NOTICE +++ b/packages/@aws-cdk/aws-events/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-eventschemas/LICENSE b/packages/@aws-cdk/aws-eventschemas/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-eventschemas/LICENSE +++ b/packages/@aws-cdk/aws-eventschemas/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-eventschemas/NOTICE b/packages/@aws-cdk/aws-eventschemas/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-eventschemas/NOTICE +++ b/packages/@aws-cdk/aws-eventschemas/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-evidently/LICENSE b/packages/@aws-cdk/aws-evidently/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-evidently/LICENSE +++ b/packages/@aws-cdk/aws-evidently/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-evidently/NOTICE b/packages/@aws-cdk/aws-evidently/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-evidently/NOTICE +++ b/packages/@aws-cdk/aws-evidently/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-finspace/LICENSE b/packages/@aws-cdk/aws-finspace/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-finspace/LICENSE +++ b/packages/@aws-cdk/aws-finspace/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-finspace/NOTICE b/packages/@aws-cdk/aws-finspace/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-finspace/NOTICE +++ b/packages/@aws-cdk/aws-finspace/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-fis/LICENSE b/packages/@aws-cdk/aws-fis/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-fis/LICENSE +++ b/packages/@aws-cdk/aws-fis/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-fis/NOTICE b/packages/@aws-cdk/aws-fis/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-fis/NOTICE +++ b/packages/@aws-cdk/aws-fis/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-fms/LICENSE b/packages/@aws-cdk/aws-fms/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-fms/LICENSE +++ b/packages/@aws-cdk/aws-fms/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-fms/NOTICE b/packages/@aws-cdk/aws-fms/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-fms/NOTICE +++ b/packages/@aws-cdk/aws-fms/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-forecast/LICENSE b/packages/@aws-cdk/aws-forecast/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-forecast/LICENSE +++ b/packages/@aws-cdk/aws-forecast/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-forecast/NOTICE b/packages/@aws-cdk/aws-forecast/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-forecast/NOTICE +++ b/packages/@aws-cdk/aws-forecast/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-frauddetector/LICENSE b/packages/@aws-cdk/aws-frauddetector/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-frauddetector/LICENSE +++ b/packages/@aws-cdk/aws-frauddetector/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-frauddetector/NOTICE b/packages/@aws-cdk/aws-frauddetector/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-frauddetector/NOTICE +++ b/packages/@aws-cdk/aws-frauddetector/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-fsx/LICENSE b/packages/@aws-cdk/aws-fsx/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-fsx/LICENSE +++ b/packages/@aws-cdk/aws-fsx/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-fsx/NOTICE b/packages/@aws-cdk/aws-fsx/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-fsx/NOTICE +++ b/packages/@aws-cdk/aws-fsx/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-gamelift/LICENSE b/packages/@aws-cdk/aws-gamelift/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-gamelift/LICENSE +++ b/packages/@aws-cdk/aws-gamelift/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-gamelift/NOTICE b/packages/@aws-cdk/aws-gamelift/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-gamelift/NOTICE +++ b/packages/@aws-cdk/aws-gamelift/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-globalaccelerator-endpoints/LICENSE b/packages/@aws-cdk/aws-globalaccelerator-endpoints/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-globalaccelerator-endpoints/LICENSE +++ b/packages/@aws-cdk/aws-globalaccelerator-endpoints/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-globalaccelerator-endpoints/NOTICE b/packages/@aws-cdk/aws-globalaccelerator-endpoints/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-globalaccelerator-endpoints/NOTICE +++ b/packages/@aws-cdk/aws-globalaccelerator-endpoints/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-globalaccelerator/LICENSE b/packages/@aws-cdk/aws-globalaccelerator/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-globalaccelerator/LICENSE +++ b/packages/@aws-cdk/aws-globalaccelerator/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-globalaccelerator/NOTICE b/packages/@aws-cdk/aws-globalaccelerator/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-globalaccelerator/NOTICE +++ b/packages/@aws-cdk/aws-globalaccelerator/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-glue/LICENSE b/packages/@aws-cdk/aws-glue/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-glue/LICENSE +++ b/packages/@aws-cdk/aws-glue/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-glue/NOTICE b/packages/@aws-cdk/aws-glue/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-glue/NOTICE +++ b/packages/@aws-cdk/aws-glue/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-grafana/LICENSE b/packages/@aws-cdk/aws-grafana/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-grafana/LICENSE +++ b/packages/@aws-cdk/aws-grafana/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-grafana/NOTICE b/packages/@aws-cdk/aws-grafana/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-grafana/NOTICE +++ b/packages/@aws-cdk/aws-grafana/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-greengrass/LICENSE b/packages/@aws-cdk/aws-greengrass/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-greengrass/LICENSE +++ b/packages/@aws-cdk/aws-greengrass/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-greengrass/NOTICE b/packages/@aws-cdk/aws-greengrass/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-greengrass/NOTICE +++ b/packages/@aws-cdk/aws-greengrass/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-greengrassv2/LICENSE b/packages/@aws-cdk/aws-greengrassv2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-greengrassv2/LICENSE +++ b/packages/@aws-cdk/aws-greengrassv2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-greengrassv2/NOTICE b/packages/@aws-cdk/aws-greengrassv2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-greengrassv2/NOTICE +++ b/packages/@aws-cdk/aws-greengrassv2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-groundstation/LICENSE b/packages/@aws-cdk/aws-groundstation/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-groundstation/LICENSE +++ b/packages/@aws-cdk/aws-groundstation/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-groundstation/NOTICE b/packages/@aws-cdk/aws-groundstation/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-groundstation/NOTICE +++ b/packages/@aws-cdk/aws-groundstation/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-guardduty/LICENSE b/packages/@aws-cdk/aws-guardduty/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-guardduty/LICENSE +++ b/packages/@aws-cdk/aws-guardduty/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-guardduty/NOTICE b/packages/@aws-cdk/aws-guardduty/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-guardduty/NOTICE +++ b/packages/@aws-cdk/aws-guardduty/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-healthlake/LICENSE b/packages/@aws-cdk/aws-healthlake/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-healthlake/LICENSE +++ b/packages/@aws-cdk/aws-healthlake/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-healthlake/NOTICE b/packages/@aws-cdk/aws-healthlake/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-healthlake/NOTICE +++ b/packages/@aws-cdk/aws-healthlake/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iam/LICENSE b/packages/@aws-cdk/aws-iam/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iam/LICENSE +++ b/packages/@aws-cdk/aws-iam/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iam/NOTICE b/packages/@aws-cdk/aws-iam/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iam/NOTICE +++ b/packages/@aws-cdk/aws-iam/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-identitystore/LICENSE b/packages/@aws-cdk/aws-identitystore/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-identitystore/LICENSE +++ b/packages/@aws-cdk/aws-identitystore/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-identitystore/NOTICE b/packages/@aws-cdk/aws-identitystore/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-identitystore/NOTICE +++ b/packages/@aws-cdk/aws-identitystore/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-imagebuilder/LICENSE b/packages/@aws-cdk/aws-imagebuilder/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-imagebuilder/LICENSE +++ b/packages/@aws-cdk/aws-imagebuilder/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-imagebuilder/NOTICE b/packages/@aws-cdk/aws-imagebuilder/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-imagebuilder/NOTICE +++ b/packages/@aws-cdk/aws-imagebuilder/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-inspector/LICENSE b/packages/@aws-cdk/aws-inspector/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-inspector/LICENSE +++ b/packages/@aws-cdk/aws-inspector/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-inspector/NOTICE b/packages/@aws-cdk/aws-inspector/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-inspector/NOTICE +++ b/packages/@aws-cdk/aws-inspector/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-inspectorv2/LICENSE b/packages/@aws-cdk/aws-inspectorv2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-inspectorv2/LICENSE +++ b/packages/@aws-cdk/aws-inspectorv2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-inspectorv2/NOTICE b/packages/@aws-cdk/aws-inspectorv2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-inspectorv2/NOTICE +++ b/packages/@aws-cdk/aws-inspectorv2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iot-actions/LICENSE b/packages/@aws-cdk/aws-iot-actions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iot-actions/LICENSE +++ b/packages/@aws-cdk/aws-iot-actions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iot-actions/NOTICE b/packages/@aws-cdk/aws-iot-actions/NOTICE index 027b201c61509..096ec7d8eb081 100644 --- a/packages/@aws-cdk/aws-iot-actions/NOTICE +++ b/packages/@aws-cdk/aws-iot-actions/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/aws-iot/LICENSE b/packages/@aws-cdk/aws-iot/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iot/LICENSE +++ b/packages/@aws-cdk/aws-iot/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iot/NOTICE b/packages/@aws-cdk/aws-iot/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iot/NOTICE +++ b/packages/@aws-cdk/aws-iot/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iot1click/LICENSE b/packages/@aws-cdk/aws-iot1click/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iot1click/LICENSE +++ b/packages/@aws-cdk/aws-iot1click/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iot1click/NOTICE b/packages/@aws-cdk/aws-iot1click/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iot1click/NOTICE +++ b/packages/@aws-cdk/aws-iot1click/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotanalytics/LICENSE b/packages/@aws-cdk/aws-iotanalytics/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotanalytics/LICENSE +++ b/packages/@aws-cdk/aws-iotanalytics/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotanalytics/NOTICE b/packages/@aws-cdk/aws-iotanalytics/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotanalytics/NOTICE +++ b/packages/@aws-cdk/aws-iotanalytics/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotcoredeviceadvisor/LICENSE b/packages/@aws-cdk/aws-iotcoredeviceadvisor/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotcoredeviceadvisor/LICENSE +++ b/packages/@aws-cdk/aws-iotcoredeviceadvisor/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotcoredeviceadvisor/NOTICE b/packages/@aws-cdk/aws-iotcoredeviceadvisor/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotcoredeviceadvisor/NOTICE +++ b/packages/@aws-cdk/aws-iotcoredeviceadvisor/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotevents-actions/LICENSE b/packages/@aws-cdk/aws-iotevents-actions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotevents-actions/LICENSE +++ b/packages/@aws-cdk/aws-iotevents-actions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotevents-actions/NOTICE b/packages/@aws-cdk/aws-iotevents-actions/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotevents-actions/NOTICE +++ b/packages/@aws-cdk/aws-iotevents-actions/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotevents/LICENSE b/packages/@aws-cdk/aws-iotevents/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotevents/LICENSE +++ b/packages/@aws-cdk/aws-iotevents/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotevents/NOTICE b/packages/@aws-cdk/aws-iotevents/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotevents/NOTICE +++ b/packages/@aws-cdk/aws-iotevents/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotfleethub/LICENSE b/packages/@aws-cdk/aws-iotfleethub/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotfleethub/LICENSE +++ b/packages/@aws-cdk/aws-iotfleethub/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotfleethub/NOTICE b/packages/@aws-cdk/aws-iotfleethub/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotfleethub/NOTICE +++ b/packages/@aws-cdk/aws-iotfleethub/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotfleetwise/LICENSE b/packages/@aws-cdk/aws-iotfleetwise/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotfleetwise/LICENSE +++ b/packages/@aws-cdk/aws-iotfleetwise/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotfleetwise/NOTICE b/packages/@aws-cdk/aws-iotfleetwise/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotfleetwise/NOTICE +++ b/packages/@aws-cdk/aws-iotfleetwise/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotsitewise/LICENSE b/packages/@aws-cdk/aws-iotsitewise/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotsitewise/LICENSE +++ b/packages/@aws-cdk/aws-iotsitewise/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotsitewise/NOTICE b/packages/@aws-cdk/aws-iotsitewise/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotsitewise/NOTICE +++ b/packages/@aws-cdk/aws-iotsitewise/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotthingsgraph/LICENSE b/packages/@aws-cdk/aws-iotthingsgraph/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotthingsgraph/LICENSE +++ b/packages/@aws-cdk/aws-iotthingsgraph/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotthingsgraph/NOTICE b/packages/@aws-cdk/aws-iotthingsgraph/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotthingsgraph/NOTICE +++ b/packages/@aws-cdk/aws-iotthingsgraph/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iottwinmaker/LICENSE b/packages/@aws-cdk/aws-iottwinmaker/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iottwinmaker/LICENSE +++ b/packages/@aws-cdk/aws-iottwinmaker/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iottwinmaker/NOTICE b/packages/@aws-cdk/aws-iottwinmaker/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iottwinmaker/NOTICE +++ b/packages/@aws-cdk/aws-iottwinmaker/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-iotwireless/LICENSE b/packages/@aws-cdk/aws-iotwireless/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-iotwireless/LICENSE +++ b/packages/@aws-cdk/aws-iotwireless/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-iotwireless/NOTICE b/packages/@aws-cdk/aws-iotwireless/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-iotwireless/NOTICE +++ b/packages/@aws-cdk/aws-iotwireless/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ivs/LICENSE b/packages/@aws-cdk/aws-ivs/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ivs/LICENSE +++ b/packages/@aws-cdk/aws-ivs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ivs/NOTICE b/packages/@aws-cdk/aws-ivs/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ivs/NOTICE +++ b/packages/@aws-cdk/aws-ivs/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kafkaconnect/LICENSE b/packages/@aws-cdk/aws-kafkaconnect/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kafkaconnect/LICENSE +++ b/packages/@aws-cdk/aws-kafkaconnect/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kafkaconnect/NOTICE b/packages/@aws-cdk/aws-kafkaconnect/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kafkaconnect/NOTICE +++ b/packages/@aws-cdk/aws-kafkaconnect/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kendra/LICENSE b/packages/@aws-cdk/aws-kendra/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kendra/LICENSE +++ b/packages/@aws-cdk/aws-kendra/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kendra/NOTICE b/packages/@aws-cdk/aws-kendra/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kendra/NOTICE +++ b/packages/@aws-cdk/aws-kendra/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesis/LICENSE b/packages/@aws-cdk/aws-kinesis/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesis/LICENSE +++ b/packages/@aws-cdk/aws-kinesis/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesis/NOTICE b/packages/@aws-cdk/aws-kinesis/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesis/NOTICE +++ b/packages/@aws-cdk/aws-kinesis/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink/LICENSE b/packages/@aws-cdk/aws-kinesisanalytics-flink/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink/LICENSE +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink/NOTICE b/packages/@aws-cdk/aws-kinesisanalytics-flink/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics-flink/NOTICE +++ b/packages/@aws-cdk/aws-kinesisanalytics-flink/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesisanalytics/LICENSE b/packages/@aws-cdk/aws-kinesisanalytics/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics/LICENSE +++ b/packages/@aws-cdk/aws-kinesisanalytics/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesisanalytics/NOTICE b/packages/@aws-cdk/aws-kinesisanalytics/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesisanalytics/NOTICE +++ b/packages/@aws-cdk/aws-kinesisanalytics/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesisanalyticsv2/LICENSE b/packages/@aws-cdk/aws-kinesisanalyticsv2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesisanalyticsv2/LICENSE +++ b/packages/@aws-cdk/aws-kinesisanalyticsv2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesisanalyticsv2/NOTICE b/packages/@aws-cdk/aws-kinesisanalyticsv2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesisanalyticsv2/NOTICE +++ b/packages/@aws-cdk/aws-kinesisanalyticsv2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations/LICENSE b/packages/@aws-cdk/aws-kinesisfirehose-destinations/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations/LICENSE +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations/NOTICE b/packages/@aws-cdk/aws-kinesisfirehose-destinations/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose-destinations/NOTICE +++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesisfirehose/LICENSE b/packages/@aws-cdk/aws-kinesisfirehose/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose/LICENSE +++ b/packages/@aws-cdk/aws-kinesisfirehose/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesisfirehose/NOTICE b/packages/@aws-cdk/aws-kinesisfirehose/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesisfirehose/NOTICE +++ b/packages/@aws-cdk/aws-kinesisfirehose/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kinesisvideo/LICENSE b/packages/@aws-cdk/aws-kinesisvideo/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kinesisvideo/LICENSE +++ b/packages/@aws-cdk/aws-kinesisvideo/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kinesisvideo/NOTICE b/packages/@aws-cdk/aws-kinesisvideo/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kinesisvideo/NOTICE +++ b/packages/@aws-cdk/aws-kinesisvideo/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-kms/LICENSE b/packages/@aws-cdk/aws-kms/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-kms/LICENSE +++ b/packages/@aws-cdk/aws-kms/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-kms/NOTICE b/packages/@aws-cdk/aws-kms/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-kms/NOTICE +++ b/packages/@aws-cdk/aws-kms/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lakeformation/LICENSE b/packages/@aws-cdk/aws-lakeformation/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lakeformation/LICENSE +++ b/packages/@aws-cdk/aws-lakeformation/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lakeformation/NOTICE b/packages/@aws-cdk/aws-lakeformation/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lakeformation/NOTICE +++ b/packages/@aws-cdk/aws-lakeformation/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lambda-destinations/LICENSE b/packages/@aws-cdk/aws-lambda-destinations/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lambda-destinations/LICENSE +++ b/packages/@aws-cdk/aws-lambda-destinations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lambda-destinations/NOTICE b/packages/@aws-cdk/aws-lambda-destinations/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lambda-destinations/NOTICE +++ b/packages/@aws-cdk/aws-lambda-destinations/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lambda-event-sources/LICENSE b/packages/@aws-cdk/aws-lambda-event-sources/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/LICENSE +++ b/packages/@aws-cdk/aws-lambda-event-sources/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lambda-event-sources/NOTICE b/packages/@aws-cdk/aws-lambda-event-sources/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lambda-event-sources/NOTICE +++ b/packages/@aws-cdk/aws-lambda-event-sources/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lambda-go/LICENSE b/packages/@aws-cdk/aws-lambda-go/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lambda-go/LICENSE +++ b/packages/@aws-cdk/aws-lambda-go/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lambda-go/NOTICE b/packages/@aws-cdk/aws-lambda-go/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lambda-go/NOTICE +++ b/packages/@aws-cdk/aws-lambda-go/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lambda-nodejs/LICENSE b/packages/@aws-cdk/aws-lambda-nodejs/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/LICENSE +++ b/packages/@aws-cdk/aws-lambda-nodejs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lambda-nodejs/NOTICE b/packages/@aws-cdk/aws-lambda-nodejs/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/NOTICE +++ b/packages/@aws-cdk/aws-lambda-nodejs/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/Dockerfile b/packages/@aws-cdk/aws-lambda-nodejs/lib/Dockerfile index 54969bb5fde2c..f84c7fbfe5794 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/lib/Dockerfile +++ b/packages/@aws-cdk/aws-lambda-nodejs/lib/Dockerfile @@ -27,6 +27,11 @@ RUN mkdir /tmp/yarn-cache && \ chmod -R 777 /tmp/yarn-cache && \ yarn config set cache-folder /tmp/yarn-cache +# Ensure all users can write to pnpm cache +RUN mkdir /tmp/pnpm-cache && \ + chmod -R 777 /tmp/pnpm-cache && \ + pnpm config --global set store-dir /tmp/pnpm-cache + # Disable npm update notifications RUN npm config --global set update-notifier false diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts index 8809166a6e57b..fd0c17a3be465 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts @@ -3,7 +3,7 @@ import * as path from 'path'; import { Architecture, AssetCode, Code, Runtime } from '@aws-cdk/aws-lambda'; import * as cdk from '@aws-cdk/core'; import { PackageInstallation } from './package-installation'; -import { PackageManager } from './package-manager'; +import { LockFile, PackageManager } from './package-manager'; import { BundlingOptions, OutputFormat, SourceMapMode } from './types'; import { exec, extractDependencies, findUp, getTsconfigCompilerOptions } from './util'; @@ -229,12 +229,16 @@ export class Bundling implements cdk.BundlingOptions { const lockFilePath = pathJoin(options.inputDir, this.relativeDepsLockFilePath ?? this.packageManager.lockFile); + const isPnpm = this.packageManager.lockFile === LockFile.PNPM; + // Create dummy package.json, copy lock file if any and then install depsCommand = chain([ + isPnpm ? osCommand.write(pathJoin(options.outputDir, 'pnpm-workspace.yaml'), ''): '', // Ensure node_modules directory is installed locally by creating local 'pnpm-workspace.yaml' file osCommand.writeJson(pathJoin(options.outputDir, 'package.json'), { dependencies }), osCommand.copy(lockFilePath, pathJoin(options.outputDir, this.packageManager.lockFile)), osCommand.changeDirectory(options.outputDir), this.packageManager.installCommand.join(' '), + isPnpm ? osCommand.remove(pathJoin(options.outputDir, 'node_modules', '.modules.yaml')) : '', // Remove '.modules.yaml' file which changes on each deployment ]); } @@ -310,13 +314,20 @@ interface BundlingCommandOptions { class OsCommand { constructor(private readonly osPlatform: NodeJS.Platform) {} - public writeJson(filePath: string, data: any): string { - const stringifiedData = JSON.stringify(data); + public write(filePath: string, data: string): string { if (this.osPlatform === 'win32') { - return `echo ^${stringifiedData}^ > "${filePath}"`; + if (!data) { // if `data` is empty, echo a blank line, otherwise the file will contain a `^` character + return `echo. > "${filePath}"`; + } + return `echo ^${data}^ > "${filePath}"`; } - return `echo '${stringifiedData}' > "${filePath}"`; + return `echo '${data}' > "${filePath}"`; + } + + public writeJson(filePath: string, data: any): string { + const stringifiedData = JSON.stringify(data); + return this.write(filePath, stringifiedData); } public copy(src: string, dest: string): string { @@ -330,6 +341,14 @@ class OsCommand { public changeDirectory(dir: string): string { return `cd "${dir}"`; } + + public remove(filePath: string): string { + if (this.osPlatform === 'win32') { + return `del "${filePath}"`; + } + + return `rm "${filePath}"`; + } } /** diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts index ea3b1f9b6f005..202be464b16da 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts @@ -51,16 +51,16 @@ export interface NodejsFunctionProps extends lambda.FunctionOptions { readonly awsSdkConnectionReuse?: boolean; /** - * The path to the dependencies lock file (`yarn.lock` or `package-lock.json`). + * The path to the dependencies lock file (`yarn.lock`, `pnpm-lock.yaml` or `package-lock.json`). * * This will be used as the source for the volume mounted in the Docker * container. * * Modules specified in `nodeModules` will be installed using the right - * installer (`npm` or `yarn`) along with this lock file. + * installer (`yarn`, `pnpm` or `npm`) along with this lock file. * * @default - the path is found by walking up parent directories searching for - * a `yarn.lock` or `package-lock.json` file + * a `yarn.lock`, `pnpm-lock.yaml` or `package-lock.json` file */ readonly depsLockFilePath?: string; diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/package-manager.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/package-manager.ts index 05ef109993460..5d68f20347840 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/lib/package-manager.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/lib/package-manager.ts @@ -39,7 +39,9 @@ export class PackageManager { case LockFile.PNPM: return new PackageManager({ lockFile: LockFile.PNPM, - installCommand: logLevel && logLevel !== LogLevel.INFO ? ['pnpm', 'install', '--reporter', 'silent'] : ['pnpm', 'install'], + installCommand: logLevel && logLevel !== LogLevel.INFO ? ['pnpm', 'install', '--reporter', 'silent', '--config.node-linker=hoisted', '--config.package-import-method=clone-or-copy'] : ['pnpm', 'install', '--config.node-linker=hoisted', '--config.package-import-method=clone-or-copy'], + // --config.node-linker=hoisted to create flat node_modules without symlinks + // --config.package-import-method=clone-or-copy to avoid hardlinking packages from the store runCommand: ['pnpm', 'exec'], argsSeparator: '--', }); diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts index bb3c0c8559742..0ca72b4149b1f 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts @@ -247,7 +247,7 @@ export interface BundlingOptions extends DockerRunOptions { * A custom bundling Docker image. * * This image should have esbuild installed globally. If you plan to use `nodeModules` - * it should also have `npm` or `yarn` depending on the lock file you're using. + * it should also have `npm`, `yarn` or `pnpm` depending on the lock file you're using. * * See https://github.com/aws/aws-cdk/blob/main/packages/%40aws-cdk/aws-lambda-nodejs/lib/Dockerfile * for the default image provided by @aws-cdk/aws-lambda-nodejs. diff --git a/packages/@aws-cdk/aws-lambda-nodejs/package.json b/packages/@aws-cdk/aws-lambda-nodejs/package.json index 5f483e81d1cc4..cf3cf09fc65fe 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/package.json +++ b/packages/@aws-cdk/aws-lambda-nodejs/package.json @@ -78,6 +78,7 @@ "@aws-cdk/integ-runner": "0.0.0", "@aws-cdk/integ-tests": "0.0.0", "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/triggers": "0.0.0", "@types/jest": "^27.5.2", "delay": "5.0.0", "esbuild": "^0.16.6" diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts index 83029ec601590..9679530a01189 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts @@ -408,7 +408,7 @@ test('Detects pnpm-lock.yaml', () => { assetHashType: AssetHashType.OUTPUT, bundling: expect.objectContaining({ command: expect.arrayContaining([ - expect.stringMatching(/pnpm-lock\.yaml.+pnpm install/), + expect.stringMatching(/echo '' > "\/asset-output\/pnpm-workspace.yaml\".+pnpm-lock\.yaml.+pnpm install --config.node-linker=hoisted --config.package-import-method=clone-or-copy && rm "\/asset-output\/node_modules\/.modules.yaml"/), ]), }), }); diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts index d1b85dfcca2b8..f347fac6a7565 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts @@ -58,6 +58,7 @@ test('cache folders have the right permissions', () => { 'bash', '-c', [ 'stat -c \'%a\' /tmp/npm-cache', 'stat -c \'%a\' /tmp/yarn-cache', + 'stat -c \'%a\' /tmp/pnpm-cache', ].join(' && '), ]); expect(proc.stdout.toString()).toMatch('777\n777'); diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/dependencies-pnpm.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/dependencies-pnpm.ts new file mode 100644 index 0000000000000..81022e2b9e00f --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/dependencies-pnpm.ts @@ -0,0 +1,6 @@ +// eslint-disable-next-line import/no-extraneous-dependencies +import axios from 'axios'; + +export async function handler() { + await axios.get('https://www.google.com'); +} diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/pnpm-lock.yaml b/packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/pnpm-lock.yaml new file mode 100644 index 0000000000000..899ba52e99ec2 --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ-handlers/pnpm/pnpm-lock.yaml @@ -0,0 +1,70 @@ +lockfileVersion: 5.4 + +specifiers: + axios: ^1.2.1 + +dependencies: + axios: 1.2.1 + +packages: + + /asynckit/0.4.0: + resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} + dev: false + + /axios/1.2.1: + resolution: {integrity: sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==} + dependencies: + follow-redirects: 1.15.2 + form-data: 4.0.0 + proxy-from-env: 1.1.0 + transitivePeerDependencies: + - debug + dev: false + + /combined-stream/1.0.8: + resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} + engines: {node: '>= 0.8'} + dependencies: + delayed-stream: 1.0.0 + dev: false + + /delayed-stream/1.0.0: + resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} + engines: {node: '>=0.4.0'} + dev: false + + /follow-redirects/1.15.2: + resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + dev: false + + /form-data/4.0.0: + resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} + engines: {node: '>= 6'} + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + mime-types: 2.1.35 + dev: false + + /mime-db/1.52.0: + resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} + engines: {node: '>= 0.6'} + dev: false + + /mime-types/2.1.35: + resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} + engines: {node: '>= 0.6'} + dependencies: + mime-db: 1.52.0 + dev: false + + /proxy-from-env/1.1.0: + resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} + dev: false diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.assets.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.assets.json new file mode 100644 index 0000000000000..f2f1759f8e85a --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.assets.json @@ -0,0 +1,19 @@ +{ + "version": "22.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "PnpmTestDefaultTestDeployAssert397EDF83.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.template.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/PnpmTestDefaultTestDeployAssert397EDF83.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.assets.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.assets.json new file mode 100644 index 0000000000000..30c2cc5969fcb --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.assets.json @@ -0,0 +1,45 @@ +{ + "version": "22.0.0", + "files": { + "58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383": { + "source": { + "path": "asset.58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8": { + "source": { + "path": "asset.44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8", + "packaging": "zip" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8.zip", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "c51cd09452e746f11796192b2e9025f8c82de145d16aeb2e2c66c2197ecbae26": { + "source": { + "path": "TestStack.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "c51cd09452e746f11796192b2e9025f8c82de145d16aeb2e2c66c2197ecbae26.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.template.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.template.json new file mode 100644 index 0000000000000..8b95fc6ae04df --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/TestStack.template.json @@ -0,0 +1,200 @@ +{ + "Resources": { + "FunctionServiceRole675BB04A": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "Function76856677": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383.zip" + }, + "Role": { + "Fn::GetAtt": [ + "FunctionServiceRole675BB04A", + "Arn" + ] + }, + "Environment": { + "Variables": { + "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" + } + }, + "Handler": "index.handler", + "Runtime": "nodejs18.x" + }, + "DependsOn": [ + "FunctionServiceRole675BB04A" + ] + }, + "FunctionCurrentVersion4E2B22618dd26ccb3af7b577163fa65856572807": { + "Type": "AWS::Lambda::Version", + "Properties": { + "FunctionName": { + "Ref": "Function76856677" + } + } + }, + "Trigger": { + "Type": "Custom::Trigger", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "AWSCDKTriggerCustomResourceProviderCustomResourceProviderHandler97BECD91", + "Arn" + ] + }, + "HandlerArn": { + "Ref": "FunctionCurrentVersion4E2B22618dd26ccb3af7b577163fa65856572807" + }, + "InvocationType": "RequestResponse", + "Timeout": 120000 + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "AWSCDKTriggerCustomResourceProviderCustomResourceProviderRoleE18FAF0A": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ], + "Policies": [ + { + "PolicyName": "Inline", + "PolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "lambda:InvokeFunction" + ], + "Resource": [ + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "Function76856677", + "Arn" + ] + }, + ":*" + ] + ] + } + ] + } + ] + } + } + ] + } + }, + "AWSCDKTriggerCustomResourceProviderCustomResourceProviderHandler97BECD91": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "S3Key": "44fdff138ed916c94d14f276217febea5c4a2e1746518f7f620c37b22a6675b8.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "__entrypoint__.handler", + "Role": { + "Fn::GetAtt": [ + "AWSCDKTriggerCustomResourceProviderCustomResourceProviderRoleE18FAF0A", + "Arn" + ] + }, + "Runtime": "nodejs14.x" + }, + "DependsOn": [ + "AWSCDKTriggerCustomResourceProviderCustomResourceProviderRoleE18FAF0A" + ] + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/cdk.out new file mode 100644 index 0000000000000..145739f539580 --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"22.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/integ.json new file mode 100644 index 0000000000000..368ae1d1b2566 --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/integ.json @@ -0,0 +1,13 @@ +{ + "version": "22.0.0", + "testCases": { + "PnpmTest/DefaultTest": { + "stacks": [ + "TestStack" + ], + "stackUpdateWorkflow": false, + "assertionStack": "PnpmTest/DefaultTest/DeployAssert", + "assertionStackName": "PnpmTestDefaultTestDeployAssert397EDF83" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/manifest.json new file mode 100644 index 0000000000000..d6305be21c368 --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/manifest.json @@ -0,0 +1,141 @@ +{ + "version": "22.0.0", + "artifacts": { + "TestStack.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "TestStack.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "TestStack": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "TestStack.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c51cd09452e746f11796192b2e9025f8c82de145d16aeb2e2c66c2197ecbae26.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "TestStack.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "TestStack.assets" + ], + "metadata": { + "/TestStack/Function/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "FunctionServiceRole675BB04A" + } + ], + "/TestStack/Function/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Function76856677" + } + ], + "/TestStack/Function/CurrentVersion/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "FunctionCurrentVersion4E2B22618dd26ccb3af7b577163fa65856572807" + } + ], + "/TestStack/Trigger/Default/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "Trigger" + } + ], + "/TestStack/AWSCDK.TriggerCustomResourceProviderCustomResourceProvider/Role": [ + { + "type": "aws:cdk:logicalId", + "data": "AWSCDKTriggerCustomResourceProviderCustomResourceProviderRoleE18FAF0A" + } + ], + "/TestStack/AWSCDK.TriggerCustomResourceProviderCustomResourceProvider/Handler": [ + { + "type": "aws:cdk:logicalId", + "data": "AWSCDKTriggerCustomResourceProviderCustomResourceProviderHandler97BECD91" + } + ], + "/TestStack/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/TestStack/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "TestStack" + }, + "PnpmTestDefaultTestDeployAssert397EDF83.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "PnpmTestDefaultTestDeployAssert397EDF83.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "PnpmTestDefaultTestDeployAssert397EDF83": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "PnpmTestDefaultTestDeployAssert397EDF83.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "PnpmTestDefaultTestDeployAssert397EDF83.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "PnpmTestDefaultTestDeployAssert397EDF83.assets" + ], + "metadata": { + "/PnpmTest/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/PnpmTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "PnpmTest/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/tree.json new file mode 100644 index 0000000000000..1fa148c5c7342 --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.js.snapshot/tree.json @@ -0,0 +1,314 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "TestStack": { + "id": "TestStack", + "path": "TestStack", + "children": { + "Function": { + "id": "Function", + "path": "TestStack/Function", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "TestStack/Function/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "TestStack/Function/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "TestStack/Function/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "TestStack/Function/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "TestStack/Function/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "TestStack/Function/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "TestStack/Function/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "s3Key": "58d2406e0a74fd42ac31e584a098bb581709c3de7bff389451c2a08db50c4383.zip" + }, + "role": { + "Fn::GetAtt": [ + "FunctionServiceRole675BB04A", + "Arn" + ] + }, + "environment": { + "variables": { + "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1" + } + }, + "handler": "index.handler", + "runtime": "nodejs18.x" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + }, + "CurrentVersion": { + "id": "CurrentVersion", + "path": "TestStack/Function/CurrentVersion", + "children": { + "Resource": { + "id": "Resource", + "path": "TestStack/Function/CurrentVersion/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Version", + "aws:cdk:cloudformation:props": { + "functionName": { + "Ref": "Function76856677" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnVersion", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Version", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda-nodejs.NodejsFunction", + "version": "0.0.0" + } + }, + "Trigger": { + "id": "Trigger", + "path": "TestStack/Trigger", + "children": { + "Default": { + "id": "Default", + "path": "TestStack/Trigger/Default", + "children": { + "Default": { + "id": "Default", + "path": "TestStack/Trigger/Default/Default", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CustomResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/triggers.Trigger", + "version": "0.0.0" + } + }, + "AWSCDK.TriggerCustomResourceProviderCustomResourceProvider": { + "id": "AWSCDK.TriggerCustomResourceProviderCustomResourceProvider", + "path": "TestStack/AWSCDK.TriggerCustomResourceProviderCustomResourceProvider", + "children": { + "Staging": { + "id": "Staging", + "path": "TestStack/AWSCDK.TriggerCustomResourceProviderCustomResourceProvider/Staging", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "Role": { + "id": "Role", + "path": "TestStack/AWSCDK.TriggerCustomResourceProviderCustomResourceProvider/Role", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + }, + "Handler": { + "id": "Handler", + "path": "TestStack/AWSCDK.TriggerCustomResourceProviderCustomResourceProvider/Handler", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CustomResourceProvider", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "TestStack/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "TestStack/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "PnpmTest": { + "id": "PnpmTest", + "path": "PnpmTest", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "PnpmTest/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "PnpmTest/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.189" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "PnpmTest/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "PnpmTest/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "PnpmTest/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.1.189" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.ts new file mode 100644 index 0000000000000..6c4352ba8f57c --- /dev/null +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/integ.dependencies-pnpm.ts @@ -0,0 +1,35 @@ +import * as path from 'path'; +import { Runtime } from '@aws-cdk/aws-lambda'; +import * as cdk from '@aws-cdk/core'; +import * as integ from '@aws-cdk/integ-tests'; +import * as triggers from '@aws-cdk/triggers'; +import * as lambda from '../lib'; + +const app = new cdk.App(); + +const stack = new cdk.Stack(app, 'TestStack'); + +const handler = new lambda.NodejsFunction(stack, 'Function', { + entry: path.join(__dirname, 'integ-handlers/pnpm/dependencies-pnpm.ts'), + runtime: Runtime.NODEJS_18_X, + bundling: { + minify: true, + // Will be installed, not bundled + // (axios is a package with sub-dependencies, + // will be used to ensure pnpm bundling works as expected) + nodeModules: ['axios'], + forceDockerBundling: true, + }, + depsLockFilePath: path.join(__dirname, 'integ-handlers/pnpm/pnpm-lock.yaml'), +}); + +new triggers.Trigger(stack, 'Trigger', { + handler, +}); + +new integ.IntegTest(app, 'PnpmTest', { + testCases: [stack], + stackUpdateWorkflow: false, // this will tell the runner to not check in assets. +}); + +app.synth(); diff --git a/packages/@aws-cdk/aws-lambda-nodejs/test/package-manager.test.ts b/packages/@aws-cdk/aws-lambda-nodejs/test/package-manager.test.ts index 8bb0682c0d568..6be593f785eff 100644 --- a/packages/@aws-cdk/aws-lambda-nodejs/test/package-manager.test.ts +++ b/packages/@aws-cdk/aws-lambda-nodejs/test/package-manager.test.ts @@ -37,7 +37,7 @@ test('from a pnpm-lock.yaml', () => { const packageManager = PackageManager.fromLockFile('/path/to/pnpm-lock.yaml'); expect(packageManager.lockFile).toEqual(LockFile.PNPM); expect(packageManager.argsSeparator).toEqual('--'); - expect(packageManager.installCommand).toEqual(['pnpm', 'install']); + expect(packageManager.installCommand).toEqual(['pnpm', 'install', '--config.node-linker=hoisted', '--config.package-import-method=clone-or-copy']); expect(packageManager.runCommand).toEqual(['pnpm', 'exec']); expect(packageManager.runBinCommand('my-bin')).toBe('pnpm exec -- my-bin'); @@ -45,7 +45,7 @@ test('from a pnpm-lock.yaml', () => { test('from a pnpm-lock.yaml with LogLevel.ERROR', () => { const packageManager = PackageManager.fromLockFile('/path/to/pnpm-lock.yaml', LogLevel.ERROR); - expect(packageManager.installCommand).toEqual(['pnpm', 'install', '--reporter', 'silent']); + expect(packageManager.installCommand).toEqual(['pnpm', 'install', '--reporter', 'silent', '--config.node-linker=hoisted', '--config.package-import-method=clone-or-copy']); }); test('defaults to NPM', () => { diff --git a/packages/@aws-cdk/aws-lambda-python/LICENSE b/packages/@aws-cdk/aws-lambda-python/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lambda-python/LICENSE +++ b/packages/@aws-cdk/aws-lambda-python/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lambda-python/NOTICE b/packages/@aws-cdk/aws-lambda-python/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lambda-python/NOTICE +++ b/packages/@aws-cdk/aws-lambda-python/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lambda/LICENSE b/packages/@aws-cdk/aws-lambda/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lambda/LICENSE +++ b/packages/@aws-cdk/aws-lambda/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lambda/NOTICE b/packages/@aws-cdk/aws-lambda/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lambda/NOTICE +++ b/packages/@aws-cdk/aws-lambda/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lex/LICENSE b/packages/@aws-cdk/aws-lex/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lex/LICENSE +++ b/packages/@aws-cdk/aws-lex/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lex/NOTICE b/packages/@aws-cdk/aws-lex/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lex/NOTICE +++ b/packages/@aws-cdk/aws-lex/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-licensemanager/LICENSE b/packages/@aws-cdk/aws-licensemanager/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-licensemanager/LICENSE +++ b/packages/@aws-cdk/aws-licensemanager/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-licensemanager/NOTICE b/packages/@aws-cdk/aws-licensemanager/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-licensemanager/NOTICE +++ b/packages/@aws-cdk/aws-licensemanager/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lightsail/LICENSE b/packages/@aws-cdk/aws-lightsail/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lightsail/LICENSE +++ b/packages/@aws-cdk/aws-lightsail/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lightsail/NOTICE b/packages/@aws-cdk/aws-lightsail/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lightsail/NOTICE +++ b/packages/@aws-cdk/aws-lightsail/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-location/LICENSE b/packages/@aws-cdk/aws-location/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-location/LICENSE +++ b/packages/@aws-cdk/aws-location/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-location/NOTICE b/packages/@aws-cdk/aws-location/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-location/NOTICE +++ b/packages/@aws-cdk/aws-location/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-logs-destinations/LICENSE b/packages/@aws-cdk/aws-logs-destinations/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-logs-destinations/LICENSE +++ b/packages/@aws-cdk/aws-logs-destinations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-logs-destinations/NOTICE b/packages/@aws-cdk/aws-logs-destinations/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-logs-destinations/NOTICE +++ b/packages/@aws-cdk/aws-logs-destinations/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-logs/LICENSE b/packages/@aws-cdk/aws-logs/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-logs/LICENSE +++ b/packages/@aws-cdk/aws-logs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-logs/NOTICE b/packages/@aws-cdk/aws-logs/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-logs/NOTICE +++ b/packages/@aws-cdk/aws-logs/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lookoutequipment/LICENSE b/packages/@aws-cdk/aws-lookoutequipment/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lookoutequipment/LICENSE +++ b/packages/@aws-cdk/aws-lookoutequipment/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lookoutequipment/NOTICE b/packages/@aws-cdk/aws-lookoutequipment/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lookoutequipment/NOTICE +++ b/packages/@aws-cdk/aws-lookoutequipment/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lookoutmetrics/LICENSE b/packages/@aws-cdk/aws-lookoutmetrics/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lookoutmetrics/LICENSE +++ b/packages/@aws-cdk/aws-lookoutmetrics/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lookoutmetrics/NOTICE b/packages/@aws-cdk/aws-lookoutmetrics/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lookoutmetrics/NOTICE +++ b/packages/@aws-cdk/aws-lookoutmetrics/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-lookoutvision/LICENSE b/packages/@aws-cdk/aws-lookoutvision/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-lookoutvision/LICENSE +++ b/packages/@aws-cdk/aws-lookoutvision/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-lookoutvision/NOTICE b/packages/@aws-cdk/aws-lookoutvision/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-lookoutvision/NOTICE +++ b/packages/@aws-cdk/aws-lookoutvision/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-m2/LICENSE b/packages/@aws-cdk/aws-m2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-m2/LICENSE +++ b/packages/@aws-cdk/aws-m2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-m2/NOTICE b/packages/@aws-cdk/aws-m2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-m2/NOTICE +++ b/packages/@aws-cdk/aws-m2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-macie/LICENSE b/packages/@aws-cdk/aws-macie/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-macie/LICENSE +++ b/packages/@aws-cdk/aws-macie/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-macie/NOTICE b/packages/@aws-cdk/aws-macie/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-macie/NOTICE +++ b/packages/@aws-cdk/aws-macie/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-managedblockchain/LICENSE b/packages/@aws-cdk/aws-managedblockchain/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-managedblockchain/LICENSE +++ b/packages/@aws-cdk/aws-managedblockchain/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-managedblockchain/NOTICE b/packages/@aws-cdk/aws-managedblockchain/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-managedblockchain/NOTICE +++ b/packages/@aws-cdk/aws-managedblockchain/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-mediaconnect/LICENSE b/packages/@aws-cdk/aws-mediaconnect/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-mediaconnect/LICENSE +++ b/packages/@aws-cdk/aws-mediaconnect/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-mediaconnect/NOTICE b/packages/@aws-cdk/aws-mediaconnect/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-mediaconnect/NOTICE +++ b/packages/@aws-cdk/aws-mediaconnect/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-mediaconvert/LICENSE b/packages/@aws-cdk/aws-mediaconvert/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-mediaconvert/LICENSE +++ b/packages/@aws-cdk/aws-mediaconvert/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-mediaconvert/NOTICE b/packages/@aws-cdk/aws-mediaconvert/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-mediaconvert/NOTICE +++ b/packages/@aws-cdk/aws-mediaconvert/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-medialive/LICENSE b/packages/@aws-cdk/aws-medialive/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-medialive/LICENSE +++ b/packages/@aws-cdk/aws-medialive/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-medialive/NOTICE b/packages/@aws-cdk/aws-medialive/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-medialive/NOTICE +++ b/packages/@aws-cdk/aws-medialive/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-mediapackage/LICENSE b/packages/@aws-cdk/aws-mediapackage/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-mediapackage/LICENSE +++ b/packages/@aws-cdk/aws-mediapackage/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-mediapackage/NOTICE b/packages/@aws-cdk/aws-mediapackage/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-mediapackage/NOTICE +++ b/packages/@aws-cdk/aws-mediapackage/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-mediastore/LICENSE b/packages/@aws-cdk/aws-mediastore/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-mediastore/LICENSE +++ b/packages/@aws-cdk/aws-mediastore/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-mediastore/NOTICE b/packages/@aws-cdk/aws-mediastore/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-mediastore/NOTICE +++ b/packages/@aws-cdk/aws-mediastore/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-mediatailor/LICENSE b/packages/@aws-cdk/aws-mediatailor/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-mediatailor/LICENSE +++ b/packages/@aws-cdk/aws-mediatailor/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-mediatailor/NOTICE b/packages/@aws-cdk/aws-mediatailor/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-mediatailor/NOTICE +++ b/packages/@aws-cdk/aws-mediatailor/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-memorydb/LICENSE b/packages/@aws-cdk/aws-memorydb/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-memorydb/LICENSE +++ b/packages/@aws-cdk/aws-memorydb/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-memorydb/NOTICE b/packages/@aws-cdk/aws-memorydb/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-memorydb/NOTICE +++ b/packages/@aws-cdk/aws-memorydb/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-msk/LICENSE b/packages/@aws-cdk/aws-msk/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-msk/LICENSE +++ b/packages/@aws-cdk/aws-msk/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-msk/NOTICE b/packages/@aws-cdk/aws-msk/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-msk/NOTICE +++ b/packages/@aws-cdk/aws-msk/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-mwaa/LICENSE b/packages/@aws-cdk/aws-mwaa/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-mwaa/LICENSE +++ b/packages/@aws-cdk/aws-mwaa/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-mwaa/NOTICE b/packages/@aws-cdk/aws-mwaa/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-mwaa/NOTICE +++ b/packages/@aws-cdk/aws-mwaa/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-neptune/LICENSE b/packages/@aws-cdk/aws-neptune/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-neptune/LICENSE +++ b/packages/@aws-cdk/aws-neptune/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-neptune/NOTICE b/packages/@aws-cdk/aws-neptune/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-neptune/NOTICE +++ b/packages/@aws-cdk/aws-neptune/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-networkfirewall/LICENSE b/packages/@aws-cdk/aws-networkfirewall/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-networkfirewall/LICENSE +++ b/packages/@aws-cdk/aws-networkfirewall/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-networkfirewall/NOTICE b/packages/@aws-cdk/aws-networkfirewall/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-networkfirewall/NOTICE +++ b/packages/@aws-cdk/aws-networkfirewall/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-networkmanager/LICENSE b/packages/@aws-cdk/aws-networkmanager/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-networkmanager/LICENSE +++ b/packages/@aws-cdk/aws-networkmanager/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-networkmanager/NOTICE b/packages/@aws-cdk/aws-networkmanager/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-networkmanager/NOTICE +++ b/packages/@aws-cdk/aws-networkmanager/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-nimblestudio/LICENSE b/packages/@aws-cdk/aws-nimblestudio/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-nimblestudio/LICENSE +++ b/packages/@aws-cdk/aws-nimblestudio/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-nimblestudio/NOTICE b/packages/@aws-cdk/aws-nimblestudio/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-nimblestudio/NOTICE +++ b/packages/@aws-cdk/aws-nimblestudio/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-oam/LICENSE b/packages/@aws-cdk/aws-oam/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-oam/LICENSE +++ b/packages/@aws-cdk/aws-oam/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-oam/NOTICE b/packages/@aws-cdk/aws-oam/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-oam/NOTICE +++ b/packages/@aws-cdk/aws-oam/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-opensearchserverless/LICENSE b/packages/@aws-cdk/aws-opensearchserverless/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-opensearchserverless/LICENSE +++ b/packages/@aws-cdk/aws-opensearchserverless/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-opensearchserverless/NOTICE b/packages/@aws-cdk/aws-opensearchserverless/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-opensearchserverless/NOTICE +++ b/packages/@aws-cdk/aws-opensearchserverless/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-opensearchservice/LICENSE b/packages/@aws-cdk/aws-opensearchservice/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-opensearchservice/LICENSE +++ b/packages/@aws-cdk/aws-opensearchservice/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-opensearchservice/NOTICE b/packages/@aws-cdk/aws-opensearchservice/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-opensearchservice/NOTICE +++ b/packages/@aws-cdk/aws-opensearchservice/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-opsworks/LICENSE b/packages/@aws-cdk/aws-opsworks/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-opsworks/LICENSE +++ b/packages/@aws-cdk/aws-opsworks/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-opsworks/NOTICE b/packages/@aws-cdk/aws-opsworks/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-opsworks/NOTICE +++ b/packages/@aws-cdk/aws-opsworks/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-opsworkscm/LICENSE b/packages/@aws-cdk/aws-opsworkscm/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-opsworkscm/LICENSE +++ b/packages/@aws-cdk/aws-opsworkscm/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-opsworkscm/NOTICE b/packages/@aws-cdk/aws-opsworkscm/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-opsworkscm/NOTICE +++ b/packages/@aws-cdk/aws-opsworkscm/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-organizations/LICENSE b/packages/@aws-cdk/aws-organizations/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-organizations/LICENSE +++ b/packages/@aws-cdk/aws-organizations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-organizations/NOTICE b/packages/@aws-cdk/aws-organizations/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-organizations/NOTICE +++ b/packages/@aws-cdk/aws-organizations/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-panorama/LICENSE b/packages/@aws-cdk/aws-panorama/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-panorama/LICENSE +++ b/packages/@aws-cdk/aws-panorama/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-panorama/NOTICE b/packages/@aws-cdk/aws-panorama/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-panorama/NOTICE +++ b/packages/@aws-cdk/aws-panorama/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-personalize/LICENSE b/packages/@aws-cdk/aws-personalize/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-personalize/LICENSE +++ b/packages/@aws-cdk/aws-personalize/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-personalize/NOTICE b/packages/@aws-cdk/aws-personalize/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-personalize/NOTICE +++ b/packages/@aws-cdk/aws-personalize/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-pinpoint/LICENSE b/packages/@aws-cdk/aws-pinpoint/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-pinpoint/LICENSE +++ b/packages/@aws-cdk/aws-pinpoint/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-pinpoint/NOTICE b/packages/@aws-cdk/aws-pinpoint/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-pinpoint/NOTICE +++ b/packages/@aws-cdk/aws-pinpoint/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-pinpointemail/LICENSE b/packages/@aws-cdk/aws-pinpointemail/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-pinpointemail/LICENSE +++ b/packages/@aws-cdk/aws-pinpointemail/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-pinpointemail/NOTICE b/packages/@aws-cdk/aws-pinpointemail/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-pinpointemail/NOTICE +++ b/packages/@aws-cdk/aws-pinpointemail/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-pipes/LICENSE b/packages/@aws-cdk/aws-pipes/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-pipes/LICENSE +++ b/packages/@aws-cdk/aws-pipes/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-pipes/NOTICE b/packages/@aws-cdk/aws-pipes/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-pipes/NOTICE +++ b/packages/@aws-cdk/aws-pipes/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-qldb/LICENSE b/packages/@aws-cdk/aws-qldb/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-qldb/LICENSE +++ b/packages/@aws-cdk/aws-qldb/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-qldb/NOTICE b/packages/@aws-cdk/aws-qldb/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-qldb/NOTICE +++ b/packages/@aws-cdk/aws-qldb/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-quicksight/LICENSE b/packages/@aws-cdk/aws-quicksight/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-quicksight/LICENSE +++ b/packages/@aws-cdk/aws-quicksight/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-quicksight/NOTICE b/packages/@aws-cdk/aws-quicksight/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-quicksight/NOTICE +++ b/packages/@aws-cdk/aws-quicksight/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ram/LICENSE b/packages/@aws-cdk/aws-ram/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ram/LICENSE +++ b/packages/@aws-cdk/aws-ram/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ram/NOTICE b/packages/@aws-cdk/aws-ram/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ram/NOTICE +++ b/packages/@aws-cdk/aws-ram/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-rds/LICENSE b/packages/@aws-cdk/aws-rds/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-rds/LICENSE +++ b/packages/@aws-cdk/aws-rds/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-rds/NOTICE b/packages/@aws-cdk/aws-rds/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-rds/NOTICE +++ b/packages/@aws-cdk/aws-rds/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-redshift/LICENSE b/packages/@aws-cdk/aws-redshift/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-redshift/LICENSE +++ b/packages/@aws-cdk/aws-redshift/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-redshift/NOTICE b/packages/@aws-cdk/aws-redshift/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-redshift/NOTICE +++ b/packages/@aws-cdk/aws-redshift/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-redshiftserverless/LICENSE b/packages/@aws-cdk/aws-redshiftserverless/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-redshiftserverless/LICENSE +++ b/packages/@aws-cdk/aws-redshiftserverless/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-redshiftserverless/NOTICE b/packages/@aws-cdk/aws-redshiftserverless/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-redshiftserverless/NOTICE +++ b/packages/@aws-cdk/aws-redshiftserverless/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-refactorspaces/LICENSE b/packages/@aws-cdk/aws-refactorspaces/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-refactorspaces/LICENSE +++ b/packages/@aws-cdk/aws-refactorspaces/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-refactorspaces/NOTICE b/packages/@aws-cdk/aws-refactorspaces/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-refactorspaces/NOTICE +++ b/packages/@aws-cdk/aws-refactorspaces/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-rekognition/LICENSE b/packages/@aws-cdk/aws-rekognition/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-rekognition/LICENSE +++ b/packages/@aws-cdk/aws-rekognition/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-rekognition/NOTICE b/packages/@aws-cdk/aws-rekognition/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-rekognition/NOTICE +++ b/packages/@aws-cdk/aws-rekognition/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-resiliencehub/LICENSE b/packages/@aws-cdk/aws-resiliencehub/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-resiliencehub/LICENSE +++ b/packages/@aws-cdk/aws-resiliencehub/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-resiliencehub/NOTICE b/packages/@aws-cdk/aws-resiliencehub/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-resiliencehub/NOTICE +++ b/packages/@aws-cdk/aws-resiliencehub/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-resourceexplorer2/LICENSE b/packages/@aws-cdk/aws-resourceexplorer2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-resourceexplorer2/LICENSE +++ b/packages/@aws-cdk/aws-resourceexplorer2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-resourceexplorer2/NOTICE b/packages/@aws-cdk/aws-resourceexplorer2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-resourceexplorer2/NOTICE +++ b/packages/@aws-cdk/aws-resourceexplorer2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-resourcegroups/LICENSE b/packages/@aws-cdk/aws-resourcegroups/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-resourcegroups/LICENSE +++ b/packages/@aws-cdk/aws-resourcegroups/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-resourcegroups/NOTICE b/packages/@aws-cdk/aws-resourcegroups/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-resourcegroups/NOTICE +++ b/packages/@aws-cdk/aws-resourcegroups/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-robomaker/LICENSE b/packages/@aws-cdk/aws-robomaker/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-robomaker/LICENSE +++ b/packages/@aws-cdk/aws-robomaker/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-robomaker/NOTICE b/packages/@aws-cdk/aws-robomaker/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-robomaker/NOTICE +++ b/packages/@aws-cdk/aws-robomaker/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-rolesanywhere/LICENSE b/packages/@aws-cdk/aws-rolesanywhere/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-rolesanywhere/LICENSE +++ b/packages/@aws-cdk/aws-rolesanywhere/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-rolesanywhere/NOTICE b/packages/@aws-cdk/aws-rolesanywhere/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-rolesanywhere/NOTICE +++ b/packages/@aws-cdk/aws-rolesanywhere/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-route53-patterns/LICENSE b/packages/@aws-cdk/aws-route53-patterns/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-route53-patterns/LICENSE +++ b/packages/@aws-cdk/aws-route53-patterns/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-route53-patterns/NOTICE b/packages/@aws-cdk/aws-route53-patterns/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-route53-patterns/NOTICE +++ b/packages/@aws-cdk/aws-route53-patterns/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-route53-targets/LICENSE b/packages/@aws-cdk/aws-route53-targets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-route53-targets/LICENSE +++ b/packages/@aws-cdk/aws-route53-targets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-route53-targets/NOTICE b/packages/@aws-cdk/aws-route53-targets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-route53-targets/NOTICE +++ b/packages/@aws-cdk/aws-route53-targets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-route53/LICENSE b/packages/@aws-cdk/aws-route53/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-route53/LICENSE +++ b/packages/@aws-cdk/aws-route53/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-route53/NOTICE b/packages/@aws-cdk/aws-route53/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-route53/NOTICE +++ b/packages/@aws-cdk/aws-route53/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-route53recoverycontrol/LICENSE b/packages/@aws-cdk/aws-route53recoverycontrol/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-route53recoverycontrol/LICENSE +++ b/packages/@aws-cdk/aws-route53recoverycontrol/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-route53recoverycontrol/NOTICE b/packages/@aws-cdk/aws-route53recoverycontrol/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-route53recoverycontrol/NOTICE +++ b/packages/@aws-cdk/aws-route53recoverycontrol/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-route53recoveryreadiness/LICENSE b/packages/@aws-cdk/aws-route53recoveryreadiness/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-route53recoveryreadiness/LICENSE +++ b/packages/@aws-cdk/aws-route53recoveryreadiness/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-route53recoveryreadiness/NOTICE b/packages/@aws-cdk/aws-route53recoveryreadiness/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-route53recoveryreadiness/NOTICE +++ b/packages/@aws-cdk/aws-route53recoveryreadiness/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-route53resolver/LICENSE b/packages/@aws-cdk/aws-route53resolver/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-route53resolver/LICENSE +++ b/packages/@aws-cdk/aws-route53resolver/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-route53resolver/NOTICE b/packages/@aws-cdk/aws-route53resolver/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-route53resolver/NOTICE +++ b/packages/@aws-cdk/aws-route53resolver/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-rum/LICENSE b/packages/@aws-cdk/aws-rum/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-rum/LICENSE +++ b/packages/@aws-cdk/aws-rum/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-rum/NOTICE b/packages/@aws-cdk/aws-rum/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-rum/NOTICE +++ b/packages/@aws-cdk/aws-rum/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-s3-assets/LICENSE b/packages/@aws-cdk/aws-s3-assets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-s3-assets/LICENSE +++ b/packages/@aws-cdk/aws-s3-assets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-s3-assets/NOTICE b/packages/@aws-cdk/aws-s3-assets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-s3-assets/NOTICE +++ b/packages/@aws-cdk/aws-s3-assets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-s3-deployment/LICENSE b/packages/@aws-cdk/aws-s3-deployment/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-s3-deployment/LICENSE +++ b/packages/@aws-cdk/aws-s3-deployment/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-s3-deployment/NOTICE b/packages/@aws-cdk/aws-s3-deployment/NOTICE index 027b201c61509..096ec7d8eb081 100644 --- a/packages/@aws-cdk/aws-s3-deployment/NOTICE +++ b/packages/@aws-cdk/aws-s3-deployment/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/aws-s3-notifications/LICENSE b/packages/@aws-cdk/aws-s3-notifications/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-s3-notifications/LICENSE +++ b/packages/@aws-cdk/aws-s3-notifications/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-s3-notifications/NOTICE b/packages/@aws-cdk/aws-s3-notifications/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-s3-notifications/NOTICE +++ b/packages/@aws-cdk/aws-s3-notifications/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-s3/LICENSE b/packages/@aws-cdk/aws-s3/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-s3/LICENSE +++ b/packages/@aws-cdk/aws-s3/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-s3/NOTICE b/packages/@aws-cdk/aws-s3/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-s3/NOTICE +++ b/packages/@aws-cdk/aws-s3/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-s3/README.md b/packages/@aws-cdk/aws-s3/README.md index e34dd8067f0ef..9a41dc49369d4 100644 --- a/packages/@aws-cdk/aws-s3/README.md +++ b/packages/@aws-cdk/aws-s3/README.md @@ -349,7 +349,25 @@ const bucket = new s3.Bucket(this, 'MyBucket', { }); ``` -[S3 Server access logging]: https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerLogs.html +### Allowing access log delivery using a Bucket Policy (recommended) + +When possible, it is recommended to use a bucket policy to grant access instead of +using ACLs. When the `@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy` feature flag +is enabled, this is done by default for server access logs. If S3 Server Access Logs +are the only logs delivered to your bucket (or if all other services logging to the +bucket support using bucket policy instead of ACLs), you can set object ownership +to [bucket owner enforced](#bucket-owner-enforced-recommended), as is recommended. + +```ts +const accessLogsBucket = new s3.Bucket(this, 'AccessLogsBucket', { + objectOwnership: s3.ObjectOwnership.BUCKET_OWNER_ENFORCED, +}); + +const bucket = new s3.Bucket(this, 'MyBucket', { + serverAccessLogsBucket: accessLogsBucket, + serverAccessLogsPrefix: 'logs', +}); +``` ## S3 Inventory @@ -485,7 +503,9 @@ new s3.Bucket(this, 'MyBucket', { ### Bucket owner enforced (recommended) -ACLs are disabled, and the bucket owner automatically owns and has full control over every object in the bucket. ACLs no longer affect permissions to data in the S3 bucket. The bucket uses policies to define access control. +ACLs are disabled, and the bucket owner automatically owns and has full control +over every object in the bucket. ACLs no longer affect permissions to data in the +S3 bucket. The bucket uses policies to define access control. ```ts new s3.Bucket(this, 'MyBucket', { @@ -493,6 +513,13 @@ new s3.Bucket(this, 'MyBucket', { }); ``` +Some services may not not support log delivery to buckets that have object ownership +set to bucket owner enforced, such as +[S3 buckets using ACLs](#allowing-access-log-delivery-using-a-bucket-policy-recommended) +or [CloudFront Distributions][CloudFront S3 Bucket]. + +[CloudFront S3 Bucket]: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/AccessLogs.html#AccessLogsBucketAndFileOwnership + ## Bucket deletion When a bucket is removed from a stack (or the stack is deleted), the S3 diff --git a/packages/@aws-cdk/aws-s3/lib/bucket.ts b/packages/@aws-cdk/aws-s3/lib/bucket.ts index 0a7b7c029e63b..36f99fcb24290 100644 --- a/packages/@aws-cdk/aws-s3/lib/bucket.ts +++ b/packages/@aws-cdk/aws-s3/lib/bucket.ts @@ -1832,7 +1832,9 @@ export class Bucket extends BucketBase { } if (props.serverAccessLogsBucket instanceof Bucket) { - props.serverAccessLogsBucket.allowLogDelivery(); + props.serverAccessLogsBucket.allowLogDelivery(this, props.serverAccessLogsPrefix); + } else if (props.serverAccessLogsPrefix) { + this.allowLogDelivery(this, props.serverAccessLogsPrefix); } for (const inventory of props.inventories ?? []) { @@ -2189,17 +2191,35 @@ export class Bucket extends BucketBase { } /** - * Allows the LogDelivery group to write, fails if ACL was set differently. + * Allows Log Delivery to the S3 bucket, using a Bucket Policy if the relevant feature + * flag is enabled, otherwise the canned ACL is used. + * + * If log delivery is to be allowed using the ACL and an ACL has already been set, this fails. * * @see - * https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl - */ - private allowLogDelivery() { - if (this.accessControl && this.accessControl !== BucketAccessControl.LOG_DELIVERY_WRITE) { + * https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html + */ + private allowLogDelivery(from: IBucket, prefix?: string) { + if (FeatureFlags.of(this).isEnabled(cxapi.S3_SERVER_ACCESS_LOGS_USE_BUCKET_POLICY)) { + this.addToResourcePolicy(new iam.PolicyStatement({ + effect: iam.Effect.ALLOW, + principals: [new iam.ServicePrincipal('logging.s3.amazonaws.com')], + actions: ['s3:PutObject'], + resources: [this.arnForObjects(prefix ? `${prefix}*`: '*')], + conditions: { + ArnLike: { + 'aws:SourceArn': from.bucketArn, + }, + StringEquals: { + 'aws:SourceAccount': from.env.account, + }, + }, + })); + } else if (this.accessControl && this.accessControl !== BucketAccessControl.LOG_DELIVERY_WRITE) { throw new Error("Cannot enable log delivery to this bucket because the bucket's ACL has been set and can't be changed"); + } else { + this.accessControl = BucketAccessControl.LOG_DELIVERY_WRITE; } - - this.accessControl = BucketAccessControl.LOG_DELIVERY_WRITE; } private parseInventoryConfiguration(): CfnBucket.InventoryConfigurationProperty[] | undefined { diff --git a/packages/@aws-cdk/aws-s3/test/bucket.test.ts b/packages/@aws-cdk/aws-s3/test/bucket.test.ts index e412ceb2bc6ad..1ff083281004e 100644 --- a/packages/@aws-cdk/aws-s3/test/bucket.test.ts +++ b/packages/@aws-cdk/aws-s3/test/bucket.test.ts @@ -2205,6 +2205,71 @@ describe('bucket', () => { ).toThrow(/Cannot enable log delivery to this bucket because the bucket's ACL has been set and can't be changed/); }); + test('Bucket Allow Log delivery should use the recommended policy when flag enabled', () => { + // GIVEN + const stack = new cdk.Stack(); + stack.node.setContext('@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy', true); + + // WHEN + const bucket = new s3.Bucket(stack, 'TestBucket', { serverAccessLogsPrefix: 'test' }); + + // THEN + const template = Template.fromStack(stack); + template.hasResourceProperties('AWS::S3::Bucket', { + AccessControl: Match.absent(), + }); + template.hasResourceProperties('AWS::S3::BucketPolicy', { + Bucket: stack.resolve(bucket.bucketName), + PolicyDocument: Match.objectLike({ + Statement: Match.arrayWith([Match.objectLike({ + Effect: 'Allow', + Principal: { Service: 'logging.s3.amazonaws.com' }, + Action: 's3:PutObject', + Resource: stack.resolve(`${bucket.bucketArn}/test*`), + Condition: { + ArnLike: { + 'aws:SourceArn': stack.resolve(bucket.bucketArn), + }, + StringEquals: { + 'aws:SourceAccount': { 'Ref': 'AWS::AccountId' }, + }, + }, + })]), + }), + }); + }); + + test('Log Delivery bucket policy should properly set source bucket ARN/Account', () => { + // GIVEN + const stack = new cdk.Stack(); + stack.node.setContext('@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy', true); + + // WHEN + const targetBucket = new s3.Bucket(stack, 'TargetBucket'); + const sourceBucket = new s3.Bucket(stack, 'SourceBucket', { serverAccessLogsBucket: targetBucket }); + + // THEN + Template.fromStack(stack).hasResourceProperties('AWS::S3::BucketPolicy', { + Bucket: stack.resolve(targetBucket.bucketName), + PolicyDocument: Match.objectLike({ + Statement: Match.arrayWith([Match.objectLike({ + Effect: 'Allow', + Principal: { Service: 'logging.s3.amazonaws.com' }, + Action: 's3:PutObject', + Resource: stack.resolve(`${targetBucket.bucketArn}/*`), + Condition: { + ArnLike: { + 'aws:SourceArn': stack.resolve(sourceBucket.bucketArn), + }, + StringEquals: { + 'aws:SourceAccount': stack.resolve(sourceBucket.env.account), + }, + }, + })]), + }), + }); + }); + test('Defaults for an inventory bucket', () => { // Given const stack = new cdk.Stack(); diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.assets.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.assets.json index aeb33ba4e0d16..1b4fa26e8804e 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.assets.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.assets.json @@ -1,7 +1,7 @@ { - "version": "20.0.0", + "version": "22.0.0", "files": { - "8091e7796cbf83b5d8109a10ea23dfbe9ac04ad84434da5dd183b89eb89e351b": { + "f58a2b25314952a1a5a6b42c6b9092caf2710430af09ba4f5d807e60f2fd3542": { "source": { "path": "aws-cdk-s3-access-logs.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "8091e7796cbf83b5d8109a10ea23dfbe9ac04ad84434da5dd183b89eb89e351b.json", + "objectKey": "f58a2b25314952a1a5a6b42c6b9092caf2710430af09ba4f5d807e60f2fd3542.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.template.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.template.json index f9f202ceb7250..532e9c171c422 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.template.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/aws-cdk-s3-access-logs.template.json @@ -2,12 +2,58 @@ "Resources": { "MyAccessLogsBucketF7FE6635": { "Type": "AWS::S3::Bucket", - "Properties": { - "AccessControl": "LogDeliveryWrite" - }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, + "MyAccessLogsBucketPolicyEA9AB063": { + "Type": "AWS::S3::BucketPolicy", + "Properties": { + "Bucket": { + "Ref": "MyAccessLogsBucketF7FE6635" + }, + "PolicyDocument": { + "Statement": [ + { + "Action": "s3:PutObject", + "Condition": { + "ArnLike": { + "aws:SourceArn": { + "Fn::GetAtt": [ + "MyBucketF68F3FF0", + "Arn" + ] + } + }, + "StringEquals": { + "aws:SourceAccount": { + "Ref": "AWS::AccountId" + } + } + }, + "Effect": "Allow", + "Principal": { + "Service": "logging.s3.amazonaws.com" + }, + "Resource": { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "MyAccessLogsBucketF7FE6635", + "Arn" + ] + }, + "/example*" + ] + ] + } + } + ], + "Version": "2012-10-17" + } + } + }, "MyBucketF68F3FF0": { "Type": "AWS::S3::Bucket", "Properties": { diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/cdk.out b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/cdk.out index 588d7b269d34f..145739f539580 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"20.0.0"} \ No newline at end of file +{"version":"22.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/integ.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/integ.json index b0449f12ced23..eba84b97fa6de 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "20.0.0", + "version": "22.0.0", "testCases": { "integ.bucket.server-access-logs": { "stacks": [ diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/manifest.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/manifest.json index ff5492fb6b7ed..2a1a113d65e6d 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/manifest.json @@ -1,12 +1,6 @@ { - "version": "20.0.0", + "version": "22.0.0", "artifacts": { - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - }, "aws-cdk-s3-access-logs.assets": { "type": "cdk:asset-manifest", "properties": { @@ -23,7 +17,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/8091e7796cbf83b5d8109a10ea23dfbe9ac04ad84434da5dd183b89eb89e351b.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f58a2b25314952a1a5a6b42c6b9092caf2710430af09ba4f5d807e60f2fd3542.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -45,6 +39,12 @@ "data": "MyAccessLogsBucketF7FE6635" } ], + "/aws-cdk-s3-access-logs/MyAccessLogsBucket/Policy/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "MyAccessLogsBucketPolicyEA9AB063" + } + ], "/aws-cdk-s3-access-logs/MyBucket/Resource": [ { "type": "aws:cdk:logicalId", @@ -65,6 +65,12 @@ ] }, "displayName": "aws-cdk-s3-access-logs" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/tree.json b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/tree.json index 7ca6e560d2fa8..2cdf059009410 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-s3/test/integ.bucket.server-access-logs.js.snapshot/tree.json @@ -4,14 +4,6 @@ "id": "App", "path": "", "children": { - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" - } - }, "aws-cdk-s3-access-logs": { "id": "aws-cdk-s3-access-logs", "path": "aws-cdk-s3-access-logs", @@ -25,14 +17,79 @@ "path": "aws-cdk-s3-access-logs/MyAccessLogsBucket/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::S3::Bucket", - "aws:cdk:cloudformation:props": { - "accessControl": "LogDeliveryWrite" - } + "aws:cdk:cloudformation:props": {} }, "constructInfo": { "fqn": "@aws-cdk/aws-s3.CfnBucket", "version": "0.0.0" } + }, + "Policy": { + "id": "Policy", + "path": "aws-cdk-s3-access-logs/MyAccessLogsBucket/Policy", + "children": { + "Resource": { + "id": "Resource", + "path": "aws-cdk-s3-access-logs/MyAccessLogsBucket/Policy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::S3::BucketPolicy", + "aws:cdk:cloudformation:props": { + "bucket": { + "Ref": "MyAccessLogsBucketF7FE6635" + }, + "policyDocument": { + "Statement": [ + { + "Action": "s3:PutObject", + "Condition": { + "ArnLike": { + "aws:SourceArn": { + "Fn::GetAtt": [ + "MyBucketF68F3FF0", + "Arn" + ] + } + }, + "StringEquals": { + "aws:SourceAccount": { + "Ref": "AWS::AccountId" + } + } + }, + "Effect": "Allow", + "Principal": { + "Service": "logging.s3.amazonaws.com" + }, + "Resource": { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "MyAccessLogsBucketF7FE6635", + "Arn" + ] + }, + "/example*" + ] + ] + } + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.CfnBucketPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketPolicy", + "version": "0.0.0" + } } }, "constructInfo": { @@ -68,17 +125,41 @@ "fqn": "@aws-cdk/aws-s3.Bucket", "version": "0.0.0" } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-s3-access-logs/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-s3-access-logs/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } } }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.1.189" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-s3objectlambda/LICENSE b/packages/@aws-cdk/aws-s3objectlambda/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-s3objectlambda/LICENSE +++ b/packages/@aws-cdk/aws-s3objectlambda/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-s3objectlambda/NOTICE b/packages/@aws-cdk/aws-s3objectlambda/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-s3objectlambda/NOTICE +++ b/packages/@aws-cdk/aws-s3objectlambda/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-s3outposts/LICENSE b/packages/@aws-cdk/aws-s3outposts/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-s3outposts/LICENSE +++ b/packages/@aws-cdk/aws-s3outposts/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-s3outposts/NOTICE b/packages/@aws-cdk/aws-s3outposts/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-s3outposts/NOTICE +++ b/packages/@aws-cdk/aws-s3outposts/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sagemaker/LICENSE b/packages/@aws-cdk/aws-sagemaker/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sagemaker/LICENSE +++ b/packages/@aws-cdk/aws-sagemaker/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sagemaker/NOTICE b/packages/@aws-cdk/aws-sagemaker/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sagemaker/NOTICE +++ b/packages/@aws-cdk/aws-sagemaker/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sam/LICENSE b/packages/@aws-cdk/aws-sam/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sam/LICENSE +++ b/packages/@aws-cdk/aws-sam/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sam/NOTICE b/packages/@aws-cdk/aws-sam/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sam/NOTICE +++ b/packages/@aws-cdk/aws-sam/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-scheduler/LICENSE b/packages/@aws-cdk/aws-scheduler/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-scheduler/LICENSE +++ b/packages/@aws-cdk/aws-scheduler/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-scheduler/NOTICE b/packages/@aws-cdk/aws-scheduler/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-scheduler/NOTICE +++ b/packages/@aws-cdk/aws-scheduler/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sdb/LICENSE b/packages/@aws-cdk/aws-sdb/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sdb/LICENSE +++ b/packages/@aws-cdk/aws-sdb/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sdb/NOTICE b/packages/@aws-cdk/aws-sdb/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sdb/NOTICE +++ b/packages/@aws-cdk/aws-sdb/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-secretsmanager/LICENSE b/packages/@aws-cdk/aws-secretsmanager/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-secretsmanager/LICENSE +++ b/packages/@aws-cdk/aws-secretsmanager/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-secretsmanager/NOTICE b/packages/@aws-cdk/aws-secretsmanager/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-secretsmanager/NOTICE +++ b/packages/@aws-cdk/aws-secretsmanager/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-securityhub/LICENSE b/packages/@aws-cdk/aws-securityhub/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-securityhub/LICENSE +++ b/packages/@aws-cdk/aws-securityhub/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-securityhub/NOTICE b/packages/@aws-cdk/aws-securityhub/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-securityhub/NOTICE +++ b/packages/@aws-cdk/aws-securityhub/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-servicecatalog/LICENSE b/packages/@aws-cdk/aws-servicecatalog/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-servicecatalog/LICENSE +++ b/packages/@aws-cdk/aws-servicecatalog/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-servicecatalog/NOTICE b/packages/@aws-cdk/aws-servicecatalog/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-servicecatalog/NOTICE +++ b/packages/@aws-cdk/aws-servicecatalog/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-servicecatalog/README.md b/packages/@aws-cdk/aws-servicecatalog/README.md index 73bc9764ec296..105dd795667e1 100644 --- a/packages/@aws-cdk/aws-servicecatalog/README.md +++ b/packages/@aws-cdk/aws-servicecatalog/README.md @@ -22,6 +22,7 @@ enables organizations to create and manage catalogs of products for their end us - [Product](#product) - [Creating a product from a local asset](#creating-a-product-from-local-asset) - [Creating a product from a stack](#creating-a-product-from-a-stack) + - [Using Assets in your Product Stack](#using-aseets-in-your-product-stack) - [Creating a Product from a stack with a history of previous versions](#creating-a-product-from-a-stack-with-a-history-of-all-previous-versions) - [Adding a product to a portfolio](#adding-a-product-to-a-portfolio) - [TagOptions](#tag-options) @@ -185,6 +186,108 @@ const product = new servicecatalog.CloudFormationProduct(this, 'Product', { }); ``` +### Using Assets in your Product Stack + +You can reference assets in a Product Stack. For example, we can add a handler to a Lambda function or a S3 Asset directly from a local asset file. +In this case, you must provide a S3 Bucket with a bucketName to store your assets. + +```ts +import * as lambda from '@aws-cdk/aws-lambda'; +import * as cdk from '@aws-cdk/core'; +import { Bucket } from "@aws-cdk/aws-s3"; + +class LambdaProduct extends servicecatalog.ProductStack { + constructor(scope: Construct, id: string) { + super(scope, id); + + new lambda.Function(this, 'LambdaProduct', { + runtime: lambda.Runtime.PYTHON_3_9, + code: lambda.Code.fromAsset("./assets"), + handler: 'index.handler' + }); + } +} + +const userDefinedBucket = new Bucket(this, `UserDefinedBucket`, { + bucketName: 'user-defined-bucket-for-product-stack-assets', +}); + +const product = new servicecatalog.CloudFormationProduct(this, 'Product', { + productName: "My Product", + owner: "Product Owner", + productVersions: [ + { + productVersionName: "v1", + cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack(new LambdaProduct(this, 'LambdaFunctionProduct', { + assetBucket: userDefinedBucket, + })), + }, + ], +}); +``` + +When a product containing an asset is shared with a spoke account, the corresponding asset bucket +will automatically grant read permissions to the spoke account. +Note, it is not recommended using a referenced bucket as permissions cannot be added from CDK. +In this case, it will be your responsibility to grant read permissions for the asset bucket to +the spoke account. +If you want to provide your own bucket policy or scope down your bucket policy further to only allow +reads from a specific launch role, refer to the following example policy: + +```ts +new iam.PolicyStatement({ + actions: [ + 's3:GetObject*', + 's3:GetBucket*', + 's3:List*', ], + effect: iam.Effect.ALLOW, + resources: [ + bucket.bucketArn, + bucket.arnForObjects('*'), + ], + principals: [ + new iam.ArnPrincipal(cdk.Stack.of(this).formatArn({ + service: 'iam', + region: '', + sharedAccount, + resource: 'role', + resourceName: launchRoleName, + })) + ], + conditions: { + 'ForAnyValue:StringEquals': { + 'aws:CalledVia': ['cloudformation.amazonaws.com'], + }, + 'Bool': { + 'aws:ViaAWSService': true, + }, + }, +}); +``` + +Furthermore, in order for a spoke account to provision a product with an asset, the role launching +the product needs permissions to read from the asset bucket. +We recommend you utilize a launch role with permissions to read from the asset bucket. +For example your launch role would need to include at least the following policy: + +```json +{ + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "s3:GetObject" + ], + "Resource": "*" + } + ] +} +``` + +Please refer to [Set launch role](#set-launch-role) for additional details about launch roles. +See [Launch Constraint](https://docs.aws.amazon.com/servicecatalog/latest/adminguide/constraints-launch.html) documentation +to understand the permissions that launch roles need. + ### Creating a Product from a stack with a history of previous versions The default behavior of Service Catalog is to overwrite each product version upon deployment. diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts b/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts index 07af9b2cc822d..d424d1a1ffcde 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts @@ -1,3 +1,4 @@ +import { IBucket } from '@aws-cdk/aws-s3'; import * as s3_assets from '@aws-cdk/aws-s3-assets'; import { Construct } from 'constructs'; import { hashValues } from './private/util'; @@ -46,9 +47,16 @@ export abstract class CloudFormationTemplate { */ export interface CloudFormationTemplateConfig { /** - * The http url of the template in S3. - */ + * The http url of the template in S3. + */ readonly httpUrl: string; + + /** + * The S3 bucket containing product stack assets. + * @default - None - no assets are used in this product + */ + readonly assetBucket?: IBucket; + } /** @@ -108,6 +116,7 @@ class CloudFormationProductStackTemplate extends CloudFormationTemplate { public bind(_scope: Construct): CloudFormationTemplateConfig { return { httpUrl: this.productStack._getTemplateUrl(), + assetBucket: this.productStack._getAssetBucket(), }; } } diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/portfolio.ts b/packages/@aws-cdk/aws-servicecatalog/lib/portfolio.ts index 91167f2454695..725d2fb8936b4 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/portfolio.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/portfolio.ts @@ -1,7 +1,8 @@ import * as iam from '@aws-cdk/aws-iam'; +import { IBucket } from '@aws-cdk/aws-s3'; import * as sns from '@aws-cdk/aws-sns'; import * as cdk from '@aws-cdk/core'; -import { Construct } from 'constructs'; +import { Construct, IConstruct } from 'constructs'; import { MessageLanguage } from './common'; import { CloudFormationRuleConstraintOptions, CommonConstraintOptions, @@ -105,7 +106,7 @@ export interface IPortfolio extends cdk.IResource { * @param product A service catalog product. * @param options options for the constraint. */ - constrainCloudFormationParameters(product:IProduct, options: CloudFormationRuleConstraintOptions): void; + constrainCloudFormationParameters(product: IProduct, options: CloudFormationRuleConstraintOptions): void; /** * Force users to assume a certain role when launching a product. @@ -155,6 +156,8 @@ abstract class PortfolioBase extends cdk.Resource implements IPortfolio { public abstract readonly portfolioArn: string; public abstract readonly portfolioId: string; private readonly associatedPrincipals: Set = new Set(); + private readonly assetBuckets: Set = new Set(); + private readonly sharedAccounts: string[] = []; public giveAccessToRole(role: iam.IRole): void { this.associatePrincipal(role.roleArn, role.node.addr); @@ -169,11 +172,17 @@ abstract class PortfolioBase extends cdk.Resource implements IPortfolio { } public addProduct(product: IProduct): void { + if (product.assetBuckets) { + for (const bucket of product.assetBuckets) { + this.assetBuckets.add(bucket); + } + } AssociationManager.associateProductWithPortfolio(this, product, undefined); } public shareWithAccount(accountId: string, options: PortfolioShareOptions = {}): void { const hashId = this.generateUniqueHash(accountId); + this.sharedAccounts.push(accountId); new CfnPortfolioShare(this, `PortfolioShare${hashId}`, { portfolioId: this.portfolioId, accountId: accountId, @@ -236,6 +245,19 @@ abstract class PortfolioBase extends cdk.Resource implements IPortfolio { } } + /** + * Gives access to Asset Buckets to Shared Accounts. + * + */ + protected addBucketPermissionsToSharedAccounts() { + if (this.sharedAccounts.length > 0) { + for (const bucket of this.assetBuckets) { + bucket.grantRead(new iam.CompositePrincipal(...this.sharedAccounts.map(account => new iam.AccountPrincipal(account))), + ); + } + } + } + /** * Create a unique id based off the L1 CfnPortfolio or the arn of an imported portfolio. */ @@ -336,6 +358,15 @@ export class Portfolio extends PortfolioBase { if (props.tagOptions !== undefined) { this.associateTagOptions(props.tagOptions); } + + const portfolioNodeId = this.node.id; + cdk.Aspects.of(this).add({ + visit(c: IConstruct) { + if (c.node.id === portfolioNodeId) { + (c as Portfolio).addBucketPermissionsToSharedAccounts(); + }; + }, + }); } protected generateUniqueHash(value: string): string { diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/private/product-stack-synthesizer.ts b/packages/@aws-cdk/aws-servicecatalog/lib/private/product-stack-synthesizer.ts index 73f6e740d1790..55cb511b65424 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/private/product-stack-synthesizer.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/private/product-stack-synthesizer.ts @@ -1,4 +1,7 @@ +import { CfnBucket, IBucket } from '@aws-cdk/aws-s3'; +import { BucketDeployment, Source } from '@aws-cdk/aws-s3-deployment'; import * as cdk from '@aws-cdk/core'; +import { ProductStack } from '../product-stack'; /** * Deployment environment for an AWS Service Catalog product stack. @@ -6,8 +9,58 @@ import * as cdk from '@aws-cdk/core'; * Interoperates with the StackSynthesizer of the parent stack. */ export class ProductStackSynthesizer extends cdk.StackSynthesizer { - public addFileAsset(_asset: cdk.FileAssetSource): cdk.FileAssetLocation { - throw new Error('Service Catalog Product Stacks cannot use Assets'); + private readonly assetBucket?: IBucket; + private bucketDeployment?: BucketDeployment; + + constructor(assetBucket?: IBucket) { + super(); + this.assetBucket = assetBucket; + } + + public addFileAsset(asset: cdk.FileAssetSource): cdk.FileAssetLocation { + if (!this.assetBucket) { + throw new Error('An Asset Bucket must be provided to use Assets'); + } + const outdir = cdk.App.of(this.boundStack)?.outdir ?? 'cdk.out'; + const assetPath = `./${outdir}/${asset.fileName}`; + if (!this.bucketDeployment) { + const parentStack = (this.boundStack as ProductStack)._getParentStack(); + if (!cdk.Resource.isOwnedResource(this.assetBucket)) { + cdk.Annotations.of(parentStack).addWarning('[WARNING] Bucket Policy Permissions cannot be added to' + + ' referenced Bucket. Please make sure your bucket has the correct permissions'); + } + this.bucketDeployment = new BucketDeployment(parentStack, 'AssetsBucketDeployment', { + sources: [Source.asset(assetPath)], + destinationBucket: this.assetBucket, + extract: false, + prune: false, + }); + } else { + this.bucketDeployment.addSource(Source.asset(assetPath)); + } + + const physicalName = this.physicalNameOfBucket(this.assetBucket); + + const bucketName = physicalName; + const s3Filename = asset.fileName?.split('.')[1] + '.zip'; + const objectKey = `${s3Filename}`; + const s3ObjectUrl = `s3://${bucketName}/${objectKey}`; + const httpUrl = `https://s3.${bucketName}/${objectKey}`; + + return { bucketName, objectKey, httpUrl, s3ObjectUrl, s3Url: httpUrl }; + } + + private physicalNameOfBucket(bucket: IBucket) { + let resolvedName; + if (cdk.Resource.isOwnedResource(bucket)) { + resolvedName = cdk.Stack.of(bucket).resolve((bucket.node.defaultChild as CfnBucket).bucketName); + } else { + resolvedName = bucket.bucketName; + } + if (resolvedName === undefined) { + throw new Error('A bucketName must be provided to use Assets'); + } + return resolvedName; } public addDockerImageAsset(_asset: cdk.DockerImageAssetSource): cdk.DockerImageAssetLocation { diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts b/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts index 216b0b90b1d12..4de5fa6e02ac1 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts @@ -1,11 +1,23 @@ import * as crypto from 'crypto'; import * as fs from 'fs'; import * as path from 'path'; +import { IBucket } from '@aws-cdk/aws-s3'; import * as cdk from '@aws-cdk/core'; import { Construct } from 'constructs'; import { ProductStackSynthesizer } from './private/product-stack-synthesizer'; import { ProductStackHistory } from './product-stack-history'; +/** + * Product stack props. + */ +export interface ProductStackProps { + /** + * A Bucket can be passed to store assets, enabling ProductStack Asset support + * @default No Bucket provided and Assets will not be supported. + */ + readonly assetBucket?: IBucket; +} + /** * A Service Catalog product stack, which is similar in form to a Cloudformation nested stack. * You can add the resources to this stack that you want to define for your service catalog product. @@ -21,15 +33,19 @@ export class ProductStack extends cdk.Stack { private _templateUrl?: string; private _parentStack: cdk.Stack; - constructor(scope: Construct, id: string) { + private assetBucket?: IBucket; + + constructor(scope: Construct, id: string, props: ProductStackProps = {}) { super(scope, id, { - synthesizer: new ProductStackSynthesizer(), + synthesizer: new ProductStackSynthesizer(props.assetBucket), }); this._parentStack = findParentStack(scope); // this is the file name of the synthesized template file within the cloud assembly this.templateFile = `${cdk.Names.uniqueId(this)}.product.template.json`; + + this.assetBucket = props.assetBucket; } /** @@ -50,6 +66,24 @@ export class ProductStack extends cdk.Stack { return cdk.Lazy.uncachedString({ produce: () => this._templateUrl }); } + /** + * Fetch the asset bucket. + * + * @internal + */ + public _getAssetBucket(): IBucket | undefined { + return this.assetBucket; + } + + /** + * Fetch the parent Stack. + * + * @internal + */ + public _getParentStack(): cdk.Stack { + return this._parentStack; + } + /** * Synthesize the product stack template, overrides the `super` class method. * diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/product.ts b/packages/@aws-cdk/aws-servicecatalog/lib/product.ts index 3c4e8bd9fb59f..29bc47b76675a 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/product.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/product.ts @@ -1,3 +1,4 @@ +import { IBucket } from '@aws-cdk/aws-s3'; import { ArnFormat, IResource, Resource, Stack } from '@aws-cdk/core'; import { Construct } from 'constructs'; import { CloudFormationTemplate } from './cloudformation-template'; @@ -23,6 +24,12 @@ export interface IProduct extends IResource { */ readonly productId: string; + /** + * The asset buckets of a product created via product stack. + * @attribute + */ + readonly assetBuckets: IBucket[]; + /** * Associate Tag Options. * A TagOption is a key-value pair managed in AWS Service Catalog. @@ -34,6 +41,7 @@ export interface IProduct extends IResource { abstract class ProductBase extends Resource implements IProduct { public abstract readonly productArn: string; public abstract readonly productId: string; + public abstract readonly assetBuckets: IBucket[]; public associateTagOptions(tagOptions: TagOptions) { AssociationManager.associateTagOptions(this, this.productId, tagOptions); @@ -161,6 +169,7 @@ export abstract class Product extends ProductBase { return new class extends ProductBase { public readonly productId = productId!; public readonly productArn = productArn; + public readonly assetBuckets = []; }(scope, id); } } @@ -171,6 +180,11 @@ export abstract class Product extends ProductBase { export class CloudFormationProduct extends Product { public readonly productArn: string; public readonly productId: string; + /** + * The asset bucket of a product created via product stack. + * @default - Empty - no assets are used in this product + */ + public readonly assetBuckets = new Array(); constructor(scope: Construct, id: string, props: CloudFormationProductProps) { super(scope, id); @@ -206,6 +220,9 @@ export class CloudFormationProduct extends Product { props: CloudFormationProductProps): CfnCloudFormationProduct.ProvisioningArtifactPropertiesProperty[] { return props.productVersions.map(productVersion => { const template = productVersion.cloudFormationTemplate.bind(this); + if (template.assetBucket) { + this.assetBuckets.push(template.assetBucket); + } InputValidator.validateUrl(this.node.path, 'provisioning template url', template.httpUrl); return { name: productVersion.productVersionName, diff --git a/packages/@aws-cdk/aws-servicecatalog/package.json b/packages/@aws-cdk/aws-servicecatalog/package.json index 9d89427ca8684..10aedf006399f 100644 --- a/packages/@aws-cdk/aws-servicecatalog/package.json +++ b/packages/@aws-cdk/aws-servicecatalog/package.json @@ -85,11 +85,15 @@ "@aws-cdk/integ-runner": "0.0.0", "@aws-cdk/cfn2ts": "0.0.0", "@aws-cdk/pkglint": "0.0.0", + "@aws-cdk/integ-tests": "0.0.0", + "@aws-cdk/aws-lambda": "0.0.0", "@types/jest": "^27.5.2" }, "dependencies": { "@aws-cdk/aws-iam": "0.0.0", + "@aws-cdk/aws-s3": "0.0.0", "@aws-cdk/aws-s3-assets": "0.0.0", + "@aws-cdk/aws-s3-deployment": "0.0.0", "@aws-cdk/aws-sns": "0.0.0", "@aws-cdk/core": "0.0.0", "constructs": "^10.0.0" @@ -97,7 +101,9 @@ "homepage": "https://github.com/aws/aws-cdk", "peerDependencies": { "@aws-cdk/aws-iam": "0.0.0", + "@aws-cdk/aws-s3": "0.0.0", "@aws-cdk/aws-s3-assets": "0.0.0", + "@aws-cdk/aws-s3-deployment": "0.0.0", "@aws-cdk/aws-sns": "0.0.0", "@aws-cdk/core": "0.0.0", "constructs": "^10.0.0" diff --git a/packages/@aws-cdk/aws-servicecatalog/test/assets/index.py b/packages/@aws-cdk/aws-servicecatalog/test/assets/index.py new file mode 100644 index 0000000000000..105bdadc3c1a8 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/assets/index.py @@ -0,0 +1,7 @@ +import json + +def handler(event, context): + return { + 'statusCode': 200, + 'body': json.dumps('Hello from Lambda!') + } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/assetsv2/index.py b/packages/@aws-cdk/aws-servicecatalog/test/assetsv2/index.py new file mode 100644 index 0000000000000..059c625350f79 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/assetsv2/index.py @@ -0,0 +1,7 @@ +import json + +def handler(event, context): + return { + 'statusCode': 200, + 'body': json.dumps('Hello from Lambda again!') + } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/cdk.out/asset.95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip b/packages/@aws-cdk/aws-servicecatalog/test/cdk.out/asset.95c924c84f5d023be4edee540cb2cb401a49f115d01ed403b288f6cb412771df.zip new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ-servicecatalog-portfolio.assets.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ-servicecatalog-portfolio.assets.json index 521c5499be89a..f9d80b2ebe145 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ-servicecatalog-portfolio.assets.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ-servicecatalog-portfolio.assets.json @@ -1,5 +1,5 @@ { - "version": "20.0.0", + "version": "21.0.0", "files": { "eba49fd9c16122ad8d201bdd34787f3236bf3777e89affb03da8aa3f73693d79": { "source": { diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ.json index c5c785c3c0b32..bedfe38a00ef7 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "20.0.0", + "version": "21.0.0", "testCases": { "integ.portfolio": { "stacks": [ diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/manifest.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/manifest.json index 9bc7fd1651d64..3b6afe97209a6 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "20.0.0", + "version": "21.0.0", "artifacts": { "Tree": { "type": "cdk:tree", diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/tree.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/tree.json index 23e9689b4c807..21b7fd4c57601 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.portfolio.js.snapshot/tree.json @@ -9,7 +9,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.1.140" } }, "integ-servicecatalog-portfolio": { @@ -730,14 +730,14 @@ } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64/index.py b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64/index.py new file mode 100644 index 0000000000000..e013fae72f87d --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64/index.py @@ -0,0 +1,308 @@ +import contextlib +import json +import logging +import os +import shutil +import subprocess +import tempfile +from urllib.request import Request, urlopen +from uuid import uuid4 +from zipfile import ZipFile + +import boto3 + +logger = logging.getLogger() +logger.setLevel(logging.INFO) + +cloudfront = boto3.client('cloudfront') +s3 = boto3.client('s3') + +CFN_SUCCESS = "SUCCESS" +CFN_FAILED = "FAILED" +ENV_KEY_MOUNT_PATH = "MOUNT_PATH" +ENV_KEY_SKIP_CLEANUP = "SKIP_CLEANUP" + +CUSTOM_RESOURCE_OWNER_TAG = "aws-cdk:cr-owned" + +def handler(event, context): + + def cfn_error(message=None): + logger.error("| cfn_error: %s" % message) + cfn_send(event, context, CFN_FAILED, reason=message) + + try: + # We are not logging ResponseURL as this is a pre-signed S3 URL, and could be used to tamper + # with the response CloudFormation sees from this Custom Resource execution. + logger.info({ key:value for (key, value) in event.items() if key != 'ResponseURL'}) + + # cloudformation request type (create/update/delete) + request_type = event['RequestType'] + + # extract resource properties + props = event['ResourceProperties'] + old_props = event.get('OldResourceProperties', {}) + physical_id = event.get('PhysicalResourceId', None) + + try: + source_bucket_names = props['SourceBucketNames'] + source_object_keys = props['SourceObjectKeys'] + source_markers = props.get('SourceMarkers', None) + dest_bucket_name = props['DestinationBucketName'] + dest_bucket_prefix = props.get('DestinationBucketKeyPrefix', '') + extract = props.get('Extract', 'true') == 'true' + retain_on_delete = props.get('RetainOnDelete', "true") == "true" + distribution_id = props.get('DistributionId', '') + user_metadata = props.get('UserMetadata', {}) + system_metadata = props.get('SystemMetadata', {}) + prune = props.get('Prune', 'true').lower() == 'true' + exclude = props.get('Exclude', []) + include = props.get('Include', []) + + # backwards compatibility - if "SourceMarkers" is not specified, + # assume all sources have an empty market map + if source_markers is None: + source_markers = [{} for i in range(len(source_bucket_names))] + + default_distribution_path = dest_bucket_prefix + if not default_distribution_path.endswith("/"): + default_distribution_path += "/" + if not default_distribution_path.startswith("/"): + default_distribution_path = "/" + default_distribution_path + default_distribution_path += "*" + + distribution_paths = props.get('DistributionPaths', [default_distribution_path]) + except KeyError as e: + cfn_error("missing request resource property %s. props: %s" % (str(e), props)) + return + + # treat "/" as if no prefix was specified + if dest_bucket_prefix == "/": + dest_bucket_prefix = "" + + s3_source_zips = list(map(lambda name, key: "s3://%s/%s" % (name, key), source_bucket_names, source_object_keys)) + s3_dest = "s3://%s/%s" % (dest_bucket_name, dest_bucket_prefix) + old_s3_dest = "s3://%s/%s" % (old_props.get("DestinationBucketName", ""), old_props.get("DestinationBucketKeyPrefix", "")) + + + # obviously this is not + if old_s3_dest == "s3:///": + old_s3_dest = None + + logger.info("| s3_dest: %s" % s3_dest) + logger.info("| old_s3_dest: %s" % old_s3_dest) + + # if we are creating a new resource, allocate a physical id for it + # otherwise, we expect physical id to be relayed by cloudformation + if request_type == "Create": + physical_id = "aws.cdk.s3deployment.%s" % str(uuid4()) + else: + if not physical_id: + cfn_error("invalid request: request type is '%s' but 'PhysicalResourceId' is not defined" % request_type) + return + + # delete or create/update (only if "retain_on_delete" is false) + if request_type == "Delete" and not retain_on_delete: + if not bucket_owned(dest_bucket_name, dest_bucket_prefix): + aws_command("s3", "rm", s3_dest, "--recursive") + + # if we are updating without retention and the destination changed, delete first + if request_type == "Update" and not retain_on_delete and old_s3_dest != s3_dest: + if not old_s3_dest: + logger.warn("cannot delete old resource without old resource properties") + return + + aws_command("s3", "rm", old_s3_dest, "--recursive") + + if request_type == "Update" or request_type == "Create": + s3_deploy(s3_source_zips, s3_dest, user_metadata, system_metadata, prune, exclude, include, source_markers, extract) + + if distribution_id: + cloudfront_invalidate(distribution_id, distribution_paths) + + cfn_send(event, context, CFN_SUCCESS, physicalResourceId=physical_id, responseData={ + # Passing through the ARN sequences dependencees on the deployment + 'DestinationBucketArn': props.get('DestinationBucketArn'), + 'SourceObjectKeys': props.get('SourceObjectKeys'), + }) + except KeyError as e: + cfn_error("invalid request. Missing key %s" % str(e)) + except Exception as e: + logger.exception(e) + cfn_error(str(e)) + +#--------------------------------------------------------------------------------------------------- +# populate all files from s3_source_zips to a destination bucket +def s3_deploy(s3_source_zips, s3_dest, user_metadata, system_metadata, prune, exclude, include, source_markers, extract): + # list lengths are equal + if len(s3_source_zips) != len(source_markers): + raise Exception("'source_markers' and 's3_source_zips' must be the same length") + + # create a temporary working directory in /tmp or if enabled an attached efs volume + if ENV_KEY_MOUNT_PATH in os.environ: + workdir = os.getenv(ENV_KEY_MOUNT_PATH) + "/" + str(uuid4()) + os.mkdir(workdir) + else: + workdir = tempfile.mkdtemp() + + logger.info("| workdir: %s" % workdir) + + # create a directory into which we extract the contents of the zip file + contents_dir=os.path.join(workdir, 'contents') + os.mkdir(contents_dir) + + try: + # download the archive from the source and extract to "contents" + for i in range(len(s3_source_zips)): + s3_source_zip = s3_source_zips[i] + markers = source_markers[i] + + if extract: + archive=os.path.join(workdir, str(uuid4())) + logger.info("archive: %s" % archive) + aws_command("s3", "cp", s3_source_zip, archive) + logger.info("| extracting archive to: %s\n" % contents_dir) + logger.info("| markers: %s" % markers) + extract_and_replace_markers(archive, contents_dir, markers) + else: + logger.info("| copying archive to: %s\n" % contents_dir) + aws_command("s3", "cp", s3_source_zip, contents_dir) + + # sync from "contents" to destination + + s3_command = ["s3", "sync"] + + if prune: + s3_command.append("--delete") + + if exclude: + for filter in exclude: + s3_command.extend(["--exclude", filter]) + + if include: + for filter in include: + s3_command.extend(["--include", filter]) + + s3_command.extend([contents_dir, s3_dest]) + s3_command.extend(create_metadata_args(user_metadata, system_metadata)) + aws_command(*s3_command) + finally: + if not os.getenv(ENV_KEY_SKIP_CLEANUP): + shutil.rmtree(workdir) + +#--------------------------------------------------------------------------------------------------- +# invalidate files in the CloudFront distribution edge caches +def cloudfront_invalidate(distribution_id, distribution_paths): + invalidation_resp = cloudfront.create_invalidation( + DistributionId=distribution_id, + InvalidationBatch={ + 'Paths': { + 'Quantity': len(distribution_paths), + 'Items': distribution_paths + }, + 'CallerReference': str(uuid4()), + }) + # by default, will wait up to 10 minutes + cloudfront.get_waiter('invalidation_completed').wait( + DistributionId=distribution_id, + Id=invalidation_resp['Invalidation']['Id']) + +#--------------------------------------------------------------------------------------------------- +# set metadata +def create_metadata_args(raw_user_metadata, raw_system_metadata): + if len(raw_user_metadata) == 0 and len(raw_system_metadata) == 0: + return [] + + format_system_metadata_key = lambda k: k.lower() + format_user_metadata_key = lambda k: k.lower() + + system_metadata = { format_system_metadata_key(k): v for k, v in raw_system_metadata.items() } + user_metadata = { format_user_metadata_key(k): v for k, v in raw_user_metadata.items() } + + flatten = lambda l: [item for sublist in l for item in sublist] + system_args = flatten([[f"--{k}", v] for k, v in system_metadata.items()]) + user_args = ["--metadata", json.dumps(user_metadata, separators=(',', ':'))] if len(user_metadata) > 0 else [] + + return system_args + user_args + ["--metadata-directive", "REPLACE"] + +#--------------------------------------------------------------------------------------------------- +# executes an "aws" cli command +def aws_command(*args): + aws="/opt/awscli/aws" # from AwsCliLayer + logger.info("| aws %s" % ' '.join(args)) + subprocess.check_call([aws] + list(args)) + +#--------------------------------------------------------------------------------------------------- +# sends a response to cloudformation +def cfn_send(event, context, responseStatus, responseData={}, physicalResourceId=None, noEcho=False, reason=None): + + responseUrl = event['ResponseURL'] + + responseBody = {} + responseBody['Status'] = responseStatus + responseBody['Reason'] = reason or ('See the details in CloudWatch Log Stream: ' + context.log_stream_name) + responseBody['PhysicalResourceId'] = physicalResourceId or context.log_stream_name + responseBody['StackId'] = event['StackId'] + responseBody['RequestId'] = event['RequestId'] + responseBody['LogicalResourceId'] = event['LogicalResourceId'] + responseBody['NoEcho'] = noEcho + responseBody['Data'] = responseData + + body = json.dumps(responseBody) + logger.info("| response body:\n" + body) + + headers = { + 'content-type' : '', + 'content-length' : str(len(body)) + } + + try: + request = Request(responseUrl, method='PUT', data=bytes(body.encode('utf-8')), headers=headers) + with contextlib.closing(urlopen(request)) as response: + logger.info("| status code: " + response.reason) + except Exception as e: + logger.error("| unable to send response to CloudFormation") + logger.exception(e) + + +#--------------------------------------------------------------------------------------------------- +# check if bucket is owned by a custom resource +# if it is then we don't want to delete content +def bucket_owned(bucketName, keyPrefix): + tag = CUSTOM_RESOURCE_OWNER_TAG + if keyPrefix != "": + tag = tag + ':' + keyPrefix + try: + request = s3.get_bucket_tagging( + Bucket=bucketName, + ) + return any((x["Key"].startswith(tag)) for x in request["TagSet"]) + except Exception as e: + logger.info("| error getting tags from bucket") + logger.exception(e) + return False + +# extract archive and replace markers in output files +def extract_and_replace_markers(archive, contents_dir, markers): + with ZipFile(archive, "r") as zip: + zip.extractall(contents_dir) + + # replace markers for this source + for file in zip.namelist(): + file_path = os.path.join(contents_dir, file) + if os.path.isdir(file_path): continue + replace_markers(file_path, markers) + +def replace_markers(filename, markers): + # convert the dict of string markers to binary markers + replace_tokens = dict([(k.encode('utf-8'), v.encode('utf-8')) for k, v in markers.items()]) + + outfile = filename + '.new' + with open(filename, 'rb') as fi, open(outfile, 'wb') as fo: + for line in fi: + for token in replace_tokens: + line = line.replace(token, replace_tokens[token]) + fo.write(line) + + # # delete the original file and rename the new one to the original + os.remove(filename) + os.rename(outfile, filename) diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/__entrypoint__.js b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/__entrypoint__.js new file mode 100755 index 0000000000000..1e3a3093c1706 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/__entrypoint__.js @@ -0,0 +1,144 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.withRetries = exports.handler = exports.external = void 0; +const https = require("https"); +const url = require("url"); +// for unit tests +exports.external = { + sendHttpRequest: defaultSendHttpRequest, + log: defaultLog, + includeStackTraces: true, + userHandlerIndex: './index', +}; +const CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED'; +const MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID'; +async function handler(event, context) { + const sanitizedEvent = { ...event, ResponseURL: '...' }; + exports.external.log(JSON.stringify(sanitizedEvent, undefined, 2)); + // ignore DELETE event when the physical resource ID is the marker that + // indicates that this DELETE is a subsequent DELETE to a failed CREATE + // operation. + if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) { + exports.external.log('ignoring DELETE event caused by a failed CREATE event'); + await submitResponse('SUCCESS', event); + return; + } + try { + // invoke the user handler. this is intentionally inside the try-catch to + // ensure that if there is an error it's reported as a failure to + // cloudformation (otherwise cfn waits). + // eslint-disable-next-line @typescript-eslint/no-require-imports + const userHandler = require(exports.external.userHandlerIndex).handler; + const result = await userHandler(sanitizedEvent, context); + // validate user response and create the combined event + const responseEvent = renderResponse(event, result); + // submit to cfn as success + await submitResponse('SUCCESS', responseEvent); + } + catch (e) { + const resp = { + ...event, + Reason: exports.external.includeStackTraces ? e.stack : e.message, + }; + if (!resp.PhysicalResourceId) { + // special case: if CREATE fails, which usually implies, we usually don't + // have a physical resource id. in this case, the subsequent DELETE + // operation does not have any meaning, and will likely fail as well. to + // address this, we use a marker so the provider framework can simply + // ignore the subsequent DELETE. + if (event.RequestType === 'Create') { + exports.external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored'); + resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER; + } + else { + // otherwise, if PhysicalResourceId is not specified, something is + // terribly wrong because all other events should have an ID. + exports.external.log(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify(event)}`); + } + } + // this is an actual error, fail the activity altogether and exist. + await submitResponse('FAILED', resp); + } +} +exports.handler = handler; +function renderResponse(cfnRequest, handlerResponse = {}) { + // if physical ID is not returned, we have some defaults for you based + // on the request type. + const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId; + // if we are in DELETE and physical ID was changed, it's an error. + if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) { + throw new Error(`DELETE: cannot change the physical resource ID from "${cfnRequest.PhysicalResourceId}" to "${handlerResponse.PhysicalResourceId}" during deletion`); + } + // merge request event and result event (result prevails). + return { + ...cfnRequest, + ...handlerResponse, + PhysicalResourceId: physicalResourceId, + }; +} +async function submitResponse(status, event) { + const json = { + Status: status, + Reason: event.Reason ?? status, + StackId: event.StackId, + RequestId: event.RequestId, + PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER, + LogicalResourceId: event.LogicalResourceId, + NoEcho: event.NoEcho, + Data: event.Data, + }; + exports.external.log('submit response to cloudformation', json); + const responseBody = JSON.stringify(json); + const parsedUrl = url.parse(event.ResponseURL); + const req = { + hostname: parsedUrl.hostname, + path: parsedUrl.path, + method: 'PUT', + headers: { 'content-type': '', 'content-length': responseBody.length }, + }; + const retryOptions = { + attempts: 5, + sleep: 1000, + }; + await withRetries(retryOptions, exports.external.sendHttpRequest)(req, responseBody); +} +async function defaultSendHttpRequest(options, responseBody) { + return new Promise((resolve, reject) => { + try { + const request = https.request(options, _ => resolve()); + request.on('error', reject); + request.write(responseBody); + request.end(); + } + catch (e) { + reject(e); + } + }); +} +function defaultLog(fmt, ...params) { + // eslint-disable-next-line no-console + console.log(fmt, ...params); +} +function withRetries(options, fn) { + return async (...xs) => { + let attempts = options.attempts; + let ms = options.sleep; + while (true) { + try { + return await fn(...xs); + } + catch (e) { + if (attempts-- <= 0) { + throw e; + } + await sleep(Math.floor(Math.random() * ms)); + ms *= 2; + } + } + }; +} +exports.withRetries = withRetries; +async function sleep(ms) { + return new Promise((ok) => setTimeout(ok, ms)); +} +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nodejs-entrypoint.js","sourceRoot":"","sources":["nodejs-entrypoint.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAA2B;AAE3B,iBAAiB;AACJ,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,sBAAsB;IACvC,GAAG,EAAE,UAAU;IACf,kBAAkB,EAAE,IAAI;IACxB,gBAAgB,EAAE,SAAS;CAC5B,CAAC;AAEF,MAAM,gCAAgC,GAAG,wDAAwD,CAAC;AAClG,MAAM,0BAA0B,GAAG,8DAA8D,CAAC;AAW3F,KAAK,UAAU,OAAO,CAAC,KAAkD,EAAE,OAA0B;IAC1G,MAAM,cAAc,GAAG,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;IACxD,gBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3D,uEAAuE;IACvE,uEAAuE;IACvE,aAAa;IACb,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,kBAAkB,KAAK,gCAAgC,EAAE;QACnG,gBAAQ,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACtE,MAAM,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO;KACR;IAED,IAAI;QACF,yEAAyE;QACzE,iEAAiE;QACjE,wCAAwC;QACxC,iEAAiE;QACjE,MAAM,WAAW,GAAY,OAAO,CAAC,gBAAQ,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAE1D,uDAAuD;QACvD,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpD,2BAA2B;QAC3B,MAAM,cAAc,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;KAChD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,GAAa;YACrB,GAAG,KAAK;YACR,MAAM,EAAE,gBAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;SAC1D,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,yEAAyE;YACzE,mEAAmE;YACnE,wEAAwE;YACxE,qEAAqE;YACrE,gCAAgC;YAChC,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,EAAE;gBAClC,gBAAQ,CAAC,GAAG,CAAC,4GAA4G,CAAC,CAAC;gBAC3H,IAAI,CAAC,kBAAkB,GAAG,gCAAgC,CAAC;aAC5D;iBAAM;gBACL,kEAAkE;gBAClE,6DAA6D;gBAC7D,gBAAQ,CAAC,GAAG,CAAC,6DAA6D,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACpG;SACF;QAED,mEAAmE;QACnE,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KACtC;AACH,CAAC;AAnDD,0BAmDC;AAED,SAAS,cAAc,CACrB,UAAyF,EACzF,kBAA0C,EAAG;IAE7C,sEAAsE;IACtE,uBAAuB;IACvB,MAAM,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,IAAI,UAAU,CAAC,kBAAkB,IAAI,UAAU,CAAC,SAAS,CAAC;IAEvH,kEAAkE;IAClE,IAAI,UAAU,CAAC,WAAW,KAAK,QAAQ,IAAI,kBAAkB,KAAK,UAAU,CAAC,kBAAkB,EAAE;QAC/F,MAAM,IAAI,KAAK,CAAC,wDAAwD,UAAU,CAAC,kBAAkB,SAAS,eAAe,CAAC,kBAAkB,mBAAmB,CAAC,CAAC;KACtK;IAED,0DAA0D;IAC1D,OAAO;QACL,GAAG,UAAU;QACb,GAAG,eAAe;QAClB,kBAAkB,EAAE,kBAAkB;KACvC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,MAA4B,EAAE,KAAe;IACzE,MAAM,IAAI,GAAmD;QAC3D,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;QAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,IAAI,0BAA0B;QAC1E,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IAEF,gBAAQ,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG;QACV,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,gBAAgB,EAAE,YAAY,CAAC,MAAM,EAAE;KACvE,CAAC;IAEF,MAAM,YAAY,GAAG;QACnB,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,IAAI;KACZ,CAAC;IACF,MAAM,WAAW,CAAC,YAAY,EAAE,gBAAQ,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAC/E,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,OAA6B,EAAE,YAAoB;IACvF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI;YACF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACvD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAC,CAAC,CAAC;SACX;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,GAAG,MAAa;IAC/C,sCAAsC;IACtC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;AAC9B,CAAC;AASD,SAAgB,WAAW,CAA0B,OAAqB,EAAE,EAA4B;IACtG,OAAO,KAAK,EAAE,GAAG,EAAK,EAAE,EAAE;QACxB,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChC,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QACvB,OAAO,IAAI,EAAE;YACX,IAAI;gBACF,OAAO,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;aACxB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,QAAQ,EAAE,IAAI,CAAC,EAAE;oBACnB,MAAM,CAAC,CAAC;iBACT;gBACD,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC5C,EAAE,IAAI,CAAC,CAAC;aACT;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAhBD,kCAgBC;AAED,KAAK,UAAU,KAAK,CAAC,EAAU;IAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC","sourcesContent":["import * as https from 'https';\nimport * as url from 'url';\n\n// for unit tests\nexport const external = {\n  sendHttpRequest: defaultSendHttpRequest,\n  log: defaultLog,\n  includeStackTraces: true,\n  userHandlerIndex: './index',\n};\n\nconst CREATE_FAILED_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::CREATE_FAILED';\nconst MISSING_PHYSICAL_ID_MARKER = 'AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID';\n\nexport type Response = AWSLambda.CloudFormationCustomResourceEvent & HandlerResponse;\nexport type Handler = (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) => Promise<HandlerResponse | void>;\nexport type HandlerResponse = undefined | {\n  Data?: any;\n  PhysicalResourceId?: string;\n  Reason?: string;\n  NoEcho?: boolean;\n};\n\nexport async function handler(event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context) {\n  const sanitizedEvent = { ...event, ResponseURL: '...' };\n  external.log(JSON.stringify(sanitizedEvent, undefined, 2));\n\n  // ignore DELETE event when the physical resource ID is the marker that\n  // indicates that this DELETE is a subsequent DELETE to a failed CREATE\n  // operation.\n  if (event.RequestType === 'Delete' && event.PhysicalResourceId === CREATE_FAILED_PHYSICAL_ID_MARKER) {\n    external.log('ignoring DELETE event caused by a failed CREATE event');\n    await submitResponse('SUCCESS', event);\n    return;\n  }\n\n  try {\n    // invoke the user handler. this is intentionally inside the try-catch to\n    // ensure that if there is an error it's reported as a failure to\n    // cloudformation (otherwise cfn waits).\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    const userHandler: Handler = require(external.userHandlerIndex).handler;\n    const result = await userHandler(sanitizedEvent, context);\n\n    // validate user response and create the combined event\n    const responseEvent = renderResponse(event, result);\n\n    // submit to cfn as success\n    await submitResponse('SUCCESS', responseEvent);\n  } catch (e) {\n    const resp: Response = {\n      ...event,\n      Reason: external.includeStackTraces ? e.stack : e.message,\n    };\n\n    if (!resp.PhysicalResourceId) {\n      // special case: if CREATE fails, which usually implies, we usually don't\n      // have a physical resource id. in this case, the subsequent DELETE\n      // operation does not have any meaning, and will likely fail as well. to\n      // address this, we use a marker so the provider framework can simply\n      // ignore the subsequent DELETE.\n      if (event.RequestType === 'Create') {\n        external.log('CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored');\n        resp.PhysicalResourceId = CREATE_FAILED_PHYSICAL_ID_MARKER;\n      } else {\n        // otherwise, if PhysicalResourceId is not specified, something is\n        // terribly wrong because all other events should have an ID.\n        external.log(`ERROR: Malformed event. \"PhysicalResourceId\" is required: ${JSON.stringify(event)}`);\n      }\n    }\n\n    // this is an actual error, fail the activity altogether and exist.\n    await submitResponse('FAILED', resp);\n  }\n}\n\nfunction renderResponse(\n  cfnRequest: AWSLambda.CloudFormationCustomResourceEvent & { PhysicalResourceId?: string },\n  handlerResponse: void | HandlerResponse = { }): Response {\n\n  // if physical ID is not returned, we have some defaults for you based\n  // on the request type.\n  const physicalResourceId = handlerResponse.PhysicalResourceId ?? cfnRequest.PhysicalResourceId ?? cfnRequest.RequestId;\n\n  // if we are in DELETE and physical ID was changed, it's an error.\n  if (cfnRequest.RequestType === 'Delete' && physicalResourceId !== cfnRequest.PhysicalResourceId) {\n    throw new Error(`DELETE: cannot change the physical resource ID from \"${cfnRequest.PhysicalResourceId}\" to \"${handlerResponse.PhysicalResourceId}\" during deletion`);\n  }\n\n  // merge request event and result event (result prevails).\n  return {\n    ...cfnRequest,\n    ...handlerResponse,\n    PhysicalResourceId: physicalResourceId,\n  };\n}\n\nasync function submitResponse(status: 'SUCCESS' | 'FAILED', event: Response) {\n  const json: AWSLambda.CloudFormationCustomResourceResponse = {\n    Status: status,\n    Reason: event.Reason ?? status,\n    StackId: event.StackId,\n    RequestId: event.RequestId,\n    PhysicalResourceId: event.PhysicalResourceId || MISSING_PHYSICAL_ID_MARKER,\n    LogicalResourceId: event.LogicalResourceId,\n    NoEcho: event.NoEcho,\n    Data: event.Data,\n  };\n\n  external.log('submit response to cloudformation', json);\n\n  const responseBody = JSON.stringify(json);\n  const parsedUrl = url.parse(event.ResponseURL);\n  const req = {\n    hostname: parsedUrl.hostname,\n    path: parsedUrl.path,\n    method: 'PUT',\n    headers: { 'content-type': '', 'content-length': responseBody.length },\n  };\n\n  const retryOptions = {\n    attempts: 5,\n    sleep: 1000,\n  };\n  await withRetries(retryOptions, external.sendHttpRequest)(req, responseBody);\n}\n\nasync function defaultSendHttpRequest(options: https.RequestOptions, responseBody: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    try {\n      const request = https.request(options, _ => resolve());\n      request.on('error', reject);\n      request.write(responseBody);\n      request.end();\n    } catch (e) {\n      reject(e);\n    }\n  });\n}\n\nfunction defaultLog(fmt: string, ...params: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(fmt, ...params);\n}\n\nexport interface RetryOptions {\n  /** How many retries (will at least try once) */\n  readonly attempts: number;\n  /** Sleep base, in ms */\n  readonly sleep: number;\n}\n\nexport function withRetries<A extends Array<any>, B>(options: RetryOptions, fn: (...xs: A) => Promise<B>): (...xs: A) => Promise<B> {\n  return async (...xs: A) => {\n    let attempts = options.attempts;\n    let ms = options.sleep;\n    while (true) {\n      try {\n        return await fn(...xs);\n      } catch (e) {\n        if (attempts-- <= 0) {\n          throw e;\n        }\n        await sleep(Math.floor(Math.random() * ms));\n        ms *= 2;\n      }\n    }\n  };\n}\n\nasync function sleep(ms: number): Promise<void> {\n  return new Promise((ok) => setTimeout(ok, ms));\n}"]} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/index.js b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/index.js new file mode 100755 index 0000000000000..7ce4156d4ba41 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c/index.js @@ -0,0 +1,78 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.handler = void 0; +// eslint-disable-next-line import/no-extraneous-dependencies +const aws_sdk_1 = require("aws-sdk"); +const AUTO_DELETE_OBJECTS_TAG = 'aws-cdk:auto-delete-objects'; +const s3 = new aws_sdk_1.S3(); +async function handler(event) { + switch (event.RequestType) { + case 'Create': + return; + case 'Update': + return onUpdate(event); + case 'Delete': + return onDelete(event.ResourceProperties?.BucketName); + } +} +exports.handler = handler; +async function onUpdate(event) { + const updateEvent = event; + const oldBucketName = updateEvent.OldResourceProperties?.BucketName; + const newBucketName = updateEvent.ResourceProperties?.BucketName; + const bucketNameHasChanged = newBucketName != null && oldBucketName != null && newBucketName !== oldBucketName; + /* If the name of the bucket has changed, CloudFormation will try to delete the bucket + and create a new one with the new name. So we have to delete the contents of the + bucket so that this operation does not fail. */ + if (bucketNameHasChanged) { + return onDelete(oldBucketName); + } +} +/** + * Recursively delete all items in the bucket + * + * @param bucketName the bucket name + */ +async function emptyBucket(bucketName) { + const listedObjects = await s3.listObjectVersions({ Bucket: bucketName }).promise(); + const contents = [...listedObjects.Versions ?? [], ...listedObjects.DeleteMarkers ?? []]; + if (contents.length === 0) { + return; + } + const records = contents.map((record) => ({ Key: record.Key, VersionId: record.VersionId })); + await s3.deleteObjects({ Bucket: bucketName, Delete: { Objects: records } }).promise(); + if (listedObjects?.IsTruncated) { + await emptyBucket(bucketName); + } +} +async function onDelete(bucketName) { + if (!bucketName) { + throw new Error('No BucketName was provided.'); + } + if (!await isBucketTaggedForDeletion(bucketName)) { + process.stdout.write(`Bucket does not have '${AUTO_DELETE_OBJECTS_TAG}' tag, skipping cleaning.\n`); + return; + } + try { + await emptyBucket(bucketName); + } + catch (e) { + if (e.code !== 'NoSuchBucket') { + throw e; + } + // Bucket doesn't exist. Ignoring + } +} +/** + * The bucket will only be tagged for deletion if it's being deleted in the same + * deployment as this Custom Resource. + * + * If the Custom Resource is every deleted before the bucket, it must be because + * `autoDeleteObjects` has been switched to false, in which case the tag would have + * been removed before we get to this Delete event. + */ +async function isBucketTaggedForDeletion(bucketName) { + const response = await s3.getBucketTagging({ Bucket: bucketName }).promise(); + return response.TagSet.some(tag => tag.Key === AUTO_DELETE_OBJECTS_TAG && tag.Value === 'true'); +} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2REFBNkQ7QUFDN0QscUNBQTZCO0FBRTdCLE1BQU0sdUJBQXVCLEdBQUcsNkJBQTZCLENBQUM7QUFFOUQsTUFBTSxFQUFFLEdBQUcsSUFBSSxZQUFFLEVBQUUsQ0FBQztBQUViLEtBQUssVUFBVSxPQUFPLENBQUMsS0FBa0Q7SUFDOUUsUUFBUSxLQUFLLENBQUMsV0FBVyxFQUFFO1FBQ3pCLEtBQUssUUFBUTtZQUNYLE9BQU87UUFDVCxLQUFLLFFBQVE7WUFDWCxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6QixLQUFLLFFBQVE7WUFDWCxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsVUFBVSxDQUFDLENBQUM7S0FDekQ7QUFDSCxDQUFDO0FBVEQsMEJBU0M7QUFFRCxLQUFLLFVBQVUsUUFBUSxDQUFDLEtBQWtEO0lBQ3hFLE1BQU0sV0FBVyxHQUFHLEtBQTBELENBQUM7SUFDL0UsTUFBTSxhQUFhLEdBQUcsV0FBVyxDQUFDLHFCQUFxQixFQUFFLFVBQVUsQ0FBQztJQUNwRSxNQUFNLGFBQWEsR0FBRyxXQUFXLENBQUMsa0JBQWtCLEVBQUUsVUFBVSxDQUFDO0lBQ2pFLE1BQU0sb0JBQW9CLEdBQUcsYUFBYSxJQUFJLElBQUksSUFBSSxhQUFhLElBQUksSUFBSSxJQUFJLGFBQWEsS0FBSyxhQUFhLENBQUM7SUFFL0c7O3NEQUVrRDtJQUNsRCxJQUFJLG9CQUFvQixFQUFFO1FBQ3hCLE9BQU8sUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0tBQ2hDO0FBQ0gsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxLQUFLLFVBQVUsV0FBVyxDQUFDLFVBQWtCO0lBQzNDLE1BQU0sYUFBYSxHQUFHLE1BQU0sRUFBRSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDcEYsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxRQUFRLElBQUksRUFBRSxFQUFFLEdBQUcsYUFBYSxDQUFDLGFBQWEsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN6RixJQUFJLFFBQVEsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3pCLE9BQU87S0FDUjtJQUVELE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFXLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNsRyxNQUFNLEVBQUUsQ0FBQyxhQUFhLENBQUMsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFFdkYsSUFBSSxhQUFhLEVBQUUsV0FBVyxFQUFFO1FBQzlCLE1BQU0sV0FBVyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0tBQy9CO0FBQ0gsQ0FBQztBQUVELEtBQUssVUFBVSxRQUFRLENBQUMsVUFBbUI7SUFDekMsSUFBSSxDQUFDLFVBQVUsRUFBRTtRQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMsNkJBQTZCLENBQUMsQ0FBQztLQUNoRDtJQUNELElBQUksQ0FBQyxNQUFNLHlCQUF5QixDQUFDLFVBQVUsQ0FBQyxFQUFFO1FBQ2hELE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLHlCQUF5Qix1QkFBdUIsNkJBQTZCLENBQUMsQ0FBQztRQUNwRyxPQUFPO0tBQ1I7SUFDRCxJQUFJO1FBQ0YsTUFBTSxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUM7S0FDL0I7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxjQUFjLEVBQUU7WUFDN0IsTUFBTSxDQUFDLENBQUM7U0FDVDtRQUNELGlDQUFpQztLQUNsQztBQUNILENBQUM7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsS0FBSyxVQUFVLHlCQUF5QixDQUFDLFVBQWtCO0lBQ3pELE1BQU0sUUFBUSxHQUFHLE1BQU0sRUFBRSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDN0UsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssdUJBQXVCLElBQUksR0FBRyxDQUFDLEtBQUssS0FBSyxNQUFNLENBQUMsQ0FBQztBQUNsRyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIGltcG9ydC9uby1leHRyYW5lb3VzLWRlcGVuZGVuY2llc1xuaW1wb3J0IHsgUzMgfSBmcm9tICdhd3Mtc2RrJztcblxuY29uc3QgQVVUT19ERUxFVEVfT0JKRUNUU19UQUcgPSAnYXdzLWNkazphdXRvLWRlbGV0ZS1vYmplY3RzJztcblxuY29uc3QgczMgPSBuZXcgUzMoKTtcblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGhhbmRsZXIoZXZlbnQ6IEFXU0xhbWJkYS5DbG91ZEZvcm1hdGlvbkN1c3RvbVJlc291cmNlRXZlbnQpIHtcbiAgc3dpdGNoIChldmVudC5SZXF1ZXN0VHlwZSkge1xuICAgIGNhc2UgJ0NyZWF0ZSc6XG4gICAgICByZXR1cm47XG4gICAgY2FzZSAnVXBkYXRlJzpcbiAgICAgIHJldHVybiBvblVwZGF0ZShldmVudCk7XG4gICAgY2FzZSAnRGVsZXRlJzpcbiAgICAgIHJldHVybiBvbkRlbGV0ZShldmVudC5SZXNvdXJjZVByb3BlcnRpZXM/LkJ1Y2tldE5hbWUpO1xuICB9XG59XG5cbmFzeW5jIGZ1bmN0aW9uIG9uVXBkYXRlKGV2ZW50OiBBV1NMYW1iZGEuQ2xvdWRGb3JtYXRpb25DdXN0b21SZXNvdXJjZUV2ZW50KSB7XG4gIGNvbnN0IHVwZGF0ZUV2ZW50ID0gZXZlbnQgYXMgQVdTTGFtYmRhLkNsb3VkRm9ybWF0aW9uQ3VzdG9tUmVzb3VyY2VVcGRhdGVFdmVudDtcbiAgY29uc3Qgb2xkQnVja2V0TmFtZSA9IHVwZGF0ZUV2ZW50Lk9sZFJlc291cmNlUHJvcGVydGllcz8uQnVja2V0TmFtZTtcbiAgY29uc3QgbmV3QnVja2V0TmFtZSA9IHVwZGF0ZUV2ZW50LlJlc291cmNlUHJvcGVydGllcz8uQnVja2V0TmFtZTtcbiAgY29uc3QgYnVja2V0TmFtZUhhc0NoYW5nZWQgPSBuZXdCdWNrZXROYW1lICE9IG51bGwgJiYgb2xkQnVja2V0TmFtZSAhPSBudWxsICYmIG5ld0J1Y2tldE5hbWUgIT09IG9sZEJ1Y2tldE5hbWU7XG5cbiAgLyogSWYgdGhlIG5hbWUgb2YgdGhlIGJ1Y2tldCBoYXMgY2hhbmdlZCwgQ2xvdWRGb3JtYXRpb24gd2lsbCB0cnkgdG8gZGVsZXRlIHRoZSBidWNrZXRcbiAgICAgYW5kIGNyZWF0ZSBhIG5ldyBvbmUgd2l0aCB0aGUgbmV3IG5hbWUuIFNvIHdlIGhhdmUgdG8gZGVsZXRlIHRoZSBjb250ZW50cyBvZiB0aGVcbiAgICAgYnVja2V0IHNvIHRoYXQgdGhpcyBvcGVyYXRpb24gZG9lcyBub3QgZmFpbC4gKi9cbiAgaWYgKGJ1Y2tldE5hbWVIYXNDaGFuZ2VkKSB7XG4gICAgcmV0dXJuIG9uRGVsZXRlKG9sZEJ1Y2tldE5hbWUpO1xuICB9XG59XG5cbi8qKlxuICogUmVjdXJzaXZlbHkgZGVsZXRlIGFsbCBpdGVtcyBpbiB0aGUgYnVja2V0XG4gKlxuICogQHBhcmFtIGJ1Y2tldE5hbWUgdGhlIGJ1Y2tldCBuYW1lXG4gKi9cbmFzeW5jIGZ1bmN0aW9uIGVtcHR5QnVja2V0KGJ1Y2tldE5hbWU6IHN0cmluZykge1xuICBjb25zdCBsaXN0ZWRPYmplY3RzID0gYXdhaXQgczMubGlzdE9iamVjdFZlcnNpb25zKHsgQnVja2V0OiBidWNrZXROYW1lIH0pLnByb21pc2UoKTtcbiAgY29uc3QgY29udGVudHMgPSBbLi4ubGlzdGVkT2JqZWN0cy5WZXJzaW9ucyA/PyBbXSwgLi4ubGlzdGVkT2JqZWN0cy5EZWxldGVNYXJrZXJzID8/IFtdXTtcbiAgaWYgKGNvbnRlbnRzLmxlbmd0aCA9PT0gMCkge1xuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IHJlY29yZHMgPSBjb250ZW50cy5tYXAoKHJlY29yZDogYW55KSA9PiAoeyBLZXk6IHJlY29yZC5LZXksIFZlcnNpb25JZDogcmVjb3JkLlZlcnNpb25JZCB9KSk7XG4gIGF3YWl0IHMzLmRlbGV0ZU9iamVjdHMoeyBCdWNrZXQ6IGJ1Y2tldE5hbWUsIERlbGV0ZTogeyBPYmplY3RzOiByZWNvcmRzIH0gfSkucHJvbWlzZSgpO1xuXG4gIGlmIChsaXN0ZWRPYmplY3RzPy5Jc1RydW5jYXRlZCkge1xuICAgIGF3YWl0IGVtcHR5QnVja2V0KGJ1Y2tldE5hbWUpO1xuICB9XG59XG5cbmFzeW5jIGZ1bmN0aW9uIG9uRGVsZXRlKGJ1Y2tldE5hbWU/OiBzdHJpbmcpIHtcbiAgaWYgKCFidWNrZXROYW1lKSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdObyBCdWNrZXROYW1lIHdhcyBwcm92aWRlZC4nKTtcbiAgfVxuICBpZiAoIWF3YWl0IGlzQnVja2V0VGFnZ2VkRm9yRGVsZXRpb24oYnVja2V0TmFtZSkpIHtcbiAgICBwcm9jZXNzLnN0ZG91dC53cml0ZShgQnVja2V0IGRvZXMgbm90IGhhdmUgJyR7QVVUT19ERUxFVEVfT0JKRUNUU19UQUd9JyB0YWcsIHNraXBwaW5nIGNsZWFuaW5nLlxcbmApO1xuICAgIHJldHVybjtcbiAgfVxuICB0cnkge1xuICAgIGF3YWl0IGVtcHR5QnVja2V0KGJ1Y2tldE5hbWUpO1xuICB9IGNhdGNoIChlKSB7XG4gICAgaWYgKGUuY29kZSAhPT0gJ05vU3VjaEJ1Y2tldCcpIHtcbiAgICAgIHRocm93IGU7XG4gICAgfVxuICAgIC8vIEJ1Y2tldCBkb2Vzbid0IGV4aXN0LiBJZ25vcmluZ1xuICB9XG59XG5cbi8qKlxuICogVGhlIGJ1Y2tldCB3aWxsIG9ubHkgYmUgdGFnZ2VkIGZvciBkZWxldGlvbiBpZiBpdCdzIGJlaW5nIGRlbGV0ZWQgaW4gdGhlIHNhbWVcbiAqIGRlcGxveW1lbnQgYXMgdGhpcyBDdXN0b20gUmVzb3VyY2UuXG4gKlxuICogSWYgdGhlIEN1c3RvbSBSZXNvdXJjZSBpcyBldmVyeSBkZWxldGVkIGJlZm9yZSB0aGUgYnVja2V0LCBpdCBtdXN0IGJlIGJlY2F1c2VcbiAqIGBhdXRvRGVsZXRlT2JqZWN0c2AgaGFzIGJlZW4gc3dpdGNoZWQgdG8gZmFsc2UsIGluIHdoaWNoIGNhc2UgdGhlIHRhZyB3b3VsZCBoYXZlXG4gKiBiZWVuIHJlbW92ZWQgYmVmb3JlIHdlIGdldCB0byB0aGlzIERlbGV0ZSBldmVudC5cbiAqL1xuYXN5bmMgZnVuY3Rpb24gaXNCdWNrZXRUYWdnZWRGb3JEZWxldGlvbihidWNrZXROYW1lOiBzdHJpbmcpIHtcbiAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBzMy5nZXRCdWNrZXRUYWdnaW5nKHsgQnVja2V0OiBidWNrZXROYW1lIH0pLnByb21pc2UoKTtcbiAgcmV0dXJuIHJlc3BvbnNlLlRhZ1NldC5zb21lKHRhZyA9PiB0YWcuS2V5ID09PSBBVVRPX0RFTEVURV9PQkpFQ1RTX1RBRyAmJiB0YWcuVmFsdWUgPT09ICd0cnVlJyk7XG59Il19 \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip new file mode 100644 index 0000000000000..d1065f07d934c Binary files /dev/null and b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip differ diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py new file mode 100644 index 0000000000000..105bdadc3c1a8 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py @@ -0,0 +1,7 @@ +import json + +def handler(event, context): + return { + 'statusCode': 200, + 'body': json.dumps('Hello from Lambda!') + } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py new file mode 100644 index 0000000000000..105bdadc3c1a8 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2/index.py @@ -0,0 +1,7 @@ +import json + +def handler(event, context): + return { + 'statusCode': 200, + 'body': json.dumps('Hello from Lambda!') + } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py new file mode 100644 index 0000000000000..059c625350f79 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py @@ -0,0 +1,7 @@ +import json + +def handler(event, context): + return { + 'statusCode': 200, + 'body': json.dumps('Hello from Lambda again!') + } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py new file mode 100644 index 0000000000000..059c625350f79 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d/index.py @@ -0,0 +1,7 @@ +import json + +def handler(event, context): + return { + 'statusCode': 200, + 'body': json.dumps('Hello from Lambda again!') + } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/cdk.out b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/cdk.out index 588d7b269d34f..145739f539580 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"20.0.0"} \ No newline at end of file +{"version":"22.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json index 4554ffc8470db..dc95a737f7391 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.assets.json @@ -1,16 +1,87 @@ { - "version": "20.0.0", + "version": "22.0.0", "files": { + "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c": { + "source": { + "path": "asset.33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510": { + "source": { + "path": "asset.5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip", + "packaging": "file" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64": { + "source": { + "path": "asset.2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2": { + "source": { + "path": "asset.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d": { + "source": { + "path": "asset.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d", + "packaging": "zip" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, "b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e": { "source": { "path": "asset.b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json", "packaging": "file" }, "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", "objectKey": "b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, @@ -20,36 +91,53 @@ "packaging": "file" }, "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", "objectKey": "6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, "dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f": { "source": { - "path": "integservicecatalogproductSNSTopicProduct24C7C16DA.product.template.json", + "path": "integservicecatalogproductSNSTopicProduct3B51CF591.product.template.json", "packaging": "file" }, "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", "objectKey": "dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" + } + } + }, + "c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a": { + "source": { + "path": "integservicecatalogproductS3AssetProductCED6E119.product.template.json", + "packaging": "file" + }, + "destinations": { + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } }, - "055a185452c29b6ca4df318d9059b86b1bd73d14c95904474dde4df581580c4a": { + "6135e800e36d77703eb2e8b9598f683698677115d74aec7f4b25db092f6fd27c": { "source": { "path": "integ-servicecatalog-product.template.json", "packaging": "file" }, "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "055a185452c29b6ca4df318d9059b86b1bd73d14c95904474dde4df581580c4a.json", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + "12345678-test-region": { + "bucketName": "cdk-hnb659fds-assets-12345678-test-region", + "objectKey": "6135e800e36d77703eb2e8b9598f683698677115d74aec7f4b25db092f6fd27c.json", + "region": "test-region", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-file-publishing-role-12345678-test-region" } } } diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json index 0a09c45713e79..e52fbab32b1ef 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ-servicecatalog-product.template.json @@ -1,5 +1,354 @@ { "Resources": { + "TestPortfolio4AC794EB": { + "Type": "AWS::ServiceCatalog::Portfolio", + "Properties": { + "DisplayName": "TestPortfolio", + "ProviderName": "TestProvider", + "AcceptLanguage": "en", + "Description": "This is our Service Catalog Portfolio" + } + }, + "TestPortfolioPortfolioProductAssociation9c99ebba36fc70F2C75A": { + "Type": "AWS::ServiceCatalog::PortfolioProductAssociation", + "Properties": { + "PortfolioId": { + "Ref": "TestPortfolio4AC794EB" + }, + "ProductId": { + "Ref": "TestProduct7606930B" + } + } + }, + "TestAssetBucket9434EFAE": { + "Type": "AWS::S3::Bucket", + "Properties": { + "BucketName": "product-stack-asset-bucket-12345678-test-region", + "Tags": [ + { + "Key": "aws-cdk:auto-delete-objects", + "Value": "true" + }, + { + "Key": "aws-cdk:cr-owned:3caa27f4", + "Value": "true" + } + ] + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "TestAssetBucketPolicy62167ACB": { + "Type": "AWS::S3::BucketPolicy", + "Properties": { + "Bucket": { + "Ref": "TestAssetBucket9434EFAE" + }, + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:List*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + } + } + }, + "TestAssetBucketAutoDeleteObjectsCustomResource5A0F8F22": { + "Type": "Custom::S3AutoDeleteObjects", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F", + "Arn" + ] + }, + "BucketName": { + "Ref": "TestAssetBucket9434EFAE" + } + }, + "DependsOn": [ + "TestAssetBucketPolicy62167ACB" + ], + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Version": "2012-10-17", + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ] + }, + "ManagedPolicyArns": [ + { + "Fn::Sub": "arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + } + ] + } + }, + "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "S3Key": "33e2651435a0d472a75c1e033c9832b21321d9e56711926b04c5705e5f63874c.zip" + }, + "Timeout": 900, + "MemorySize": 128, + "Handler": "__entrypoint__.handler", + "Role": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + }, + "Runtime": "nodejs14.x", + "Description": { + "Fn::Join": [ + "", + [ + "Lambda function for auto-deleting objects in ", + { + "Ref": "TestAssetBucket9434EFAE" + }, + " S3 bucket." + ] + ] + } + }, + "DependsOn": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" + ] + }, + "AssetsBucketDeploymentAwsCliLayer9BCEE17F": { + "Type": "AWS::Lambda::LayerVersion", + "Properties": { + "Content": { + "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "S3Key": "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip" + }, + "Description": "/opt/awscli/aws" + } + }, + "AssetsBucketDeploymentCustomResource283760D6": { + "Type": "Custom::CDKBucketDeployment", + "Properties": { + "ServiceToken": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536", + "Arn" + ] + }, + "SourceBucketNames": [ + "cdk-hnb659fds-assets-12345678-test-region", + "cdk-hnb659fds-assets-12345678-test-region" + ], + "SourceObjectKeys": [ + "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip", + "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" + ], + "SourceMarkers": [ + {}, + {} + ], + "DestinationBucketName": { + "Ref": "TestAssetBucket9434EFAE" + }, + "Extract": false, + "Prune": false + }, + "UpdateReplacePolicy": "Delete", + "DeletionPolicy": "Delete" + }, + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF": { + "Type": "AWS::IAM::Policy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region/*" + ] + ] + } + ] + }, + { + "Action": [ + "s3:Abort*", + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*", + "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", + "Roles": [ + { + "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + } + ] + } + }, + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "S3Key": "2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64.zip" + }, + "Role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, + "Handler": "index.handler", + "Layers": [ + { + "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + } + ], + "Runtime": "python3.9", + "Timeout": 900 + }, + "DependsOn": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + ] + }, "TestProduct7606930B": { "Type": "AWS::ServiceCatalog::CloudFormationProduct", "Properties": { @@ -16,7 +365,7 @@ "DisableTemplateValidation": false, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json" } } }, @@ -24,7 +373,7 @@ "DisableTemplateValidation": false, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json" } } }, @@ -32,7 +381,7 @@ "DisableTemplateValidation": false, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" } } }, @@ -40,77 +389,36 @@ "DisableTemplateValidation": false, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" } } }, + { + "DisableTemplateValidation": true, + "Info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json" + } + }, + "Name": "testAssetProduct" + }, { "DisableTemplateValidation": false, "Info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" } }, "Name": "v1" } ] } - }, - "TestProductTagOptionAssociation0d813eebb333DA3E2F21": { - "Type": "AWS::ServiceCatalog::TagOptionAssociation", - "Properties": { - "ResourceId": { - "Ref": "TestProduct7606930B" - }, - "TagOptionId": { - "Ref": "TagOptions5f31c54ba705F110F743" - } - } - }, - "TestProductTagOptionAssociation5d93a5c977b4B664DD87": { - "Type": "AWS::ServiceCatalog::TagOptionAssociation", - "Properties": { - "ResourceId": { - "Ref": "TestProduct7606930B" - }, - "TagOptionId": { - "Ref": "TagOptions8d263919cebb6764AC10" - } - } - }, - "TestProductTagOptionAssociationcfaf40b186a3E5FDECDC": { - "Type": "AWS::ServiceCatalog::TagOptionAssociation", - "Properties": { - "ResourceId": { - "Ref": "TestProduct7606930B" - }, - "TagOptionId": { - "Ref": "TagOptionsa260cbbd99c416C40F73" - } - } - }, - "TagOptions5f31c54ba705F110F743": { - "Type": "AWS::ServiceCatalog::TagOption", - "Properties": { - "Key": "key1", - "Value": "value1", - "Active": true - } - }, - "TagOptions8d263919cebb6764AC10": { - "Type": "AWS::ServiceCatalog::TagOption", - "Properties": { - "Key": "key1", - "Value": "value2", - "Active": true - } - }, - "TagOptionsa260cbbd99c416C40F73": { - "Type": "AWS::ServiceCatalog::TagOption", - "Properties": { - "Key": "key2", - "Value": "value1", - "Active": true + } + }, + "Outputs": { + "PortfolioId": { + "Value": { + "Ref": "TestPortfolio4AC794EB" } } }, diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ.json index b0af43e71d6f8..2e83475ed3933 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integ.json @@ -1,14 +1,13 @@ { - "version": "20.0.0", + "enableLookups": true, + "version": "22.0.0", "testCases": { - "integ.product": { + "integ-product/DefaultTest": { "stacks": [ "integ-servicecatalog-product" ], - "diffAssets": false, - "stackUpdateWorkflow": true + "assertionStack": "integ-product/DefaultTest/DeployAssert", + "assertionStackName": "integproductDefaultTestDeployAssertEB23E2A9" } - }, - "synthContext": {}, - "enableLookups": false + } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integproductDefaultTestDeployAssertEB23E2A9.assets.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integproductDefaultTestDeployAssertEB23E2A9.assets.json new file mode 100644 index 0000000000000..95084c763fe0a --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integproductDefaultTestDeployAssertEB23E2A9.assets.json @@ -0,0 +1,19 @@ +{ + "version": "22.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "integproductDefaultTestDeployAssertEB23E2A9.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integproductDefaultTestDeployAssertEB23E2A9.template.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integproductDefaultTestDeployAssertEB23E2A9.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integproductDefaultTestDeployAssertEB23E2A9.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json new file mode 100644 index 0000000000000..6be8f345ba1c8 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/integservicecatalogproductS3AssetProductCED6E119.product.template.json @@ -0,0 +1,106 @@ +{ + "Resources": { + "HelloHandlerServiceRole11EF7C63": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "HelloHandler2E4FBA4D": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "product-stack-asset-bucket-12345678-test-region", + "S3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" + }, + "Role": { + "Fn::GetAtt": [ + "HelloHandlerServiceRole11EF7C63", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "python3.9" + }, + "DependsOn": [ + "HelloHandlerServiceRole11EF7C63" + ] + }, + "HelloHandler2ServiceRole37B1402D": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "ManagedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "HelloHandler2109B0120": { + "Type": "AWS::Lambda::Function", + "Properties": { + "Code": { + "S3Bucket": "product-stack-asset-bucket-12345678-test-region", + "S3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" + }, + "Role": { + "Fn::GetAtt": [ + "HelloHandler2ServiceRole37B1402D", + "Arn" + ] + }, + "Handler": "index.handler", + "Runtime": "python3.9" + }, + "DependsOn": [ + "HelloHandler2ServiceRole37B1402D" + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json index be560c2b18f62..4c11ffe8ad156 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/manifest.json @@ -1,12 +1,6 @@ { - "version": "20.0.0", + "version": "22.0.0", "artifacts": { - "Tree": { - "type": "cdk:tree", - "properties": { - "file": "tree.json" - } - }, "integ-servicecatalog-product.assets": { "type": "cdk:asset-manifest", "properties": { @@ -17,20 +11,20 @@ }, "integ-servicecatalog-product": { "type": "aws:cloudformation:stack", - "environment": "aws://unknown-account/unknown-region", + "environment": "aws://12345678/test-region", "properties": { "templateFile": "integ-servicecatalog-product.template.json", "validateOnSynth": false, - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", - "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/055a185452c29b6ca4df318d9059b86b1bd73d14c95904474dde4df581580c4a.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-deploy-role-12345678-test-region", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-cfn-exec-role-12345678-test-region", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-12345678-test-region/6135e800e36d77703eb2e8b9598f683698677115d74aec7f4b25db092f6fd27c.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ "integ-servicecatalog-product.assets" ], "lookupRole": { - "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "arn": "arn:${AWS::Partition}:iam::12345678:role/cdk-hnb659fds-lookup-role-12345678-test-region", "requiresBootstrapStackVersion": 8, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" } @@ -39,46 +33,88 @@ "integ-servicecatalog-product.assets" ], "metadata": { - "/integ-servicecatalog-product/TestProduct/Resource": [ + "/integ-servicecatalog-product/TestPortfolio/Resource": [ { "type": "aws:cdk:logicalId", - "data": "TestProduct7606930B" + "data": "TestPortfolio4AC794EB" + } + ], + "/integ-servicecatalog-product/TestPortfolio/PortfolioProductAssociation9c99ebba36fc": [ + { + "type": "aws:cdk:logicalId", + "data": "TestPortfolioPortfolioProductAssociation9c99ebba36fc70F2C75A" } ], - "/integ-servicecatalog-product/TestProduct/TagOptionAssociation0d813eebb333": [ + "/integ-servicecatalog-product/TestAssetBucket/Resource": [ { "type": "aws:cdk:logicalId", - "data": "TestProductTagOptionAssociation0d813eebb333DA3E2F21" + "data": "TestAssetBucket9434EFAE" } ], - "/integ-servicecatalog-product/TestProduct/TagOptionAssociation5d93a5c977b4": [ + "/integ-servicecatalog-product/TestAssetBucket/Policy/Resource": [ { "type": "aws:cdk:logicalId", - "data": "TestProductTagOptionAssociation5d93a5c977b4B664DD87" + "data": "TestAssetBucketPolicy62167ACB" } ], - "/integ-servicecatalog-product/TestProduct/TagOptionAssociationcfaf40b186a3": [ + "/integ-servicecatalog-product/TestAssetBucket/AutoDeleteObjectsCustomResource/Default": [ { "type": "aws:cdk:logicalId", - "data": "TestProductTagOptionAssociationcfaf40b186a3E5FDECDC" + "data": "TestAssetBucketAutoDeleteObjectsCustomResource5A0F8F22" } ], - "/integ-servicecatalog-product/TagOptions/5f31c54ba705": [ + "/integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role": [ { "type": "aws:cdk:logicalId", - "data": "TagOptions5f31c54ba705F110F743" + "data": "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092" } ], - "/integ-servicecatalog-product/TagOptions/8d263919cebb": [ + "/integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler": [ { "type": "aws:cdk:logicalId", - "data": "TagOptions8d263919cebb6764AC10" + "data": "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F" } ], - "/integ-servicecatalog-product/TagOptions/a260cbbd99c4": [ + "/integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Resource": [ { "type": "aws:cdk:logicalId", - "data": "TagOptionsa260cbbd99c416C40F73" + "data": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + } + ], + "/integ-servicecatalog-product/AssetsBucketDeployment/CustomResource/Default": [ + { + "type": "aws:cdk:logicalId", + "data": "AssetsBucketDeploymentCustomResource283760D6" + } + ], + "/integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + } + ], + "/integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/DefaultPolicy/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF" + } + ], + "/integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536" + } + ], + "/integ-servicecatalog-product/TestProduct/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "TestProduct7606930B" + } + ], + "/integ-servicecatalog-product/PortfolioId": [ + { + "type": "aws:cdk:logicalId", + "data": "PortfolioId" } ], "/integ-servicecatalog-product/BootstrapVersion": [ @@ -95,6 +131,59 @@ ] }, "displayName": "integ-servicecatalog-product" + }, + "integproductDefaultTestDeployAssertEB23E2A9.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "integproductDefaultTestDeployAssertEB23E2A9.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "integproductDefaultTestDeployAssertEB23E2A9": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "integproductDefaultTestDeployAssertEB23E2A9.template.json", + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "integproductDefaultTestDeployAssertEB23E2A9.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "integproductDefaultTestDeployAssertEB23E2A9.assets" + ], + "metadata": { + "/integ-product/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/integ-product/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "integ-product/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/tree.json b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/tree.json index ac285ac183ffe..3b79bde4c8bcc 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.js.snapshot/tree.json @@ -4,18 +4,56 @@ "id": "App", "path": "", "children": { - "Tree": { - "id": "Tree", - "path": "Tree", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" - } - }, "integ-servicecatalog-product": { "id": "integ-servicecatalog-product", "path": "integ-servicecatalog-product", "children": { + "TestPortfolio": { + "id": "TestPortfolio", + "path": "integ-servicecatalog-product/TestPortfolio", + "children": { + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/TestPortfolio/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::Portfolio", + "aws:cdk:cloudformation:props": { + "displayName": "TestPortfolio", + "providerName": "TestProvider", + "acceptLanguage": "en", + "description": "This is our Service Catalog Portfolio" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-servicecatalog.CfnPortfolio", + "version": "0.0.0" + } + }, + "PortfolioProductAssociation9c99ebba36fc": { + "id": "PortfolioProductAssociation9c99ebba36fc", + "path": "integ-servicecatalog-product/TestPortfolio/PortfolioProductAssociation9c99ebba36fc", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::PortfolioProductAssociation", + "aws:cdk:cloudformation:props": { + "portfolioId": { + "Ref": "TestPortfolio4AC794EB" + }, + "productId": { + "Ref": "TestProduct7606930B" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-servicecatalog.CfnPortfolioProductAssociation", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-servicecatalog.Portfolio", + "version": "0.0.0" + } + }, "SNSTopicProduct3": { "id": "SNSTopicProduct3", "path": "integ-servicecatalog-product/SNSTopicProduct3", @@ -56,6 +94,161 @@ "version": "0.0.0" } }, + "TestAssetBucket": { + "id": "TestAssetBucket", + "path": "integ-servicecatalog-product/TestAssetBucket", + "children": { + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/TestAssetBucket/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::S3::Bucket", + "aws:cdk:cloudformation:props": { + "bucketName": "product-stack-asset-bucket-12345678-test-region", + "tags": [ + { + "key": "aws-cdk:auto-delete-objects", + "value": "true" + }, + { + "key": "aws-cdk:cr-owned:3caa27f4", + "value": "true" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.CfnBucket", + "version": "0.0.0" + } + }, + "Policy": { + "id": "Policy", + "path": "integ-servicecatalog-product/TestAssetBucket/Policy", + "children": { + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/TestAssetBucket/Policy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::S3::BucketPolicy", + "aws:cdk:cloudformation:props": { + "bucket": { + "Ref": "TestAssetBucket9434EFAE" + }, + "policyDocument": { + "Statement": [ + { + "Action": [ + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:List*" + ], + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::GetAtt": [ + "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092", + "Arn" + ] + } + }, + "Resource": [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.CfnBucketPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketPolicy", + "version": "0.0.0" + } + }, + "AutoDeleteObjectsCustomResource": { + "id": "AutoDeleteObjectsCustomResource", + "path": "integ-servicecatalog-product/TestAssetBucket/AutoDeleteObjectsCustomResource", + "children": { + "Default": { + "id": "Default", + "path": "integ-servicecatalog-product/TestAssetBucket/AutoDeleteObjectsCustomResource/Default", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CustomResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.Bucket", + "version": "0.0.0" + } + }, + "Custom::S3AutoDeleteObjectsCustomResourceProvider": { + "id": "Custom::S3AutoDeleteObjectsCustomResourceProvider", + "path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider", + "children": { + "Staging": { + "id": "Staging", + "path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "Role": { + "id": "Role", + "path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + }, + "Handler": { + "id": "Handler", + "path": "integ-servicecatalog-product/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CustomResourceProvider", + "version": "0.0.0" + } + }, "SNSTopicProduct1": { "id": "SNSTopicProduct1", "path": "integ-servicecatalog-product/SNSTopicProduct1", @@ -120,25 +313,642 @@ "version": "0.0.0" } }, + "S3AssetProduct": { + "id": "S3AssetProduct", + "path": "integ-servicecatalog-product/S3AssetProduct", + "children": { + "HelloHandler": { + "id": "HelloHandler", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": "product-stack-asset-bucket-12345678-test-region", + "s3Key": "d3833f63e813b3a96ea04c8c50ca98209330867f5f6ac358efca11f85a3476c2.zip" + }, + "role": { + "Fn::GetAtt": [ + "HelloHandlerServiceRole11EF7C63", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "python3.9" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + }, + "HelloHandler2": { + "id": "HelloHandler2", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/S3AssetProduct/HelloHandler2/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": "product-stack-asset-bucket-12345678-test-region", + "s3Key": "e2204c9fddfc339ea362dec9143b4c22f883d4c18dd38c456f8f6a7161c1073d.zip" + }, + "role": { + "Fn::GetAtt": [ + "HelloHandler2ServiceRole37B1402D", + "Arn" + ] + }, + "handler": "index.handler", + "runtime": "python3.9" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-servicecatalog.ProductStack", + "version": "0.0.0" + } + }, + "AssetsBucketDeployment": { + "id": "AssetsBucketDeployment", + "path": "integ-servicecatalog-product/AssetsBucketDeployment", + "children": { + "AwsCliLayer": { + "id": "AwsCliLayer", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer", + "children": { + "Code": { + "id": "Code", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/AwsCliLayer/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::LayerVersion", + "aws:cdk:cloudformation:props": { + "content": { + "s3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "s3Key": "5d8d1d0aacea23824c62f362e1e3c14b7dd14a31c71b53bfae4d14a6373c5510.zip" + }, + "description": "/opt/awscli/aws" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnLayerVersion", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/lambda-layer-awscli.AwsCliLayer", + "version": "0.0.0" + } + }, + "CustomResourceHandler": { + "id": "CustomResourceHandler", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/CustomResourceHandler", + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.SingletonFunction", + "version": "0.0.0" + } + }, + "Asset1": { + "id": "Asset1", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset1", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset1/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset1/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "CustomResource": { + "id": "CustomResource", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/CustomResource", + "children": { + "Default": { + "id": "Default", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/CustomResource/Default", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnResource", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.CustomResource", + "version": "0.0.0" + } + }, + "Asset2": { + "id": "Asset2", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset2", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset2/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-servicecatalog-product/AssetsBucketDeployment/Asset2/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-deployment.BucketDeployment", + "version": "0.0.0" + } + }, + "Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C": { + "id": "Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C", + "children": { + "ServiceRole": { + "id": "ServiceRole", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole", + "children": { + "ImportServiceRole": { + "id": "ImportServiceRole", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/ImportServiceRole", + "constructInfo": { + "fqn": "@aws-cdk/core.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "lambda.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + }, + "managedPolicyArns": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ] + ] + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + }, + "DefaultPolicy": { + "id": "DefaultPolicy", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/DefaultPolicy", + "children": { + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/ServiceRole/DefaultPolicy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Policy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::cdk-hnb659fds-assets-12345678-test-region/*" + ] + ] + } + ] + }, + { + "Action": [ + "s3:Abort*", + "s3:DeleteObject*", + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*", + "s3:PutObject", + "s3:PutObjectLegalHold", + "s3:PutObjectRetention", + "s3:PutObjectTagging", + "s3:PutObjectVersionTagging" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "TestAssetBucket9434EFAE", + "Arn" + ] + }, + "/*" + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "policyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF", + "roles": [ + { + "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Policy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, + "Code": { + "id": "Code", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code", + "children": { + "Stage": { + "id": "Stage", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code/Stage", + "constructInfo": { + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Code/AssetBucket", + "constructInfo": { + "fqn": "@aws-cdk/aws-s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-s3-assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/Custom::CDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Lambda::Function", + "aws:cdk:cloudformation:props": { + "code": { + "s3Bucket": "cdk-hnb659fds-assets-12345678-test-region", + "s3Key": "2bc265c5e0569aeb24a6349c15bd54e76e845892376515e036627ab0cc70bb64.zip" + }, + "role": { + "Fn::GetAtt": [ + "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265", + "Arn" + ] + }, + "handler": "index.handler", + "layers": [ + { + "Ref": "AssetsBucketDeploymentAwsCliLayer9BCEE17F" + } + ], + "runtime": "python3.9", + "timeout": 900 + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.CfnFunction", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-lambda.Function", + "version": "0.0.0" + } + }, "TestProduct": { "id": "TestProduct", "path": "integ-servicecatalog-product/TestProduct", "children": { - "Templatebf5098893076": { - "id": "Templatebf5098893076", - "path": "integ-servicecatalog-product/TestProduct/Templatebf5098893076", + "Template1d7080eb134c": { + "id": "Template1d7080eb134c", + "path": "integ-servicecatalog-product/TestProduct/Template1d7080eb134c", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product/TestProduct/Templatebf5098893076/Stage", + "path": "integ-servicecatalog-product/TestProduct/Template1d7080eb134c/Stage", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" } }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product/TestProduct/Templatebf5098893076/AssetBucket", + "path": "integ-servicecatalog-product/TestProduct/Template1d7080eb134c/AssetBucket", "constructInfo": { "fqn": "@aws-cdk/aws-s3.BucketBase", "version": "0.0.0" @@ -150,21 +960,21 @@ "version": "0.0.0" } }, - "Template8a84aa3ab88f": { - "id": "Template8a84aa3ab88f", - "path": "integ-servicecatalog-product/TestProduct/Template8a84aa3ab88f", + "Template346eefaaa30e": { + "id": "Template346eefaaa30e", + "path": "integ-servicecatalog-product/TestProduct/Template346eefaaa30e", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product/TestProduct/Template8a84aa3ab88f/Stage", + "path": "integ-servicecatalog-product/TestProduct/Template346eefaaa30e/Stage", "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.AssetStaging", + "version": "0.0.0" } }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product/TestProduct/Template8a84aa3ab88f/AssetBucket", + "path": "integ-servicecatalog-product/TestProduct/Template346eefaaa30e/AssetBucket", "constructInfo": { "fqn": "@aws-cdk/aws-s3.BucketBase", "version": "0.0.0" @@ -195,7 +1005,7 @@ "disableTemplateValidation": false, "info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/b59f768286e16b69628bb23b9c1a1f07300a24101b8979d8e2a94ff1ab03d09e.json" } } }, @@ -203,22 +1013,43 @@ "disableTemplateValidation": false, "info": { "LoadTemplateFromURL": { - "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json" + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/6412a5f4524c6b41d26fbeee226c68c2dad735393940a51008d77e6f8b1038f5.json" } } }, { "disableTemplateValidation": false, - "info": {} + "info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" + } + } }, { "disableTemplateValidation": false, - "info": {} + "info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" + } + } + }, + { + "name": "testAssetProduct", + "disableTemplateValidation": true, + "info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/c6a724b9f87d5f730d400d518f32edba51cf14c851d05c5eea07a9170b9e510a.json" + } + } }, { "name": "v1", "disableTemplateValidation": false, - "info": {} + "info": { + "LoadTemplateFromURL": { + "Fn::Sub": "https://s3.test-region.${AWS::URLSuffix}/cdk-hnb659fds-assets-12345678-test-region/dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f.json" + } + } } ] } @@ -227,63 +1058,6 @@ "fqn": "@aws-cdk/aws-servicecatalog.CfnCloudFormationProduct", "version": "0.0.0" } - }, - "TagOptionAssociation0d813eebb333": { - "id": "TagOptionAssociation0d813eebb333", - "path": "integ-servicecatalog-product/TestProduct/TagOptionAssociation0d813eebb333", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::TagOptionAssociation", - "aws:cdk:cloudformation:props": { - "resourceId": { - "Ref": "TestProduct7606930B" - }, - "tagOptionId": { - "Ref": "TagOptions5f31c54ba705F110F743" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.CfnTagOptionAssociation", - "version": "0.0.0" - } - }, - "TagOptionAssociation5d93a5c977b4": { - "id": "TagOptionAssociation5d93a5c977b4", - "path": "integ-servicecatalog-product/TestProduct/TagOptionAssociation5d93a5c977b4", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::TagOptionAssociation", - "aws:cdk:cloudformation:props": { - "resourceId": { - "Ref": "TestProduct7606930B" - }, - "tagOptionId": { - "Ref": "TagOptions8d263919cebb6764AC10" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.CfnTagOptionAssociation", - "version": "0.0.0" - } - }, - "TagOptionAssociationcfaf40b186a3": { - "id": "TagOptionAssociationcfaf40b186a3", - "path": "integ-servicecatalog-product/TestProduct/TagOptionAssociationcfaf40b186a3", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::TagOptionAssociation", - "aws:cdk:cloudformation:props": { - "resourceId": { - "Ref": "TestProduct7606930B" - }, - "tagOptionId": { - "Ref": "TagOptionsa260cbbd99c416C40F73" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.CfnTagOptionAssociation", - "version": "0.0.0" - } } }, "constructInfo": { @@ -291,74 +1065,102 @@ "version": "0.0.0" } }, - "TagOptions": { - "id": "TagOptions", - "path": "integ-servicecatalog-product/TagOptions", + "PortfolioId": { + "id": "PortfolioId", + "path": "integ-servicecatalog-product/PortfolioId", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnOutput", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "integ-servicecatalog-product/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "integ-servicecatalog-product/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Stack", + "version": "0.0.0" + } + }, + "integ-product": { + "id": "integ-product", + "path": "integ-product", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "integ-product/DefaultTest", "children": { - "5f31c54ba705": { - "id": "5f31c54ba705", - "path": "integ-servicecatalog-product/TagOptions/5f31c54ba705", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::TagOption", - "aws:cdk:cloudformation:props": { - "key": "key1", - "value": "value1", - "active": true - } - }, + "Default": { + "id": "Default", + "path": "integ-product/DefaultTest/Default", "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.CfnTagOption", - "version": "0.0.0" + "fqn": "constructs.Construct", + "version": "10.1.189" } }, - "8d263919cebb": { - "id": "8d263919cebb", - "path": "integ-servicecatalog-product/TagOptions/8d263919cebb", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::TagOption", - "aws:cdk:cloudformation:props": { - "key": "key1", - "value": "value2", - "active": true - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.CfnTagOption", - "version": "0.0.0" - } - }, - "a260cbbd99c4": { - "id": "a260cbbd99c4", - "path": "integ-servicecatalog-product/TagOptions/a260cbbd99c4", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::ServiceCatalog::TagOption", - "aws:cdk:cloudformation:props": { - "key": "key2", - "value": "value1", - "active": true + "DeployAssert": { + "id": "DeployAssert", + "path": "integ-product/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "integ-product/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "integ-product/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "@aws-cdk/core.CfnRule", + "version": "0.0.0" + } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.CfnTagOption", + "fqn": "@aws-cdk/core.Stack", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-servicecatalog.TagOptions", + "fqn": "@aws-cdk/integ-tests.IntegTestCase", "version": "0.0.0" } } }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.1.85" + "version": "10.1.189" } } }, "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.1.85" + "fqn": "@aws-cdk/core.App", + "version": "0.0.0" } } } \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts index 1bd5d03ea260d..6d32d6aad82ff 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts @@ -1,11 +1,72 @@ import * as path from 'path'; +import * as lambda from '@aws-cdk/aws-lambda'; +import * as s3 from '@aws-cdk/aws-s3'; import * as sns from '@aws-cdk/aws-sns'; import * as cdk from '@aws-cdk/core'; +import { IntegTest } from '@aws-cdk/integ-tests'; import * as servicecatalog from '../lib'; -import { ProductStackHistory } from '../lib'; +import { ProductStackHistory, ProductStackProps } from '../lib'; + +/** + * Follow these instructions to manually test provisioning a Product with an Asset with the resources provisioned in this stack: + * + * 1. Deploy the stack: + ``` + $ cdk deploy --app "node integ.product.js" integ-servicecatalog-product + ``` + * + * 2. Obtain IAM Principal ARN that will provision product. + One way this can be done is by using + ``` + $ aws sts get-caller-identity + ``` + * + * 3. Associate your principal to your portfolio. PortfolioId is stored as an output values from the deployed stack. + ``` + $ aws servicecatalog associate-principal-with-portfolio \ + --portfolio-id= \ + --principal-arn= \ + --principal-type=IAM + ``` + * + * 4. Provision Product using the following prefilled values. + ``` + $ aws servicecatalog provision-product \ + --provisioned-product-name=testAssetProvisioningProduct \ + --product-name=testProduct \ + --provisioning-artifact-name=testAssetProduct + ``` + * + * 5. Verify Provision Product was provisioned providing the ProvisionedProductId from the previous step. + ``` + $ aws servicecatalog describe-provisioned-product --id= + ``` + * + * 6. Terminate Provisioned Product providing the ProvisionedProductId from the previous step. + ``` + $ aws servicecatalog terminate-provisioned-product --provisioned-product-id= + ``` + * + * 7. Disassociate your principal from your portfolio. + ``` + $ aws servicecatalog disassociate-principal-from-portfolio \ + --portfolio-id= \ + --principal-arn= \ + ``` + * + * 8. Destroy the stack: + ``` + $ cdk destroy --app "node integ.product.js" integ-servicecatalog-product + ``` + */ const app = new cdk.App(); -const stack = new cdk.Stack(app, 'integ-servicecatalog-product'); +const stack = new cdk.Stack(app, 'integ-servicecatalog-product', { + env: { + account: process.env.CDK_INTEG_ACCOUNT ?? process.env.CDK_DEFAULT_ACCOUNT, + region: process.env.CDK_INTEG_REGION ?? process.env.CDK_DEFAULT_REGION, + }, +}); class TestProductStack extends servicecatalog.ProductStack { constructor(scope: any, id: string) { @@ -15,10 +76,41 @@ class TestProductStack extends servicecatalog.ProductStack { } } +const portfolio = new servicecatalog.Portfolio(stack, 'TestPortfolio', { + displayName: 'TestPortfolio', + providerName: 'TestProvider', + description: 'This is our Service Catalog Portfolio', + messageLanguage: servicecatalog.MessageLanguage.EN, +}); + +class TestAssetProductStack extends servicecatalog.ProductStack { + constructor(scope: any, id: string, props?: ProductStackProps) { + super(scope, id, props); + + new lambda.Function(this, 'HelloHandler', { + runtime: lambda.Runtime.PYTHON_3_9, + code: lambda.Code.fromAsset('./assets'), + handler: 'index.handler', + }); + + new lambda.Function(this, 'HelloHandler2', { + runtime: lambda.Runtime.PYTHON_3_9, + code: lambda.Code.fromAsset('./assetsv2'), + handler: 'index.handler', + }); + } +} + const productStackHistory = new ProductStackHistory(stack, 'ProductStackHistory', { productStack: new TestProductStack(stack, 'SNSTopicProduct3'), currentVersionName: 'v1', - currentVersionLocked: true, + currentVersionLocked: false, +}); + +const testAssetBucket = new s3.Bucket(stack, 'TestAssetBucket', { + bucketName: `product-stack-asset-bucket-${stack.account}-${stack.region}`, + removalPolicy: cdk.RemovalPolicy.DESTROY, + autoDeleteObjects: true, }); const product = new servicecatalog.CloudFormationProduct(stack, 'TestProduct', { @@ -42,17 +134,24 @@ const product = new servicecatalog.CloudFormationProduct(stack, 'TestProduct', { { cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack(new TestProductStack(stack, 'SNSTopicProduct2')), }, + { + productVersionName: 'testAssetProduct', + validateTemplate: false, + cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack(new TestAssetProductStack(stack, 'S3AssetProduct', { + assetBucket: testAssetBucket, + })), + }, productStackHistory.currentVersion(), ], }); -const tagOptions = new servicecatalog.TagOptions(stack, 'TagOptions', { - allowedValuesForTags: { - key1: ['value1', 'value2'], - key2: ['value1'], - }, +new IntegTest(app, 'integ-product', { + testCases: [stack], + enableLookups: true, }); -product.associateTagOptions(tagOptions); +portfolio.addProduct(product); + +new cdk.CfnOutput(stack, 'PortfolioId', { value: portfolio.portfolioId }); app.synth(); diff --git a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out new file mode 100644 index 0000000000000..8ecc185e9dbee --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"21.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.test.ts b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.test.ts index 1785393db5afd..a85d1de05ae57 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.test.ts +++ b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.test.ts @@ -1,5 +1,6 @@ import { Template } from '@aws-cdk/assertions'; import * as iam from '@aws-cdk/aws-iam'; +import * as s3 from '@aws-cdk/aws-s3'; import * as sns from '@aws-cdk/aws-sns'; import * as cdk from '@aws-cdk/core'; import * as servicecatalog from '../lib'; @@ -194,6 +195,62 @@ describe('Portfolio', () => { }); }), + test('portfolio share with assets', () => { + const assetBucket = new s3.Bucket(stack, 'MyProductStackAssetBucket', { + bucketName: 'test-asset-bucket', + }); + + const productStack = new servicecatalog.ProductStack(stack, 'MyProductStack', { + }); + + const product = new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { + productName: 'testProduct', + owner: 'testOwner', + productVersions: [ + { + productVersionName: 'v1', + cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack(productStack), + }, + ], + }); + + product.assetBuckets.push(assetBucket); + + const shareAccountId = '012345678901'; + + portfolio.addProduct(product); + portfolio.shareWithAccount(shareAccountId); + + Template.fromStack(stack).hasResourceProperties('AWS::ServiceCatalog::PortfolioShare', { + AccountId: shareAccountId, + }); + Template.fromStack(stack).hasResourceProperties('AWS::S3::Bucket', { + BucketName: 'test-asset-bucket', + }); + Template.fromStack(stack).hasResourceProperties('AWS::S3::BucketPolicy', { + PolicyDocument: { + Statement: [{ + Effect: 'Allow', + Action: ['s3:GetObject*', 's3:GetBucket*', 's3:List*'], + Principal: { + AWS: { + 'Fn::Join': [ + '', + [ + 'arn:', + { + Ref: 'AWS::Partition', + }, + ':iam::012345678901:root', + ], + ], + }, + }, + }], + }, + }); + }), + test('portfolio share with share tagOptions', () => { const shareAccountId = '012345678901'; @@ -782,4 +839,4 @@ describe('portfolio associations and product constraints', () => { }).toThrowError(/Cannot configure StackSet deployment when a launch role is already defined for association/); }); }); -}); \ No newline at end of file +}); diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product-stack.test.ts b/packages/@aws-cdk/aws-servicecatalog/test/product-stack.test.ts index c2c008b4a63e9..e9caacbce81ed 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product-stack.test.ts +++ b/packages/@aws-cdk/aws-servicecatalog/test/product-stack.test.ts @@ -1,5 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; +import * as s3 from '@aws-cdk/aws-s3'; import * as s3_assets from '@aws-cdk/aws-s3-assets'; import * as sns from '@aws-cdk/aws-sns'; import * as cdk from '@aws-cdk/core'; @@ -8,19 +9,71 @@ import * as servicecatalog from '../lib'; /* eslint-disable quote-props */ describe('ProductStack', () => { - test('fails to add asset to a product stack', () => { + test('Asset bucket undefined in product stack without assets', () => { // GIVEN const app = new cdk.App(); const mainStack = new cdk.Stack(app, 'MyStack'); const productStack = new servicecatalog.ProductStack(mainStack, 'MyProductStack'); + // THEN + expect(productStack._getAssetBucket()).toBeUndefined(); + }), + + test('Used defined Asset bucket in product stack with assets', () => { + // GIVEN + const app = new cdk.App( + { outdir: 'cdk.out' }, + ); + const mainStack = new cdk.Stack(app, 'MyStack'); + const testAssetBucket = new s3.Bucket(mainStack, 'TestAssetBucket', { + bucketName: 'test-asset-bucket', + }); + const productStack = new servicecatalog.ProductStack(mainStack, 'MyProductStack', { + assetBucket: testAssetBucket, + }); + + // WHEN + new s3_assets.Asset(productStack, 'testAsset', { + path: path.join(__dirname, 'assets'), + }); + + // THEN + expect(productStack._getAssetBucket()).toBeDefined(); + }); + + test('fails if bucketName is not specified in product stack with assets', () => { + // GIVEN + const app = new cdk.App( + { outdir: 'cdk.out' }, + ); + const mainStack = new cdk.Stack(app, 'MyStack'); + const testAssetBucket = new s3.Bucket(mainStack, 'TestAssetBucket', { + }); + const productStack = new servicecatalog.ProductStack(mainStack, 'MyProductStack', { + assetBucket: testAssetBucket, + }); + // THEN expect(() => { new s3_assets.Asset(productStack, 'testAsset', { - path: path.join(__dirname, 'product1.template.json'), + path: path.join(__dirname, 'assets'), }); - }).toThrow(/Service Catalog Product Stacks cannot use Assets/); - }), + }).toThrow('A bucketName must be provided to use Assets'); + }); + + test('fails if Asset bucket is not defined in product stack with assets', () => { + // GIVEN + const app = new cdk.App(); + const mainStack = new cdk.Stack(app, 'MyStack'); + const productStack = new servicecatalog.ProductStack(mainStack, 'MyProductStack'); + + // THEN + expect(() => { + new s3_assets.Asset(productStack, 'testAsset', { + path: path.join(__dirname, 'assets'), + }); + }).toThrow('An Asset Bucket must be provided to use Assets'); + }); test('fails if defined at root', () => { // GIVEN diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out new file mode 100644 index 0000000000000..8ecc185e9dbee --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"21.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry/LICENSE b/packages/@aws-cdk/aws-servicecatalogappregistry/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry/LICENSE +++ b/packages/@aws-cdk/aws-servicecatalogappregistry/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry/NOTICE b/packages/@aws-cdk/aws-servicecatalogappregistry/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-servicecatalogappregistry/NOTICE +++ b/packages/@aws-cdk/aws-servicecatalogappregistry/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-servicediscovery/LICENSE b/packages/@aws-cdk/aws-servicediscovery/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-servicediscovery/LICENSE +++ b/packages/@aws-cdk/aws-servicediscovery/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-servicediscovery/NOTICE b/packages/@aws-cdk/aws-servicediscovery/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-servicediscovery/NOTICE +++ b/packages/@aws-cdk/aws-servicediscovery/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ses-actions/LICENSE b/packages/@aws-cdk/aws-ses-actions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ses-actions/LICENSE +++ b/packages/@aws-cdk/aws-ses-actions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ses-actions/NOTICE b/packages/@aws-cdk/aws-ses-actions/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ses-actions/NOTICE +++ b/packages/@aws-cdk/aws-ses-actions/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ses/LICENSE b/packages/@aws-cdk/aws-ses/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ses/LICENSE +++ b/packages/@aws-cdk/aws-ses/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ses/NOTICE b/packages/@aws-cdk/aws-ses/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ses/NOTICE +++ b/packages/@aws-cdk/aws-ses/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-signer/LICENSE b/packages/@aws-cdk/aws-signer/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-signer/LICENSE +++ b/packages/@aws-cdk/aws-signer/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-signer/NOTICE b/packages/@aws-cdk/aws-signer/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-signer/NOTICE +++ b/packages/@aws-cdk/aws-signer/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sns-subscriptions/LICENSE b/packages/@aws-cdk/aws-sns-subscriptions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/LICENSE +++ b/packages/@aws-cdk/aws-sns-subscriptions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sns-subscriptions/NOTICE b/packages/@aws-cdk/aws-sns-subscriptions/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sns-subscriptions/NOTICE +++ b/packages/@aws-cdk/aws-sns-subscriptions/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sns/LICENSE b/packages/@aws-cdk/aws-sns/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sns/LICENSE +++ b/packages/@aws-cdk/aws-sns/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sns/NOTICE b/packages/@aws-cdk/aws-sns/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sns/NOTICE +++ b/packages/@aws-cdk/aws-sns/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sqs/LICENSE b/packages/@aws-cdk/aws-sqs/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sqs/LICENSE +++ b/packages/@aws-cdk/aws-sqs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sqs/NOTICE b/packages/@aws-cdk/aws-sqs/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sqs/NOTICE +++ b/packages/@aws-cdk/aws-sqs/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ssm/LICENSE b/packages/@aws-cdk/aws-ssm/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ssm/LICENSE +++ b/packages/@aws-cdk/aws-ssm/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ssm/NOTICE b/packages/@aws-cdk/aws-ssm/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ssm/NOTICE +++ b/packages/@aws-cdk/aws-ssm/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ssmcontacts/LICENSE b/packages/@aws-cdk/aws-ssmcontacts/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ssmcontacts/LICENSE +++ b/packages/@aws-cdk/aws-ssmcontacts/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ssmcontacts/NOTICE b/packages/@aws-cdk/aws-ssmcontacts/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ssmcontacts/NOTICE +++ b/packages/@aws-cdk/aws-ssmcontacts/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-ssmincidents/LICENSE b/packages/@aws-cdk/aws-ssmincidents/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-ssmincidents/LICENSE +++ b/packages/@aws-cdk/aws-ssmincidents/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-ssmincidents/NOTICE b/packages/@aws-cdk/aws-ssmincidents/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-ssmincidents/NOTICE +++ b/packages/@aws-cdk/aws-ssmincidents/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-sso/LICENSE b/packages/@aws-cdk/aws-sso/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-sso/LICENSE +++ b/packages/@aws-cdk/aws-sso/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-sso/NOTICE b/packages/@aws-cdk/aws-sso/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-sso/NOTICE +++ b/packages/@aws-cdk/aws-sso/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/LICENSE b/packages/@aws-cdk/aws-stepfunctions-tasks/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/LICENSE +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/NOTICE b/packages/@aws-cdk/aws-stepfunctions-tasks/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/NOTICE +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-stepfunctions/LICENSE b/packages/@aws-cdk/aws-stepfunctions/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-stepfunctions/LICENSE +++ b/packages/@aws-cdk/aws-stepfunctions/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-stepfunctions/NOTICE b/packages/@aws-cdk/aws-stepfunctions/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-stepfunctions/NOTICE +++ b/packages/@aws-cdk/aws-stepfunctions/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-supportapp/LICENSE b/packages/@aws-cdk/aws-supportapp/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-supportapp/LICENSE +++ b/packages/@aws-cdk/aws-supportapp/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-supportapp/NOTICE b/packages/@aws-cdk/aws-supportapp/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-supportapp/NOTICE +++ b/packages/@aws-cdk/aws-supportapp/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-synthetics/LICENSE b/packages/@aws-cdk/aws-synthetics/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-synthetics/LICENSE +++ b/packages/@aws-cdk/aws-synthetics/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-synthetics/NOTICE b/packages/@aws-cdk/aws-synthetics/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-synthetics/NOTICE +++ b/packages/@aws-cdk/aws-synthetics/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-timestream/LICENSE b/packages/@aws-cdk/aws-timestream/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-timestream/LICENSE +++ b/packages/@aws-cdk/aws-timestream/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-timestream/NOTICE b/packages/@aws-cdk/aws-timestream/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-timestream/NOTICE +++ b/packages/@aws-cdk/aws-timestream/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-transfer/LICENSE b/packages/@aws-cdk/aws-transfer/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-transfer/LICENSE +++ b/packages/@aws-cdk/aws-transfer/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-transfer/NOTICE b/packages/@aws-cdk/aws-transfer/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-transfer/NOTICE +++ b/packages/@aws-cdk/aws-transfer/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-voiceid/LICENSE b/packages/@aws-cdk/aws-voiceid/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-voiceid/LICENSE +++ b/packages/@aws-cdk/aws-voiceid/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-voiceid/NOTICE b/packages/@aws-cdk/aws-voiceid/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-voiceid/NOTICE +++ b/packages/@aws-cdk/aws-voiceid/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-waf/LICENSE b/packages/@aws-cdk/aws-waf/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-waf/LICENSE +++ b/packages/@aws-cdk/aws-waf/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-waf/NOTICE b/packages/@aws-cdk/aws-waf/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-waf/NOTICE +++ b/packages/@aws-cdk/aws-waf/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-wafregional/LICENSE b/packages/@aws-cdk/aws-wafregional/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-wafregional/LICENSE +++ b/packages/@aws-cdk/aws-wafregional/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-wafregional/NOTICE b/packages/@aws-cdk/aws-wafregional/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-wafregional/NOTICE +++ b/packages/@aws-cdk/aws-wafregional/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-wafv2/LICENSE b/packages/@aws-cdk/aws-wafv2/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-wafv2/LICENSE +++ b/packages/@aws-cdk/aws-wafv2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-wafv2/NOTICE b/packages/@aws-cdk/aws-wafv2/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-wafv2/NOTICE +++ b/packages/@aws-cdk/aws-wafv2/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-wisdom/LICENSE b/packages/@aws-cdk/aws-wisdom/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-wisdom/LICENSE +++ b/packages/@aws-cdk/aws-wisdom/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-wisdom/NOTICE b/packages/@aws-cdk/aws-wisdom/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-wisdom/NOTICE +++ b/packages/@aws-cdk/aws-wisdom/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-workspaces/LICENSE b/packages/@aws-cdk/aws-workspaces/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-workspaces/LICENSE +++ b/packages/@aws-cdk/aws-workspaces/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-workspaces/NOTICE b/packages/@aws-cdk/aws-workspaces/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-workspaces/NOTICE +++ b/packages/@aws-cdk/aws-workspaces/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/aws-xray/LICENSE b/packages/@aws-cdk/aws-xray/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/aws-xray/LICENSE +++ b/packages/@aws-cdk/aws-xray/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/aws-xray/NOTICE b/packages/@aws-cdk/aws-xray/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/aws-xray/NOTICE +++ b/packages/@aws-cdk/aws-xray/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/cdk-assets-schema/LICENSE b/packages/@aws-cdk/cdk-assets-schema/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/cdk-assets-schema/LICENSE +++ b/packages/@aws-cdk/cdk-assets-schema/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/cdk-assets-schema/NOTICE b/packages/@aws-cdk/cdk-assets-schema/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/cdk-assets-schema/NOTICE +++ b/packages/@aws-cdk/cdk-assets-schema/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/cfnspec/build-tools/template/LICENSE b/packages/@aws-cdk/cfnspec/build-tools/template/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/cfnspec/build-tools/template/LICENSE +++ b/packages/@aws-cdk/cfnspec/build-tools/template/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/cfnspec/build-tools/template/NOTICE b/packages/@aws-cdk/cfnspec/build-tools/template/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/cfnspec/build-tools/template/NOTICE +++ b/packages/@aws-cdk/cfnspec/build-tools/template/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/cloud-assembly-schema/LICENSE b/packages/@aws-cdk/cloud-assembly-schema/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/LICENSE +++ b/packages/@aws-cdk/cloud-assembly-schema/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/cloud-assembly-schema/NOTICE b/packages/@aws-cdk/cloud-assembly-schema/NOTICE index 81233a285a9eb..2017bfea2c9c5 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/NOTICE +++ b/packages/@aws-cdk/cloud-assembly-schema/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/cloudformation-diff/LICENSE b/packages/@aws-cdk/cloudformation-diff/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/cloudformation-diff/LICENSE +++ b/packages/@aws-cdk/cloudformation-diff/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/cloudformation-diff/NOTICE b/packages/@aws-cdk/cloudformation-diff/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/cloudformation-diff/NOTICE +++ b/packages/@aws-cdk/cloudformation-diff/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/cloudformation-include/LICENSE b/packages/@aws-cdk/cloudformation-include/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/cloudformation-include/LICENSE +++ b/packages/@aws-cdk/cloudformation-include/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/cloudformation-include/NOTICE b/packages/@aws-cdk/cloudformation-include/NOTICE index ee9b8119d893f..91f398efbcb4a 100644 --- a/packages/@aws-cdk/cloudformation-include/NOTICE +++ b/packages/@aws-cdk/cloudformation-include/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/core/LICENSE b/packages/@aws-cdk/core/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/core/LICENSE +++ b/packages/@aws-cdk/core/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/core/NOTICE b/packages/@aws-cdk/core/NOTICE index 9d6c364a16a8b..2646a7a22fc0a 100644 --- a/packages/@aws-cdk/core/NOTICE +++ b/packages/@aws-cdk/core/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/custom-resources/LICENSE b/packages/@aws-cdk/custom-resources/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/custom-resources/LICENSE +++ b/packages/@aws-cdk/custom-resources/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/custom-resources/NOTICE b/packages/@aws-cdk/custom-resources/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/custom-resources/NOTICE +++ b/packages/@aws-cdk/custom-resources/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md b/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md index 0d060c9a08fce..4b2be9b40d651 100644 --- a/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md +++ b/packages/@aws-cdk/cx-api/FEATURE_FLAGS.md @@ -39,6 +39,7 @@ Flags come in three types: | [@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker](#aws-cdkaws-ecsdisableexplicitdeploymentcontrollerforcircuitbreaker) | Avoid setting the "ECS" deployment controller when adding a circuit breaker | 2.51.0 | (fix) | | [@aws-cdk/aws-events:eventsTargetQueueSameAccount](#aws-cdkaws-eventseventstargetqueuesameaccount) | Event Rules may only push to encrypted SQS queues in the same account | 2.51.0 | (fix) | | [@aws-cdk/aws-iam:standardizedServicePrincipals](#aws-cdkaws-iamstandardizedserviceprincipals) | Use standardized (global) service principals everywhere | 2.51.0 | (fix) | +| [@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy](#aws-cdkaws-s3serveraccesslogsusebucketpolicy) | Use S3 Bucket Policy instead of ACLs for Server Access Logging | 2.59.0 | (fix) | @@ -68,7 +69,8 @@ The following json shows the current recommended set of flags, as `cdk init` wou "@aws-cdk/core:enablePartitionLiterals": true, "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true, "@aws-cdk/aws-iam:standardizedServicePrincipals": true, - "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true + "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true, + "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true } } ``` @@ -695,4 +697,24 @@ This flag disables use of that exceptions database and always uses the global se | 2.51.0 | `false` | `true` | +### @aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy + +*Use S3 Bucket Policy instead of ACLs for Server Access Logging* (fix) + +Enable this feature flag to use S3 Bucket Policy for granting permission fo Server Access Logging +rather than using the canned `LogDeliveryWrite` ACL. ACLs do not work when Object Ownership is +enabled on the bucket. + +This flag uses a Bucket Policy statement to allow Server Access Log delivery, following best +practices for S3. + +@see https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html + + +| Since | Default | Recommended | +| ----- | ----- | ----- | +| (not in v1) | | | +| 2.59.0 | `false` | `true` | + + diff --git a/packages/@aws-cdk/cx-api/LICENSE b/packages/@aws-cdk/cx-api/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/cx-api/LICENSE +++ b/packages/@aws-cdk/cx-api/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/cx-api/NOTICE b/packages/@aws-cdk/cx-api/NOTICE index fbea130559f09..dfd92979140de 100644 --- a/packages/@aws-cdk/cx-api/NOTICE +++ b/packages/@aws-cdk/cx-api/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/@aws-cdk/cx-api/README.md b/packages/@aws-cdk/cx-api/README.md index 5493d904da83e..0d61f27c371be 100644 --- a/packages/@aws-cdk/cx-api/README.md +++ b/packages/@aws-cdk/cx-api/README.md @@ -120,3 +120,22 @@ _cdk.json_ } } ``` + +* `@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy` + +Enable this feature flag to use S3 Bucket Policy for granting permission fo Server Access Logging +rather than using the canned \`LogDeliveryWrite\` ACL. ACLs do not work when Object Ownership is +enabled on the bucket. + +This flag uses a Bucket Policy statement to allow Server Access Log delivery, following best +practices for S3. + +https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html + +```json +{ + "context": { + "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true + } +} +``` diff --git a/packages/@aws-cdk/cx-api/lib/features.ts b/packages/@aws-cdk/cx-api/lib/features.ts index 1d29788bd4a97..7a3c533fd72d1 100644 --- a/packages/@aws-cdk/cx-api/lib/features.ts +++ b/packages/@aws-cdk/cx-api/lib/features.ts @@ -74,6 +74,7 @@ export const ENABLE_PARTITION_LITERALS = '@aws-cdk/core:enablePartitionLiterals' export const EVENTS_TARGET_QUEUE_SAME_ACCOUNT = '@aws-cdk/aws-events:eventsTargetQueueSameAccount'; export const IAM_STANDARDIZED_SERVICE_PRINCIPALS = '@aws-cdk/aws-iam:standardizedServicePrincipals'; export const ECS_DISABLE_EXPLICIT_DEPLOYMENT_CONTROLLER_FOR_CIRCUIT_BREAKER = '@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker'; +export const S3_SERVER_ACCESS_LOGS_USE_BUCKET_POLICY = '@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy'; export const FLAGS: Record = { ////////////////////////////////////////////////////////////////////// @@ -558,6 +559,23 @@ export const FLAGS: Record = { introducedIn: { v2: '2.51.0' }, recommendedValue: true, }, + ////////////////////////////////////////////////////////////////////// + [S3_SERVER_ACCESS_LOGS_USE_BUCKET_POLICY]: { + type: FlagType.BugFix, + summary: 'Use S3 Bucket Policy instead of ACLs for Server Access Logging', + detailsMd: ` + Enable this feature flag to use S3 Bucket Policy for granting permission fo Server Access Logging + rather than using the canned \`LogDeliveryWrite\` ACL. ACLs do not work when Object Ownership is + enabled on the bucket. + + This flag uses a Bucket Policy statement to allow Server Access Log delivery, following best + practices for S3. + + @see https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html + `, + introducedIn: { v2: '2.59.0' }, + recommendedValue: true, + }, }; const CURRENT_MV = 'v2'; diff --git a/packages/@aws-cdk/example-construct-library/LICENSE b/packages/@aws-cdk/example-construct-library/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/example-construct-library/LICENSE +++ b/packages/@aws-cdk/example-construct-library/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/example-construct-library/NOTICE b/packages/@aws-cdk/example-construct-library/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/example-construct-library/NOTICE +++ b/packages/@aws-cdk/example-construct-library/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/integ-runner/LICENSE b/packages/@aws-cdk/integ-runner/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/integ-runner/LICENSE +++ b/packages/@aws-cdk/integ-runner/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/integ-runner/NOTICE b/packages/@aws-cdk/integ-runner/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/integ-runner/NOTICE +++ b/packages/@aws-cdk/integ-runner/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/integ-tests/LICENSE b/packages/@aws-cdk/integ-tests/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/integ-tests/LICENSE +++ b/packages/@aws-cdk/integ-tests/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/integ-tests/NOTICE b/packages/@aws-cdk/integ-tests/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/integ-tests/NOTICE +++ b/packages/@aws-cdk/integ-tests/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/lambda-layer-awscli/LICENSE b/packages/@aws-cdk/lambda-layer-awscli/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/lambda-layer-awscli/LICENSE +++ b/packages/@aws-cdk/lambda-layer-awscli/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/lambda-layer-awscli/NOTICE b/packages/@aws-cdk/lambda-layer-awscli/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/lambda-layer-awscli/NOTICE +++ b/packages/@aws-cdk/lambda-layer-awscli/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/lambda-layer-kubectl/LICENSE b/packages/@aws-cdk/lambda-layer-kubectl/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/lambda-layer-kubectl/LICENSE +++ b/packages/@aws-cdk/lambda-layer-kubectl/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/lambda-layer-kubectl/NOTICE b/packages/@aws-cdk/lambda-layer-kubectl/NOTICE index 3b6804faf350b..35797a0012b2d 100644 --- a/packages/@aws-cdk/lambda-layer-kubectl/NOTICE +++ b/packages/@aws-cdk/lambda-layer-kubectl/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ---------------- diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/LICENSE b/packages/@aws-cdk/lambda-layer-node-proxy-agent/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/lambda-layer-node-proxy-agent/LICENSE +++ b/packages/@aws-cdk/lambda-layer-node-proxy-agent/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/NOTICE b/packages/@aws-cdk/lambda-layer-node-proxy-agent/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/lambda-layer-node-proxy-agent/NOTICE +++ b/packages/@aws-cdk/lambda-layer-node-proxy-agent/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/pipelines/LICENSE b/packages/@aws-cdk/pipelines/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/pipelines/LICENSE +++ b/packages/@aws-cdk/pipelines/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/pipelines/NOTICE b/packages/@aws-cdk/pipelines/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/pipelines/NOTICE +++ b/packages/@aws-cdk/pipelines/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/region-info/LICENSE b/packages/@aws-cdk/region-info/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/region-info/LICENSE +++ b/packages/@aws-cdk/region-info/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/region-info/NOTICE b/packages/@aws-cdk/region-info/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/region-info/NOTICE +++ b/packages/@aws-cdk/region-info/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/triggers/LICENSE b/packages/@aws-cdk/triggers/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/triggers/LICENSE +++ b/packages/@aws-cdk/triggers/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/triggers/NOTICE b/packages/@aws-cdk/triggers/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/@aws-cdk/triggers/NOTICE +++ b/packages/@aws-cdk/triggers/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/@aws-cdk/yaml-cfn/LICENSE b/packages/@aws-cdk/yaml-cfn/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/@aws-cdk/yaml-cfn/LICENSE +++ b/packages/@aws-cdk/yaml-cfn/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/@aws-cdk/yaml-cfn/NOTICE b/packages/@aws-cdk/yaml-cfn/NOTICE index 0e8abc9945a17..a5a290d6cbe2e 100644 --- a/packages/@aws-cdk/yaml-cfn/NOTICE +++ b/packages/@aws-cdk/yaml-cfn/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/aws-cdk-lib/LICENSE b/packages/aws-cdk-lib/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/aws-cdk-lib/LICENSE +++ b/packages/aws-cdk-lib/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/aws-cdk-lib/NOTICE b/packages/aws-cdk-lib/NOTICE index 133b08d0d7489..6e3b597cc9c8f 100644 --- a/packages/aws-cdk-lib/NOTICE +++ b/packages/aws-cdk-lib/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. ------------------------------------------------------------------------------- diff --git a/packages/aws-cdk-migration/LICENSE b/packages/aws-cdk-migration/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/aws-cdk-migration/LICENSE +++ b/packages/aws-cdk-migration/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/aws-cdk-migration/NOTICE b/packages/aws-cdk-migration/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/aws-cdk-migration/NOTICE +++ b/packages/aws-cdk-migration/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/aws-cdk/LICENSE b/packages/aws-cdk/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/aws-cdk/LICENSE +++ b/packages/aws-cdk/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/aws-cdk/NOTICE b/packages/aws-cdk/NOTICE index 2fdce4d2a0591..c99af884575a8 100644 --- a/packages/aws-cdk/NOTICE +++ b/packages/aws-cdk/NOTICE @@ -1,5 +1,5 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/awslint/LICENSE b/packages/awslint/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/awslint/LICENSE +++ b/packages/awslint/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/awslint/NOTICE b/packages/awslint/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/awslint/NOTICE +++ b/packages/awslint/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/cdk-assets/LICENSE b/packages/cdk-assets/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/cdk-assets/LICENSE +++ b/packages/cdk-assets/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/cdk-assets/NOTICE b/packages/cdk-assets/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/cdk-assets/NOTICE +++ b/packages/cdk-assets/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/cdk-cli-wrapper/LICENSE b/packages/cdk-cli-wrapper/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/cdk-cli-wrapper/LICENSE +++ b/packages/cdk-cli-wrapper/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/cdk-cli-wrapper/NOTICE b/packages/cdk-cli-wrapper/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/cdk-cli-wrapper/NOTICE +++ b/packages/cdk-cli-wrapper/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/packages/cdk/LICENSE b/packages/cdk/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/packages/cdk/LICENSE +++ b/packages/cdk/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/cdk/NOTICE b/packages/cdk/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/packages/cdk/NOTICE +++ b/packages/cdk/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/cdk-build-tools/LICENSE b/tools/@aws-cdk/cdk-build-tools/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/cdk-build-tools/LICENSE +++ b/tools/@aws-cdk/cdk-build-tools/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/cdk-build-tools/NOTICE b/tools/@aws-cdk/cdk-build-tools/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/cdk-build-tools/NOTICE +++ b/tools/@aws-cdk/cdk-build-tools/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/cdk-release/LICENSE b/tools/@aws-cdk/cdk-release/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/cdk-release/LICENSE +++ b/tools/@aws-cdk/cdk-release/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/cdk-release/NOTICE b/tools/@aws-cdk/cdk-release/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/cdk-release/NOTICE +++ b/tools/@aws-cdk/cdk-release/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/cfn2ts/LICENSE b/tools/@aws-cdk/cfn2ts/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/cfn2ts/LICENSE +++ b/tools/@aws-cdk/cfn2ts/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/cfn2ts/NOTICE b/tools/@aws-cdk/cfn2ts/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/cfn2ts/NOTICE +++ b/tools/@aws-cdk/cfn2ts/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/eslint-plugin/LICENSE b/tools/@aws-cdk/eslint-plugin/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/eslint-plugin/LICENSE +++ b/tools/@aws-cdk/eslint-plugin/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/eslint-plugin/NOTICE b/tools/@aws-cdk/eslint-plugin/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/eslint-plugin/NOTICE +++ b/tools/@aws-cdk/eslint-plugin/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/individual-pkg-gen/LICENSE b/tools/@aws-cdk/individual-pkg-gen/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/individual-pkg-gen/LICENSE +++ b/tools/@aws-cdk/individual-pkg-gen/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/individual-pkg-gen/NOTICE b/tools/@aws-cdk/individual-pkg-gen/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/individual-pkg-gen/NOTICE +++ b/tools/@aws-cdk/individual-pkg-gen/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/pkglint/NOTICE b/tools/@aws-cdk/pkglint/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/pkglint/NOTICE +++ b/tools/@aws-cdk/pkglint/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/pkgtools/LICENSE b/tools/@aws-cdk/pkgtools/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/pkgtools/LICENSE +++ b/tools/@aws-cdk/pkgtools/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/pkgtools/NOTICE b/tools/@aws-cdk/pkgtools/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/pkgtools/NOTICE +++ b/tools/@aws-cdk/pkgtools/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/prlint/LICENSE b/tools/@aws-cdk/prlint/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/prlint/LICENSE +++ b/tools/@aws-cdk/prlint/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/prlint/NOTICE b/tools/@aws-cdk/prlint/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/prlint/NOTICE +++ b/tools/@aws-cdk/prlint/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/ubergen/LICENSE b/tools/@aws-cdk/ubergen/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/ubergen/LICENSE +++ b/tools/@aws-cdk/ubergen/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/ubergen/NOTICE b/tools/@aws-cdk/ubergen/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/ubergen/NOTICE +++ b/tools/@aws-cdk/ubergen/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/tools/@aws-cdk/yarn-cling/LICENSE b/tools/@aws-cdk/yarn-cling/LICENSE index 82ad00bb02d0b..9b722c65c5481 100644 --- a/tools/@aws-cdk/yarn-cling/LICENSE +++ b/tools/@aws-cdk/yarn-cling/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tools/@aws-cdk/yarn-cling/NOTICE b/tools/@aws-cdk/yarn-cling/NOTICE index 1b7adbb891265..a27b7dd317649 100644 --- a/tools/@aws-cdk/yarn-cling/NOTICE +++ b/tools/@aws-cdk/yarn-cling/NOTICE @@ -1,2 +1,2 @@ AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/version.v2.json b/version.v2.json index 60d086b099fdf..be1e689fdd99c 100644 --- a/version.v2.json +++ b/version.v2.json @@ -1,4 +1,4 @@ { - "version": "2.58.1", - "alphaVersion": "2.58.1-alpha.0" + "version": "2.59.0", + "alphaVersion": "2.59.0-alpha.0" } \ No newline at end of file