diff --git a/unzip/add-on/aws-ad-with-rdgw-ad-connector.template b/unzip/add-on/aws-ad-with-rdgw-ad-connector.template index c07eb72..685b611 100644 --- a/unzip/add-on/aws-ad-with-rdgw-ad-connector.template +++ b/unzip/add-on/aws-ad-with-rdgw-ad-connector.template @@ -1,15 +1,16 @@ -# Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# Licensed under the Apache License Version 2.0 (the "License"). You may not +# use this file except in compliance with the License. A copy of the License is +# located at # -# http://aws.amazon.com/asl/ +# http://www.apache.org/licenses/ +# +# or in the "license" file accompanying this file. This file is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or +# implied. See the License for the specific language governing permissions and +# limitations under the License. # -# or in the "license" file accompanying this file. This file is distributed -# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either -# express or implied. See the License for the specific language governing -# permissions and limitations under the License. AWSTemplateFormatVersion: '2010-09-09' Description: AWS Managed AD and Directory Connector for AWS SSO - Add-On Product @@ -204,7 +205,7 @@ Mappings: SourceBucketName: Name: solutions-reference SourceKeyName: - Name: aws-landing-zone/v2.3.0/add-on/aws-ad-with-rdgw-ad-connector.zip + Name: aws-landing-zone/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.zip DestinationKeyName: Name: aws-landing-zone-configuration.zip LambdaFunction: @@ -220,7 +221,7 @@ Resources: log_level: !FindInMap [LambdaFunction, Logging, Level] Code: S3Bucket: !Sub solutions-${AWS::Region} - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-add-on-config-deployer.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-add-on-config-deployer.zip Description: AWS Landing Zone Add-On Deployment Lambda Handler: add_on_config_deployer.lambda_handler MemorySize: '512' diff --git a/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-aws-ad-connector.template b/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-aws-ad-connector.template index b25f072..0bb1936 100644 --- a/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-aws-ad-connector.template +++ b/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-aws-ad-connector.template @@ -181,7 +181,7 @@ Resources: sm_arn_handshake_sm: !Ref HandshakeStateMachine Code: S3Bucket: !Sub solutions-${AWS::Region} - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-avm-cr.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-avm-cr.zip Description: AWS Lambda-backed Custom Resources for AVM FunctionName: LandingZoneADConnector Handler: lambda_custom_resource.lambda_handler @@ -201,7 +201,7 @@ Resources: log_level: 'info' Code: S3Bucket: !Sub solutions-${AWS::Region} - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-state-machine.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-state-machine.zip Description: AWS Landing Zone State Machine Handler FunctionName: LandingZoneStateMachineLambdaADConnector Handler: state_machine_router.lambda_handler @@ -623,7 +623,7 @@ Resources: wait_time: 15 Code: S3Bucket: !Sub solutions-${AWS::Region} - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-handshake-state-machine.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-handshake-state-machine.zip Description: AWS Lambda-backed Custom Resources for Handshake Mechanism FunctionName: LandingZoneHandshakeSMLambdaADConnector Handler: handshake_sm_router.lambda_handler diff --git a/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-rdgw.template b/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-rdgw.template index 7da65d8..4657b18 100644 --- a/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-rdgw.template +++ b/unzip/add-on/aws-ad-with-rdgw-ad-connector/templates/core_accounts/aws-landing-zone-rdgw.template @@ -198,7 +198,7 @@ "S3KeyPrefix": { "AllowedPattern": "^[0-9a-zA-Z-/.]*$", "ConstraintDescription": "Quick Start key prefix can include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash (/).", - "Default": "aws-landing-zone/v2.3.0/scripts/", + "Default": "aws-landing-zone/v2.3.1/scripts/", "Description": "S3 key prefix for the Quick Start assets. Quick Start key prefix can include numbers, lowercase letters, uppercase letters, hyphens (-), and forward slash (/).", "Type": "String" }, @@ -868,6 +868,7 @@ } }, "Properties": { + "AssociatePublicIpAddress": True, "ImageId": { "Ref": "LatestRdgwAmiId" }, @@ -913,6 +914,18 @@ "Ref": "AWS::Region" }, "\n", + "# Signal the status from cfn-init\n", + "cfn-signal -e $? ", + " --stack ", + { + "Ref": "AWS::StackName" + }, + " --resource RDGWAutoScalingGroup ", + " --region ", + { + "Ref": "AWS::Region" + }, + "\n", "\n" ] ] @@ -994,3 +1007,4 @@ } } } + diff --git a/unzip/add-on/aws-centralized-logging-solution/templates/aws_baseline/aws-landing-zone-centralized-logging-spoke.template b/unzip/add-on/aws-centralized-logging-solution/templates/aws_baseline/aws-landing-zone-centralized-logging-spoke.template index 4fc4aa6..2642d8e 100644 --- a/unzip/add-on/aws-centralized-logging-solution/templates/aws_baseline/aws-landing-zone-centralized-logging-spoke.template +++ b/unzip/add-on/aws-centralized-logging-solution/templates/aws_baseline/aws-landing-zone-centralized-logging-spoke.template @@ -100,10 +100,13 @@ Mappings: InstanceMap: send-data: {"SendAnonymousData": "Yes"} + # Lambda source code mapping + # Centralized Version v3.0.0 for helper Lambda, v3.0.1 for log streamer + # for Node.js updates SourceCode: General: S3Bucket: "solutions" - KeyPrefix: "centralized-logging/v3.0.0" + KeyPrefix: "centralized-logging" # CloudWatch logs pattern mapping FilterPatternLookup: @@ -176,8 +179,8 @@ Resources: Role: !Sub ${LogStreamerRole.Arn} Code: S3Bucket: !Join ["-", [!FindInMap ["SourceCode", "General", "S3Bucket"], Ref: "AWS::Region"]] - S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "clog-indexing-service.zip"]] - Runtime: nodejs8.10 + S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "v3.0.1/clog-indexing-service.zip"]] + Runtime: nodejs12.x Timeout: 300 LogStreamerInvokePermission: @@ -215,47 +218,52 @@ Resources: # Solution Helper resources # [SolutionHelperRole, SolutionHelper, SendingAnonymousData, CreateUniqueID] # + SolutionHelper: + Type: 'AWS::Lambda::Function' + Properties: + Description: Centralized Logging - Lambda function to generate a unique ID + Environment: + Variables: + # V56536055 - 10/08/2018 - better logging capabilities + LOG_LEVEL: 'INFO' #change to WARN, ERROR or DEBUG as needed + Handler: index.handler + Runtime: nodejs12.x + Timeout: 300 + Role: !GetAtt SolutionHelperRole.Arn + Code: + S3Bucket: !Join ["-", [!FindInMap ["SourceCode", "General", "S3Bucket"], Ref: "AWS::Region"]] + S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "v3.0.0/clog-auth.zip"]] + SolutionHelperRole: Type: AWS::IAM::Role Properties: AssumeRolePolicyDocument: - Version: 2012-10-17 + Version: '2012-10-17' Statement: - Effect: Allow Principal: - Service: lambda.amazonaws.com - Action: sts:AssumeRole - Path: / + Service: + - lambda.amazonaws.com + Action: + - sts:AssumeRole + Path: "/" Policies: - - PolicyName: Custom_Lambda_Loader_Permissions + - PolicyName: root PolicyDocument: - Version: 2012-10-17 + Version: '2012-10-17' Statement: - Effect: Allow Action: - logs:CreateLogGroup - logs:CreateLogStream - logs:PutLogEvents - Resource: !Sub arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/* - - SolutionHelper: - Type: AWS::Lambda::Function - Properties: - Handler: solution-helper.lambda_handler - Role: !Sub ${SolutionHelperRole.Arn} - Description: EFS Backup - This function is a CloudFormation custom lambda resource that generates UUID for each deployment. - Code: - S3Bucket: !Sub solutions-${AWS::Region} - S3Key: library/solution-helper/v3/solution-helper.zip - Runtime: python2.7 - Timeout: 300 + Resource: !Sub 'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${AWS::StackName}-*' CreateUniqueID: Type: Custom::LoadLambda Properties: - ServiceToken: !Sub ${SolutionHelper.Arn} - Region: !Sub ${AWS::Region} - CreateUniqueID: true + ServiceToken: !GetAtt SolutionHelper.Arn + Resource: UUID Outputs: LambdaArn: diff --git a/unzip/add-on/aws-centralized-logging-solution/templates/core_accounts/aws-landing-zone-centralized-logging-primary.template b/unzip/add-on/aws-centralized-logging-solution/templates/core_accounts/aws-landing-zone-centralized-logging-primary.template index e714560..816581d 100644 --- a/unzip/add-on/aws-centralized-logging-solution/templates/core_accounts/aws-landing-zone-centralized-logging-primary.template +++ b/unzip/add-on/aws-centralized-logging-solution/templates/core_accounts/aws-landing-zone-centralized-logging-primary.template @@ -136,10 +136,12 @@ Mappings: Large: '6' # Lambda source code mapping + # Centralized Version v3.0.0 for helper Lambda, v3.0.1 for log streamer + # for Node.js updates SourceCode: General: S3Bucket: "solutions" - KeyPrefix: "centralized-logging/v3.0.0" + KeyPrefix: "centralized-logging" Conditions: DemoData: !Equals [!Ref DemoTemplate, 'Yes'] @@ -339,12 +341,12 @@ Resources: # V56536055 - 10/08/2018 - better logging capabilities LOG_LEVEL: 'INFO' #change to WARN, ERROR or DEBUG as needed Handler: index.handler - Runtime: nodejs8.10 + Runtime: nodejs12.x Timeout: 300 Role: !GetAtt LambdaESCognitoRole.Arn Code: S3Bucket: !Join ["-", [!FindInMap ["SourceCode", "General", "S3Bucket"], Ref: "AWS::Region"]] - S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "clog-auth.zip"]] + S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "v3.0.0/clog-auth.zip"]] LambdaESCognitoRole: Type: AWS::IAM::Role @@ -774,8 +776,8 @@ Resources: Role: !Sub ${LogStreamerRole.Arn} Code: S3Bucket: !Join ["-", [!FindInMap ["SourceCode", "General", "S3Bucket"], Ref: "AWS::Region"]] - S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "clog-indexing-service.zip"]] - Runtime: nodejs8.10 + S3Key: !Join ["/", [!FindInMap ["SourceCode", "General", "KeyPrefix"], "v3.0.1/clog-indexing-service.zip"]] + Runtime: nodejs12.x Timeout: 300 LogStreamerInvokePermission: diff --git a/unzip/add-on/aws-centralized-logging-soution.template b/unzip/add-on/aws-centralized-logging-soution.template index 080aad3..211b94d 100644 --- a/unzip/add-on/aws-centralized-logging-soution.template +++ b/unzip/add-on/aws-centralized-logging-soution.template @@ -1,15 +1,16 @@ -# Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# Licensed under the Apache License Version 2.0 (the "License"). You may not +# use this file except in compliance with the License. A copy of the License is +# located at # -# http://aws.amazon.com/asl/ +# http://www.apache.org/licenses/ +# +# or in the "license" file accompanying this file. This file is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or +# implied. See the License for the specific language governing permissions and +# limitations under the License. # -# or in the "license" file accompanying this file. This file is distributed -# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either -# express or implied. See the License for the specific language governing -# permissions and limitations under the License. AWSTemplateFormatVersion: '2010-09-09' Description: AWS Centralized Logging Solution - Add-On Product @@ -125,7 +126,7 @@ Mappings: SourceBucketName: Name: solutions-reference SourceKeyName: - Name: aws-landing-zone/v2.3.0/add-on/aws-centralized-logging-solution.zip + Name: aws-landing-zone/v2.3.1/add-on/aws-centralized-logging-solution.zip DestinationKeyName: Name: aws-landing-zone-configuration.zip LambdaFunction: @@ -141,7 +142,7 @@ Resources: log_level: !FindInMap [LambdaFunction, Logging, Level] Code: S3Bucket: !Sub solutions-${AWS::Region} - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-add-on-config-deployer.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-add-on-config-deployer.zip Description: AWS Landing Zone Add-On Deployment Lambda Handler: add_on_config_deployer.lambda_handler MemorySize: '512' diff --git a/unzip/aws-landing-zone-add-on-config-deployer/add_on_config_deployer.py b/unzip/aws-landing-zone-add-on-config-deployer/add_on_config_deployer.py index 68c19a7..bfa9c16 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/add_on_config_deployer.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/add_on_config_deployer.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python @@ -167,7 +167,6 @@ def config_deployer(event, previous_event, RequestType = 'Create'): lzconfig_add_on_path = lzconfig_extract_path + "/" + "aws-landing-zone-configuration/add-on" make_dir(lzconfig_add_on_path) - shutil.copyfile(output_path + "/" + add_on_zip_file_name, lzconfig_add_on_path + "/" + add_on_zip_file_name) # if previous_event exists - delete the old zip file from the landing zone config zip if previous_event is not None: @@ -183,6 +182,10 @@ def config_deployer(event, previous_event, RequestType = 'Create'): logger.info("Found the old add-on zip file in the ALZ config zip, deleting the file") os.remove(lzconfig_add_on_path + "/" + previous_add_on_zip_file_name) + # copy the latest add-on zip into the ALZ config + shutil.copyfile(output_path + "/" + add_on_zip_file_name, + lzconfig_add_on_path + "/" + add_on_zip_file_name) + zip_function(destination_key_name, lzconfig_extract_path, output_path) # Upload the file in the customer S3 bucket local_file = output_path + "/" + destination_key_name diff --git a/unzip/aws-landing-zone-add-on-config-deployer/certifi/__init__.py b/unzip/aws-landing-zone-add-on-config-deployer/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/certifi/__init__.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-add-on-config-deployer/certifi/cacert.pem b/unzip/aws-landing-zone-add-on-config-deployer/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/certifi/cacert.pem +++ b/unzip/aws-landing-zone-add-on-config-deployer/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-add-on-config-deployer/config_deployer.py b/unzip/aws-landing-zone-add-on-config-deployer/config_deployer.py index af09caf..c86010d 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/config_deployer.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/config_deployer.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/assume_role_helper.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/cloudformation.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/cloudformation.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/crhelper.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/crhelper.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/directory_service.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/directory_service.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/ec2.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/ec2.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/guardduty.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/guardduty.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/helper.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/helper.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/iam.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/iam.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/kms.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/kms.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/logger.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/logger.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/metrics.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/metrics.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/organizations.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/organizations.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/pipeline.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/pipeline.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/s3.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/s3.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/scp.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/scp.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/service_catalog.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/service_catalog.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/sns.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/sns.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/ssm.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/ssm.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/state_machine.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/state_machine.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/lib/sts.py b/unzip/aws-landing-zone-add-on-config-deployer/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/lib/sts.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-add-on-config-deployer/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-add-on-config-deployer/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 373fd8f..0000000 Binary files a/unzip/aws-landing-zone-add-on-config-deployer/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-add-on-config-deployer/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-add-on-config-deployer/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..9c0f86e Binary files /dev/null and b/unzip/aws-landing-zone-add-on-config-deployer/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-add-on-config-deployer/simplejson/__init__.py b/unzip/aws-landing-zone-add-on-config-deployer/simplejson/__init__.py index 0556a7a..7b5687c 100644 --- a/unzip/aws-landing-zone-add-on-config-deployer/simplejson/__init__.py +++ b/unzip/aws-landing-zone-add-on-config-deployer/simplejson/__init__.py @@ -87,7 +87,6 @@ >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j)) '[2.0, 1.0]' - Using simplejson.tool from the shell to validate and pretty-print:: $ echo '{"json":"obj"}' | python -m simplejson.tool @@ -96,9 +95,30 @@ } $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 3 (char 2) + +Parsing multiple documents serialized as JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def loads_lines(docs): + ... for doc in docs.splitlines(): + ... yield json.loads(doc) + ... + >>> sum(doc["count"] for doc in loads_lines('{"count":1}\n{"count":2}\n{"count":3}\n')) + 6 + +Serializing multiple objects to JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def dumps_lines(objs): + ... for obj in objs: + ... yield json.dumps(obj, separators=(',',':')) + '\n' + ... + >>> ''.join(dumps_lines([{'count': 1}, {'count': 2}, {'count': 3}])) + '{"count":1}\n{"count":2}\n{"count":3}\n' + """ from __future__ import absolute_import -__version__ = '3.16.0' +__version__ = '3.17.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', @@ -160,18 +180,12 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, ``.write()``-supporting file-like object). If *skipkeys* is true then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If *ensure_ascii* is false, then the some chunks written to ``fp`` - may be ``unicode`` instances, subject to normal Python ``str`` to - ``unicode`` coercion rules. Unless ``fp.write()`` explicitly - understands ``unicode`` (as in ``codecs.getwriter()``) this is likely - to cause an error. - - If *check_circular* is false, then the circular reference check - for container types will be skipped and a circular reference will - result in an ``OverflowError`` (or worse). + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If *allow_nan* is false, then it will be a ``ValueError`` to serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) @@ -182,9 +196,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, If *indent* is a string, then JSON array elements and object members will be pretty-printed with a newline followed by that string repeated for each level of nesting. ``None`` (the default) selects the most compact - representation without any newlines. For backwards compatibility with - versions of simplejson earlier than 2.1.0, an integer is also accepted - and is converted to a string with that many spaces. + representation without any newlines. If specified, *separators* should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')`` @@ -289,12 +301,12 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If ``ensure_ascii`` is false, then the return value will be a - ``unicode`` instance subject to normal Python ``str`` to ``unicode`` - coercion rules instead of being escaped to an ASCII ``str``. + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If ``check_circular`` is false, then the circular reference check for container types will be skipped and a circular reference will @@ -318,7 +330,8 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, compact JSON representation, you should specify ``(',', ':')`` to eliminate whitespace. - ``encoding`` is the character encoding for str instances, default is UTF-8. + ``encoding`` is the character encoding for bytes instances, default is + UTF-8. ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. @@ -408,14 +421,11 @@ def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None, use_decimal=False, namedtuple_as_object=True, tuple_as_array=True, **kw): """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing - a JSON document) to a Python object. + a JSON document as `str` or `bytes`) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + `bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding `str` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the @@ -468,11 +478,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, document) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + :class:`bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding :class:`unicode` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the diff --git a/unzip/aws-landing-zone-add-on-config-deployer/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-add-on-config-deployer/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index a53b85f..0000000 Binary files a/unzip/aws-landing-zone-add-on-config-deployer/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-add-on-config-deployer/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-add-on-config-deployer/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..40383ee Binary files /dev/null and b/unzip/aws-landing-zone-add-on-config-deployer/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-addon-publisher/lib/assume_role_helper.py b/unzip/aws-landing-zone-addon-publisher/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/cloudformation.py b/unzip/aws-landing-zone-addon-publisher/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/cloudformation.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/crhelper.py b/unzip/aws-landing-zone-addon-publisher/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/crhelper.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-addon-publisher/lib/directory_service.py b/unzip/aws-landing-zone-addon-publisher/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/directory_service.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/ec2.py b/unzip/aws-landing-zone-addon-publisher/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/ec2.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-addon-publisher/lib/guardduty.py b/unzip/aws-landing-zone-addon-publisher/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/guardduty.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/helper.py b/unzip/aws-landing-zone-addon-publisher/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/helper.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-addon-publisher/lib/iam.py b/unzip/aws-landing-zone-addon-publisher/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/iam.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/kms.py b/unzip/aws-landing-zone-addon-publisher/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/kms.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/logger.py b/unzip/aws-landing-zone-addon-publisher/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/logger.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-addon-publisher/lib/metrics.py b/unzip/aws-landing-zone-addon-publisher/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/metrics.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-addon-publisher/lib/organizations.py b/unzip/aws-landing-zone-addon-publisher/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/organizations.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/pipeline.py b/unzip/aws-landing-zone-addon-publisher/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/pipeline.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/s3.py b/unzip/aws-landing-zone-addon-publisher/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/s3.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/scp.py b/unzip/aws-landing-zone-addon-publisher/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/scp.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/service_catalog.py b/unzip/aws-landing-zone-addon-publisher/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/service_catalog.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/sns.py b/unzip/aws-landing-zone-addon-publisher/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/sns.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-addon-publisher/lib/ssm.py b/unzip/aws-landing-zone-addon-publisher/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/ssm.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/state_machine.py b/unzip/aws-landing-zone-addon-publisher/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/state_machine.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/lib/sts.py b/unzip/aws-landing-zone-addon-publisher/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-addon-publisher/lib/sts.py +++ b/unzip/aws-landing-zone-addon-publisher/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-addon-publisher/publish.py b/unzip/aws-landing-zone-addon-publisher/publish.py index 6e1b026..8b6c79a 100644 --- a/unzip/aws-landing-zone-addon-publisher/publish.py +++ b/unzip/aws-landing-zone-addon-publisher/publish.py @@ -1,19 +1,17 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -############################################################################## -# Copyright 2019 Amazon.com, Inc. and its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not # -# use this file except in compliance with the License. A copy of the # -# License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed # -# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, # -# express or implied. See the License for the specific language governing # -# permissions and limitations under the License. # -############################################################################## +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # +###################################################################################################################### # publish.py # Once new Add-on(s) will be published by the AWS Solutions team diff --git a/unzip/aws-landing-zone-avm-cr/certifi/__init__.py b/unzip/aws-landing-zone-avm-cr/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-avm-cr/certifi/__init__.py +++ b/unzip/aws-landing-zone-avm-cr/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-avm-cr/certifi/cacert.pem b/unzip/aws-landing-zone-avm-cr/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-avm-cr/certifi/cacert.pem +++ b/unzip/aws-landing-zone-avm-cr/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-avm-cr/custom_resource_handler.py b/unzip/aws-landing-zone-avm-cr/custom_resource_handler.py index 51bf6fd..dd106e2 100644 --- a/unzip/aws-landing-zone-avm-cr/custom_resource_handler.py +++ b/unzip/aws-landing-zone-avm-cr/custom_resource_handler.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lambda_custom_resource.py b/unzip/aws-landing-zone-avm-cr/lambda_custom_resource.py index 6bd94ec..490c89d 100644 --- a/unzip/aws-landing-zone-avm-cr/lambda_custom_resource.py +++ b/unzip/aws-landing-zone-avm-cr/lambda_custom_resource.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/assume_role_helper.py b/unzip/aws-landing-zone-avm-cr/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-avm-cr/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/cloudformation.py b/unzip/aws-landing-zone-avm-cr/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/cloudformation.py +++ b/unzip/aws-landing-zone-avm-cr/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/crhelper.py b/unzip/aws-landing-zone-avm-cr/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/crhelper.py +++ b/unzip/aws-landing-zone-avm-cr/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-avm-cr/lib/directory_service.py b/unzip/aws-landing-zone-avm-cr/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/directory_service.py +++ b/unzip/aws-landing-zone-avm-cr/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/ec2.py b/unzip/aws-landing-zone-avm-cr/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/ec2.py +++ b/unzip/aws-landing-zone-avm-cr/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-avm-cr/lib/guardduty.py b/unzip/aws-landing-zone-avm-cr/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/guardduty.py +++ b/unzip/aws-landing-zone-avm-cr/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/helper.py b/unzip/aws-landing-zone-avm-cr/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/helper.py +++ b/unzip/aws-landing-zone-avm-cr/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-avm-cr/lib/iam.py b/unzip/aws-landing-zone-avm-cr/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/iam.py +++ b/unzip/aws-landing-zone-avm-cr/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/kms.py b/unzip/aws-landing-zone-avm-cr/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/kms.py +++ b/unzip/aws-landing-zone-avm-cr/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/logger.py b/unzip/aws-landing-zone-avm-cr/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/logger.py +++ b/unzip/aws-landing-zone-avm-cr/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-avm-cr/lib/metrics.py b/unzip/aws-landing-zone-avm-cr/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/metrics.py +++ b/unzip/aws-landing-zone-avm-cr/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-avm-cr/lib/organizations.py b/unzip/aws-landing-zone-avm-cr/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/organizations.py +++ b/unzip/aws-landing-zone-avm-cr/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/pipeline.py b/unzip/aws-landing-zone-avm-cr/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/pipeline.py +++ b/unzip/aws-landing-zone-avm-cr/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/s3.py b/unzip/aws-landing-zone-avm-cr/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/s3.py +++ b/unzip/aws-landing-zone-avm-cr/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/scp.py b/unzip/aws-landing-zone-avm-cr/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/scp.py +++ b/unzip/aws-landing-zone-avm-cr/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/service_catalog.py b/unzip/aws-landing-zone-avm-cr/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/service_catalog.py +++ b/unzip/aws-landing-zone-avm-cr/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/sns.py b/unzip/aws-landing-zone-avm-cr/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/sns.py +++ b/unzip/aws-landing-zone-avm-cr/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-avm-cr/lib/ssm.py b/unzip/aws-landing-zone-avm-cr/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/ssm.py +++ b/unzip/aws-landing-zone-avm-cr/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/state_machine.py b/unzip/aws-landing-zone-avm-cr/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/state_machine.py +++ b/unzip/aws-landing-zone-avm-cr/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-avm-cr/lib/sts.py b/unzip/aws-landing-zone-avm-cr/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-avm-cr/lib/sts.py +++ b/unzip/aws-landing-zone-avm-cr/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/certifi/__init__.py b/unzip/aws-landing-zone-config-deployer/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-config-deployer/certifi/__init__.py +++ b/unzip/aws-landing-zone-config-deployer/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-config-deployer/certifi/cacert.pem b/unzip/aws-landing-zone-config-deployer/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-config-deployer/certifi/cacert.pem +++ b/unzip/aws-landing-zone-config-deployer/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-config-deployer/config_deployer.py b/unzip/aws-landing-zone-config-deployer/config_deployer.py index af09caf..c86010d 100644 --- a/unzip/aws-landing-zone-config-deployer/config_deployer.py +++ b/unzip/aws-landing-zone-config-deployer/config_deployer.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/assume_role_helper.py b/unzip/aws-landing-zone-config-deployer/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-config-deployer/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/cloudformation.py b/unzip/aws-landing-zone-config-deployer/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/cloudformation.py +++ b/unzip/aws-landing-zone-config-deployer/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/crhelper.py b/unzip/aws-landing-zone-config-deployer/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/crhelper.py +++ b/unzip/aws-landing-zone-config-deployer/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-config-deployer/lib/directory_service.py b/unzip/aws-landing-zone-config-deployer/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/directory_service.py +++ b/unzip/aws-landing-zone-config-deployer/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/ec2.py b/unzip/aws-landing-zone-config-deployer/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/ec2.py +++ b/unzip/aws-landing-zone-config-deployer/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-config-deployer/lib/guardduty.py b/unzip/aws-landing-zone-config-deployer/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/guardduty.py +++ b/unzip/aws-landing-zone-config-deployer/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/helper.py b/unzip/aws-landing-zone-config-deployer/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/helper.py +++ b/unzip/aws-landing-zone-config-deployer/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-config-deployer/lib/iam.py b/unzip/aws-landing-zone-config-deployer/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/iam.py +++ b/unzip/aws-landing-zone-config-deployer/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/kms.py b/unzip/aws-landing-zone-config-deployer/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/kms.py +++ b/unzip/aws-landing-zone-config-deployer/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/logger.py b/unzip/aws-landing-zone-config-deployer/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/logger.py +++ b/unzip/aws-landing-zone-config-deployer/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-config-deployer/lib/metrics.py b/unzip/aws-landing-zone-config-deployer/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/metrics.py +++ b/unzip/aws-landing-zone-config-deployer/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-config-deployer/lib/organizations.py b/unzip/aws-landing-zone-config-deployer/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/organizations.py +++ b/unzip/aws-landing-zone-config-deployer/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/pipeline.py b/unzip/aws-landing-zone-config-deployer/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/pipeline.py +++ b/unzip/aws-landing-zone-config-deployer/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/s3.py b/unzip/aws-landing-zone-config-deployer/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/s3.py +++ b/unzip/aws-landing-zone-config-deployer/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/scp.py b/unzip/aws-landing-zone-config-deployer/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/scp.py +++ b/unzip/aws-landing-zone-config-deployer/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/service_catalog.py b/unzip/aws-landing-zone-config-deployer/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/service_catalog.py +++ b/unzip/aws-landing-zone-config-deployer/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/sns.py b/unzip/aws-landing-zone-config-deployer/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/sns.py +++ b/unzip/aws-landing-zone-config-deployer/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-config-deployer/lib/ssm.py b/unzip/aws-landing-zone-config-deployer/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/ssm.py +++ b/unzip/aws-landing-zone-config-deployer/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/state_machine.py b/unzip/aws-landing-zone-config-deployer/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/state_machine.py +++ b/unzip/aws-landing-zone-config-deployer/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/lib/sts.py b/unzip/aws-landing-zone-config-deployer/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-config-deployer/lib/sts.py +++ b/unzip/aws-landing-zone-config-deployer/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-config-deployer/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-config-deployer/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 373fd8f..0000000 Binary files a/unzip/aws-landing-zone-config-deployer/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-config-deployer/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-config-deployer/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..9c0f86e Binary files /dev/null and b/unzip/aws-landing-zone-config-deployer/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-config-deployer/simplejson/__init__.py b/unzip/aws-landing-zone-config-deployer/simplejson/__init__.py index 0556a7a..7b5687c 100644 --- a/unzip/aws-landing-zone-config-deployer/simplejson/__init__.py +++ b/unzip/aws-landing-zone-config-deployer/simplejson/__init__.py @@ -87,7 +87,6 @@ >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j)) '[2.0, 1.0]' - Using simplejson.tool from the shell to validate and pretty-print:: $ echo '{"json":"obj"}' | python -m simplejson.tool @@ -96,9 +95,30 @@ } $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 3 (char 2) + +Parsing multiple documents serialized as JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def loads_lines(docs): + ... for doc in docs.splitlines(): + ... yield json.loads(doc) + ... + >>> sum(doc["count"] for doc in loads_lines('{"count":1}\n{"count":2}\n{"count":3}\n')) + 6 + +Serializing multiple objects to JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def dumps_lines(objs): + ... for obj in objs: + ... yield json.dumps(obj, separators=(',',':')) + '\n' + ... + >>> ''.join(dumps_lines([{'count': 1}, {'count': 2}, {'count': 3}])) + '{"count":1}\n{"count":2}\n{"count":3}\n' + """ from __future__ import absolute_import -__version__ = '3.16.0' +__version__ = '3.17.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', @@ -160,18 +180,12 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, ``.write()``-supporting file-like object). If *skipkeys* is true then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If *ensure_ascii* is false, then the some chunks written to ``fp`` - may be ``unicode`` instances, subject to normal Python ``str`` to - ``unicode`` coercion rules. Unless ``fp.write()`` explicitly - understands ``unicode`` (as in ``codecs.getwriter()``) this is likely - to cause an error. - - If *check_circular* is false, then the circular reference check - for container types will be skipped and a circular reference will - result in an ``OverflowError`` (or worse). + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If *allow_nan* is false, then it will be a ``ValueError`` to serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) @@ -182,9 +196,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, If *indent* is a string, then JSON array elements and object members will be pretty-printed with a newline followed by that string repeated for each level of nesting. ``None`` (the default) selects the most compact - representation without any newlines. For backwards compatibility with - versions of simplejson earlier than 2.1.0, an integer is also accepted - and is converted to a string with that many spaces. + representation without any newlines. If specified, *separators* should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')`` @@ -289,12 +301,12 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If ``ensure_ascii`` is false, then the return value will be a - ``unicode`` instance subject to normal Python ``str`` to ``unicode`` - coercion rules instead of being escaped to an ASCII ``str``. + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If ``check_circular`` is false, then the circular reference check for container types will be skipped and a circular reference will @@ -318,7 +330,8 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, compact JSON representation, you should specify ``(',', ':')`` to eliminate whitespace. - ``encoding`` is the character encoding for str instances, default is UTF-8. + ``encoding`` is the character encoding for bytes instances, default is + UTF-8. ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. @@ -408,14 +421,11 @@ def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None, use_decimal=False, namedtuple_as_object=True, tuple_as_array=True, **kw): """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing - a JSON document) to a Python object. + a JSON document as `str` or `bytes`) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + `bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding `str` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the @@ -468,11 +478,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, document) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + :class:`bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding :class:`unicode` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the diff --git a/unzip/aws-landing-zone-config-deployer/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-config-deployer/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index a53b85f..0000000 Binary files a/unzip/aws-landing-zone-config-deployer/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-config-deployer/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-config-deployer/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..40383ee Binary files /dev/null and b/unzip/aws-landing-zone-config-deployer/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-configuration/templates/aws_baseline/aws-landing-zone-iam-password-policy.template b/unzip/aws-landing-zone-configuration/templates/aws_baseline/aws-landing-zone-iam-password-policy.template index d4d4fa1..55eb2b3 100644 --- a/unzip/aws-landing-zone-configuration/templates/aws_baseline/aws-landing-zone-iam-password-policy.template +++ b/unzip/aws-landing-zone-configuration/templates/aws_baseline/aws-landing-zone-iam-password-policy.template @@ -139,7 +139,7 @@ Resources: !Sub | 'use strict'; const AWS = require('aws-sdk'); - const response = require('cfn-response'); + const response = require('./cfn-response'); const iam = new AWS.IAM({apiVersion: '2010-05-08'}); exports.handler = (event, context, cb) => { console.log(`Invoke: ${!JSON.stringify(event)}`); @@ -184,7 +184,7 @@ Resources: Handler: 'index.handler' MemorySize: 128 Role: !GetAtt 'LambdaRole.Arn' - Runtime: 'nodejs8.10' + Runtime: 'nodejs10.x' Timeout: 60 LambdaLogGroup: Type: 'AWS::Logs::LogGroup' diff --git a/unzip/aws-landing-zone-configuration/templates/core_accounts/aws-landing-zone-logging.template b/unzip/aws-landing-zone-configuration/templates/core_accounts/aws-landing-zone-logging.template index 8da0bae..25e221f 100644 --- a/unzip/aws-landing-zone-configuration/templates/core_accounts/aws-landing-zone-logging.template +++ b/unzip/aws-landing-zone-configuration/templates/core_accounts/aws-landing-zone-logging.template @@ -45,6 +45,12 @@ Resources: - ServerSideEncryptionByDefault: KMSMasterKeyID: !Ref KMSMasterKeyID SSEAlgorithm: !Ref SSEAlgorithm + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + S3KmsBucket: DeletionPolicy: Retain Condition: UseKMS @@ -60,6 +66,12 @@ Resources: - ServerSideEncryptionByDefault: KMSMasterKeyID: !Ref KMSMasterKeyID SSEAlgorithm: !Ref SSEAlgorithm + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + S3KmsBucketPolicy: Type: AWS::S3::BucketPolicy Condition: UseKMS @@ -111,6 +123,12 @@ Resources: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: SSEAlgorithm: !Ref SSEAlgorithm + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + S3Bucket: DeletionPolicy: Retain Condition: UseAES256 @@ -125,6 +143,12 @@ Resources: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: SSEAlgorithm: !Ref SSEAlgorithm + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + S3BucketPolicy: Type: AWS::S3::BucketPolicy Condition: UseAES256 diff --git a/unzip/aws-landing-zone-handshake-state-machine/certifi/__init__.py b/unzip/aws-landing-zone-handshake-state-machine/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/certifi/__init__.py +++ b/unzip/aws-landing-zone-handshake-state-machine/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-handshake-state-machine/certifi/cacert.pem b/unzip/aws-landing-zone-handshake-state-machine/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/certifi/cacert.pem +++ b/unzip/aws-landing-zone-handshake-state-machine/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_handler.py b/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_handler.py index 44fd86e..351c3c4 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_handler.py +++ b/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_handler.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_router.py b/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_router.py index 228c596..68ec9a9 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_router.py +++ b/unzip/aws-landing-zone-handshake-state-machine/handshake_sm_router.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/assume_role_helper.py b/unzip/aws-landing-zone-handshake-state-machine/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/cloudformation.py b/unzip/aws-landing-zone-handshake-state-machine/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/cloudformation.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/crhelper.py b/unzip/aws-landing-zone-handshake-state-machine/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/crhelper.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/directory_service.py b/unzip/aws-landing-zone-handshake-state-machine/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/directory_service.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/ec2.py b/unzip/aws-landing-zone-handshake-state-machine/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/ec2.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/guardduty.py b/unzip/aws-landing-zone-handshake-state-machine/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/guardduty.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/helper.py b/unzip/aws-landing-zone-handshake-state-machine/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/helper.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/iam.py b/unzip/aws-landing-zone-handshake-state-machine/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/iam.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/kms.py b/unzip/aws-landing-zone-handshake-state-machine/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/kms.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/logger.py b/unzip/aws-landing-zone-handshake-state-machine/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/logger.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/metrics.py b/unzip/aws-landing-zone-handshake-state-machine/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/metrics.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/organizations.py b/unzip/aws-landing-zone-handshake-state-machine/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/organizations.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/pipeline.py b/unzip/aws-landing-zone-handshake-state-machine/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/pipeline.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/s3.py b/unzip/aws-landing-zone-handshake-state-machine/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/s3.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/scp.py b/unzip/aws-landing-zone-handshake-state-machine/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/scp.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/service_catalog.py b/unzip/aws-landing-zone-handshake-state-machine/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/service_catalog.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/sns.py b/unzip/aws-landing-zone-handshake-state-machine/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/sns.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/ssm.py b/unzip/aws-landing-zone-handshake-state-machine/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/ssm.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/state_machine.py b/unzip/aws-landing-zone-handshake-state-machine/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/state_machine.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-handshake-state-machine/lib/sts.py b/unzip/aws-landing-zone-handshake-state-machine/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-handshake-state-machine/lib/sts.py +++ b/unzip/aws-landing-zone-handshake-state-machine/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-initiation.template b/unzip/aws-landing-zone-initiation.template index 2f1762a..160a7a7 100644 --- a/unzip/aws-landing-zone-initiation.template +++ b/unzip/aws-landing-zone-initiation.template @@ -1,18 +1,18 @@ -# Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# Licensed under the Amazon Software License (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at +# Licensed under the Apache License Version 2.0 (the "License"). You may not +# use this file except in compliance with the License. A copy of the License is +# located at # -# http://aws.amazon.com/asl/ +# http://www.apache.org/licenses/ +# +# or in the "license" file accompanying this file. This file is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or +# implied. See the License for the specific language governing permissions and +# limitations under the License. # -# or in the "license" file accompanying this file. This file is distributed -# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either -# express or implied. See the License for the specific language governing -# permissions and limitations under the License. - AWSTemplateFormatVersion: '2010-09-09' -Description: '(SO0044) - AWS Landing Zone Version v2.3.0, AddOns Version aov1.0' +Description: '(SO0044) - AWS Landing Zone Version v2.3.1, AddOns Version aov1.0' Parameters: SharedServicesAccountEmail: @@ -344,7 +344,7 @@ Mappings: SourceBucketName: Name: "solutions-reference" SourceKeyName: - Name: aws-landing-zone/v2.3.0/aws-landing-zone-configuration.zip + Name: aws-landing-zone/v2.3.1/aws-landing-zone-configuration.zip LandingZonePipelineS3TriggerKey: Name: aws-landing-zone-configuration.zip LandingZonePipelineS3NonTriggerKey: @@ -383,7 +383,7 @@ Mappings: Metrics: SendAnonymousData: 'Yes' Data: - AddonTemplate: 'https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.0/aws-landing-zone-initiation.template' + AddonTemplate: 'https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.1/aws-landing-zone-initiation.template' LambdaFunction: Logging: Level: 'info' @@ -524,6 +524,8 @@ Resources: rules_to_suppress: - id: W28 reason: "The role name is defined to allow cross account access from the master account." + - id: W43 + reason: "Temporary exception to be removed post v2.3.1" Properties: RoleName: AWSCloudFormationStackSetExecutionRole AssumeRolePolicyDocument: @@ -591,6 +593,11 @@ Resources: PipelineApprovalTopic: Type: AWS::SNS::Topic + Metadata: + cfn_nag: + rules_to_suppress: + - id: W47 + reason: "The SNS topic does not require a KMS Master Key." Condition: IsPipelineApprovalStageCondition Properties: Subscription: @@ -599,6 +606,11 @@ Resources: LandingZonePipelineS3Bucket: Type: AWS::S3::Bucket + Metadata: + cfn_nag: + rules_to_suppress: + - id: W51 + reason: "Temporary exception to be removed post v2.3.1" Properties: BucketName: !Sub aws-landing-zone-configuration-${AWS::AccountId}-${AWS::Region} BucketEncryption: @@ -609,9 +621,19 @@ Resources: Status: Enabled LoggingConfiguration: DestinationBucketName: !Ref S3LoggingBucket + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True LandingZonePipelineArtifactS3Bucket: Type: AWS::S3::Bucket + Metadata: + cfn_nag: + rules_to_suppress: + - id: W51 + reason: "Temporary exception to be removed post v2.3.1" DeletionPolicy: Retain Properties: VersioningConfiguration: @@ -622,6 +644,11 @@ Resources: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: SSEAlgorithm: AES256 + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True # Create buckets using S3-SSE keys for default encryption S3LoggingBucket: @@ -632,6 +659,8 @@ Resources: rules_to_suppress: - id: W35 reason: "This S3 bucket is used as the destination for 'LandingZonePipelineS3Bucket' and 'LandingZonePipelineArtifactS3Bucket'" + - id: W51 + reason: "Log delivery controlled by ACL, not bucket policy" Properties: BucketName: !Sub aws-landing-zone-s3-access-logs-${AWS::AccountId}-${AWS::Region} AccessControl: LogDeliveryWrite @@ -641,6 +670,11 @@ Resources: ServerSideEncryptionConfiguration: - ServerSideEncryptionByDefault: SSEAlgorithm: AES256 + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True LandingZoneCodePipelineRole: Type: AWS::IAM::Role @@ -919,7 +953,7 @@ Resources: EncryptionKey: !Join ["/", ["alias", !FindInMap [KMS, Alias, Name]]] Source: Type: CODEPIPELINE - BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.7\n ruby: 2.6\n commands:\n - export current=`pwd`\n - if [ -f manifest.yaml ];then export current=`pwd`;else if [ -f aws-landing-zone-configuration/manifest.yaml ]; then export current=`pwd`/aws-landing-zone-configuration; else echo 'manifest.yaml does not exist at the root level of aws-landing-zone-configuration.zip or inside aws-landing-zone-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get update && apt-get upgrade -y\n - apt-get install zip wget python-pip libyaml-dev rsync -y\n - which python && python --version\n - which python3 && python3 --version\n - which pip && pip --version\n - pip install --upgrade pip==18.0\n - pip install --upgrade setuptools\n - pip install --upgrade virtualenv\n - pip install --upgrade PyYAML\n - pip install --upgrade yorm\n - pip install --upgrade jinja2\n - pip install --upgrade boto3\n - pip install --upgrade pyyaml\n - pip install --upgrade pykwalify\n - pip install cfn_flip\n - pip freeze\n - ruby -v\n - gem -v\n - gem install cfn-nag -v 0.3.64\n pre_build:\n commands:\n - cd $current\n - echo 'Download the Validation scripts'\n - aws s3 cp s3://solutions-reference/aws-landing-zone/v2.3.0/aws-landing-zone-validation.zip $current\n - unzip -o $current/aws-landing-zone-validation.zip -d $current\n - cp bin/lz_scripts/* .\n build:\n commands:\n - echo 'Starting build `date` in `pwd`'\n - echo 'bash merge_directories.sh $LAMBDA_ARN_SSM_PS_KEY $NONE_TYPE_VALUES $BOOL_VALUES'\n - bash merge_directories.sh $LAMBDA_ARN_SSM_PS_KEY $NONE_TYPE_VALUES $BOOL_VALUES\n - echo 'Executing validation tests'\n - echo 'bash $current/validation/run-validation.sh $ARTIFACT_BUCKET'\n - bash $current/validation/run-validation.sh $ARTIFACT_BUCKET\n - echo 'Installing validation tests completed `date`'\n - echo 'Source Dist completed `date`'\n post_build:\n commands:\n - echo 'Starting post build `date` in `pwd`'\n - echo 'build completed on `date`'\n - echo 'Printing Merge Report'\n - cat merge_report.txt\nartifacts:\n files:\n - '**/*'\n" + BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.7\n ruby: 2.6\n commands:\n - export current=`pwd`\n - if [ -f manifest.yaml ];then export current=`pwd`;else if [ -f aws-landing-zone-configuration/manifest.yaml ]; then export current=`pwd`/aws-landing-zone-configuration; else echo 'manifest.yaml does not exist at the root level of aws-landing-zone-configuration.zip or inside aws-landing-zone-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get update && apt-get upgrade -y\n - apt-get install zip wget python-pip libyaml-dev rsync -y\n - which python && python --version\n - which python3 && python3 --version\n - which pip && pip --version\n - pip install --upgrade pip==18.0\n - pip install --upgrade setuptools\n - pip install --upgrade virtualenv\n - pip install --upgrade PyYAML\n - pip install --upgrade yorm\n - pip install --upgrade jinja2\n - pip install --upgrade boto3\n - pip install --upgrade pyyaml\n - pip install --upgrade pykwalify\n - pip install cfn_flip\n - pip freeze\n - ruby -v\n - gem -v\n - gem install cfn-nag -v 0.3.64\n pre_build:\n commands:\n - cd $current\n - echo 'Download the Validation scripts'\n - aws s3 cp s3://solutions-reference/aws-landing-zone/v2.3.1/aws-landing-zone-validation.zip $current\n - unzip -o $current/aws-landing-zone-validation.zip -d $current\n - cp bin/lz_scripts/* .\n build:\n commands:\n - echo 'Starting build `date` in `pwd`'\n - echo 'bash merge_directories.sh $LAMBDA_ARN_SSM_PS_KEY $NONE_TYPE_VALUES $BOOL_VALUES'\n - bash merge_directories.sh $LAMBDA_ARN_SSM_PS_KEY $NONE_TYPE_VALUES $BOOL_VALUES\n - echo 'Executing validation tests'\n - echo 'bash $current/validation/run-validation.sh $ARTIFACT_BUCKET'\n - bash $current/validation/run-validation.sh $ARTIFACT_BUCKET\n - echo 'Installing validation tests completed `date`'\n - echo 'Source Dist completed `date`'\n post_build:\n commands:\n - echo 'Starting post build `date` in `pwd`'\n - echo 'build completed on `date`'\n - echo 'Printing Merge Report'\n - cat merge_report.txt\nartifacts:\n files:\n - '**/*'\n" Environment: ComputeType: BUILD_GENERAL1_SMALL Image: "aws/codebuild/standard:2.0" @@ -1011,7 +1045,7 @@ Resources: EncryptionKey: !Join ["/", ["alias", !FindInMap [KMS, Alias, Name]]] Source: Type: CODEPIPELINE - BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.7\n commands:\n - export current=`pwd`\n - if [ -f manifest.yaml ];then export current=`pwd`;else if [ -f aws-landing-zone-configuration/manifest.yaml ]; then export current=`pwd`/aws-landing-zone-configuration; else echo 'manifest.yaml does not exist at the root level of aws-landing-zone-configuration.zip or inside aws-landing-zone-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get update && apt-get upgrade -y\n - apt-get install zip wget python-pip libyaml-dev -y\n - which python && python --version\n - which python3 && python3 --version\n - which pip && pip --version\n - pip install --upgrade pip==18.0\n - pip install --upgrade setuptools\n - pip install --upgrade virtualenv\n - pip install --upgrade PyYAML\n - pip install --upgrade yorm\n - pip install --upgrade boto3\n - pip install --upgrade pyyaml\n - pip freeze\n pre_build:\n commands:\n - cd $current\n - echo 'Download the Launch AVM Code'\n - aws s3 cp s3://solutions-reference/aws-landing-zone/v2.3.0/aws-landing-zone-launch-avm.zip $current\n - unzip -o $current/aws-landing-zone-launch-avm.zip -d $current\n build:\n commands:\n - echo 'Starting Launch AVM `date` in `pwd`'\n - echo 'python3 launch_avm.py $log_level $wait_time $current/manifest.yaml $sm_arn_launch_avm $batch_size'\n - python3 launch_avm.py $log_level $wait_time $current/manifest.yaml $sm_arn_launch_avm $batch_size\n - echo 'Completed Launch AVM `date` in `pwd`'\nartifacts:\n files:\n - '**/*'\n" + BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.7\n commands:\n - export current=`pwd`\n - if [ -f manifest.yaml ];then export current=`pwd`;else if [ -f aws-landing-zone-configuration/manifest.yaml ]; then export current=`pwd`/aws-landing-zone-configuration; else echo 'manifest.yaml does not exist at the root level of aws-landing-zone-configuration.zip or inside aws-landing-zone-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get update && apt-get upgrade -y\n - apt-get install zip wget python-pip libyaml-dev -y\n - which python && python --version\n - which python3 && python3 --version\n - which pip && pip --version\n - pip install --upgrade pip==18.0\n - pip install --upgrade setuptools\n - pip install --upgrade virtualenv\n - pip install --upgrade PyYAML\n - pip install --upgrade yorm\n - pip install --upgrade boto3\n - pip install --upgrade pyyaml\n - pip freeze\n pre_build:\n commands:\n - cd $current\n - echo 'Download the Launch AVM Code'\n - aws s3 cp s3://solutions-reference/aws-landing-zone/v2.3.1/aws-landing-zone-launch-avm.zip $current\n - unzip -o $current/aws-landing-zone-launch-avm.zip -d $current\n build:\n commands:\n - echo 'Starting Launch AVM `date` in `pwd`'\n - echo 'python3 launch_avm.py $log_level $wait_time $current/manifest.yaml $sm_arn_launch_avm $batch_size'\n - python3 launch_avm.py $log_level $wait_time $current/manifest.yaml $sm_arn_launch_avm $batch_size\n - echo 'Completed Launch AVM `date` in `pwd`'\nartifacts:\n files:\n - '**/*'\n" Environment: ComputeType: BUILD_GENERAL1_SMALL Image: "aws/codebuild/standard:2.0" @@ -1108,7 +1142,7 @@ Resources: kms_key_alias_name: !FindInMap [KMS, Alias, Name] Code: S3Bucket: !Sub "solutions-${AWS::Region}" - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-config-deployer.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-config-deployer.zip FunctionName: LandingZoneDeploymentLambda Description: AWS Landing Zone Deployment Lambda Handler: config_deployer.lambda_handler @@ -1366,7 +1400,7 @@ Resources: lambda_arn_param_name: !FindInMap [SSMParameterNames, LandingZoneLambdaParameterName, Name] Code: S3Bucket: !Sub "solutions-${AWS::Region}" - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-state-machine-trigger.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-state-machine-trigger.zip FunctionName: LandingZoneStateMachineTriggerLambda Description: AWS Landing Zone State Machine Trigger Handler: state_machine_trigger.lambda_handler @@ -1597,7 +1631,7 @@ Resources: unlock_role_arns: !Sub arn:aws:iam::${AWS::AccountId}:root Code: S3Bucket: !Sub "solutions-${AWS::Region}" - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-state-machine.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-state-machine.zip FunctionName: LandingZoneStateMachineLambda Description: AWS Landing Zone State Machine Handler Handler: state_machine_router.lambda_handler @@ -1710,7 +1744,7 @@ Resources: wait_time: '15' Code: S3Bucket: !Sub "solutions-${AWS::Region}" - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-handshake-state-machine.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-handshake-state-machine.zip Description: AWS Lambda-backed Custom Resources for Handshake Mechanism FunctionName: LandingZoneHandshakeSMLambda Handler: handshake_sm_router.lambda_handler @@ -1875,7 +1909,7 @@ Resources: sm_arn_handshake_sm: !Ref HandshakeStateMachine Code: S3Bucket: !Sub "solutions-${AWS::Region}" - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-avm-cr.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-avm-cr.zip Description: AWS Lambda-backed Custom Resources for AVM FunctionName: LandingZone Handler: lambda_custom_resource.lambda_handler @@ -5633,6 +5667,11 @@ Resources: AddonSNSTopic: Type: AWS::SNS::Topic + Metadata: + cfn_nag: + rules_to_suppress: + - id: W47 + reason: "The SNS topic does not require a KMS Master Key." Condition: IsAddonsManagedCondition Properties: Subscription: @@ -5653,11 +5692,11 @@ Resources: AddonTemplate: !FindInMap [Solution, Data, "AddonTemplate"] AddonStack: !Sub ${AWS::StackId} AddonTopic: !If [IsAddonsManagedCondition, !Ref AddonSNSTopic, ''] - ReleaseNotes: https://solutions-reference.s3.amazonaws.com/aws-landing-zone/v2.3.0/release_notes.html + ReleaseNotes: https://solutions-reference.s3.amazonaws.com/aws-landing-zone/v2.3.1/release_notes.html log_level: !FindInMap [LambdaFunction, Logging, Level] Code: S3Bucket: !Sub "solutions-${AWS::Region}" - S3Key: aws-landing-zone/v2.3.0/aws-landing-zone-addon-publisher.zip + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-addon-publisher.zip FunctionName: LandingZoneAddonPublisher Handler: publish.lambda_handler Runtime: python3.7 @@ -5700,8 +5739,9 @@ Resources: Description: Install the centralized log aggregation and monitoring solution ProvisioningArtifactParameters: - Info: - LoadTemplateFromURL: https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.0/add-on/aws-centralized-logging-solution.template - Name: v1.1 + LoadTemplateFromURL: https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.1/add-on/aws-centralized-logging-solution.template + Name: v1.2 + Description: Updated Node.js runtime to 12.x AddLandingZoneAddOnProduct1ToPortfolio: Type: "AWS::ServiceCatalog::PortfolioProductAssociation" @@ -5728,9 +5768,9 @@ Resources: Description: This AWS Landing Zone add-on will deploy Directory Connector for AWS SSO peered with AWS Managed Active Directory and a Remote Desktop Gateway in the shared service account. Use this add-on to provide an AWS managed AD infrastructure for controlling user access to AWS and your EC2 instances. ProvisioningArtifactParameters: - Info: - LoadTemplateFromURL: https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.0/add-on/aws-ad-with-rdgw-ad-connector.template - Name: v1.2.1 - Description: This version adds a retain policy to protect Active Directory from deletion. + LoadTemplateFromURL: https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.template + Name: v1.3 + Description: This version corrects an issue impacting pipeline execution during add-on installation. AddLandingZoneAddOnProduct2ToPortfolio: Type: "AWS::ServiceCatalog::PortfolioProductAssociation" @@ -5757,7 +5797,7 @@ Outputs: Value: !Ref LandingZonePipelineS3Bucket LandingZoneSolutionVersion: Description: Version Number - Value: "v2.3.0" + Value: "v2.3.1" Export: Name: AWS-Landing-Zone-Version LandingZoneAddonsVersion: diff --git a/unzip/aws-landing-zone-launch-avm/_yaml.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-launch-avm/_yaml.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 7e0b90b..0000000 Binary files a/unzip/aws-landing-zone-launch-avm/_yaml.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-launch-avm/_yaml.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-launch-avm/_yaml.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..1cc58df Binary files /dev/null and b/unzip/aws-landing-zone-launch-avm/_yaml.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-launch-avm/certifi/__init__.py b/unzip/aws-landing-zone-launch-avm/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-launch-avm/certifi/__init__.py +++ b/unzip/aws-landing-zone-launch-avm/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-launch-avm/certifi/cacert.pem b/unzip/aws-landing-zone-launch-avm/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-launch-avm/certifi/cacert.pem +++ b/unzip/aws-landing-zone-launch-avm/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-launch-avm/lib/assume_role_helper.py b/unzip/aws-landing-zone-launch-avm/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-launch-avm/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/cloudformation.py b/unzip/aws-landing-zone-launch-avm/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/cloudformation.py +++ b/unzip/aws-landing-zone-launch-avm/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/crhelper.py b/unzip/aws-landing-zone-launch-avm/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/crhelper.py +++ b/unzip/aws-landing-zone-launch-avm/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-launch-avm/lib/directory_service.py b/unzip/aws-landing-zone-launch-avm/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/directory_service.py +++ b/unzip/aws-landing-zone-launch-avm/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/ec2.py b/unzip/aws-landing-zone-launch-avm/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/ec2.py +++ b/unzip/aws-landing-zone-launch-avm/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-launch-avm/lib/guardduty.py b/unzip/aws-landing-zone-launch-avm/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/guardduty.py +++ b/unzip/aws-landing-zone-launch-avm/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/helper.py b/unzip/aws-landing-zone-launch-avm/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/helper.py +++ b/unzip/aws-landing-zone-launch-avm/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-launch-avm/lib/iam.py b/unzip/aws-landing-zone-launch-avm/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/iam.py +++ b/unzip/aws-landing-zone-launch-avm/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/kms.py b/unzip/aws-landing-zone-launch-avm/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/kms.py +++ b/unzip/aws-landing-zone-launch-avm/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/logger.py b/unzip/aws-landing-zone-launch-avm/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/logger.py +++ b/unzip/aws-landing-zone-launch-avm/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-launch-avm/lib/metrics.py b/unzip/aws-landing-zone-launch-avm/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/metrics.py +++ b/unzip/aws-landing-zone-launch-avm/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-launch-avm/lib/organizations.py b/unzip/aws-landing-zone-launch-avm/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/organizations.py +++ b/unzip/aws-landing-zone-launch-avm/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/pipeline.py b/unzip/aws-landing-zone-launch-avm/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/pipeline.py +++ b/unzip/aws-landing-zone-launch-avm/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/s3.py b/unzip/aws-landing-zone-launch-avm/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/s3.py +++ b/unzip/aws-landing-zone-launch-avm/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/scp.py b/unzip/aws-landing-zone-launch-avm/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/scp.py +++ b/unzip/aws-landing-zone-launch-avm/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/service_catalog.py b/unzip/aws-landing-zone-launch-avm/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/service_catalog.py +++ b/unzip/aws-landing-zone-launch-avm/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/sns.py b/unzip/aws-landing-zone-launch-avm/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/sns.py +++ b/unzip/aws-landing-zone-launch-avm/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-launch-avm/lib/ssm.py b/unzip/aws-landing-zone-launch-avm/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/ssm.py +++ b/unzip/aws-landing-zone-launch-avm/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/state_machine.py b/unzip/aws-landing-zone-launch-avm/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/state_machine.py +++ b/unzip/aws-landing-zone-launch-avm/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/lib/sts.py b/unzip/aws-landing-zone-launch-avm/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-launch-avm/lib/sts.py +++ b/unzip/aws-landing-zone-launch-avm/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-launch-avm/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 373fd8f..0000000 Binary files a/unzip/aws-landing-zone-launch-avm/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-launch-avm/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-launch-avm/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..9c0f86e Binary files /dev/null and b/unzip/aws-landing-zone-launch-avm/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-launch-avm/simplejson/__init__.py b/unzip/aws-landing-zone-launch-avm/simplejson/__init__.py index 0556a7a..7b5687c 100644 --- a/unzip/aws-landing-zone-launch-avm/simplejson/__init__.py +++ b/unzip/aws-landing-zone-launch-avm/simplejson/__init__.py @@ -87,7 +87,6 @@ >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j)) '[2.0, 1.0]' - Using simplejson.tool from the shell to validate and pretty-print:: $ echo '{"json":"obj"}' | python -m simplejson.tool @@ -96,9 +95,30 @@ } $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 3 (char 2) + +Parsing multiple documents serialized as JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def loads_lines(docs): + ... for doc in docs.splitlines(): + ... yield json.loads(doc) + ... + >>> sum(doc["count"] for doc in loads_lines('{"count":1}\n{"count":2}\n{"count":3}\n')) + 6 + +Serializing multiple objects to JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def dumps_lines(objs): + ... for obj in objs: + ... yield json.dumps(obj, separators=(',',':')) + '\n' + ... + >>> ''.join(dumps_lines([{'count': 1}, {'count': 2}, {'count': 3}])) + '{"count":1}\n{"count":2}\n{"count":3}\n' + """ from __future__ import absolute_import -__version__ = '3.16.0' +__version__ = '3.17.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', @@ -160,18 +180,12 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, ``.write()``-supporting file-like object). If *skipkeys* is true then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If *ensure_ascii* is false, then the some chunks written to ``fp`` - may be ``unicode`` instances, subject to normal Python ``str`` to - ``unicode`` coercion rules. Unless ``fp.write()`` explicitly - understands ``unicode`` (as in ``codecs.getwriter()``) this is likely - to cause an error. - - If *check_circular* is false, then the circular reference check - for container types will be skipped and a circular reference will - result in an ``OverflowError`` (or worse). + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If *allow_nan* is false, then it will be a ``ValueError`` to serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) @@ -182,9 +196,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, If *indent* is a string, then JSON array elements and object members will be pretty-printed with a newline followed by that string repeated for each level of nesting. ``None`` (the default) selects the most compact - representation without any newlines. For backwards compatibility with - versions of simplejson earlier than 2.1.0, an integer is also accepted - and is converted to a string with that many spaces. + representation without any newlines. If specified, *separators* should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')`` @@ -289,12 +301,12 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If ``ensure_ascii`` is false, then the return value will be a - ``unicode`` instance subject to normal Python ``str`` to ``unicode`` - coercion rules instead of being escaped to an ASCII ``str``. + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If ``check_circular`` is false, then the circular reference check for container types will be skipped and a circular reference will @@ -318,7 +330,8 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, compact JSON representation, you should specify ``(',', ':')`` to eliminate whitespace. - ``encoding`` is the character encoding for str instances, default is UTF-8. + ``encoding`` is the character encoding for bytes instances, default is + UTF-8. ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. @@ -408,14 +421,11 @@ def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None, use_decimal=False, namedtuple_as_object=True, tuple_as_array=True, **kw): """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing - a JSON document) to a Python object. + a JSON document as `str` or `bytes`) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + `bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding `str` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the @@ -468,11 +478,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, document) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + :class:`bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding :class:`unicode` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the diff --git a/unzip/aws-landing-zone-launch-avm/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-launch-avm/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index a53b85f..0000000 Binary files a/unzip/aws-landing-zone-launch-avm/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-launch-avm/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-launch-avm/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..40383ee Binary files /dev/null and b/unzip/aws-landing-zone-launch-avm/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-launch-avm/state_machine_handler.py b/unzip/aws-landing-zone-launch-avm/state_machine_handler.py index b73c662..bae1269 100644 --- a/unzip/aws-landing-zone-launch-avm/state_machine_handler.py +++ b/unzip/aws-landing-zone-launch-avm/state_machine_handler.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-launch-avm/state_machine_router.py b/unzip/aws-landing-zone-launch-avm/state_machine_router.py index 3bc7940..dff714c 100644 --- a/unzip/aws-landing-zone-launch-avm/state_machine_router.py +++ b/unzip/aws-landing-zone-launch-avm/state_machine_router.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/_yaml.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-state-machine-trigger/_yaml.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 7e0b90b..0000000 Binary files a/unzip/aws-landing-zone-state-machine-trigger/_yaml.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-state-machine-trigger/_yaml.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-state-machine-trigger/_yaml.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..1cc58df Binary files /dev/null and b/unzip/aws-landing-zone-state-machine-trigger/_yaml.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-state-machine-trigger/certifi/__init__.py b/unzip/aws-landing-zone-state-machine-trigger/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/certifi/__init__.py +++ b/unzip/aws-landing-zone-state-machine-trigger/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-state-machine-trigger/certifi/cacert.pem b/unzip/aws-landing-zone-state-machine-trigger/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/certifi/cacert.pem +++ b/unzip/aws-landing-zone-state-machine-trigger/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/assume_role_helper.py b/unzip/aws-landing-zone-state-machine-trigger/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/cloudformation.py b/unzip/aws-landing-zone-state-machine-trigger/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/cloudformation.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/crhelper.py b/unzip/aws-landing-zone-state-machine-trigger/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/crhelper.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/directory_service.py b/unzip/aws-landing-zone-state-machine-trigger/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/directory_service.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/ec2.py b/unzip/aws-landing-zone-state-machine-trigger/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/ec2.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/guardduty.py b/unzip/aws-landing-zone-state-machine-trigger/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/guardduty.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/helper.py b/unzip/aws-landing-zone-state-machine-trigger/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/helper.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/iam.py b/unzip/aws-landing-zone-state-machine-trigger/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/iam.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/kms.py b/unzip/aws-landing-zone-state-machine-trigger/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/kms.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/logger.py b/unzip/aws-landing-zone-state-machine-trigger/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/logger.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/metrics.py b/unzip/aws-landing-zone-state-machine-trigger/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/metrics.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/organizations.py b/unzip/aws-landing-zone-state-machine-trigger/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/organizations.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/pipeline.py b/unzip/aws-landing-zone-state-machine-trigger/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/pipeline.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/s3.py b/unzip/aws-landing-zone-state-machine-trigger/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/s3.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/scp.py b/unzip/aws-landing-zone-state-machine-trigger/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/scp.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/service_catalog.py b/unzip/aws-landing-zone-state-machine-trigger/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/service_catalog.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/sns.py b/unzip/aws-landing-zone-state-machine-trigger/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/sns.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/ssm.py b/unzip/aws-landing-zone-state-machine-trigger/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/ssm.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/state_machine.py b/unzip/aws-landing-zone-state-machine-trigger/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/state_machine.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/lib/sts.py b/unzip/aws-landing-zone-state-machine-trigger/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/lib/sts.py +++ b/unzip/aws-landing-zone-state-machine-trigger/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine-trigger/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-state-machine-trigger/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 373fd8f..0000000 Binary files a/unzip/aws-landing-zone-state-machine-trigger/markupsafe/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-state-machine-trigger/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-state-machine-trigger/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..9c0f86e Binary files /dev/null and b/unzip/aws-landing-zone-state-machine-trigger/markupsafe/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-state-machine-trigger/simplejson/__init__.py b/unzip/aws-landing-zone-state-machine-trigger/simplejson/__init__.py index 0556a7a..7b5687c 100644 --- a/unzip/aws-landing-zone-state-machine-trigger/simplejson/__init__.py +++ b/unzip/aws-landing-zone-state-machine-trigger/simplejson/__init__.py @@ -87,7 +87,6 @@ >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j)) '[2.0, 1.0]' - Using simplejson.tool from the shell to validate and pretty-print:: $ echo '{"json":"obj"}' | python -m simplejson.tool @@ -96,9 +95,30 @@ } $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 3 (char 2) + +Parsing multiple documents serialized as JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def loads_lines(docs): + ... for doc in docs.splitlines(): + ... yield json.loads(doc) + ... + >>> sum(doc["count"] for doc in loads_lines('{"count":1}\n{"count":2}\n{"count":3}\n')) + 6 + +Serializing multiple objects to JSON lines (newline-delimited JSON):: + + >>> import simplejson as json + >>> def dumps_lines(objs): + ... for obj in objs: + ... yield json.dumps(obj, separators=(',',':')) + '\n' + ... + >>> ''.join(dumps_lines([{'count': 1}, {'count': 2}, {'count': 3}])) + '{"count":1}\n{"count":2}\n{"count":3}\n' + """ from __future__ import absolute_import -__version__ = '3.16.0' +__version__ = '3.17.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', @@ -160,18 +180,12 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, ``.write()``-supporting file-like object). If *skipkeys* is true then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If *ensure_ascii* is false, then the some chunks written to ``fp`` - may be ``unicode`` instances, subject to normal Python ``str`` to - ``unicode`` coercion rules. Unless ``fp.write()`` explicitly - understands ``unicode`` (as in ``codecs.getwriter()``) this is likely - to cause an error. - - If *check_circular* is false, then the circular reference check - for container types will be skipped and a circular reference will - result in an ``OverflowError`` (or worse). + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If *allow_nan* is false, then it will be a ``ValueError`` to serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) @@ -182,9 +196,7 @@ def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True, If *indent* is a string, then JSON array elements and object members will be pretty-printed with a newline followed by that string repeated for each level of nesting. ``None`` (the default) selects the most compact - representation without any newlines. For backwards compatibility with - versions of simplejson earlier than 2.1.0, an integer is also accepted - and is converted to a string with that many spaces. + representation without any newlines. If specified, *separators* should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')`` @@ -289,12 +301,12 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, """Serialize ``obj`` to a JSON formatted ``str``. If ``skipkeys`` is false then ``dict`` keys that are not basic types - (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``) + (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``) will be skipped instead of raising a ``TypeError``. - If ``ensure_ascii`` is false, then the return value will be a - ``unicode`` instance subject to normal Python ``str`` to ``unicode`` - coercion rules instead of being escaped to an ASCII ``str``. + If *ensure_ascii* is false (default: ``True``), then the output may + contain non-ASCII characters, so long as they do not need to be escaped + by JSON. When it is true, all non-ASCII characters are escaped. If ``check_circular`` is false, then the circular reference check for container types will be skipped and a circular reference will @@ -318,7 +330,8 @@ def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True, compact JSON representation, you should specify ``(',', ':')`` to eliminate whitespace. - ``encoding`` is the character encoding for str instances, default is UTF-8. + ``encoding`` is the character encoding for bytes instances, default is + UTF-8. ``default(obj)`` is a function that should return a serializable version of obj or raise TypeError. The default simply raises TypeError. @@ -408,14 +421,11 @@ def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None, use_decimal=False, namedtuple_as_object=True, tuple_as_array=True, **kw): """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing - a JSON document) to a Python object. + a JSON document as `str` or `bytes`) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + `bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding `str` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the @@ -468,11 +478,8 @@ def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None, document) to a Python object. *encoding* determines the encoding used to interpret any - :class:`str` objects decoded by this instance (``'utf-8'`` by - default). It has no effect when decoding :class:`unicode` objects. - - Note that currently only encodings that are a superset of ASCII work, - strings of other encodings should be passed in as :class:`unicode`. + :class:`bytes` objects decoded by this instance (``'utf-8'`` by + default). It has no effect when decoding :class:`unicode` objects. *object_hook*, if specified, will be called with the result of every JSON object decoded and its return value will be used in place of the diff --git a/unzip/aws-landing-zone-state-machine-trigger/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-state-machine-trigger/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index a53b85f..0000000 Binary files a/unzip/aws-landing-zone-state-machine-trigger/simplejson/_speedups.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-state-machine-trigger/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-state-machine-trigger/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..40383ee Binary files /dev/null and b/unzip/aws-landing-zone-state-machine-trigger/simplejson/_speedups.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-state-machine/certifi/__init__.py b/unzip/aws-landing-zone-state-machine/certifi/__init__.py index 8e358e4..0d59a05 100644 --- a/unzip/aws-landing-zone-state-machine/certifi/__init__.py +++ b/unzip/aws-landing-zone-state-machine/certifi/__init__.py @@ -1,3 +1,3 @@ from .core import where -__version__ = "2019.09.11" +__version__ = "2019.11.28" diff --git a/unzip/aws-landing-zone-state-machine/certifi/cacert.pem b/unzip/aws-landing-zone-state-machine/certifi/cacert.pem index 70fa91f..a4758ef 100644 --- a/unzip/aws-landing-zone-state-machine/certifi/cacert.pem +++ b/unzip/aws-landing-zone-state-machine/certifi/cacert.pem @@ -4556,3 +4556,47 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG mpv0 -----END CERTIFICATE----- + +# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only +# Label: "Entrust Root Certification Authority - G4" +# Serial: 289383649854506086828220374796556676440 +# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88 +# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01 +# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88 +-----BEGIN CERTIFICATE----- +MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw +gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL +Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg +MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw +BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0 +MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT +MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1 +c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ +bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg +Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ +2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E +T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j +5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM +C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T +DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX +wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A +2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm +nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8 +dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl +N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj +c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD +VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS +5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS +Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr +hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/ +B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI +AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw +H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+ +b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk +2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol +IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk +5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY +n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw== +-----END CERTIFICATE----- diff --git a/unzip/aws-landing-zone-state-machine/lib/assume_role_helper.py b/unzip/aws-landing-zone-state-machine/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-state-machine/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-state-machine/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/cloudformation.py b/unzip/aws-landing-zone-state-machine/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-state-machine/lib/cloudformation.py +++ b/unzip/aws-landing-zone-state-machine/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/crhelper.py b/unzip/aws-landing-zone-state-machine/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-state-machine/lib/crhelper.py +++ b/unzip/aws-landing-zone-state-machine/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-state-machine/lib/directory_service.py b/unzip/aws-landing-zone-state-machine/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-state-machine/lib/directory_service.py +++ b/unzip/aws-landing-zone-state-machine/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/ec2.py b/unzip/aws-landing-zone-state-machine/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-state-machine/lib/ec2.py +++ b/unzip/aws-landing-zone-state-machine/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-state-machine/lib/guardduty.py b/unzip/aws-landing-zone-state-machine/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-state-machine/lib/guardduty.py +++ b/unzip/aws-landing-zone-state-machine/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/helper.py b/unzip/aws-landing-zone-state-machine/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-state-machine/lib/helper.py +++ b/unzip/aws-landing-zone-state-machine/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-state-machine/lib/iam.py b/unzip/aws-landing-zone-state-machine/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-state-machine/lib/iam.py +++ b/unzip/aws-landing-zone-state-machine/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/kms.py b/unzip/aws-landing-zone-state-machine/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-state-machine/lib/kms.py +++ b/unzip/aws-landing-zone-state-machine/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/logger.py b/unzip/aws-landing-zone-state-machine/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-state-machine/lib/logger.py +++ b/unzip/aws-landing-zone-state-machine/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-state-machine/lib/metrics.py b/unzip/aws-landing-zone-state-machine/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-state-machine/lib/metrics.py +++ b/unzip/aws-landing-zone-state-machine/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-state-machine/lib/organizations.py b/unzip/aws-landing-zone-state-machine/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-state-machine/lib/organizations.py +++ b/unzip/aws-landing-zone-state-machine/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/pipeline.py b/unzip/aws-landing-zone-state-machine/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-state-machine/lib/pipeline.py +++ b/unzip/aws-landing-zone-state-machine/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/s3.py b/unzip/aws-landing-zone-state-machine/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-state-machine/lib/s3.py +++ b/unzip/aws-landing-zone-state-machine/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/scp.py b/unzip/aws-landing-zone-state-machine/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-state-machine/lib/scp.py +++ b/unzip/aws-landing-zone-state-machine/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/service_catalog.py b/unzip/aws-landing-zone-state-machine/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-state-machine/lib/service_catalog.py +++ b/unzip/aws-landing-zone-state-machine/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/sns.py b/unzip/aws-landing-zone-state-machine/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-state-machine/lib/sns.py +++ b/unzip/aws-landing-zone-state-machine/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-state-machine/lib/ssm.py b/unzip/aws-landing-zone-state-machine/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-state-machine/lib/ssm.py +++ b/unzip/aws-landing-zone-state-machine/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/state_machine.py b/unzip/aws-landing-zone-state-machine/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-state-machine/lib/state_machine.py +++ b/unzip/aws-landing-zone-state-machine/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/lib/sts.py b/unzip/aws-landing-zone-state-machine/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-state-machine/lib/sts.py +++ b/unzip/aws-landing-zone-state-machine/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-state-machine/state_machine_handler.py b/unzip/aws-landing-zone-state-machine/state_machine_handler.py index b73c662..bae1269 100644 --- a/unzip/aws-landing-zone-state-machine/state_machine_handler.py +++ b/unzip/aws-landing-zone-state-machine/state_machine_handler.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-state-machine/state_machine_router.py b/unzip/aws-landing-zone-state-machine/state_machine_router.py index 3bc7940..dff714c 100644 --- a/unzip/aws-landing-zone-state-machine/state_machine_router.py +++ b/unzip/aws-landing-zone-state-machine/state_machine_router.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-validation/_yaml.cpython-37m-x86_64-linux-gnu.so b/unzip/aws-landing-zone-validation/_yaml.cpython-37m-x86_64-linux-gnu.so deleted file mode 100755 index 7e0b90b..0000000 Binary files a/unzip/aws-landing-zone-validation/_yaml.cpython-37m-x86_64-linux-gnu.so and /dev/null differ diff --git a/unzip/aws-landing-zone-validation/_yaml.cpython-38-x86_64-linux-gnu.so b/unzip/aws-landing-zone-validation/_yaml.cpython-38-x86_64-linux-gnu.so new file mode 100755 index 0000000..1cc58df Binary files /dev/null and b/unzip/aws-landing-zone-validation/_yaml.cpython-38-x86_64-linux-gnu.so differ diff --git a/unzip/aws-landing-zone-validation/bin/build_scripts/lambda_build.py b/unzip/aws-landing-zone-validation/bin/build_scripts/lambda_build.py index 4254d32..8c58747 100644 --- a/unzip/aws-landing-zone-validation/bin/build_scripts/lambda_build.py +++ b/unzip/aws-landing-zone-validation/bin/build_scripts/lambda_build.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/usr/bin/env python diff --git a/unzip/aws-landing-zone-validation/bin/lz_scripts/find_replace.py b/unzip/aws-landing-zone-validation/bin/lz_scripts/find_replace.py index 028ff46..1e298a1 100644 --- a/unzip/aws-landing-zone-validation/bin/lz_scripts/find_replace.py +++ b/unzip/aws-landing-zone-validation/bin/lz_scripts/find_replace.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/assume_role_helper.py b/unzip/aws-landing-zone-validation/lib/assume_role_helper.py index ebcfae2..e17d720 100644 --- a/unzip/aws-landing-zone-validation/lib/assume_role_helper.py +++ b/unzip/aws-landing-zone-validation/lib/assume_role_helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/cloudformation.py b/unzip/aws-landing-zone-validation/lib/cloudformation.py index 18957c7..d3f70d2 100644 --- a/unzip/aws-landing-zone-validation/lib/cloudformation.py +++ b/unzip/aws-landing-zone-validation/lib/cloudformation.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/crhelper.py b/unzip/aws-landing-zone-validation/lib/crhelper.py index 7fcdfa7..8eff19e 100644 --- a/unzip/aws-landing-zone-validation/lib/crhelper.py +++ b/unzip/aws-landing-zone-validation/lib/crhelper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import threading diff --git a/unzip/aws-landing-zone-validation/lib/directory_service.py b/unzip/aws-landing-zone-validation/lib/directory_service.py index 5fc8e10..8d92246 100644 --- a/unzip/aws-landing-zone-validation/lib/directory_service.py +++ b/unzip/aws-landing-zone-validation/lib/directory_service.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/ec2.py b/unzip/aws-landing-zone-validation/lib/ec2.py index 7463c00..c3cd64c 100644 --- a/unzip/aws-landing-zone-validation/lib/ec2.py +++ b/unzip/aws-landing-zone-validation/lib/ec2.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python from botocore.exceptions import ClientError diff --git a/unzip/aws-landing-zone-validation/lib/guardduty.py b/unzip/aws-landing-zone-validation/lib/guardduty.py index 700eaef..7990ecb 100644 --- a/unzip/aws-landing-zone-validation/lib/guardduty.py +++ b/unzip/aws-landing-zone-validation/lib/guardduty.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/helper.py b/unzip/aws-landing-zone-validation/lib/helper.py index 3d431f8..561764e 100644 --- a/unzip/aws-landing-zone-validation/lib/helper.py +++ b/unzip/aws-landing-zone-validation/lib/helper.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import re diff --git a/unzip/aws-landing-zone-validation/lib/iam.py b/unzip/aws-landing-zone-validation/lib/iam.py index f5e6fcd..f8c8018 100644 --- a/unzip/aws-landing-zone-validation/lib/iam.py +++ b/unzip/aws-landing-zone-validation/lib/iam.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/kms.py b/unzip/aws-landing-zone-validation/lib/kms.py index 5b8e1d2..3db2690 100644 --- a/unzip/aws-landing-zone-validation/lib/kms.py +++ b/unzip/aws-landing-zone-validation/lib/kms.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/logger.py b/unzip/aws-landing-zone-validation/lib/logger.py index b6c4156..902a149 100644 --- a/unzip/aws-landing-zone-validation/lib/logger.py +++ b/unzip/aws-landing-zone-validation/lib/logger.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-validation/lib/metrics.py b/unzip/aws-landing-zone-validation/lib/metrics.py index 613a08c..3163375 100644 --- a/unzip/aws-landing-zone-validation/lib/metrics.py +++ b/unzip/aws-landing-zone-validation/lib/metrics.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### import json diff --git a/unzip/aws-landing-zone-validation/lib/organizations.py b/unzip/aws-landing-zone-validation/lib/organizations.py index eae64fe..026452c 100644 --- a/unzip/aws-landing-zone-validation/lib/organizations.py +++ b/unzip/aws-landing-zone-validation/lib/organizations.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/pipeline.py b/unzip/aws-landing-zone-validation/lib/pipeline.py index 8de4d1d..87feaae 100644 --- a/unzip/aws-landing-zone-validation/lib/pipeline.py +++ b/unzip/aws-landing-zone-validation/lib/pipeline.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/s3.py b/unzip/aws-landing-zone-validation/lib/s3.py index 76a8dda..a0d04d9 100644 --- a/unzip/aws-landing-zone-validation/lib/s3.py +++ b/unzip/aws-landing-zone-validation/lib/s3.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/scp.py b/unzip/aws-landing-zone-validation/lib/scp.py index f2bd42e..2ca76ab 100644 --- a/unzip/aws-landing-zone-validation/lib/scp.py +++ b/unzip/aws-landing-zone-validation/lib/scp.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/service_catalog.py b/unzip/aws-landing-zone-validation/lib/service_catalog.py index a04a1e4..a5d8fbb 100644 --- a/unzip/aws-landing-zone-validation/lib/service_catalog.py +++ b/unzip/aws-landing-zone-validation/lib/service_catalog.py @@ -1,15 +1,14 @@ - -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### # !/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/sns.py b/unzip/aws-landing-zone-validation/lib/sns.py index 4ae15ab..efcad3b 100644 --- a/unzip/aws-landing-zone-validation/lib/sns.py +++ b/unzip/aws-landing-zone-validation/lib/sns.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python import boto3 diff --git a/unzip/aws-landing-zone-validation/lib/ssm.py b/unzip/aws-landing-zone-validation/lib/ssm.py index 7f18c25..19bcd4a 100644 --- a/unzip/aws-landing-zone-validation/lib/ssm.py +++ b/unzip/aws-landing-zone-validation/lib/ssm.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/state_machine.py b/unzip/aws-landing-zone-validation/lib/state_machine.py index 793031b..807d2c6 100644 --- a/unzip/aws-landing-zone-validation/lib/state_machine.py +++ b/unzip/aws-landing-zone-validation/lib/state_machine.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/unzip/aws-landing-zone-validation/lib/sts.py b/unzip/aws-landing-zone-validation/lib/sts.py index ca783f1..f06c413 100644 --- a/unzip/aws-landing-zone-validation/lib/sts.py +++ b/unzip/aws-landing-zone-validation/lib/sts.py @@ -1,14 +1,14 @@ -###################################################################################################################### -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. # -# # -# Licensed under the Amazon Software License (the "License"). You may not use this file except in compliance # -# with the License. A copy of the License is located at # -# # -# http://aws.amazon.com/asl/ # -# # -# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +###################################################################################################################### +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# # +# Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except in compliance # +# with the License. A copy of the License is located at # +# # +# http://www.apache.org/licenses/ # +# # +# or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES # +# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # +# and limitations under the License. # ###################################################################################################################### #!/bin/python diff --git a/zip/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.template b/zip/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.template new file mode 100644 index 0000000..685b611 --- /dev/null +++ b/zip/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.template @@ -0,0 +1,260 @@ +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License Version 2.0 (the "License"). You may not +# use this file except in compliance with the License. A copy of the License is +# located at +# +# http://www.apache.org/licenses/ +# +# or in the "license" file accompanying this file. This file is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or +# implied. See the License for the specific language governing permissions and +# limitations under the License. +# +AWSTemplateFormatVersion: '2010-09-09' +Description: AWS Managed AD and Directory Connector for AWS SSO - Add-On Product + +Parameters: + #General Inputs; applies to all Add-Ons + AccountName: + Description: What is the Account name where Shared-services VPC exist? + Type: String + Default: shared-services + + PrimaryAccountName: + Description: AD Connector must be deployed in Organizations Master account + Type: String + AllowedValues: + - primary + Default: primary + + OUName: + Description: In which Organizational Unit do the above accounts belong to? + Type: String + Default: core + + ADRegion: + Description: In which region does Shared-services VPC exists? + Type: String + + SSORegion: + Description: AD Connector must be deployed in AWS SSO supported region(s) + Type: String + + MergeAddOn: + Type: String + Description: Do you want to trigger the pipeline right away to deploy the Add-On? + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + +#Add-On specific Inputs +# Active Directory + DomainDNSName: + AllowedPattern: "[a-zA-Z0-9\\-]+\\..+" + Default: example.com + Description: Fully qualified domain name (FQDN) of the forest root domain e.g. example.com + MaxLength: 25 + MinLength: 3 + Type: String + DomainNetBIOSName: + AllowedPattern: "[a-zA-Z0-9\\-]+" + Default: example + Description: NetBIOS name of the domain (up to 15 characters) for users of earlier versions of Windows e.g. EXAMPLE + MaxLength: 15 + MinLength: 1 + Type: String + PasswordNeverExpires: + Description: By default AWS Managed AD passwords will expire every 42 days. Change this value to 'Yes' if you want your Active Directory admin & connector user passwords to never expire. + AllowedValues: + - 'Yes' + - 'No' + Default: 'No' + Type: String + +# RDGW Configuration + RDGWInstanceType: + Description: Amazon EC2 instance type for the Remote Desktop Gateway instances + Type: String + Default: t2.micro + AllowedValues: + - t2.micro + - t2.large + - m3.large + - m3.xlarge + - m3.2xlarge + - m4.large + - m4.xlarge + - m4.2xlarge + - m4.4xlarge + - m5.large + - m5.xlarge + - m5.2xlarge + - m5.4xlarge + RDGWCIDR: + AllowedPattern: "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$" + Description: Allowed CIDR Block for external access to the Remote Desktop Gateways + Type: String + NumberOfRDGWHosts: + AllowedValues: + - '1' + - '2' + - '3' + - '4' + Default: '1' + Description: Enter the number of Remote Desktop Gateway hosts to create + Type: String + + # AWS SSO (AD Connector) Network Configuration + ADConnectorVPCCIDR: + Type: String + Default: '10.249.0.0/24' + AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$ + ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28 + Description: CIDR block for AD Connector to use for connecting AWS SSO to Active Directory + ADConnectorPrivateSubnet1CIDR: + Type: String + Default: '10.249.0.0/27' + AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$ + ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28 + Description: CIDR block for AD Connector VPC subnet created in AZ1 + ADConnectorPrivateSubnet2CIDR: + Type: String + Default: '10.249.0.32/27' + AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$ + ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28 + Description: CIDR block for AD Connector VPC subnet created in AZ2 +# Flow logs retention in days + LogsRetentionInDays: + Description: 'Specifies the number of days you want to retain VPC flow logs in each account.' + Type: Number + Default: 90 + AllowedValues: [1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 3653] + + +Metadata: + AWS::CloudFormation::Interface: + ParameterGroups: + - Label: + default: Account/Region Selection + Parameters: + - AccountName + - PrimaryAccountName + - OUName + - ADRegion + - SSORegion + - Label: + default: Landing Zone Pipeline Configuration + Parameters: + - MergeAddOn + - Label: + default: Active Directory Configuration + Parameters: + - DomainDNSName + - DomainNetBIOSName + - PasswordNeverExpires + - RDGWInstanceType + - RDGWCIDR + - NumberOfRDGWHosts + - Label: + default: AWS SSO Network Configuration + Parameters: + - ADConnectorVPCCIDR + - ADConnectorPrivateSubnet1CIDR + - ADConnectorPrivateSubnet2CIDR + - LogsRetentionInDays + + ParameterLabels: + OUName: + default: Organizational Unit Name + AccountName: + default: Core Account Name + PrimaryAccountName: + default: Master Account Name + ADRegion: + default: AWS Managed AD Region + SSORegion: + default: AWS SSO Region + MergeAddOn: + default: Auto Deploy Add-On Product + DomainDNSName: + default: Domain DNS Name + DomainNetBIOSName: + default: Domain Net BIOS Name + RDGWInstanceType: + default: RDGW Instance Type + RDGWCIDR: + default: Allowed Remote Desktop External Access CIDR + NumberOfRDGWHosts: + default: Number of RDGW Hosts + ADConnectorVPCCIDR: + default: AD Connector VPC CIDR + ADConnectorPrivateSubnet1CIDR: + default: AD Connector VPC Subnet 1 + ADConnectorPrivateSubnet2CIDR: + default: AD Connector VPC Subnet 2 + LogsRetentionInDays: + default: VPC Flow Logs Retention In Days + PasswordNeverExpires: + default: Password Never Expires + + +Mappings: + BucketConfiguration: + SourceBucketName: + Name: solutions-reference + SourceKeyName: + Name: aws-landing-zone/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.zip + DestinationKeyName: + Name: aws-landing-zone-configuration.zip + LambdaFunction: + Logging: + Level: 'info' + +Resources: + LandingZoneAddOnDeploymentLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + Code: + S3Bucket: !Sub solutions-${AWS::Region} + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-add-on-config-deployer.zip + Description: AWS Landing Zone Add-On Deployment Lambda + Handler: add_on_config_deployer.lambda_handler + MemorySize: '512' + Role: !Sub arn:aws:iam::${AWS::AccountId}:role/LandingZoneDeploymentLambdaRole + Runtime: python3.6 + Timeout: '300' + TracingConfig: + Mode: Active + LandingZoneAddOnConfigDeployer: + Type: Custom::AddOnConfigDeployer + Properties: + bucket_config: + destination_bucket_name: !Sub aws-landing-zone-configuration-${AWS::AccountId}-${AWS::Region} + destination_s3_key: !FindInMap [BucketConfiguration, DestinationKeyName, Name] + source_bucket_name: !FindInMap [BucketConfiguration, SourceBucketName, Name] + source_s3_key: !FindInMap [BucketConfiguration, SourceKeyName, Name] + merge_add_on: !Ref MergeAddOn + find_replace: + - file_name: user-input.yaml + parameters: + ad_region: !Ref ADRegion + ad_conn_region: !Ref SSORegion + core_ou: !Ref OUName + core_account: !Ref AccountName + domain_dns_name: !Ref DomainDNSName + domain_net_bios_name: !Ref DomainNetBIOSName + no_of_rdgw_hosts: !Ref NumberOfRDGWHosts + rdgw_instance_type: !Ref RDGWInstanceType + rdgw_cidr: !Ref RDGWCIDR + password_never_expires: !Ref PasswordNeverExpires + private_subnet1a_cidr: !Ref ADConnectorPrivateSubnet1CIDR + private_subnet2a_cidr: !Ref ADConnectorPrivateSubnet2CIDR + vpc_cidr: !Ref ADConnectorVPCCIDR + logs_retention_in_days: !Ref LogsRetentionInDays + alz_region: !Ref AWS::Region + ServiceToken: !GetAtt LandingZoneAddOnDeploymentLambda.Arn diff --git a/zip/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.zip b/zip/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.zip new file mode 100644 index 0000000..0995b30 Binary files /dev/null and b/zip/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.zip differ diff --git a/zip/v2.3.1/add-on/aws-centralized-logging-solution.template b/zip/v2.3.1/add-on/aws-centralized-logging-solution.template new file mode 100644 index 0000000..211b94d --- /dev/null +++ b/zip/v2.3.1/add-on/aws-centralized-logging-solution.template @@ -0,0 +1,176 @@ +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License Version 2.0 (the "License"). You may not +# use this file except in compliance with the License. A copy of the License is +# located at +# +# http://www.apache.org/licenses/ +# +# or in the "license" file accompanying this file. This file is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or +# implied. See the License for the specific language governing permissions and +# limitations under the License. +# +AWSTemplateFormatVersion: '2010-09-09' +Description: AWS Centralized Logging Solution - Add-On Product + +Parameters: + #General Inputs; applies to all Add-Ons + AccountName: + Description: In which Account do you wish to deploy? + Type: String + Default: shared-services + + OUName: + Description: Which OU does the above Account belong to? + Type: String + Default: core + + Region: + Description: In Which Region do you wish to deploy Centralized Logging Hub? + Type: String + + MergeAddOn: + Type: String + Description: Do you want to trigger the pipeline right away to deploy the Add-On? + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + + AVMProduct: + Description: AWS Landing Zone Baseline Service Catalog Product + Type: CommaDelimitedList + Default: AWS-Landing-Zone-Account-Vending-Machine + + #Add-On specific Inputs + DOMAINNAME: + Description: Name for the Amazon ES domain that this template will create. Domain names must start with a lowercase letter and must be between 3 and 28 characters. Valid characters are a-z (lowercase only), 0-9. + Type: String + Default: centralizedlogging + + # Email address for the Elasticsearch domain admin + DomainAdminEmail: + Description: An email address to send Amazon Elasticsearch service CloudWatch alarm notifications + Type: String + AllowedPattern: ^[_A-Za-z0-9-\+\.]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$ + + # Email address for Cognito Admin user + CognitoAdminEmail: + Description: Email address for creating a Cognito user to access Kibana dashboard + Type: String + AllowedPattern: ^[_A-Za-z0-9-\+\.]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$ + + # ES cluster size + ClusterSize: + Description: Amazon ES cluster size; small (2 data nodes), medium (4 data nodes), large (10 data nodes) + Type: String + Default: Small + AllowedValues: + - Small + - Medium + - Large + + SpokeRegions: + Description: In Which Regions (comma seperated list) do you wish to deploy Centralized Logging Spokes? + Type: CommaDelimitedList + +Metadata: + AWS::CloudFormation::Interface: + ParameterGroups: + - Label: + default: Account/Region Selection + Parameters: + - AccountName + - OUName + - Region + - AVMProduct + - Label: + default: Landing Zone Pipeline Configuration + Parameters: + - MergeAddOn + - Label: + default: AWS Centralized Logging Solution + Parameters: + - DOMAINNAME + - DomainAdminEmail + - ClusterSize + - CognitoAdminEmail + - SpokeRegions + + ParameterLabels: + OUName: + default: Organizational Unit Name + AccountName: + default: Account Name + Region: + default: Centralized Logging Hub Region + AVMProduct: + default: Baseline Product Name + MergeAddOn: + default: Auto Deploy Add-On Product + DOMAINNAME: + default: Elasticsearch Domain name + DomainAdminEmail: + default: Elasticsearch notification address + ClusterSize: + default: Elasticsearch Cluster Size + CognitoAdminEmail: + default: Cognito user email address + SpokeRegions: + default: Centralized Logging Spoke Regions + + +Mappings: + BucketConfiguration: + SourceBucketName: + Name: solutions-reference + SourceKeyName: + Name: aws-landing-zone/v2.3.1/add-on/aws-centralized-logging-solution.zip + DestinationKeyName: + Name: aws-landing-zone-configuration.zip + LambdaFunction: + Logging: + Level: 'info' + +Resources: + LandingZoneAddOnDeploymentLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + Code: + S3Bucket: !Sub solutions-${AWS::Region} + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-add-on-config-deployer.zip + Description: AWS Landing Zone Add-On Deployment Lambda + Handler: add_on_config_deployer.lambda_handler + MemorySize: '512' + Role: !Sub arn:aws:iam::${AWS::AccountId}:role/LandingZoneDeploymentLambdaRole + Runtime: python3.6 + Timeout: '300' + TracingConfig: + Mode: Active + LandingZoneAddOnConfigDeployer: + Type: Custom::AddOnConfigDeployer + Properties: + bucket_config: + destination_bucket_name: !Sub aws-landing-zone-configuration-${AWS::AccountId}-${AWS::Region} + destination_s3_key: !FindInMap [BucketConfiguration, DestinationKeyName, Name] + source_bucket_name: !FindInMap [BucketConfiguration, SourceBucketName, Name] + source_s3_key: !FindInMap [BucketConfiguration, SourceKeyName, Name] + merge_add_on: !Ref MergeAddOn + find_replace: + - file_name: user-input.yaml + parameters: + region: !Ref Region + core_ou: !Ref OUName + core_account: !Ref AccountName + avm_products: !Ref AVMProduct + domain_name: !Ref DOMAINNAME + domain_admin_email: !Ref DomainAdminEmail + cognito_admin_email: !Ref CognitoAdminEmail + cluster_size: !Ref ClusterSize + spoke_regions: !Ref SpokeRegions + cloud_trail_region: !Sub ${AWS::Region} + ServiceToken: !GetAtt LandingZoneAddOnDeploymentLambda.Arn diff --git a/zip/v2.3.1/add-on/aws-centralized-logging-solution.zip b/zip/v2.3.1/add-on/aws-centralized-logging-solution.zip new file mode 100644 index 0000000..6f3647e Binary files /dev/null and b/zip/v2.3.1/add-on/aws-centralized-logging-solution.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-add-on-config-deployer.zip b/zip/v2.3.1/aws-landing-zone-add-on-config-deployer.zip new file mode 100644 index 0000000..edc822a Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-add-on-config-deployer.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-addon-publisher.zip b/zip/v2.3.1/aws-landing-zone-addon-publisher.zip new file mode 100644 index 0000000..dc8d70c Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-addon-publisher.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-avm-cr.zip b/zip/v2.3.1/aws-landing-zone-avm-cr.zip new file mode 100644 index 0000000..6b908f1 Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-avm-cr.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-config-deployer.zip b/zip/v2.3.1/aws-landing-zone-config-deployer.zip new file mode 100644 index 0000000..9324eb0 Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-config-deployer.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-configuration.zip b/zip/v2.3.1/aws-landing-zone-configuration.zip new file mode 100644 index 0000000..f21b4fb Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-configuration.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-handshake-state-machine.zip b/zip/v2.3.1/aws-landing-zone-handshake-state-machine.zip new file mode 100644 index 0000000..8ac8d0d Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-handshake-state-machine.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-initiation.template b/zip/v2.3.1/aws-landing-zone-initiation.template new file mode 100644 index 0000000..160a7a7 --- /dev/null +++ b/zip/v2.3.1/aws-landing-zone-initiation.template @@ -0,0 +1,5807 @@ +# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License Version 2.0 (the "License"). You may not +# use this file except in compliance with the License. A copy of the License is +# located at +# +# http://www.apache.org/licenses/ +# +# or in the "license" file accompanying this file. This file is distributed on +# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or +# implied. See the License for the specific language governing permissions and +# limitations under the License. +# +AWSTemplateFormatVersion: '2010-09-09' +Description: '(SO0044) - AWS Landing Zone Version v2.3.1, AddOns Version aov1.0' + +Parameters: + SharedServicesAccountEmail: + Description: Email address used to create a centralized Shared Services account + Type: String + MinLength: 6 + MaxLength: 64 + AllowedPattern: ^[_A-Za-z0-9-\+\.]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$ + ConstraintDescription: Account Email can contain only ASCII characters. This must be in the format of something@email.com + LoggingAccountEmail: + Description: Email address used create a centralized audit log account + Type: String + MinLength: 6 + MaxLength: 64 + AllowedPattern: ^[_A-Za-z0-9-\+\.]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$ + ConstraintDescription: Account Email can contain only ASCII characters. This must be in the format of something@email.com + SecurityAccountEmail: + Description: Email address used create a centralized security account + Type: String + MinLength: 6 + MaxLength: 64 + AllowedPattern: ^[_A-Za-z0-9-\+\.]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$ + ConstraintDescription: Account Email can contain only ASCII characters. This must be in the format of something@email.com + SecurityAlertEmail: + Description: Email for all the Security Alerts related to Landing Zone + Type: String + MinLength: 6 + MaxLength: 64 + AllowedPattern: ^[_A-Za-z0-9-\+\.]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9]+)*(\.[A-Za-z]{2,})$ + ConstraintDescription: Security Alert Email can contain only ASCII characters. This must be in the format of something@email.com + SubscribeAllChangeEventsEmailToTopic: + Type: String + Default: 'No' + Description: Indicates whether AllConfigurationEmail will be subscribed to the AllConfigurationTopicName topic. + AllowedValues: + - 'Yes' + - 'No' + AllChangeEventsEmail: + Description: Email for all the alerts related to Landing Zone + Type: String + Default: '' + MinLength: 0 + MaxLength: 64 + NestedOUDelimiter: + Description: Delimiter for nested OU names in Manifest file + Type: String + Default: "Colon (:)" + AllowedValues: + - "Colon (:)" + - "Dot (.)" + - "Hyphen (-)" + - "Underscore (_)" + - "Semicolon (;)" + - "Hash (#)" + - "Pipe (|)" + CoreOUName: + Description: Name of Organizations Unit for the Core Accounts. CloudFormation template validation only allows '-' (hyphen, '.' (period) special characters in the OU names + Type: String + Default: core + MinLength: 1 + MaxLength: 128 + NonCoreOUNames: + Description: Comma separated list of additional Organizations Unit names for organizing additional AWS accounts by applications, business units, etc. CloudFormation template validation only allows '-' (hyphen, '.' (period) special characters in the OU names + Default: applications + Type: CommaDelimitedList + PipelineApprovalStage: + Description: Do you want to add a manual approval stage to the AWS Landing Zone Configuration Pipeline? + AllowedValues: + - 'Yes' + - 'No' + Default: 'No' + Type: String + PipelineApprovalEmail: + Description: (Not required if Pipeline Approval Stage = 'No') Email for notifying that the Landing Zone pipeline is waiting for an Approval + Type: String + BuildLandingZone: + Description: Do you want to trigger the pipeline right away to build the Landing Zone? + AllowedValues: + - 'Yes' + - 'No' + Default: 'Yes' + Type: String + LockStackSetsExecutionRole: + Description: Do you want to lock down the AWS StackSetsExecution role in the member accounts? + AllowedValues: + - 'Yes' + - 'No' + Default: 'Yes' + Type: String + +# Shared Services VPC + VPCOptions: + Type: String + Default: Shared-Services-Network-3-AZs + Description: Create a shared service VPC with subnets in 2 or 3 AZs. The 3 AZ option is recommended for all regions except when the desired AD Region only has 2 AZs. + AllowedValues: + - Shared-Services-Network-2-AZs + - Shared-Services-Network-3-AZs + VPCCidr: + Type: String + Default: '100.64.0.0/16' + AllowedPattern: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(1[6-9]|2[0-8]))$ + ConstraintDescription: CIDR block parameter must be in the form x.x.x.x/16-28 + Description: CIDR block for the Shared Services VPC + +# AWS Config + EnableAllRegions: + Type: String + Description: "AWS recommends only changing this option to speed up the configuration of POC or demo environments. This setting controls the regions that will be monitored by Amazon GuardDuty, AWS Config/Rules, and security notifications. Monitoring in all AWS regions is highly recommended." + Default: 'All regions' + AllowedValues: + - 'All regions' + - 'Current region only' + +# AWS Config Rules + EnableEncryptedVolumesRule: + Type: String + Description: "Enables the AWS managed encrypted-volumes config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableRdsEncryptionRule: + Type: String + Description: "Enables the AWS managed rds-storage-encrypted config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableS3PublicReadRule: + Type: String + Description: "Enables the AWS managed s3-bucket-public-read-prohibited config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableS3PublicWriteRule: + Type: String + Description: "Enables the AWS managed s3-bucket-public-write-prohibited config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableS3ServerSideEncryptionRule: + Type: String + Description: "Enables the AWS managed s3-bucket-server-side-encryption-enabled config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableRootMfaRule: + Type: String + Description: "Enables the AWS managed root-account-mfa-enabled config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableIamPasswordPolicyRule: + Type: String + Description: "Enables the AWS managed iam-password-policy config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableRestrictedCommonPortsRule: + Type: String + Description: "Enables the AWS managed restricted-common-ports config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + EnableRestrictedSshRule: + Type: String + Description: "Enables the AWS managed restricted-ssh config rule." + Default: 'Yes' + AllowedValues: + - 'Yes' + - 'No' + +# Flow logs retention in days + LogsRetentionInDays: + Description: 'Specifies the number of days you want to retain VPC flow logs in each account.' + Type: Number + Default: 90 + AllowedValues: [1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, 3653] + +# Add-On Publisher Parameters + + AddonsManagedParameter: + Type: String + Description: "Should AWS automatically make new versions of Add-On(s) available in the Add-On portfolio?" + Default: 'AWS Managed' + AllowedValues: + - 'AWS Managed' + - 'Manual Updates' + + NotificationAddonsEmailParameter: + Type: String + Description: Email to notify customers that new add-on(s) are available in the Add-On Portfolio. + Default: '' + MinLength: 0 + MaxLength: 64 + +Metadata: + AWS::CloudFormation::Interface: + ParameterGroups: + - Label: + default: Landing Zone Core Account Configuration + Parameters: + - SharedServicesAccountEmail + - LoggingAccountEmail + - SecurityAccountEmail + - NestedOUDelimiter + - CoreOUName + - NonCoreOUNames + - SecurityAlertEmail + - LockStackSetsExecutionRole + - SubscribeAllChangeEventsEmailToTopic + - AllChangeEventsEmail + - Label: + default: Landing Zone Pipeline Configuration + Parameters: + - PipelineApprovalStage + - PipelineApprovalEmail + - BuildLandingZone + - Label: + default: Shared Services VPC Configuration + Parameters: + - VPCOptions + - VPCCidr + - Label: + default: VPC Flow Logs Retention Policy + Parameters: + - LogsRetentionInDays + - Label: + default: AWS Security and Configuration services + Parameters: + - EnableAllRegions + - Label: + default: AWS Config Rules + Parameters: + - EnableEncryptedVolumesRule + - EnableRdsEncryptionRule + - EnableS3PublicReadRule + - EnableS3PublicWriteRule + - EnableS3ServerSideEncryptionRule + - EnableRootMfaRule + - EnableIamPasswordPolicyRule + - EnableRestrictedCommonPortsRule + - EnableRestrictedSshRule + - Label: + default: "Add-On Publisher Configuration" + Parameters: + - AddonsManagedParameter + - NotificationAddonsEmailParameter + + ParameterLabels: + SharedServicesAccountEmail: + default: Shared Services Account Email Address + LoggingAccountEmail: + default: Log Archive Account Email Address + SecurityAccountEmail: + default: Security Account Email Address + NestedOUDelimiter: + default: Nested OU Name Delimiter + CoreOUName: + default: Core OU Name + NonCoreOUNames: + default: Non Core OU Names + SecurityAlertEmail: + default: Security Alert Email Address + LockStackSetsExecutionRole: + default: Lock StackSetsExecution Role + AllChangeEventsEmail: + default: All Change Events Email + SubscribeAllChangeEventsEmailToTopic: + default: Subscribe All Change Events Email to Topic + PipelineApprovalStage: + default: Pipeline Approval Stage + PipelineApprovalEmail: + default: Pipeline Approval Email Address + BuildLandingZone: + default: Auto Build Landing Zone + VPCOptions: + default: Shared Services VPC Options + VPCCidr: + default: Shared Services VPC CIDR + EnableAllRegions: + default: Enable AWS Security and Configuration Monitoring in + EnableEncryptedVolumesRule: + default: Enable Encrypted Volumes Rule + EnableRdsEncryptionRule: + default: Enable RDS Encryption Rule + EnableS3PublicReadRule: + default: Enable S3 Public Read Rule + EnableS3PublicWriteRule: + default: Enable S3 Public Write Rule + EnableS3ServerSideEncryptionRule: + default: Enable S3 SSE Policy Rule + EnableRootMfaRule: + default: Enable Root MFA Rule + EnableIamPasswordPolicyRule: + default: Enable IAM Password Policy Rule + EnableRestrictedCommonPortsRule: + default: Enable Restricted Common Ports Rule + EnableRestrictedSshRule: + default: Enable Restricted SSH Rule + LogsRetentionInDays: + default: VPC Flow Logs Retention In Days + + AddonsManagedParameter: + default: "AWS Manages Service Catalog Add-On Portfolio?" + NotificationAddonsEmailParameter: + default: "Add-On Update Notification Email" + +Mappings: + SSMParameterNames: + LandingZoneSCProductConstraintRoleParameterName: + Name: /org/primary/service_catalog/constraint/role_arn + LandingZoneSCPortfolioPrincipalRoleParameterName: + Name: /org/primary/service_catalog/principal/role_arn + LandingZoneSecurityAlertEmailParameterName: + Name: /org/primary/security_alert_email_id + LandingZoneAllAlertEmailParameterName: + Name: /org/primary/all_alerts_email_id + LandingZoneLambdaParameterName: + Name: /org/primary/avm_lambda_arn + BucketConfiguration: + SourceBucketName: + Name: "solutions-reference" + SourceKeyName: + Name: aws-landing-zone/v2.3.1/aws-landing-zone-configuration.zip + LandingZonePipelineS3TriggerKey: + Name: aws-landing-zone-configuration.zip + LandingZonePipelineS3NonTriggerKey: + Name: _aws-landing-zone-configuration.zip + KMS: + Alias: + Name: AwsLandingZoneKMSKey + VPC: + Shared-Services-Network-2-AZs: + AvailabilityZones: 2 + PublicSubnets: + - PublicSubnet1CIDR + - PublicSubnet2CIDR + PrivateSubnets: + - PrivateSubnet1ACIDR + - PrivateSubnet2ACIDR + CreateAdditionalPrivateSubnets: 'false' + CreatePrivateSubnets: 'true' + CreatePublicSubnets: 'true' + TransitVPC: 'false' + Shared-Services-Network-3-AZs: + AvailabilityZones: 3 + PublicSubnets: + - PublicSubnet1CIDR + - PublicSubnet2CIDR + - PublicSubnet3CIDR + PrivateSubnets: + - PrivateSubnet1ACIDR + - PrivateSubnet2ACIDR + - PrivateSubnet3ACIDR + CreateAdditionalPrivateSubnets: 'false' + CreatePrivateSubnets: 'true' + CreatePublicSubnets: 'true' + TransitVPC: 'false' + Solution: + Metrics: + SendAnonymousData: 'Yes' + Data: + AddonTemplate: 'https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.1/aws-landing-zone-initiation.template' + LambdaFunction: + Logging: + Level: 'info' + FindReplace: + Values: + NoneType: 'null' + BoolType: 'yes,no,Yes,No,True,False,true,false' # no spaces are allowed in this string, comma is the only allowed delimiter + +Conditions: + IsPipelineApprovalStageCondition: !Equals [!Ref PipelineApprovalStage, 'Yes'] + IsBuildLandingZoneCondition: !Equals [!Ref BuildLandingZone, 'Yes'] + IsSubscribeToTopicCondition: !Equals [!Ref SubscribeAllChangeEventsEmailToTopic, 'Yes'] + IsAddonsManagedCondition: !Equals [!Ref AddonsManagedParameter, 'AWS Managed'] + IsAddonsEmailEmpty: !Equals [!Ref NotificationAddonsEmailParameter, ''] + +Resources: + # IAM Role for Service Catalog Principal + LandingZoneSCPortfolioPrincipalRole: + Type: AWS::IAM::Role + Properties: + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + ManagedPolicyArns: + - arn:aws:iam::aws:policy/AWSServiceCatalogEndUserFullAccess + # IAM Role for Service Catalog Product Constraint + LandingZoneSCProductConstraintRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: F3 + reason: "Allow catalog-user:* : required by AWS Service Catalog Launch Constraints Documentation" + # https://docs.aws.amazon.com/servicecatalog/latest/adminguide/constraints-launch.html + - id: W11 + reason: "Allow Resource * for Cloudformation/S3 API: required by AWS Service Catalog Launch Constraints Documentation" + # https://docs.aws.amazon.com/servicecatalog/latest/adminguide/constraints-launch.html + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + Properties: + RoleName: LandingZoneSCProductConstraintRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: servicecatalog.amazonaws.com + Action: sts:AssumeRole + Path: / + ManagedPolicyArns: + - arn:aws:iam::aws:policy/AWSLambdaFullAccess + Policies: + - PolicyName: LZAVMProductPolicy + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - Fn::Sub: 'arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*' + - Effect: Allow + Action: + - catalog-user:* + - cloudformation:CreateStack + - cloudformation:DeleteStack + - cloudformation:DescribeStackEvents + - cloudformation:DescribeStacks + - cloudformation:GetTemplateSummary + - cloudformation:SetStackPolicy + - cloudformation:ValidateTemplate + - cloudformation:UpdateStack + - s3:GetObject + Resource: '*' + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: Allow + Action: + - states:DescribeStateMachine + - states:DescribeStateMachineForExecution + - states:DescribeExecution + - states:ListExecutions + - states:StartExecution + - states:StopExecution + Resource: + - Fn::Sub: ${OrganizationsStateMachine} + - Fn::Sub: ${ServiceControlPolicyMachine} + - Fn::Sub: ${StackSetStateMachine} + - Fn::Sub: ${ServiceCatalogStateMachine} + - Fn::Sub: ${LaunchAVMStateMachine} + - Fn::Sub: ${CheckAVMExistsStateMachine} + # IAM Role for CloudFormation StackSet Administration in Master account + AWSCloudFormationStackSetAdministrationRole: + Metadata: + cfn_nag: + rules_to_suppress: + - id: W11 + reason: "Allow * in the ARN of the execution role to allow cross account access to user created child account in the AWS Organizations" + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + Type: AWS::IAM::Role + Properties: + RoleName: AWSCloudFormationStackSetAdministrationRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: cloudformation.amazonaws.com + Action: + - sts:AssumeRole + Path: / + Policies: + - PolicyName: AssumeRole-AWSCloudFormationStackSetExecutionRole + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - sts:AssumeRole + Resource: + - "arn:aws:iam::*:role/AWSCloudFormationStackSetExecutionRole" + + # IAM Role for CloudFormation StackSet Execution in Master account + AWSCloudFormationStackSetExecutionRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: W28 + reason: "The role name is defined to allow cross account access from the master account." + - id: W43 + reason: "Temporary exception to be removed post v2.3.1" + Properties: + RoleName: AWSCloudFormationStackSetExecutionRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + AWS: + - Fn::Sub: ${AWSCloudFormationStackSetAdministrationRole.Arn} + - Fn::Sub: ${StateMachineLambdaRole.Arn} + - Fn::Sub: ${LandingZoneLambdaRole.Arn} + Action: + - sts:AssumeRole + ManagedPolicyArns: + - arn:aws:iam::aws:policy/AdministratorAccess + + # SSM Parameter to store the IAM Role ARN of Service Catalog Principal + LandingZoneSCPortfolioPrincipalRoleParameter: + DependsOn: + - LandingZoneSCPortfolioPrincipalRole + Type: AWS::SSM::Parameter + Properties: + Name: + Fn::FindInMap: + - SSMParameterNames + - LandingZoneSCPortfolioPrincipalRoleParameterName + - Name + Description: Contains the IAM Role Arn for Landing Zone Service Catalog Principal + Type: StringList + Value: + Fn::Sub: + '${StateMachineLambdaRole.Arn}' + # SSM Parameter to store the IAM Role ARN of Service Catalog Constraint + LandingZoneSCProductConstraintRoleParameter: + DependsOn: + - LandingZoneSCProductConstraintRole + Type: AWS::SSM::Parameter + Properties: + Name: + Fn::FindInMap: + - SSMParameterNames + - LandingZoneSCProductConstraintRoleParameterName + - Name + Description: Contains the IAM Role Arn for Landing Zone Launch Constraint + Type: String + Value: + Fn::Sub: + '${LandingZoneSCProductConstraintRole.Arn}' + + SecurityAlertEmailParameter: + Type: AWS::SSM::Parameter + Properties: + Name: !FindInMap [SSMParameterNames, LandingZoneSecurityAlertEmailParameterName, Name] + Description: Contains the Landing Zone Security Alert Email ID + Type: String + Value: !Ref SecurityAlertEmail + + AllAlertEmailParameter: + Type: AWS::SSM::Parameter + Properties: + Name: !FindInMap [SSMParameterNames, LandingZoneAllAlertEmailParameterName, Name] + Description: Contains the Landing Zone Change Alert Email ID + Type: String + Value: !If [IsSubscribeToTopicCondition, !Ref AllChangeEventsEmail, 'no-notifications@email.com'] + + PipelineApprovalTopic: + Type: AWS::SNS::Topic + Metadata: + cfn_nag: + rules_to_suppress: + - id: W47 + reason: "The SNS topic does not require a KMS Master Key." + Condition: IsPipelineApprovalStageCondition + Properties: + Subscription: + - Endpoint: !Ref PipelineApprovalEmail + Protocol: email + + LandingZonePipelineS3Bucket: + Type: AWS::S3::Bucket + Metadata: + cfn_nag: + rules_to_suppress: + - id: W51 + reason: "Temporary exception to be removed post v2.3.1" + Properties: + BucketName: !Sub aws-landing-zone-configuration-${AWS::AccountId}-${AWS::Region} + BucketEncryption: + ServerSideEncryptionConfiguration: + - ServerSideEncryptionByDefault: + SSEAlgorithm: AES256 + VersioningConfiguration: + Status: Enabled + LoggingConfiguration: + DestinationBucketName: !Ref S3LoggingBucket + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + + LandingZonePipelineArtifactS3Bucket: + Type: AWS::S3::Bucket + Metadata: + cfn_nag: + rules_to_suppress: + - id: W51 + reason: "Temporary exception to be removed post v2.3.1" + DeletionPolicy: Retain + Properties: + VersioningConfiguration: + Status: Enabled + LoggingConfiguration: + DestinationBucketName: !Ref S3LoggingBucket + BucketEncryption: + ServerSideEncryptionConfiguration: + - ServerSideEncryptionByDefault: + SSEAlgorithm: AES256 + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + + # Create buckets using S3-SSE keys for default encryption + S3LoggingBucket: + DeletionPolicy: Retain + Type: AWS::S3::Bucket + Metadata: + cfn_nag: + rules_to_suppress: + - id: W35 + reason: "This S3 bucket is used as the destination for 'LandingZonePipelineS3Bucket' and 'LandingZonePipelineArtifactS3Bucket'" + - id: W51 + reason: "Log delivery controlled by ACL, not bucket policy" + Properties: + BucketName: !Sub aws-landing-zone-s3-access-logs-${AWS::AccountId}-${AWS::Region} + AccessControl: LogDeliveryWrite + VersioningConfiguration: + Status: Enabled + BucketEncryption: + ServerSideEncryptionConfiguration: + - ServerSideEncryptionByDefault: + SSEAlgorithm: AES256 + PublicAccessBlockConfiguration: + BlockPublicAcls: True + BlockPublicPolicy: True + IgnorePublicAcls: True + RestrictPublicBuckets: True + + LandingZoneCodePipelineRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + - id: W11 + reason: "Allow Resource * for KMS/SSM API. KMS Service only support all resources. Key ID is generated by the service. SSM parameters are customer defined." + Properties: + RoleName: LandingZoneCodePipelineRole + AssumeRolePolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: "Allow" + Principal: + Service: + - "codepipeline.amazonaws.com" + Action: + - "sts:AssumeRole" + Path: "/" + Policies: + - PolicyName: "AWS-Landing-Zone-CodePipeline-Policy" + PolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: "Allow" + Action: + - s3:GetBucketVersioning + Resource: + - !Sub "arn:aws:s3:::${LandingZonePipelineArtifactS3Bucket}" + - !Sub "arn:aws:s3:::${LandingZonePipelineS3Bucket}" + - Effect: "Allow" + Action: + - s3:PutObject + - s3:GetObject + - s3:GetObjectVersion + Resource: + - !Sub "arn:aws:s3:::${LandingZonePipelineArtifactS3Bucket}/*" + - !Sub "arn:aws:s3:::${LandingZonePipelineS3Bucket}/*" + - Effect: Allow + Action: + - ssm:PutParameter + - ssm:GetParameter + - ssm:DeleteParameter + - ssm:GetParametersByPath + - ssm:DescribeParameters + Resource: '*' + - Effect: "Allow" + Action: + - "codebuild:BatchGetBuilds" + - "codebuild:StartBuild" + Resource: + - !Sub "arn:aws:codebuild:${AWS::Region}:${AWS::AccountId}:project/${LandingZoneCodeBuild}" + - !Sub "arn:aws:codebuild:${AWS::Region}:${AWS::AccountId}:project/${LaunchAVMCodeBuild}" + - Effect: "Allow" + Action: + - codecommit:GetBranch + - codecommit:GetCommit + - codecommit:UploadArchive + - codecommit:GetUploadArchiveStatus + - codecommit:CancelUploadArchive + Resource: "*" + - Effect: "Allow" + Action: + - "lambda:InvokeFunction" + Resource: !GetAtt StateMachineTriggerLambda.Arn + - Effect: "Allow" + Action: + - lambda:ListFunctions + - lambda:ListVersionsByFunction + Resource: "*" + - !If + - IsPipelineApprovalStageCondition + - Effect: "Allow" + Action: + - "sns:Publish" + Resource: !Ref PipelineApprovalTopic + - !Ref AWS::NoValue + + LandingZoneCodePipeline: + Type: AWS::CodePipeline::Pipeline + Properties: + Name: AWS-Landing-Zone-CodePipeline + RoleArn: !GetAtt LandingZoneCodePipelineRole.Arn + ArtifactStore: + Location: !Ref LandingZonePipelineArtifactS3Bucket + Type: S3 + Stages: + - Name: Source + Actions: + - Name: Source + ActionTypeId: + Category: Source + Owner: AWS + Version: "1" + Provider: S3 + OutputArtifacts: + - Name: SourceApp + Configuration: + S3Bucket: !Ref LandingZonePipelineS3Bucket + S3ObjectKey: !FindInMap [BucketConfiguration, LandingZonePipelineS3TriggerKey, Name] + RunOrder: 1 + - Name: Build + Actions: + - Name: CodeBuild + InputArtifacts: + - Name: SourceApp + ActionTypeId: + Category: Build + Owner: AWS + Version: "1" + Provider: CodeBuild + OutputArtifacts: + - Name: BuiltApp + Configuration: + ProjectName: !Ref LandingZoneCodeBuild + - !If + - IsPipelineApprovalStageCondition + - Name: Approval + Actions: + - Name: Approval + ActionTypeId: + Category: Approval + Owner: AWS + Version: "1" + Provider: Manual + RunOrder: 1 + Configuration: + NotificationArn: !Ref PipelineApprovalTopic + - !Ref AWS::NoValue + - Name: CoreAccounts + Actions: + - Name: Deploy + InputArtifacts: + - Name: BuiltApp + ActionTypeId: + Category: Invoke + Owner: AWS + Version: "1" + Provider: Lambda + Configuration: + FunctionName: !Ref StateMachineTriggerLambda + UserParameters: "{\"pipeline_stage\": \"core_accounts\", \"artifact\" : \"BuiltApp\", \"exec_mode\" : \"sequential\"}" + RunOrder: 1 + - Name: ServiceControlPolicy + Actions: + - Name: Deploy + InputArtifacts: + - Name: BuiltApp + ActionTypeId: + Category: Invoke + Owner: AWS + Version: "1" + Provider: Lambda + Configuration: + FunctionName: !Ref StateMachineTriggerLambda + UserParameters: "{\"pipeline_stage\": \"service_control_policy\", \"artifact\" : \"BuiltApp\", \"exec_mode\" : \"sequential\"}" + RunOrder: 1 + - Name: CoreResource + Actions: + - Name: Deploy + InputArtifacts: + - Name: BuiltApp + ActionTypeId: + Category: Invoke + Owner: AWS + Version: "1" + Provider: Lambda + Configuration: + FunctionName: !Ref StateMachineTriggerLambda + UserParameters: "{\"pipeline_stage\": \"core_resources\", \"artifact\" : \"BuiltApp\", \"exec_mode\" : \"sequential\"}" + RunOrder: 1 + - Name: ServiceCatalog + Actions: + - Name: Deploy + InputArtifacts: + - Name: BuiltApp + ActionTypeId: + Category: Invoke + Owner: AWS + Version: "1" + Provider: Lambda + Configuration: + FunctionName: !Ref StateMachineTriggerLambda + UserParameters: "{\"pipeline_stage\": \"service_catalog\", \"artifact\" : \"BuiltApp\", \"exec_mode\" : \"sequential\"}" + RunOrder: 1 + - Name: BaselineResource + Actions: + - Name: Deploy + InputArtifacts: + - Name: BuiltApp + ActionTypeId: + Category: Invoke + Owner: AWS + Version: "1" + Provider: Lambda + Configuration: + FunctionName: !Ref StateMachineTriggerLambda + UserParameters: "{\"pipeline_stage\": \"baseline_resources\", \"artifact\" : \"BuiltApp\", \"exec_mode\" : \"sequential\"}" + RunOrder: 1 + - Name: LaunchAVM + Actions: + - Name: CodeBuild + InputArtifacts: + - Name: BuiltApp + ActionTypeId: + Category: Build + Owner: AWS + Version: "1" + Provider: CodeBuild + Configuration: + ProjectName: !Ref LaunchAVMCodeBuild + + LandingZoneCodeBuildRole: + Type: "AWS::IAM::Role" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W11 + reason: "Allow Resource * for Cloudformation/SSM API: needs to support user defined cfn templates and ssm parameter names." + Properties: + AssumeRolePolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: "Allow" + Principal: + Service: + - "codebuild.amazonaws.com" + Action: + - "sts:AssumeRole" + Path: "/" + Policies: + - PolicyName: "AWS-Landing-Zone-CodeBuild-Policy" + PolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/*" + - Effect: "Allow" + Action: + - s3:PutObject + - s3:GetObjectVersion + - s3:DeleteObject + Resource: + - !Sub "arn:aws:s3:::${LandingZonePipelineArtifactS3Bucket}/*" + - Effect: Allow + Action: + - s3:GetObject + - cloudformation:ValidateTemplate + Resource: "*" + - Effect: "Allow" + Action: + - s3:GetObject + Resource: + - "arn:aws:s3:::solutions-reference/*" + - Effect: Allow + Action: + - ssm:GetParameter + - ssm:GetParametersByPath + - ssm:DescribeParameters + Resource: '*' + + LandingZoneCodeBuild: + Type: AWS::CodeBuild::Project + DependsOn: LandingZoneDeploymentLambda + Properties: + Name: AWS-Landing-Zone-CodeBuild + ServiceRole: !GetAtt LandingZoneCodeBuildRole.Arn + EncryptionKey: !Join ["/", ["alias", !FindInMap [KMS, Alias, Name]]] + Source: + Type: CODEPIPELINE + BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.7\n ruby: 2.6\n commands:\n - export current=`pwd`\n - if [ -f manifest.yaml ];then export current=`pwd`;else if [ -f aws-landing-zone-configuration/manifest.yaml ]; then export current=`pwd`/aws-landing-zone-configuration; else echo 'manifest.yaml does not exist at the root level of aws-landing-zone-configuration.zip or inside aws-landing-zone-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get update && apt-get upgrade -y\n - apt-get install zip wget python-pip libyaml-dev rsync -y\n - which python && python --version\n - which python3 && python3 --version\n - which pip && pip --version\n - pip install --upgrade pip==18.0\n - pip install --upgrade setuptools\n - pip install --upgrade virtualenv\n - pip install --upgrade PyYAML\n - pip install --upgrade yorm\n - pip install --upgrade jinja2\n - pip install --upgrade boto3\n - pip install --upgrade pyyaml\n - pip install --upgrade pykwalify\n - pip install cfn_flip\n - pip freeze\n - ruby -v\n - gem -v\n - gem install cfn-nag -v 0.3.64\n pre_build:\n commands:\n - cd $current\n - echo 'Download the Validation scripts'\n - aws s3 cp s3://solutions-reference/aws-landing-zone/v2.3.1/aws-landing-zone-validation.zip $current\n - unzip -o $current/aws-landing-zone-validation.zip -d $current\n - cp bin/lz_scripts/* .\n build:\n commands:\n - echo 'Starting build `date` in `pwd`'\n - echo 'bash merge_directories.sh $LAMBDA_ARN_SSM_PS_KEY $NONE_TYPE_VALUES $BOOL_VALUES'\n - bash merge_directories.sh $LAMBDA_ARN_SSM_PS_KEY $NONE_TYPE_VALUES $BOOL_VALUES\n - echo 'Executing validation tests'\n - echo 'bash $current/validation/run-validation.sh $ARTIFACT_BUCKET'\n - bash $current/validation/run-validation.sh $ARTIFACT_BUCKET\n - echo 'Installing validation tests completed `date`'\n - echo 'Source Dist completed `date`'\n post_build:\n commands:\n - echo 'Starting post build `date` in `pwd`'\n - echo 'build completed on `date`'\n - echo 'Printing Merge Report'\n - cat merge_report.txt\nartifacts:\n files:\n - '**/*'\n" + Environment: + ComputeType: BUILD_GENERAL1_SMALL + Image: "aws/codebuild/standard:2.0" + Type: LINUX_CONTAINER + EnvironmentVariables: + - Name: ARTIFACT_BUCKET + Value: !Ref LandingZonePipelineArtifactS3Bucket + - Name: LAMBDA_ARN_SSM_PS_KEY + Value: !FindInMap [SSMParameterNames, LandingZoneLambdaParameterName, Name] + - Name: NONE_TYPE_VALUES + Value: !FindInMap [FindReplace, Values, NoneType] + - Name: BOOL_VALUES + Value: !FindInMap [FindReplace, Values, BoolType] + Artifacts: + Name: !Sub ${LandingZonePipelineArtifactS3Bucket}-Built + Type: CODEPIPELINE + + LaunchAVMCodeBuildRole: + Type: "AWS::IAM::Role" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W11 + reason: "Allow * for Organizations APIs to list/describe/move user created child accounts in the AWS Organizations" + - id: W11 + reason: "Allow * for states:DescribeStateMachineForExecution and states:DescribeExecution because the state machine exeuction ARNs are generated at run-time" + Properties: + AssumeRolePolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: "Allow" + Principal: + Service: + - "codebuild.amazonaws.com" + Action: + - "sts:AssumeRole" + Path: "/" + Policies: + - PolicyName: "AWS-Landing-Zone-LaunchAVM-CodeBuild-Policy" + PolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/codebuild/*" + - Effect: "Allow" + Action: + - s3:GetObject + Resource: + - !Sub "arn:aws:s3:::${LandingZonePipelineArtifactS3Bucket}/*" + - Effect: "Allow" + Action: + - s3:GetObject + Resource: + - "arn:aws:s3:::solutions-reference/*" + - Effect: Allow + Action: + - states:ListExecutions + - states:StartExecution + - states:StopExecution + - states:DescribeStateMachine + Resource: + - !Ref LaunchAVMStateMachine + - Effect: Allow + Action: + - states:DescribeStateMachineForExecution + - states:DescribeExecution + Resource: + - '*' + - Effect: Allow + Action: + - organizations:ListRoots + - organizations:ListOrganizationalUnitsForParent + - organizations:ListAccountsForParent + - organizations:DescribeAccount + - organizations:MoveAccount + Resource: '*' + + LaunchAVMCodeBuild: + Type: AWS::CodeBuild::Project + DependsOn: LandingZoneDeploymentLambda + Properties: + Name: AWS-Landing-Zone-LaunchAVM-CodeBuild + ServiceRole: !GetAtt LaunchAVMCodeBuildRole.Arn + EncryptionKey: !Join ["/", ["alias", !FindInMap [KMS, Alias, Name]]] + Source: + Type: CODEPIPELINE + BuildSpec: "version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.7\n commands:\n - export current=`pwd`\n - if [ -f manifest.yaml ];then export current=`pwd`;else if [ -f aws-landing-zone-configuration/manifest.yaml ]; then export current=`pwd`/aws-landing-zone-configuration; else echo 'manifest.yaml does not exist at the root level of aws-landing-zone-configuration.zip or inside aws-landing-zone-configuration folder, please check the ZIP file'; exit 1; fi; fi;\n - apt-get update && apt-get upgrade -y\n - apt-get install zip wget python-pip libyaml-dev -y\n - which python && python --version\n - which python3 && python3 --version\n - which pip && pip --version\n - pip install --upgrade pip==18.0\n - pip install --upgrade setuptools\n - pip install --upgrade virtualenv\n - pip install --upgrade PyYAML\n - pip install --upgrade yorm\n - pip install --upgrade boto3\n - pip install --upgrade pyyaml\n - pip freeze\n pre_build:\n commands:\n - cd $current\n - echo 'Download the Launch AVM Code'\n - aws s3 cp s3://solutions-reference/aws-landing-zone/v2.3.1/aws-landing-zone-launch-avm.zip $current\n - unzip -o $current/aws-landing-zone-launch-avm.zip -d $current\n build:\n commands:\n - echo 'Starting Launch AVM `date` in `pwd`'\n - echo 'python3 launch_avm.py $log_level $wait_time $current/manifest.yaml $sm_arn_launch_avm $batch_size'\n - python3 launch_avm.py $log_level $wait_time $current/manifest.yaml $sm_arn_launch_avm $batch_size\n - echo 'Completed Launch AVM `date` in `pwd`'\nartifacts:\n files:\n - '**/*'\n" + Environment: + ComputeType: BUILD_GENERAL1_SMALL + Image: "aws/codebuild/standard:2.0" + Type: LINUX_CONTAINER + EnvironmentVariables: + - Name: sm_arn_launch_avm + Value: !Ref LaunchAVMStateMachine + - Name: log_level + Value: !FindInMap [LambdaFunction, Logging, Level] + - Name: wait_time + Value: "30" + - Name: batch_size + Value: "10" + Artifacts: + Name: !Sub ${LandingZonePipelineArtifactS3Bucket}-Built + Type: CODEPIPELINE + TimeoutInMinutes: 480 + + LandingZoneDeploymentLambdaRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: W11 + reason: "Allow Resource * for KMS API. KMS Service only support all resources. Key ID is generated by the service." + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + Properties: + RoleName: LandingZoneDeploymentLambdaRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + Path: / + Policies: + - PolicyName: LandingZoneDeploymentLambda + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Join ['', ['arn:aws:logs:', !Ref 'AWS::Region', ':', !Ref 'AWS::AccountId',':log-group:/aws/lambda/*']] + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: "Allow" + Action: + - s3:GetEncryptionConfiguration + - s3:PutEncryptionConfiguration + Resource: '*' + - Effect: "Allow" + Action: + - "kms:CreateKey" + - "kms:CreateAlias" + - "kms:ListAliases" + - "kms:DescribeKey" + - "kms:TagResource" + - "kms:PutKeyPolicy" + Resource: "*" + - Effect: Allow + Action: + - ssm:PutParameter + - ssm:GetParameter + - ssm:DeleteParameter + - ssm:GetParametersByPath + - ssm:DescribeParameters + Resource: '*' + - Effect: "Allow" + Action: + - s3:GetObject + Resource: + - "arn:aws:s3:::solutions-reference/*" + - Effect: "Allow" + Action: + - s3:GetObject + - "s3:PutObject" + Resource: + - !Sub "arn:aws:s3:::${LandingZonePipelineS3Bucket}/*" + LandingZoneDeploymentLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + kms_key_alias_name: !FindInMap [KMS, Alias, Name] + Code: + S3Bucket: !Sub "solutions-${AWS::Region}" + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-config-deployer.zip + FunctionName: LandingZoneDeploymentLambda + Description: AWS Landing Zone Deployment Lambda + Handler: config_deployer.lambda_handler + MemorySize: 512 + Role: !GetAtt 'LandingZoneDeploymentLambdaRole.Arn' + Runtime: python3.6 + Timeout: 300 + TracingConfig: + Mode: Active + + LandingZoneConfigDeployer: + Type: Custom::ConfigDeployer + Properties: + metrics_flag: !FindInMap [Solution, Metrics, SendAnonymousData] + email_list: + - !Ref SharedServicesAccountEmail + - !Ref LoggingAccountEmail + - !Ref SecurityAccountEmail + - !Ref SecurityAlertEmail + bucket_config: + destination_bucket_name: !Ref LandingZonePipelineS3Bucket + destination_s3_key: !If [IsBuildLandingZoneCondition, !FindInMap [BucketConfiguration, LandingZonePipelineS3TriggerKey, Name], !FindInMap [BucketConfiguration, LandingZonePipelineS3NonTriggerKey, Name]] + source_bucket_name: !FindInMap [BucketConfiguration, SourceBucketName, Name] + source_s3_key: !FindInMap [BucketConfiguration, SourceKeyName, Name] + kms_config: + kms_key_alias: !Join ["/", ["alias", !FindInMap [KMS, Alias, Name]]] + kms_key_policy: + Version: "2012-10-17" + Id: "key-alz-1" + Statement: + - + Sid: "Allow administration of the key" + Effect: "Allow" + Principal: + AWS: !Join ["", ["arn:aws:iam::", Ref: "AWS::AccountId", ":root" ]] + Action: + - "kms:Create*" + - "kms:Describe*" + - "kms:Enable*" + - "kms:List*" + - "kms:Put*" + - "kms:Update*" + - "kms:Revoke*" + - "kms:Disable*" + - "kms:Get*" + - "kms:Delete*" + - "kms:ScheduleKeyDeletion" + - "kms:CancelKeyDeletion" + Resource: "*" + - + Sid: "Allow use of the key" + Effect: "Allow" + Principal: + AWS: + - Fn::Sub: ${LandingZoneLambdaRole.Arn} + - Fn::Sub: ${StateMachineLambdaRole.Arn} + - Fn::Sub: ${LandingZoneDeploymentLambdaRole.Arn} + - Fn::Sub: ${StateMachineTriggerLambdaRole.Arn} + - Fn::Sub: ${LandingZoneCodePipelineRole.Arn} + - Fn::Sub: ${HandshakeSMLambdaRole.Arn} + - Fn::Sub: ${LandingZoneCodeBuildRole.Arn} + - Fn::Sub: ${LaunchAVMCodeBuildRole.Arn} + Action: + - "kms:Encrypt" + - "kms:Decrypt" + - "kms:ReEncrypt*" + - "kms:GenerateDataKey*" + - "kms:DescribeKey" + Resource: "*" + find_replace: + - file_name: manifest.yaml.j2 + parameters: + region: !Sub ${AWS::Region} + core_ou: !Ref CoreOUName + ou_list: !Ref NonCoreOUNames + security_email: !Ref SecurityAccountEmail + logging_email: !Ref LoggingAccountEmail + shared_services_email: !Ref SharedServicesAccountEmail + security_alert_email: !Ref SecurityAlertEmail + lock_down_stack_sets_role: !Ref LockStackSetsExecutionRole + enable_all_regions: !Ref EnableAllRegions + nested_ou_delimiter: !Ref NestedOUDelimiter + - file_name: parameters/core_accounts/aws-landing-zone-shared-services-vpc.json.j2 + parameters: + number_of_az: !FindInMap [VPC, !Ref VPCOptions, AvailabilityZones] + additional_private_subnets: !FindInMap [VPC, !Ref VPCOptions, CreateAdditionalPrivateSubnets] + create_private_subnets: !FindInMap [VPC, !Ref VPCOptions, CreatePrivateSubnets] + create_public_subnets: !FindInMap [VPC, !Ref VPCOptions, CreatePublicSubnets] + private_subnet1a_cidr: !GetAtt VPCCalculator.PrivateSubnet1ACIDR + private_subnet1b_cidr: !GetAtt VPCCalculator.PrivateSubnet1BCIDR + private_subnet2a_cidr: !GetAtt VPCCalculator.PrivateSubnet2ACIDR + private_subnet2b_cidr: !GetAtt VPCCalculator.PrivateSubnet2BCIDR + private_subnet3a_cidr: !GetAtt VPCCalculator.PrivateSubnet3ACIDR + private_subnet3b_cidr: !GetAtt VPCCalculator.PrivateSubnet3BCIDR + private_subnet4a_cidr: !GetAtt VPCCalculator.PrivateSubnet4ACIDR + private_subnet4b_cidr: !GetAtt VPCCalculator.PrivateSubnet4BCIDR + public_subnet1_cidr: !GetAtt VPCCalculator.PublicSubnet1CIDR + public_subnet2_cidr: !GetAtt VPCCalculator.PublicSubnet2CIDR + public_subnet3_cidr: !GetAtt VPCCalculator.PublicSubnet3CIDR + public_subnet4_cidr: !GetAtt VPCCalculator.PublicSubnet4CIDR + logs_retention_in_days: !Ref LogsRetentionInDays + vpc_cidr: !Ref VPCCidr + transit_vpc: !FindInMap [VPC, !Ref VPCOptions, TransitVPC] + - file_name: parameters/aws_baseline/aws-landing-zone-config-rules-global.json.j2 + parameters: + enable_root_mfa_rule: !Ref EnableRootMfaRule + enable_iam_password_policy_rule: !Ref EnableIamPasswordPolicyRule + - file_name: parameters/aws_baseline/aws-landing-zone-config-rules.json.j2 + parameters: + enable_encrypted_volumes_rule: !Ref EnableEncryptedVolumesRule + enable_rds_encryption_rule: !Ref EnableRdsEncryptionRule + enable_s3_public_read_rule: !Ref EnableS3PublicReadRule + enable_s3_public_write_rule: !Ref EnableS3PublicWriteRule + enable_s3_server_side_encryption_rule: !Ref EnableS3ServerSideEncryptionRule + enable_restricted_common_ports_rule: !Ref EnableRestrictedCommonPortsRule + enable_restricted_ssh_rule: !Ref EnableRestrictedSshRule + - file_name: parameters/core_accounts/aws-landing-zone-notification.json.j2 + parameters: + subscribe_to_all_configuration_topic: !Ref SubscribeAllChangeEventsEmailToTopic + + ServiceToken: !GetAtt LandingZoneDeploymentLambda.Arn + + StateMachineTriggerLambdaRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + - id: W11 + reason: "Allow Resource * for KMS/SSM API. KMS Service only support all resources. Key ID is generated by the service. SSM parameters are customer defined." + Properties: + RoleName: StateMachineTriggerLambdaRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + Path: / + Policies: + - PolicyName: LandingZoneStateMachineTriggerLambda + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Join ['', ['arn:aws:logs:', !Ref 'AWS::Region', ':', !Ref 'AWS::AccountId', + ':log-group:/aws/lambda/*']] + - Effect: Allow + Action: + - ssm:PutParameter + - ssm:GetParameter + - ssm:DeleteParameter + - ssm:GetParametersByPath + - ssm:DescribeParameters + Resource: '*' + - Effect: Allow + Action: + - "kms:Encrypt" + - "kms:Decrypt" + - "kms:ReEncryptFrom" + - "kms:ReEncryptTo" + - "kms:GenerateDataKey" + - "kms:GenerateDataKeyWithoutPlaintext" + - "kms:DescribeKey" + Resource: "*" + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: Allow + Action: + - s3:PutObject + - s3:GetObject + - s3:ListBucketByTags + - s3:ListBucketMultipartUploads + - s3:ListAllMyBuckets + - s3:PutBucketLogging + - s3:ListBucketVersions + - s3:PutBucketPolicy + - s3:CreateBucket + - s3:ListBucket + - s3:GetBucketPolicy + Resource: '*' # supports remotely sourced templates feature. The host S3 bucket can be created by the customer. + - Effect: Allow + Action: + - states:ListExecutions + - states:StartExecution + - states:StopExecution + Resource: + - !Ref OrganizationsStateMachine + - !Ref ServiceControlPolicyMachine + - !Ref StackSetStateMachine + - !Ref ServiceCatalogStateMachine + - !Ref LaunchAVMStateMachine + - !Ref CheckAVMExistsStateMachine + - !Ref HandshakeStateMachine + - Effect: Allow + Action: + - states:DescribeStateMachine + - states:DescribeStateMachineForExecution + - states:DescribeExecution + Resource: '*' + - Effect: Allow + Action: + - codepipeline:PutJobSuccessResult + - codepipeline:PutJobFailureResult + Resource: '*' + - Effect: Allow + Action: + - organizations:ListRoots + - organizations:ListOrganizationalUnitsForParent + - organizations:ListAccountsForParent + - organizations:DescribeAccount + Resource: '*' + - Effect: Allow + Action: + - sts:AssumeRole + Resource: 'arn:aws:iam::*:role/AWSCloudFormationStackSetExecutionRole' + - Effect: Allow + Action: + - ec2:DescribeAvailabilityZones + - ec2:DescribeRegions + Resource: '*' + - Effect: Allow + Action: + - cloudformation:DescribeStackSet + - cloudformation:ListStackInstances + - cloudformation:ListStackSetOperations + Resource: '*' + StateMachineTriggerLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + kms_key_alias_name: !FindInMap [KMS, Alias, Name] + staging_bucket: !Ref LandingZonePipelineArtifactS3Bucket + wait_time: "5" + sm_arn_account: !Ref OrganizationsStateMachine + sm_arn_stack_set: !Ref StackSetStateMachine + sm_arn_service_control_policy: !Ref ServiceControlPolicyMachine + sm_arn_service_catalog: !Ref ServiceCatalogStateMachine + sm_arn_baseline_resources: !Ref StackSetStateMachine + sm_arn_launch_avm: !Ref LaunchAVMStateMachine + sm_arn_check_avm_exists: !Ref CheckAVMExistsStateMachine + sm_arn_handshake_sm: !Ref HandshakeStateMachine + lambda_arn_param_name: !FindInMap [SSMParameterNames, LandingZoneLambdaParameterName, Name] + Code: + S3Bucket: !Sub "solutions-${AWS::Region}" + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-state-machine-trigger.zip + FunctionName: LandingZoneStateMachineTriggerLambda + Description: AWS Landing Zone State Machine Trigger + Handler: state_machine_trigger.lambda_handler + MemorySize: 3008 + Role: !GetAtt 'StateMachineTriggerLambdaRole.Arn' + Runtime: python3.6 + Timeout: 900 + TracingConfig: + Mode: Active + StateMachineLambdaRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: F38 + reason: "PassRole action is required to make changes to all (*) the Service Catalog Resources" + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + - id: W11 + reason: "Allow Resource * for KMS/SSM/Org/SC/CFN API. Key ID is generated by the service. Other resources are customer defined." + Properties: + RoleName: StateMachineLambdaRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + Path: / + Policies: + - PolicyName: StateMachineLambda + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Join ['', ['arn:aws:logs:', !Ref 'AWS::Region', ':', !Ref 'AWS::AccountId', + ':log-group:/aws/lambda/*']] + - Effect: Allow + Action: + - iam:GetRole + Resource: '*' + - Effect: Allow + Action: + - organizations:CreateOrganization + - organizations:CreateOrganizationalUnit + - organizations:ListPolicies + - organizations:ListPoliciesForTarget + - organizations:ListTargetsForPolicy + - organizations:ListParents + - organizations:ListRoots + - organizations:ListAccounts + - organizations:ListOrganizationalUnitsForParent + - organizations:ListAccountsForParent + - organizations:EnablePolicyType + - organizations:CreatePolicy + - organizations:UpdatePolicy + - organizations:DeletePolicy + - organizations:DetachPolicy + - organizations:AttachPolicy + - organizations:CreateAccount + - organizations:DescribeAccount + - organizations:DescribeCreateAccountStatus + - organizations:DescribeOrganization + - organizations:MoveAccount + - organizations:UpdateOrganizationalUnit + - organizations:DeleteOrganizationalUnit + Resource: '*' + - Effect: Allow + Action: + - servicecatalog:CreateConstraint + - servicecatalog:CreatePortfolio + - servicecatalog:CreateProduct + - servicecatalog:CreateTagOption + - servicecatalog:CreateProvisioningArtifact + - servicecatalog:UpdateProvisioningArtifact + - servicecatalog:DeleteProvisioningArtifact + - servicecatalog:UpdatePortfolio + - servicecatalog:UpdateProduct + - servicecatalog:UpdateTagOption + - servicecatalog:DeleteConstraint + - servicecatalog:DeletePortfolio + - servicecatalog:DeleteProduct + - servicecatalog:DescribePortfolio + - servicecatalog:DescribeProvisioningArtifact + - servicecatalog:DescribeConstraint + - servicecatalog:AssociatePrincipalWithPortfolio + - servicecatalog:AssociateProductWithPortfolio + - servicecatalog:AssociateTagOptionWithResource + - servicecatalog:DisassociatePrincipalFromPortfolio + - servicecatalog:DisassociateProductFromPortfolio + - servicecatalog:DisassociateTagOptionFromResource + - servicecatalog:DeleteProduct + - servicecatalog:ListTagOptions + - servicecatalog:ListResourcesForTagOption + - servicecatalog:ListPortfoliosForProduct + - servicecatalog:ListConstraintsForPortfolio + - servicecatalog:ListProvisioningArtifacts + - servicecatalog:ListPrincipalsForPortfolio + - servicecatalog:ListPortfolios + - servicecatalog:DescribeRecord + - servicecatalog:DescribeProvisionedProduct + - servicecatalog:SearchProvisionedProducts + - servicecatalog:UpdateProvisionedProduct + - servicecatalog:TerminateProvisionedProduct + Resource: '*' + - Effect: Allow + Action: + - servicecatalog:SearchProductsAsAdmin + - servicecatalog:ProvisionProduct + Resource: '*' + Condition: + StringEquals: + servicecatalog:accountLevel: self + - Effect: Allow + Action: + - cloudformation:CreateStackSet + - cloudformation:CreateStack + - cloudformation:DeleteStack + - cloudformation:DeleteStackSet + - cloudformation:CreateStackInstances + - cloudformation:DeleteStackInstances + - cloudformation:DescribeStackInstance + - cloudformation:DescribeStackSetOperation + - cloudformation:DescribeStackSet + - cloudformation:UpdateStackSet + - cloudformation:UpdateStackInstances + - cloudformation:ValidateTemplate + - cloudformation:TagResource + - cloudformation:ListStackInstances + - cloudformation:GetTemplateSummary + - cloudformation:DescribeStacks + Resource: '*' + - Effect: Allow + Action: + - ssm:PutParameter + - ssm:GetParameter + - ssm:GetParameters + - ssm:DeleteParameter + - ssm:DescribeParameters + - ssm:GetParametersByPath + Resource: '*' + - Effect: Allow + Action: + - "kms:Encrypt" + - "kms:Decrypt" + - "kms:ReEncryptFrom" + - "kms:ReEncryptTo" + - "kms:GenerateDataKey" + - "kms:GenerateDataKeyWithoutPlaintext" + - "kms:DescribeKey" + Resource: "*" + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: Allow + Action: + - iam:CreateServiceLinkedRole + - iam:PutRolePolicy + - iam:UpdateRoleDescription + - iam:DeleteServiceLinkedRole + - iam:GetServiceLinkedRoleDeletionStatus + - iam:GetGroup + - iam:PassRole + Resource: '*' + - Effect: Allow + Action: + - s3:PutObject + - s3:GetObject + - s3:ListBucketByTags + - s3:ListBucketMultipartUploads + - s3:ListAllMyBuckets + - s3:PutBucketLogging + - s3:ListBucketVersions + - s3:PutBucketPolicy + - s3:CreateBucket + - s3:ListBucket + - s3:GetBucketPolicy + Resource: '*' + - Effect: Allow + Action: + - ec2:DescribeInternetGateways + - ec2:DescribeRegions + - ec2:DescribeSubnets + - ec2:DescribeVpcs + - ec2:DeleteInternetGateway + - ec2:DeleteSubnet + - ec2:DeleteVpc + - ec2:DetachInternetGateway + - ec2:CreateKeyPair + - ec2:DescribeSubnets + - ec2:DescribeVpcs + - ec2:CreateSecurityGroup + - ec2:CreateNetworkInterface + - ec2:DescribeNetworkInterfaces + - ec2:AuthorizeSecurityGroupIngress + - ec2:AuthorizeSecurityGroupEgress + - ec2:DeleteSecurityGroup + - ec2:DeleteNetworkInterface + - ec2:RevokeSecurityGroupIngress + - ec2:RevokeSecurityGroupEgress + Resource: '*' + - Effect: Allow + Action: + - ds:ConnectDirectory + - ds:DescribeDirectories + - ds:DeleteDirectory + Resource: '*' + - Effect: Allow + Action: + - sts:AssumeRole + Resource: 'arn:aws:iam::*:role/AWSCloudFormationStackSetExecutionRole' + StateMachineLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + kms_key_alias_name: !FindInMap [KMS, Alias, Name] + ssm_key_for_lock_down_role_arns: lock_down_role_arns_list + unlock_role_arns: !Sub arn:aws:iam::${AWS::AccountId}:root + Code: + S3Bucket: !Sub "solutions-${AWS::Region}" + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-state-machine.zip + FunctionName: LandingZoneStateMachineLambda + Description: AWS Landing Zone State Machine Handler + Handler: state_machine_router.lambda_handler + MemorySize: 1024 + Role: !GetAtt 'StateMachineLambdaRole.Arn' + Runtime: python3.6 + Timeout: 300 + TracingConfig: + Mode: Active + + HandshakeSMLambdaRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + - id: W11 + reason: "Allow Resource * for KMS/GuardDuty API. KMS Key ID and GD Detector Id are generated by the service. SSM parameters are customer defined." + Properties: + RoleName: LandingZoneHandshakeSMLambdaRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + Path: / + Policies: + - PolicyName: LandingZoneHandshakeSMLambda + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Join ['', ['arn:aws:logs:', !Ref 'AWS::Region', ':', !Ref 'AWS::AccountId', + ':log-group:/aws/lambda/*']] + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: Allow + Action: + - ec2:DescribeInternetGateways + - ec2:DescribeRegions + - ec2:DescribeSubnets + - ec2:DescribeVpcs + - ec2:DeleteInternetGateway + - ec2:DeleteSubnet + - ec2:DeleteVpc + - ec2:DetachInternetGateway + - ec2:CreateKeyPair + - ec2:DescribeAvailabilityZones + - ec2:DescribeVPCPeeringConnections + - ec2:CreateVPCPeeringConnection + - ec2:AcceptVPCPeeringConnection + - ec2:DeleteVPCPeeringConnection + - ec2:CreateRoute + - ec2:ReplaceRoute + - ec2:DeleteRoute + Resource: '*' + - Effect: Allow + Action: + - guardduty:ListInvitations + - guardduty:ListDetectors + - guardduty:ListMembers + - guardduty:CreateDetector + - guardduty:DeleteDetector + - guardduty:CreateMembers + - guardduty:InviteMembers + - guardduty:AcceptInvitation + - guardduty:GetMasterAccount + - guardduty:DeleteMembers + - guardduty:DisassociateFromMasterAccount + Resource: '*' + - Effect: Allow + Action: + - ssm:PutParameter + - ssm:GetParameter + - ssm:GetParameters + - ssm:DeleteParameter + - ssm:DescribeParameters + Resource: '*' + - Effect: Allow + Action: + - "kms:Encrypt" + - "kms:Decrypt" + - "kms:ReEncryptFrom" + - "kms:ReEncryptTo" + - "kms:GenerateDataKey" + - "kms:GenerateDataKeyWithoutPlaintext" + - "kms:DescribeKey" + Resource: "*" + - Effect: Allow + Action: + - sts:AssumeRole + Resource: 'arn:aws:iam::*:role/AWSCloudFormationStackSetExecutionRole' + HandshakeSMLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + wait_time: '15' + Code: + S3Bucket: !Sub "solutions-${AWS::Region}" + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-handshake-state-machine.zip + Description: AWS Lambda-backed Custom Resources for Handshake Mechanism + FunctionName: LandingZoneHandshakeSMLambda + Handler: handshake_sm_router.lambda_handler + MemorySize: 1024 + Role: !GetAtt 'HandshakeSMLambdaRole.Arn' + Runtime: python3.6 + Timeout: 660 + TracingConfig: + Mode: Active + + LockDownRoleArnParameter0: + DependsOn: + - StateMachineLambda + Type: AWS::SSM::Parameter + Properties: + Name: /lock_down_role_arns_list/AWSCloudFormationStackSetAdministrationRole + Description: Contains the IAM Role ARNs to lock down the AWSCloudFormationStackSetExecutionRole Role in member account + Type: String + Value: !Sub ${AWSCloudFormationStackSetAdministrationRole.Arn} + + LockDownRoleArnParameter1: + DependsOn: + - StateMachineLambda + Type: AWS::SSM::Parameter + Properties: + Name: /lock_down_role_arns_list/StateMachineTriggerLambdaRole + Description: Contains the IAM Role ARNs to lock down the AWSCloudFormationStackSetExecutionRole Role in member account + Type: String + Value: !Sub arn:aws:iam::${AWS::AccountId}:role/StateMachineTriggerLambdaRole + + LockDownRoleArnParameter2: + DependsOn: + - StateMachineLambda + Type: AWS::SSM::Parameter + Properties: + Name: /lock_down_role_arns_list/LandingZoneLambdaRole + Description: Contains the IAM Role ARNs to lock down the AWSCloudFormationStackSetExecutionRole Role in member account + Type: String + Value: !Sub arn:aws:iam::${AWS::AccountId}:role/LandingZoneLambdaRole + + LockDownRoleArnParameter3: + DependsOn: + - StateMachineLambda + Type: AWS::SSM::Parameter + Properties: + Name: /lock_down_role_arns_list/StateMachineLambdaRole + Description: Contains the IAM Role ARNs to lock down the AWSCloudFormationStackSetExecutionRole Role in member account + Type: String + Value: !Sub arn:aws:iam::${AWS::AccountId}:role/StateMachineLambdaRole + + LockDownRoleArnParameter4: + DependsOn: + - StateMachineLambda + Type: AWS::SSM::Parameter + Properties: + Name: /lock_down_role_arns_list/LandingZoneHandshakeSMLambdaRole + Description: Contains the IAM Role ARNs to lock down the AWSCloudFormationStackSetExecutionRole Role in member account + Type: String + Value: !Sub arn:aws:iam::${AWS::AccountId}:role/LandingZoneHandshakeSMLambdaRole + + LandingZoneLambdaRole: + Type: AWS::IAM::Role + Metadata: + cfn_nag: + rules_to_suppress: + - id: W28 + reason: "The role name is defined to identify AWS Landing Zone resources." + - id: W11 + reason: "Allow Resource * for KMS/EC2 API. KMS Key ID is generated by the service. SSM parameters and EC2 resources are customer defined." + Properties: + RoleName: LandingZoneLambdaRole + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + Path: / + Policies: + - PolicyName: LandingZoneLambda + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Join ['', ['arn:aws:logs:', !Ref 'AWS::Region', ':', !Ref 'AWS::AccountId', + ':log-group:/aws/lambda/*']] + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: Allow + Action: + - states:DescribeStateMachine + - states:DescribeStateMachineForExecution + - states:DescribeExecution + - states:ListExecutions + - states:StartExecution + - states:StopExecution + Resource: '*' + - Effect: Allow + Action: + - ec2:DescribeInternetGateways + - ec2:DescribeRegions + - ec2:DescribeSubnets + - ec2:DescribeVpcs + - ec2:DeleteInternetGateway + - ec2:DeleteSubnet + - ec2:DeleteVpc + - ec2:DetachInternetGateway + - ec2:CreateKeyPair + - ec2:DescribeAvailabilityZones + - ec2:DescribeVPCPeeringConnections + - ec2:CreateVPCPeeringConnection + - ec2:AcceptVPCPeeringConnection + - ec2:DeleteVPCPeeringConnection + - ec2:CreateRoute + - ec2:ReplaceRoute + - ec2:DeleteRoute + Resource: '*' + - Effect: Allow + Action: + - ssm:PutParameter + - ssm:GetParameter + - ssm:GetParameters + - ssm:DeleteParameter + Resource: '*' + - Effect: Allow + Action: + - "kms:Encrypt" + - "kms:Decrypt" + - "kms:ReEncryptFrom" + - "kms:ReEncryptTo" + - "kms:GenerateDataKey" + - "kms:GenerateDataKeyWithoutPlaintext" + - "kms:DescribeKey" + Resource: "*" + - Effect: Allow + Action: + - sts:AssumeRole + Resource: 'arn:aws:iam::*:role/AWSCloudFormationStackSetExecutionRole' + LandingZoneLambda: + Type: AWS::Lambda::Function + Properties: + Environment: + Variables: + log_level: !FindInMap [LambdaFunction, Logging, Level] + kms_key_alias_name: !FindInMap [KMS, Alias, Name] + sm_arn_account: !Ref OrganizationsStateMachine + sm_arn_stack_set: !Ref StackSetStateMachine + sm_arn_service_control_policy: !Ref ServiceControlPolicyMachine + sm_arn_service_catalog: !Ref ServiceCatalogStateMachine + sm_arn_baseline_resources: !Ref StackSetStateMachine + sm_arn_launch_avm: !Ref LaunchAVMStateMachine + sm_arn_check_avm_exists: !Ref CheckAVMExistsStateMachine + sm_arn_handshake_sm: !Ref HandshakeStateMachine + Code: + S3Bucket: !Sub "solutions-${AWS::Region}" + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-avm-cr.zip + Description: AWS Lambda-backed Custom Resources for AVM + FunctionName: LandingZone + Handler: lambda_custom_resource.lambda_handler + MemorySize: 1024 + Role: !GetAtt 'LandingZoneLambdaRole.Arn' + Runtime: python3.6 + Timeout: 300 + TracingConfig: + Mode: Active + + VPCCalculator: + Type: Custom::VPCCalculator + Properties: + VPCCidr: !Ref VPCCidr + PublicSubnets: !FindInMap + - VPC + - !Ref VPCOptions + - PublicSubnets + PrivateSubnets: !FindInMap + - VPC + - !Ref VPCOptions + - PrivateSubnets + AvailabilityZones: !FindInMap + - VPC + - !Ref VPCOptions + - AvailabilityZones + CreatePrivateSubnets: !FindInMap + - VPC + - !Ref VPCOptions + - CreatePrivateSubnets + CreateAdditionalPrivateSubnets: !FindInMap + - VPC + - !Ref VPCOptions + - CreateAdditionalPrivateSubnets + ServiceToken: !GetAtt LandingZoneLambda.Arn + + + LandingZoneLambdaParameter: + DependsOn: + - LandingZoneLambda + Type: AWS::SSM::Parameter + Properties: + Name: !FindInMap [SSMParameterNames, LandingZoneLambdaParameterName, Name] + Description: Contains the Lambda ARN for AVM Custom Resource + Type: String + Value: !Sub ${LandingZoneLambda.Arn} + + StateMachineRole: + Type: "AWS::IAM::Role" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W11 + reason: "Allow Resource * for AWS Lambda Functions in the account. State Machine execution fails otherwise." + Properties: + AssumeRolePolicyDocument: + Version: "2012-10-17" + Statement: + - + Effect: "Allow" + Principal: + Service: + - !Sub "states.${AWS::Region}.amazonaws.com" + Action: + - "sts:AssumeRole" + Path: "/" + Policies: + - PolicyName: "lambda" + PolicyDocument: + Version: "2012-10-17" + Statement: + - Effect: "Allow" + Action: + - "lambda:InvokeFunction" + Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:*" + + OrganizationsStateMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneOrganizationsStateMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine that manages the AWS Organization, Organizational Units and Accounts", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Check Organization Pass" + }, + "Check Organization Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "list_roots" + }, + "ResultPath": "$.params", + "Next": "Check Organization" + }, + "Check Organization": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Check Organization Unit Pass" + }, + "Check Organization Unit Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "check_organization_unit" + }, + "ResultPath": "$.params", + "Next": "Check Organization Unit" + }, + "Check Organization Unit": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Check Account Pass" + }, + "Check Account Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "list_accounts" + }, + "ResultPath": "$.params", + "Next": "Check Account" + }, + "Check Account": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Check Complete?" + }, + "Check Complete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.NextToken", + "StringEquals": "Complete", + "Next": "Request Type" + } + ], + "Default": "Check Account Wait" + }, + "Check Account Wait": { + "Type": "Wait", + "Seconds": 5, + "Next": "Check Account" + }, + "Request Type": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RequestType", + "StringEquals": "Update", + "Next": "Create Update" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Delete", + "Next": "Delete" + } + ], + "Default": "Create Update" + }, + "Create Update": { + "Type": "Pass", + "Next": "Create Organization Choice" + }, + "Delete": { + "Type": "Pass", + "Next": "Account Id?" + }, + "Create Organization Choice": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RootId", + "StringEquals": "None", + "Next": "Create Organization Pass" + } + ], + "Default": "Create Organization Unit Choice" + }, + "Create Organization Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "create_organization" + }, + "ResultPath": "$.params", + "Next": "Create Organization" + }, + "Create Organization": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Create Organization Unit Choice" + }, + "Create Organization Unit Choice": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OUId", + "StringEquals": "None", + "Next": "Create Organization Unit Pass" + } + ], + "Default": "Account Choice" + }, + "Create Organization Unit Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "create_organization_unit" + }, + "ResultPath": "$.params", + "Next": "Create Organization Unit" + }, + "Create Organization Unit": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Account Choice" + }, + "Account Choice": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ResourceProperties.AccountName", + "StringEquals": "", + "Next": "Describe Organization Pass" + }, + { + "Variable": "$.AccountId", + "StringEquals": "None", + "Next": "Create Account Pass" + } + ], + "Default": "Get ParentId Pass" + }, + "Create Account Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "create_account" + }, + "ResultPath": "$.params", + "Next": "Create Account" + }, + "Create Account": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Organization initializing?" + }, + "Organization initializing?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OrganizationInitializing", + "StringEquals": "no", + "Next": "Wait On Create Account" + }, + { + "Variable": "$.OrganizationInitializing", + "StringEquals": "yes", + "Next": "Wait on Organization initialization" + } + ], + "Default": "Wait On Create Account" + }, + "Wait on Organization initialization": { + "Type": "Wait", + "Seconds": 300, + "Next": "Create Account Pass" + }, + "Create Account Status Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "describe_account_status" + }, + "ResultPath": "$.params", + "Next": "Create Account Status" + }, + "Create Account Status": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Create Complete?" + }, + "Create Complete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.CreateAccountStatus", + "StringEquals": "FAILED", + "Next": "Account Create Failed" + }, + { + "Variable": "$.CreateAccountStatus", + "StringEquals": "SUCCEEDED", + "Next": "Move Account Pass" + } + ], + "Default": "Wait On Create Account" + }, + "Wait On Create Account": { + "Type": "Wait", + "Seconds": 10, + "Next": "Create Account Status Pass" + }, + "Account Create Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Account Id?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.AccountId", + "StringEquals": "None", + "Next": "Organization Unit Id?" + } + ], + "Default": "Get ParentId Pass" + }, + "Get ParentId Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "list_parents" + }, + "ResultPath": "$.params", + "Next": "Get ParentId" + }, + "Get ParentId": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Move Account Pass" + }, + "Move Account Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "move_account" + }, + "ResultPath": "$.params", + "Next": "Move Account" + }, + "Move Account": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Check Account Status Pass" + }, + "Check Account Status Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "account_initialization_check" + }, + "ResultPath": "$.params", + "Next": "Check Account Status" + }, + "Check Account Status": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Is New Account Initialized?" + }, + "Is New Account Initialized?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.AccountInitialized", + "StringEquals": "yes", + "Next": "Request Type Choice" + }, + { + "Variable": "$.AccountInitialized", + "StringEquals": "no", + "Next": "Wait for 5 minutes" + } + ], + "Default": "Wait for 5 minutes" + }, + "Wait for 5 minutes": { + "Type": "Wait", + "Seconds": 300, + "Next": "Check Account Status Pass" + }, + "Request Type Choice": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create", + "Next": "Describe Organization Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update", + "Next": "Describe Organization Pass" + } + ], + "Default": "Organization Unit Id?" + }, + "Organization Unit Id?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OUId", + "StringEquals": "None", + "Next": "Organization Unit Not Found" + } + ], + "Default": "Check Organization Unit Is Empty Pass" + }, + "Organization Unit Not Found": { + "Type": "Pass", + "Next": "Send Success Pass" + }, + "Check Organization Unit Is Empty Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "list_accounts_for_parent" + }, + "ResultPath": "$.params", + "Next": "Check Organization Unit Is Empty" + }, + "Check Organization Unit Is Empty": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Delete Organization Unit Choice" + }, + "Delete Organization Unit Choice": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OrgUnitAccounts", + "NumericEquals": 0, + "Next": "Delete Organization Unit Pass" + } + ], + "Default": "Organization Unit Not Empty" + }, + "Delete Organization Unit Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "delete_organization_unit" + }, + "ResultPath": "$.params", + "Next": "Delete Organization Unit" + }, + "Delete Organization Unit": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Send Success Pass" + }, + "Organization Unit Not Empty": { + "Type": "Pass", + "Next": "Send Success Pass" + }, + "Describe Organization Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "describe_organization" + }, + "ResultPath": "$.params", + "Next": "Describe Organization" + }, + "Describe Organization": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "SSM Parameter Store Pass" + }, + "SSM Parameter Store Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "ssm_put_parameters" + }, + "ResultPath": "$.params", + "Next": "Put Parameters" + }, + "Put Parameters": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Update Stack Sets Assume Role Policy Pass" + }, + "Update Stack Sets Assume Role Policy Pass": { + "Type": "Pass", + "Result": { + "ClassName": "Organizations", + "FunctionName": "lock_down_stack_sets_role" + }, + "ResultPath": "$.params", + "Next": "Update Stack Sets Assume Role Policy" + }, + "Update Stack Sets Assume Role Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Send Success Pass" + }, + "Send Success Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_success_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Success Response" + }, + "Send Success Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Success" + }, + "Success": { + "Type": "Succeed" + }, + "Send Failed Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_failure_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Failed Response" + }, + "Send Failed Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Failed" + }, + "Failed": { + "Type": "Fail" + } + } + } + + ServiceControlPolicyMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneServiceControlPolicyMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine that manages the Service Control Policies.", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create/Delete or Attach/Detach Policy?" + }, + "Create/Delete or Attach/Detach Policy?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ResourceProperties.AccountId", + "StringEquals": "", + "Next": "Enable Policy Type params" + }, + { + "Variable": "$.ResourceProperties.AccountId", + "StringGreaterThan": "", + "Next": "Attach/Detach Policy params" + } + ] + }, + "Enable Policy Type params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "enable_policy_type" + }, + "ResultPath": "$.params", + "Next": "Enable Policy Type" + }, + "Enable Policy Type": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Wait" + }, + "Wait": { + "Type": "Wait", + "Seconds": 10, + "Next": "Create/Delete Policy params" + }, + "Create/Delete Policy params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "list_policies" + }, + "ResultPath": "$.params", + "Next": "Check If Policy Exist?" + }, + "Check If Policy Exist?": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create or Delete Policy?" + }, + "Create or Delete Policy?": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Or": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update" + } + ] + }, + { + "Variable": "$.PolicyExist", + "StringEquals": "no" + } + ], + "Next": "Create Policy Params" + }, + { + "And": [ + { + "Or": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update" + } + ] + }, + { + "Variable": "$.PolicyExist", + "StringEquals": "yes" + } + ], + "Next": "Update Policy Params" + }, + { + "And": [ + { + "Variable": "$.RequestType", + "StringEquals": "Delete" + }, + { + "Variable": "$.PolicyExist", + "StringEquals": "yes" + } + ], + "Next": "Detach Policy from All Accounts Params" + }, + { + "And": [ + { + "Variable": "$.RequestType", + "StringEquals": "Delete" + }, + { + "Variable": "$.PolicyExist", + "StringEquals": "no" + } + ], + "Next": "Finish" + } + ] + }, + "Create Policy Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "create_policy" + }, + "ResultPath": "$.params", + "Next": "Create Policy" + }, + "Create Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "ConfigureCount2 params" + }, + "Update Policy Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "update_policy" + }, + "ResultPath": "$.params", + "Next": "Update Policy" + }, + "Update Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "ConfigureCount2 params" + }, + "ConfigureCount2 params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "configure_count_2" + }, + "ResultPath": "$.params", + "Next": "ConfigureCount2" + }, + "ConfigureCount2": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator2 params" + }, + "Iterator2 params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "iterator2" + }, + "ResultPath": "$.params", + "Next": "Iterator2" + }, + "Iterator2": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "IsCountReached2" + }, + "IsCountReached2": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.Continue", + "BooleanEquals": true, + "Next": "List Policies For OU Params" + } + ], + "Default": "Cloudformation Response Params" + }, + "List Policies For OU Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "list_policies_for_ou" + }, + "ResultPath": "$.params", + "Next": "List Policies For OU" + }, + "List Policies For OU": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Attach or Detach Policy to OU Choice" + }, + "Attach or Detach Policy to OU Choice": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.Operation", + "StringEquals": "Attach", + "Next": "Check if Policy is attached to OU?" + }, + { + "Variable": "$.Operation", + "StringEquals": "Detach", + "Next": "Check if Policy is detached from OU?" + } + ], + "Default": "Invalid Operation2" + }, + "Invalid Operation2": { + "Type": "Fail", + "Cause": "Invalid Operation Type, valid choices are [Attach, Detach]", + "Error": "Returning NULL in the response." + }, + "Check if Policy is attached to OU?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PolicyAttached", + "StringEquals": "yes", + "Next": "Iterator2 params" + }, + { + "Variable": "$.PolicyAttached", + "StringEquals": "no", + "Next": "Attach Policy to OU Params" + } + ], + "Default": "Invalid Operation2" + }, + "Attach Policy to OU Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "attach_policy" + }, + "ResultPath": "$.params", + "Next": "Attach Policy to OU" + }, + "Attach Policy to OU": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator2 params" + }, + "Check if Policy is detached from OU?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PolicyAttached", + "StringEquals": "yes", + "Next": "Detach Policy from OU Params" + }, + { + "Variable": "$.PolicyAttached", + "StringEquals": "no", + "Next": "Iterator2 params" + } + ], + "Default": "Invalid Operation2" + }, + "Detach Policy from OU Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "detach_policy" + }, + "ResultPath": "$.params", + "Next": "Detach Policy from OU" + }, + "Detach Policy from OU": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator2 params" + }, + "Detach Policy from All Accounts Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "detach_policy_from_all_accounts" + }, + "ResultPath": "$.params", + "Next": "Detach Policy from All Accounts" + }, + "Detach Policy from All Accounts": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Delete Policy Params" + }, + "Delete Policy Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "delete_policy" + }, + "ResultPath": "$.params", + "Next": "Delete Policy" + }, + "Delete Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Cloudformation Response Params" + }, + "Attach/Detach Policy params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "configure_count" + }, + "ResultPath": "$.params", + "Next": "ConfigureCount" + }, + "ConfigureCount": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator params" + }, + "Iterator params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "iterator" + }, + "ResultPath": "$.params", + "Next": "Iterator" + }, + "Iterator": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "IsCountReached" + }, + "IsCountReached": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.Continue", + "BooleanEquals": true, + "Next": "List Policy Params" + } + ], + "Default": "Cloudformation Response Params" + }, + "List Policy Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "list_policies" + }, + "ResultPath": "$.params", + "Next": "List Policy" + }, + "List Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "List Policies For Account Params" + }, + "List Policies For Account Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "list_policies_for_account" + }, + "ResultPath": "$.params", + "Next": "List Policies For Account" + }, + "List Policies For Account": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Attach or Detach Policy Choice" + }, + "Attach or Detach Policy Choice": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Or": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update" + } + ] + }, + { + "Variable": "$.ResourceProperties.Operation", + "StringEquals": "Attach" + } + ], + "Next": "Check if Policy is attached?" + }, + { + "And": [ + { + "Variable": "$.RequestType", + "StringEquals": "Delete" + }, + { + "Variable": "$.ResourceProperties.Operation", + "StringEquals": "Attach" + } + ], + "Next": "Check if Policy is detached?" + }, + { + "Variable": "$.ResourceProperties.Operation", + "StringEquals": "Detach", + "Next": "Check if Policy is detached?" + } + ], + "Default": "Invalid Operation" + }, + "Invalid Operation": { + "Type": "Fail", + "Cause": "Invalid Operation Type, valid choices are [Attach, Detach]", + "Error": "Returning NULL in the response." + }, + "Check if Policy is attached?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PolicyAttached", + "StringEquals": "yes", + "Next": "Iterator params" + }, + { + "Variable": "$.PolicyAttached", + "StringEquals": "no", + "Next": "Attach Policy Params" + } + ], + "Default": "Invalid Operation" + }, + "Attach Policy Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "attach_policy" + }, + "ResultPath": "$.params", + "Next": "Attach Policy" + }, + "Attach Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator params" + }, + "Check if Policy is detached?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PolicyAttached", + "StringEquals": "yes", + "Next": "Detach Policy Params" + }, + { + "Variable": "$.PolicyAttached", + "StringEquals": "no", + "Next": "Iterator params" + } + ], + "Default": "Invalid Operation" + }, + "Detach Policy Params": { + "Type": "Pass", + "Result": { + "ClassName": "SCP", + "FunctionName": "detach_policy" + }, + "ResultPath": "$.params", + "Next": "Detach Policy" + }, + "Detach Policy": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator params" + }, + "Cloudformation Response Params": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_success_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Response" + }, + "Send Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Finish" + }, + "Finish": { + "Type": "Succeed" + } + } + } + StackSetStateMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneStackSetStateMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine that manages the CloudFormation stacks in multiple accounts using StackSet APIs.", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Describe StackSet Pass" + }, + "Describe StackSet Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "describe_stack_set" + }, + "ResultPath": "$.params", + "Next": "Check StackSet Existence" + }, + "Check StackSet Existence": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "StackSets: Create or Delete?" + }, + "StackSets: Create or Delete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create", + "Next": "Skip StackSets?" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update", + "Next": "Skip StackSets?" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Delete", + "Next": "Describe StackSet" + } + ], + "Default": "Undefined Request Type" + }, + "Undefined Request Type": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Skip StackSets?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ResourceProperties.TemplateURL", + "StringEquals": "", + "Next": "Check Instance Pass" + } + ], + "Default": "Does StackSet Exist?" + }, + "Does StackSet Exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.StackSetExist", + "StringEquals": "no", + "Next": "Deploy StackSet Pass" + }, + { + "Variable": "$.StackSetExist", + "StringEquals": "yes", + "Next": "List StackInstances Accounts Pass" + } + ], + "Default": "Unable to describe StackSet" + }, + "Unable to describe StackSet": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Deploy StackSet Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "create_stack_set" + }, + "ResultPath": "$.params", + "Next": "Deploy StackSet" + }, + "Deploy StackSet": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "StackSet Deployed?" + }, + "StackSet Deployed?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.StackSetStatus", + "StringEquals": "success", + "Next": "Deploy Stack Instance?" + }, + { + "Variable": "$.StackSetStatus", + "StringEquals": "failure", + "Next": "StackSet Deployment Failed" + } + ], + "Default": "StackSet Deployment Failed" + }, + "StackSet Deployment Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Deploy Stack Instance?": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Variable": "$.ResourceProperties.AccountList", + "StringLessThan": "1" + }, + { + "Variable": "$.ResourceProperties.RegionList", + "StringLessThan": "1" + } + ], + "Next": "StackSet Deployed" + } + ], + "Default": "Create or Delete Stack Instance?" + }, + "Create or Delete Stack Instance?": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Variable": "$.CreateInstance", + "StringEquals": "no" + }, + { + "Variable": "$.DeleteInstance", + "StringEquals": "yes" + } + ], + "Next": "Reroute to Delete Pass" + }, + { + "Variable": "$.CreateInstance", + "StringEquals": "yes", + "Next": "Deploy Stack Instance Pass" + }, + { + "And": [ + { + "Variable": "$.CreateInstance", + "StringEquals": "no" + }, + { + "Variable": "$.DeleteInstance", + "StringEquals": "no" + } + ], + "Next": "Export Stack Output Pass" + } + ], + "Default": "Deploy Stack Instance Pass" + }, + "StackSet Deployed": { + "Type": "Pass", + "Next": "Export Stack Output Pass" + }, + "Deploy Stack Instance Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "create_stack_instances" + }, + "ResultPath": "$.params", + "Next": "Deploy Stack Instance" + }, + "Deploy Stack Instance": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Create Operation ID?" + }, + "Create Operation ID?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationId", + "StringEquals": "OperationInProgressException", + "Next": "Waiting on create... OperationInProgress" + } + ], + "Default": "Create Task Running" + }, + "Waiting on create... OperationInProgress": { + "Type": "Wait", + "Seconds": 30, + "Next": "Deploy Stack Instance" + }, + "Create Task Running": { + "Type": "Wait", + "Seconds": 10, + "Next": "Create Task Pass" + }, + "Create Task Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "describe_stack_set_operation" + }, + "ResultPath": "$.params", + "Next": "Create Task Status?" + }, + "Create Task Status?": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Create Task Completed?" + }, + "Create Task Completed?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationStatus", + "StringEquals": "SUCCEEDED", + "Next": "Create Task Completed" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "RUNNING", + "Next": "Create Task Running" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "FAILED", + "Next": "Create Task Failed" + } + ], + "Default": "Create Task Failed" + }, + "Create Task Completed": { + "Type": "Pass", + "Next": "Export Stack Output Pass" + }, + "Create Task Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "List StackInstances Accounts Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "list_stack_instances_account_ids" + }, + "ResultPath": "$.params", + "Next": "List StackInstances Accounts" + }, + "List StackInstances Accounts": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Check List StackInstances Accounts Complete?" + }, + "Check List StackInstances Accounts Complete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.NextToken", + "StringEquals": "Complete", + "Next": "Update StackSet Pass" + } + ], + "Default": "Check List StackInstances Accounts Wait" + }, + "Check List StackInstances Accounts Wait": { + "Type": "Wait", + "Seconds": 5, + "Next": "List StackInstances Accounts" + }, + "Update StackSet Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "update_stack_set" + }, + "ResultPath": "$.params", + "Next": "Update StackSet" + }, + "Update StackSet": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Update Operation ID?" + }, + "Update Operation ID?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationId", + "StringEquals": "OperationInProgressException", + "Next": "Waiting on update... OperationInProgress" + } + ], + "Default": "Update Task Running" + }, + "Waiting on update... OperationInProgress": { + "Type": "Wait", + "Seconds": 30, + "Next": "Update StackSet" + }, + "Update Task Running": { + "Type": "Wait", + "Seconds": 10, + "Next": "Update Task Pass" + }, + "Update Task Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "describe_stack_set_operation" + }, + "ResultPath": "$.params", + "Next": "Update Task Status?" + }, + "Update Task Status?": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Update Task Completed?" + }, + "Update Task Completed?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationStatus", + "StringEquals": "SUCCEEDED", + "Next": "Check Instance Pass" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "RUNNING", + "Next": "Update Task Running" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "STOPPED", + "Next": "Update Task Completed" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "STOPPING", + "Next": "Update Task Running" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "FAILED", + "Next": "Update Task Failed" + } + ], + "Default": "Update Task Failed" + }, + "Update Task Completed": { + "Type": "Pass", + "Next": "Export Stack Output Pass" + }, + "Update Task Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Check Instance Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "list_stack_instances" + }, + "ResultPath": "$.params", + "Next": "Check Instance" + }, + "Check Instance": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Check Complete?" + }, + "Check Complete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.NextToken", + "StringEquals": "Complete", + "Next": "Create or Update Instance?" + } + ], + "Default": "Check Instance Wait" + }, + "Check Instance Wait": { + "Type": "Wait", + "Seconds": 5, + "Next": "Check Instance" + }, + "Create or Update Instance?": { + "Type": "Choice", + "Choices": [ + { + "Or": [ + { + "Variable": "$.CreateInstance", + "StringEquals": "yes" + }, + { + "Variable": "$.DeleteInstance", + "StringEquals": "yes" + } + ], + "Next": "Deploy Stack Instance?" + }, + { + "And": [ + { + "Variable": "$.CreateInstance", + "StringEquals": "no" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Create" + } + ], + "Next": "Export Stack Output Pass" + }, + { + "And": [ + { + "Variable": "$.CreateInstance", + "StringEquals": "no" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update" + } + ], + "Next": "Update Stack Instance?" + } + ], + "Default": "Export Stack Output Pass" + }, + "Update Stack Instance?": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Variable": "$.ResourceProperties.AccountList", + "StringLessThan": "1" + }, + { + "Variable": "$.ResourceProperties.RegionList", + "StringLessThan": "1" + } + ], + "Next": "StackSet Updated" + }, + { + "Variable": "$.OverrideParametersExist", + "StringEquals": "no", + "Next": "Override parameters do not exist in the event" + } + ], + "Default": "Update Stack Instance Pass" + }, + "StackSet Updated": { + "Type": "Pass", + "Next": "Export Stack Output Pass" + }, + "Override parameters do not exist in the event": { + "Type": "Pass", + "Next": "Export Stack Output Pass" + }, + "Update Stack Instance Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "update_stack_instances" + }, + "ResultPath": "$.params", + "Next": "Update Stack Instance" + }, + "Update Stack Instance": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Update Instance Operation ID?" + }, + "Update Instance Operation ID?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationId", + "StringEquals": "OperationInProgressException", + "Next": "Waiting on Update... OperationInProgress" + } + ], + "Default": "Update Instance Task Running" + }, + "Waiting on Update... OperationInProgress": { + "Type": "Wait", + "Seconds": 30, + "Next": "Update Stack Instance" + }, + "Update Instance Task Running": { + "Type": "Wait", + "Seconds": 10, + "Next": "Update Instance Task Pass" + }, + "Update Instance Task Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "describe_stack_set_operation" + }, + "ResultPath": "$.params", + "Next": "Update Instance Task Status?" + }, + "Update Instance Task Status?": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Update Instance Task Completed?" + }, + "Update Instance Task Completed?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationStatus", + "StringEquals": "SUCCEEDED", + "Next": "Update Instance Task Completed" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "RUNNING", + "Next": "Update Instance Task Running" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "FAILED", + "Next": "Update Instance Task Failed" + } + ], + "Default": "Update Task Failed" + }, + "Update Instance Task Completed": { + "Type": "Pass", + "Next": "Export Stack Output Pass" + }, + "Update Instance Task Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Describe StackSet": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "describe_stack_set" + }, + "ResultPath": "$.params", + "Next": "Describe StackSet Function" + }, + "Describe StackSet Function": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Check StackSet Existence?" + }, + "Check StackSet Existence?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.StackSetExist", + "StringEquals": "no", + "Next": "StackSet Not Found" + }, + { + "Variable": "$.StackSetExist", + "StringEquals": "yes", + "Next": "List Stack Instances Pass" + } + ], + "Default": "Unable to find StackSet" + }, + "Unable to find StackSet": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "StackSet Not Found": { + "Type": "Pass", + "Next": "Send Success Pass" + }, + "List Stack Instances Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "list_stack_instances" + }, + "ResultPath": "$.params", + "Next": "List Stack Instances" + }, + "List Stack Instances": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Does Stack Instance Exist?" + }, + "Does Stack Instance Exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.InstanceExist", + "StringEquals": "yes", + "Next": "Delete Stack Instances Pass" + }, + { + "Variable": "$.InstanceExist", + "StringEquals": "no", + "Next": "Event from CloudFormation?" + } + ], + "Default": "Unable to list stack instances" + }, + "Event from CloudFormation?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ResourceProperties.TemplateURL", + "StringEquals": "", + "Next": "Send Success Pass" + } + ], + "Default": "Delete StackSet Pass" + }, + "Unable to list stack instances": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Delete Stack Instances Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "delete_stack_instances" + }, + "ResultPath": "$.params", + "Next": "Delete Stack Instance Function" + }, + "Delete Stack Instance Function": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Delete Operation ID?" + }, + "Delete Operation ID?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationId", + "StringEquals": "OperationInProgressException", + "Next": "Waiting on delete... OperationInProgress" + } + ], + "Default": "Delete Task Running" + }, + "Waiting on delete... OperationInProgress": { + "Type": "Wait", + "Seconds": 30, + "Next": "Delete Stack Instance Function" + }, + "Delete Task Running": { + "Type": "Wait", + "Seconds": 10, + "Next": "Delete Task Pass" + }, + "Delete Task Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "describe_stack_set_operation" + }, + "ResultPath": "$.params", + "Next": "Delete Task Status?" + }, + "Delete Task Status?": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Delete Task Completed?" + }, + "Delete Task Completed?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.OperationStatus", + "StringEquals": "SUCCEEDED", + "Next": "List Stack Remaining Instances Pass" + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "RUNNING", + "Next": "Delete Task Running" + }, + { + "And": [ + { + "Variable": "$.RetryDeleteFlag", + "BooleanEquals": false + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "FAILED" + } + ], + "Next": "Delete Task Failed" + }, + { + "And": [ + { + "Variable": "$.RetryDeleteFlag", + "BooleanEquals": true + }, + { + "Variable": "$.OperationStatus", + "StringEquals": "FAILED" + } + ], + "Next": "Delete Stack Instances Pass" + } + ], + "Default": "Delete Task Failed" + }, + "List Stack Remaining Instances Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "list_stack_instances" + }, + "ResultPath": "$.params", + "Next": "List Stack Instances Again" + }, + "List Stack Instances Again": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Check Remaining Stack Instance?" + }, + "Check Remaining Stack Instance?": { + "Type": "Choice", + "Choices": [ + { + "Or": [ + { + "Variable": "$.InstanceExist", + "StringEquals": "yes" + }, + { + "Variable": "$.ResourceProperties.TemplateURL", + "StringEquals": "" + } + ], + "Next": "Stack Instance Deleted" + }, + { + "Variable": "$.InstanceExist", + "StringEquals": "no", + "Next": "Delete StackSet Pass" + } + ], + "Default": "Send Failed Pass" + }, + "Stack Instance Deleted": { + "Type": "Pass", + "Next": "Send Success Pass" + }, + "Delete Task Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Delete StackSet Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "delete_stack_set" + }, + "ResultPath": "$.params", + "Next": "Delete StackSet Function" + }, + "Delete StackSet Function": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "InputPath": "$", + "Next": "Deleted StackSet" + }, + "Deleted StackSet": { + "Type": "Pass", + "Next": "Send Success Pass" + }, + "Export Stack Output Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "export_cfn_output" + }, + "ResultPath": "$.params", + "Next": "Export Stack Output" + }, + "Export Stack Output": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "SSM Parameter Store Pass" + }, + "SSM Parameter Store Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "ssm_put_parameters" + }, + "ResultPath": "$.params", + "Next": "Put Parameters" + }, + "Put Parameters": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Delete Stack Instance or Finish?" + }, + "Delete Stack Instance or Finish?": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Variable": "$.CreateInstance", + "StringEquals": "yes" + }, + { + "Variable": "$.DeleteInstance", + "StringEquals": "yes" + } + ], + "Next": "Reroute to Delete Pass" + } + ], + "Default": "Send Success Pass" + }, + "Reroute to Delete Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CloudFormation", + "FunctionName": "reroute_to_delete_stack_instances" + }, + "ResultPath": "$.params", + "Next": "Reroute to Delete" + }, + "Reroute to Delete": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Delete Stack Instances Pass" + }, + "Send Success Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_success_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Success Response" + }, + "Send Success Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Success" + }, + "Success": { + "Type": "Succeed" + }, + "Send Failed Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_failure_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Failed Response" + }, + "Send Failed Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Failed" + }, + "Failed": { + "Type": "Fail" + } + } + } + + ServiceCatalogStateMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneServiceCatalogStateMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine that manages the Service Catalog Portfolio and Products.", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Service Catalog: Create or Delete?" + }, + "Service Catalog: Create or Delete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create", + "Next": "List Portfolio Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update", + "Next": "List Portfolio Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Delete", + "Next": "Check Portfolio Pass" + } + ], + "Default": "Undefined Request Type" + }, + "Undefined Request Type": { + "Type": "Fail", + "Cause": "Undefined Request Type", + "Error": "Undefined Request Type" + }, + "List Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_portfolios" + }, + "ResultPath": "$.params", + "Next": "Check Portfolio Existence" + }, + "Check Portfolio Existence": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Does Portfolio Exist?" + }, + "Does Portfolio Exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PortfolioExist", + "StringEquals": "no", + "Next": "Create Portfolio Pass" + }, + { + "Variable": "$.PortfolioExist", + "StringEquals": "yes", + "Next": "Update Portfolio Pass" + } + ], + "Default": "Unable to find portfolio" + }, + "Unable to find portfolio": { + "Type": "Fail", + "Cause": "Portfolio Name not found in the response", + "Error": "Returning NULL in the response." + }, + "Create Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "create_portfolio" + }, + "ResultPath": "$.params", + "Next": "Create Portfolio" + }, + "Create Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Associate Principal with Portfolio Pass" + }, + "Update Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "update_portfolio" + }, + "ResultPath": "$.params", + "Next": "Update Portfolio" + }, + "Update Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Associate Principal with Portfolio Pass" + }, + "Associate Principal with Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "associate_principal_with_portfolio" + }, + "ResultPath": "$.params", + "Next": "Associate Principal with Portfolio" + }, + "Associate Principal with Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Search Products Pass" + }, + "Search Products Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "search_products_as_admin" + }, + "ResultPath": "$.params", + "Next": "Search Products" + }, + "Search Products": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Does Product Exist?" + }, + "Does Product Exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ProductExist", + "StringEquals": "no", + "Next": "Create Product Pass" + }, + { + "Variable": "$.ProductExist", + "StringEquals": "yes", + "Next": "Update Product Pass" + } + ], + "Default": "Unable to find product" + }, + "Unable to find product": { + "Type": "Fail", + "Cause": "Product Name not found in the response" + }, + "Create Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "create_product" + }, + "ResultPath": "$.params", + "Next": "Create Product" + }, + "Create Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "List Portfolios for the Product Pass" + }, + "Update Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "update_product" + }, + "ResultPath": "$.params", + "Next": "Update Product" + }, + "Update Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "List Artifacts Pass" + }, + "List Artifacts Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_provisioning_artifacts" + }, + "ResultPath": "$.params", + "Next": "List Artifacts" + }, + "List Artifacts": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Compare Templates Pass" + }, + + "Compare Templates Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "compare_product_templates" + }, + "ResultPath": "$.params", + "Next": "Compare Product Templates" + }, + "Compare Product Templates": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create New Artifact?" + }, + + + "Create New Artifact?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.CreateNewArtifact", + "StringEquals": "no", + "Next": "List Portfolios for the Product Pass" + }, + { + "Variable": "$.CreateNewArtifact", + "StringEquals": "yes", + "Next": "Reaching Version Limit?" + } + ], + "Default": "Reaching Version Limit?" + }, + + + + + + "Reaching Version Limit?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.DeleteOldestArtifact", + "StringEquals": "no", + "Next": "Create Artifact Pass" + }, + { + "Variable": "$.DeleteOldestArtifact", + "StringEquals": "yes", + "Next": "Delete Artifact Pass" + } + ], + "Default": "Delete Artifact Pass" + }, + "Delete Artifact Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "delete_provisioning_artifact" + }, + "ResultPath": "$.params", + "Next": "Delete Artifact" + }, + "Delete Artifact": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create Artifact Pass" + }, + "Create Artifact Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "create_provisioning_artifact" + }, + "ResultPath": "$.params", + "Next": "Create Artifact" + }, + "Create Artifact": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "New Artifact Status Pass" + }, + "New Artifact Status Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "describe_provisioning_artifact" + }, + "ResultPath": "$.params", + "Next": "New Artifact Status" + }, + "New Artifact Status": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Is New Artifact Available?" + }, + "Is New Artifact Available?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ProvisioningArtifactStatus", + "StringEquals": "AVAILABLE", + "Next": "Hide Previous Artifact?" + }, + { + "Variable": "$.ProvisioningArtifactStatus", + "StringEquals": "FAILED", + "Next": "New Artifact Creation Failed" + }, + { + "Variable": "$.ProvisioningArtifactStatus", + "StringEquals": "CREATING", + "Next": "New Artifact: Wait for 5 seconds" + } + ], + "Default": "New Artifact: Wait for 5 seconds" + }, + "New Artifact: Wait for 5 seconds": { + "Type": "Wait", + "Seconds": 5, + "Next": "New Artifact Status Pass" + }, + "New Artifact Creation Failed": { + "Type": "Fail", + "Cause": "Unable to create the new version." + }, + "Hide Previous Artifact?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ResourceProperties.SCProduct.HideOldVersions", + "StringEquals": "Yes", + "Next": "Update Artifact Pass" + } + ], + "Default": "List Portfolios for the Product Pass" + }, + "Update Artifact Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "update_provisioning_artifact" + }, + "ResultPath": "$.params", + "Next": "Update Artifact" + }, + "Update Artifact": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Update Artifact Status Pass" + }, + "Update Artifact Status Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "describe_provisioning_artifact" + }, + "ResultPath": "$.params", + "Next": "Update Artifact Status" + }, + "Update Artifact Status": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Is Updated Artifact Available?" + }, + "Is Updated Artifact Available?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ProvisioningArtifactStatus", + "StringEquals": "AVAILABLE", + "Next": "List Portfolios for the Product Pass" + }, + { + "Variable": "$.ProvisioningArtifactStatus", + "StringEquals": "FAILED", + "Next": "Artifact Update Failed" + }, + { + "Variable": "$.ProvisioningArtifactStatus", + "StringEquals": "CREATING", + "Next": "Update Artifact: Wait for 5 seconds" + } + ], + "Default": "Update Artifact: Wait for 5 seconds" + }, + "Update Artifact: Wait for 5 seconds": { + "Type": "Wait", + "Seconds": 5, + "Next": "Update Artifact Status Pass" + }, + "Artifact Update Failed": { + "Type": "Fail", + "Cause": "Unable to create the new version." + }, + "List Portfolios for the Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_portfolios_for_product" + }, + "ResultPath": "$.params", + "Next": "List Portfolios for the Product" + }, + "List Portfolios for the Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Is Product already associated with the portfolio?" + }, + "Is Product already associated with the portfolio?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.AlreadyAssociated", + "StringEquals": "no", + "Next": "Associate Product with Portfolio Pass" + }, + { + "Variable": "$.AlreadyAssociated", + "StringEquals": "yes", + "Next": "List Launch Constraints Pass" + } + ], + "Default": "Unable to check" + }, + "Unable to check": { + "Type": "Fail", + "Cause": "Unable to check if product is already associated" + }, + "Associate Product with Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "associate_product_with_portfolio" + }, + "ResultPath": "$.params", + "Next": "Associate Product with Portfolio" + }, + "Associate Product with Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "List Launch Constraints Pass" + }, + "List Launch Constraints Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_constraints_for_portfolio" + }, + "ResultPath": "$.params", + "Next": "List Launch Constraints" + }, + "List Launch Constraints": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Does launch constraint exist?" + }, + "Does launch constraint exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.LaunchConstraintExist", + "StringEquals": "yes", + "Next": "Describe Constraint Pass" + }, + { + "Variable": "$.LaunchConstraintExist", + "StringEquals": "no", + "Next": "Create Constraint Pass" + } + ], + "Default": "Unable to find a launch constraint" + }, + "Unable to find a launch constraint": { + "Type": "Fail", + "Cause": "Unable to check if launch constraint exist" + }, + "Describe Constraint Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "describe_constraint" + }, + "ResultPath": "$.params", + "Next": "Describe Constraint" + }, + "Describe Constraint": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Does the role arn match?" + }, + "Does the role arn match?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RoleArnMatched", + "StringEquals": "yes", + "Next": "SSM Parameter Store Pass" + }, + { + "Variable": "$.RoleArnMatched", + "StringEquals": "no", + "Next": "Delete Constraint Pass" + } + ], + "Default": "Unable to match" + }, + "Unable to match": { + "Type": "Fail", + "Cause": "Unable to match the role arn" + }, + "Delete Constraint Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "delete_constraint" + }, + "ResultPath": "$.params", + "Next": "Delete Constraint" + }, + "Delete Constraint": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create Constraint Pass" + }, + "Create Constraint Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "create_constraint" + }, + "ResultPath": "$.params", + "Next": "Create Constraint" + }, + "Create Constraint": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "SSM Parameter Store Pass" + }, + "SSM Parameter Store Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "ssm_put_parameters" + }, + "ResultPath": "$.params", + "Next": "Put Parameters" + }, + "Put Parameters": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Finish" + }, + "Finish": { + "Type": "Succeed" + }, + "Check Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_portfolios" + }, + "ResultPath": "$.params", + "Next": "Check Portfolio" + }, + "Check Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Check Product Pass" + }, + "Check Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "search_products_as_admin" + }, + "ResultPath": "$.params", + "Next": "Check Product" + }, + "Check Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Check Portfolios for the Product Pass" + }, + "Check Portfolios for the Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_portfolios_for_product" + }, + "ResultPath": "$.params", + "Next": "Check Portfolios for the Product" + }, + "Check Portfolios for the Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Check Launch Constraints Pass" + }, + "Check Launch Constraints Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_constraints_for_portfolio" + }, + "ResultPath": "$.params", + "Next": "Check Launch Constraints" + }, + "Check Launch Constraints": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Check Principals Pass" + }, + "Check Principals Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "list_principals_for_portfolio" + }, + "ResultPath": "$.params", + "Next": "Check Principals" + }, + "Check Principals": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Does portfolio exist?" + }, + "Does portfolio exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PortfolioExist", + "StringEquals": "yes", + "Next": "Does Constraint Exist?" + } + ], + "Default": "Finish" + }, + "Does Constraint Exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.LaunchConstraintExist", + "StringEquals": "yes", + "Next": "Delete Launch Constraint Pass" + } + ], + "Default": "Is product associated with the portfolio?" + }, + "Delete Launch Constraint Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "delete_constraint" + }, + "ResultPath": "$.params", + "Next": "Delete Launch Constraint" + }, + "Delete Launch Constraint": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Is product associated with the portfolio?" + }, + "Is product associated with the portfolio?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.AlreadyAssociated", + "StringEquals": "yes", + "Next": "Dissociate Product with Portfolio Pass" + } + ], + "Default": "Does launch product exist?" + }, + "Dissociate Product with Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "disassociate_product_from_portfolio" + }, + "ResultPath": "$.params", + "Next": "Dissociate Product with Portfolio" + }, + "Dissociate Product with Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Does launch product exist?" + }, + "Does launch product exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ProductExist", + "StringEquals": "yes", + "Next": "Delete Product Pass" + } + ], + "Default": "Is principal associated with Portfolio?" + }, + "Delete Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "delete_product" + }, + "ResultPath": "$.params", + "Next": "Delete Product" + }, + "Delete Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Is principal associated with Portfolio?" + }, + "Is principal associated with Portfolio?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.PrincipalExist", + "StringEquals": "yes", + "Next": "Disassociate Principal Pass" + } + ], + "Default": "Delete Portfolio Pass" + }, + "Disassociate Principal Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "disassociate_principal_from_portfolio" + }, + "ResultPath": "$.params", + "Next": "Disassociate Principal" + }, + "Disassociate Principal": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Delete Portfolio Pass" + }, + "Delete Portfolio Pass": { + "Type": "Pass", + "Result": { + "ClassName": "ServiceCatalog", + "FunctionName": "delete_portfolio" + }, + "ResultPath": "$.params", + "Next": "Delete Portfolio" + }, + "Delete Portfolio": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Finish" + } + } + } + + LaunchAVMStateMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneLaunchAVMStateMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine to launch or terminate Service Catalog Product", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Lookup Service Catalog Product Pass" + }, + "Lookup Service Catalog Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "lookup_product" + }, + "ResultPath": "$.params", + "Next": "Lookup Service Catalog Product" + }, + "Lookup Service Catalog Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "ConfigureCount Pass" + }, + "ConfigureCount Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "configure_count" + }, + "ResultPath": "$.params", + "Next": "ConfigureCount" + }, + "ConfigureCount": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Iterator Pass" + }, + "Iterator Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "iterator" + }, + "ResultPath": "$.params", + "Next": "Iterator" + }, + "Iterator": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "IsCountReached" + }, + "IsCountReached": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.Continue", + "BooleanEquals": true, + "Next": "Search Provisioned Product Pass" + } + ], + "Default": "Send Success Pass" + }, + "Search Provisioned Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "search_provisioned_products" + }, + "ResultPath": "$.params", + "Next": "Search Provisioned Product" + }, + "Search Provisioned Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Search Complete?" + }, + "Search Complete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.NextPageToken", + "StringEquals": "Complete", + "Next": "Does Provisioned Product Exist?" + } + ], + "Default": "Search Provisioned Product Account Wait" + }, + "Search Provisioned Product Account Wait": { + "Type": "Wait", + "Seconds": 1, + "Next": "Search Provisioned Product Pass" + }, + "Does Provisioned Product Exist?": { + "Type": "Choice", + "Choices": [ + { + "And": [ + { + "Variable": "$.ProvisionedProductExists", + "BooleanEquals": true + }, + { + "Variable": "$.RequestType", + "StringEquals": "Create" + } + ], + "Next": "Update Provisioned Product Pass" + }, + { + "And": [ + { + "Variable": "$.ProvisionedProductExists", + "BooleanEquals": true + }, + { + "Variable": "$.RequestType", + "StringEquals": "Delete" + } + ], + "Next": "Terminate Provisioned Product Pass" + }, + { + "And": [ + { + "Variable": "$.ProvisionedProductExists", + "BooleanEquals": false + }, + { + "Variable": "$.RequestType", + "StringEquals": "Create" + } + ], + "Next": "Launch Product Pass" + }, + { + "And": [ + { + "Variable": "$.ProvisionedProductExists", + "BooleanEquals": false + }, + { + "Variable": "$.RequestType", + "StringEquals": "Delete" + } + ], + "Next": "Iterator Pass" + } + ] + }, + "Update Provisioned Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "update_provisioned_product" + }, + "ResultPath": "$.params", + "Next": "Update Provisioned Product" + }, + "Update Provisioned Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Describe Provisioned Product Pass" + }, + "Terminate Provisioned Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "terminate_provisioned_product" + }, + "ResultPath": "$.params", + "Next": "Terminate Provisioned Product" + }, + "Terminate Provisioned Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Describe Provisioned Product Pass" + }, + "Launch Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "provision_product" + }, + "ResultPath": "$.params", + "Next": "Launch Product" + }, + "Launch Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Describe Provisioned Product Pass" + }, + "Describe Provisioned Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "LaunchAVM", + "FunctionName": "describe_record" + }, + "ResultPath": "$.params", + "Next": "Describe Provisioned Product" + }, + "Describe Provisioned Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Is Product Provisioned Or Terminated successfully?" + }, + "Is Product Provisioned Or Terminated successfully?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ProvisioningStatus", + "StringEquals": "FAILED", + "Next": "Send Failed Pass" + }, + { + "Variable": "$.ProvisioningStatus", + "StringEquals": "SUCCEEDED", + "Next": "Iterator Pass" + }, + { + "Variable": "$.ProvisioningStatus", + "StringEquals": "RETRY", + "Next": "Random Wait Pass" + } + ], + "Default": "Wait For Product To Provision" + }, + "Random Wait Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "random_wait" + }, + "ResultPath": "$.params", + "Next": "Random Wait" + }, + "Random Wait": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 900, + "HeartbeatSeconds": 60, + "Next": "Does Provisioned Product Exist?" + }, + "Wait For Product To Provision": { + "Type": "Wait", + "Seconds": 10, + "Next": "Describe Provisioned Product Pass" + }, + "Send Success Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_success_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Success Response" + }, + "Send Success Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Success" + }, + "Success": { + "Type": "Succeed" + }, + "Send Failed Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_failure_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Failed Response" + }, + "Send Failed Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Failed" + }, + "Failed": { + "Type": "Fail" + } + } + } + CheckAVMExistsStateMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneCheckAVMExistsStateMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine to check if the Provisioned product exists?", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create or Delete?" + }, + "Create or Delete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RequestType", + "StringEquals": "Create", + "Next": "Lookup Service Catalog Product Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update", + "Next": "Lookup Service Catalog Product Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Delete", + "Next": "Send Success Pass" + } + ] + }, + "Lookup Service Catalog Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CheckAVMExists", + "FunctionName": "lookup_product" + }, + "ResultPath": "$.params", + "Next": "Lookup Service Catalog Product" + }, + "Lookup Service Catalog Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Search Provisioned Product Pass" + }, + "Search Provisioned Product Pass": { + "Type": "Pass", + "Result": { + "ClassName": "CheckAVMExists", + "FunctionName": "search_provisioned_products" + }, + "ResultPath": "$.params", + "Next": "Search Provisioned Product" + }, + "Search Provisioned Product": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "Next": "Search Complete?" + }, + "Search Complete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.NextPageToken", + "StringEquals": "Complete", + "Next": "Does Provisioned Product Exist?" + } + ], + "Default": "Search Provisioned Product Account Wait" + }, + "Search Provisioned Product Account Wait": { + "Type": "Wait", + "Seconds": 1, + "Next": "Search Provisioned Product Pass" + }, + "Does Provisioned Product Exist?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.ProvisionedProductExists", + "BooleanEquals": true, + "Next": "Send Failed Pass" + }, + { + "Variable": "$.ProvisionedProductExists", + "BooleanEquals": false, + "Next": "Send Success Pass" + } + ] + }, + "Send Success Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_success_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Success Response" + }, + "Send Success Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Success" + }, + "Success": { + "Type": "Succeed" + }, + "Send Failed Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_failure_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Failed Response" + }, + "Send Failed Response": { + "Type": "Task", + "Resource": "${StateMachineLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Failed" + }, + "Failed": { + "Type": "Fail" + } + } + } + + HandshakeStateMachine: + Type: 'AWS::StepFunctions::StateMachine' + Properties: + StateMachineName: LandingZoneHandshakeStateMachine + RoleArn: !GetAtt 'StateMachineRole.Arn' + DefinitionString: + Fn::Sub: |- + { + "Comment": "A state machine that manages the handshakes between hub and spoke accounts for multiple AWS services", + "StartAt": "Metrics Pass", + "States": { + "Metrics Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_execution_data" + }, + "ResultPath": "$.params", + "Next": "Metrics" + }, + "Metrics": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Describe Resources Hub Pass" + }, + "Describe Resources Hub Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Hub", + "ClassName": "Handshake", + "FunctionName": "describe_resources" + }, + "ResultPath": "$.params", + "Next": "Describe Resources Hub" + }, + "Describe Resources Hub": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Describe Resources Spoke Pass" + }, + "Describe Resources Spoke Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Spoke", + "ClassName": "Handshake", + "FunctionName": "describe_resources" + }, + "ResultPath": "$.params", + "Next": "Describe Resources Spoke" + }, + "Describe Resources Spoke": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Action: Create or Delete?" + }, + "Action: Create or Delete?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RequestType", + "StringEquals": "Delete", + "Next": "Delete Resources Spoke Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Create", + "Next": "Create Resources Spoke Pass" + }, + { + "Variable": "$.RequestType", + "StringEquals": "Update", + "Next": "Create Resources Spoke Pass" + } + ], + "Default": "Undefined Request Type" + }, + "Create Resources Spoke Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Spoke", + "ClassName": "Handshake", + "FunctionName": "create_resources" + }, + "ResultPath": "$.params", + "Next": "Create Resources Spoke" + }, + "Create Resources Spoke": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Create Resources Hub Pass" + }, + "Create Resources Hub Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Hub", + "ClassName": "Handshake", + "FunctionName": "create_resources" + }, + "ResultPath": "$.params", + "Next": "Create Resources Hub" + }, + "Create Resources Hub": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Send Invitation Pass" + }, + "Send Invitation Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Hub", + "ClassName": "Handshake", + "FunctionName": "send_invitation" + }, + "ResultPath": "$.params", + "Next": "Send Invitation" + }, + "Send Invitation": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Accept Invitation Pass" + }, + "Accept Invitation Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Spoke", + "ClassName": "Handshake", + "FunctionName": "accept_invitation" + }, + "ResultPath": "$.params", + "Next": "Accept Invitation" + }, + "Accept Invitation": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Invitation Status Pass" + }, + "Invitation Status Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Spoke", + "ClassName": "Handshake", + "FunctionName": "check_invitation_status" + }, + "ResultPath": "$.params", + "Next": "Invitation Status" + }, + "Invitation Status": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Handshake Completed?" + }, + "Handshake Completed?": { + "Type": "Choice", + "Choices": [ + { + "Variable": "$.RelationshipStatus", + "StringEquals": "active", + "Next": "Handshake Successful" + }, + { + "Variable": "$.RelationshipStatus", + "StringEquals": "enabled", + "Next": "Handshake Successful" + }, + { + "Variable": "$.RelationshipStatus", + "StringEquals": "created", + "Next": "Handshake Successful" + }, + { + "Variable": "$.RelationshipStatus", + "StringEquals": "emailverification", + "Next": "Handshake Failed" + }, + { + "Variable": "$.RelationshipStatus", + "StringEquals": "rejected", + "Next": "Handshake Failed" + }, + { + "Variable": "$.RelationshipStatus", + "StringEquals": "expired", + "Next": "Handshake Failed" + }, + { + "Variable": "$.RelationshipStatus", + "StringEquals": "MasterAcctIdEqualsMemberAcctId", + "Next": "Handshake Successful" + } + ], + "Default": "Processing Invitation" + }, + "Handshake Successful": { + "Type": "Pass", + "Next": "SSM Parameter Store Pass" + }, + "Handshake Failed": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "Processing Invitation": { + "Type": "Wait", + "Seconds": 10, + "Next": "Invitation Status Pass" + }, + "Delete Resources Spoke Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Spoke", + "ClassName": "Handshake", + "FunctionName": "delete_resources" + }, + "ResultPath": "$.params", + "Next": "Delete Resources Spoke" + }, + "Delete Resources Spoke": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Delete Resources Hub Pass" + }, + "Delete Resources Hub Pass": { + "Type": "Pass", + "Result": { + "PeerType": "Hub", + "ClassName": "Handshake", + "FunctionName": "delete_resources" + }, + "ResultPath": "$.params", + "Next": "Delete Resources Hub" + }, + "Delete Resources Hub": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Send Success Pass" + }, + "Undefined Request Type": { + "Type": "Pass", + "Next": "Send Failed Pass" + }, + "SSM Parameter Store Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "ssm_put_parameters" + }, + "ResultPath": "$.params", + "Next": "Put Parameters" + }, + "Put Parameters": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Send Success Pass" + }, + "Send Success Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_success_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Success Response" + }, + "Send Success Response": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Success" + }, + "Success": { + "Type": "Succeed" + }, + "Send Failed Pass": { + "Type": "Pass", + "Result": { + "ClassName": "GeneralFunctions", + "FunctionName": "send_failure_to_cfn" + }, + "ResultPath": "$.params", + "Next": "Send Failed Response" + }, + "Send Failed Response": { + "Type": "Task", + "Resource": "${HandshakeSMLambda.Arn}", + "TimeoutSeconds": 300, + "HeartbeatSeconds": 60, + "Next": "Failed" + }, + "Failed": { + "Type": "Fail" + } + } + } + +# Add-On Publisher Resources + + # Permissions & Policies + + PublisherScheduleRulePermission: + Type: AWS::Lambda::Permission + Condition: IsAddonsManagedCondition + Properties: + FunctionName: !Ref PublishAddonsFunction + Action: lambda:InvokeFunction + Principal: events.amazonaws.com + SourceArn: !GetAtt PublisherScheduleRule.Arn + + PublisherLambdaRole: + Condition: IsAddonsManagedCondition + Metadata: + cfn_nag: + rules_to_suppress: + - id: W11 + reason: "Allow Resource * to allow updating resources defined by the customer." + Type: AWS::IAM::Role + Properties: + AssumeRolePolicyDocument: + Version: 2012-10-17 + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: sts:AssumeRole + Path: "/" + ManagedPolicyArns: + - arn:aws:iam::aws:policy/AWSServiceCatalogAdminFullAccess + Policies: + - PolicyName: LambdaPublisherPolicy + PolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Action: + - logs:CreateLogGroup + - logs:CreateLogStream + - logs:PutLogEvents + Resource: + - !Join ['', ['arn:aws:logs:', !Ref 'AWS::Region', ':', !Ref 'AWS::AccountId', + ':log-group:/aws/lambda/*']] + - Effect: Allow + Action: + - cloudformation:GetTemplateSummary + - cloudformation:DescribeStacks + - cloudformation:ValidateTemplate + - cloudformation:CreateUploadBucket + Resource: '*' + - Effect: Allow + Action: + - xray:PutTraceSegments + - xray:PutTelemetryRecords + Resource: '*' + - Effect: Allow + Action: + - cloudformation:UpdateStack + Resource: !Sub ${AWS::StackId} + - Effect: Allow + Action: + - sns:Publish + Resource: !Ref AddonSNSTopic + + # SNS Topic + + AddonSNSTopic: + Type: AWS::SNS::Topic + Metadata: + cfn_nag: + rules_to_suppress: + - id: W47 + reason: "The SNS topic does not require a KMS Master Key." + Condition: IsAddonsManagedCondition + Properties: + Subscription: + - Endpoint: !If [IsAddonsEmailEmpty, 'no-notifications@email.com', !Ref NotificationAddonsEmailParameter] + Protocol: email + TopicName: 'LZ-Addon-Updates' + + # Lambda + + PublishAddonsFunction: + Type: AWS::Lambda::Function + Condition: IsAddonsManagedCondition + Properties: + Role: !GetAtt PublisherLambdaRole.Arn + Description: AWS Landing Zone Addons Publisher + Environment: + Variables: + AddonTemplate: !FindInMap [Solution, Data, "AddonTemplate"] + AddonStack: !Sub ${AWS::StackId} + AddonTopic: !If [IsAddonsManagedCondition, !Ref AddonSNSTopic, ''] + ReleaseNotes: https://solutions-reference.s3.amazonaws.com/aws-landing-zone/v2.3.1/release_notes.html + log_level: !FindInMap [LambdaFunction, Logging, Level] + Code: + S3Bucket: !Sub "solutions-${AWS::Region}" + S3Key: aws-landing-zone/v2.3.1/aws-landing-zone-addon-publisher.zip + FunctionName: LandingZoneAddonPublisher + Handler: publish.lambda_handler + Runtime: python3.7 + Timeout: 900 + + # CloudWatch [start] + + PublisherScheduleRule: + Type: AWS::Events::Rule + Condition: IsAddonsManagedCondition + Properties: + Description: Rule to trigger Publisher function on a schedule. + ScheduleExpression: cron(55 11 * * ? *) + State: ENABLED + Targets: + - Arn: !GetAtt PublishAddonsFunction.Arn + Id: PublishAddonsFunction + + # CloudWatch [end] + + # Addons Resources aov1.0 + + #Service Catalog Portfolio for Add-On Products + LandingZoneAddOnPortfolio: + Type: "AWS::ServiceCatalog::Portfolio" + Properties: + ProviderName: AWS Solutions + Description: Add-On Products for AWS Landing Zone + DisplayName: AWS Landing Zone - Add-On Products + Tags: + - Key: AWS Solutions + Value: Landing Zone Solution + + #Service Catalog Add-On Product1 + LandingZoneAddOnProduct1: + Type: "AWS::ServiceCatalog::CloudFormationProduct" + Properties: + Name: AWS Centralized Logging Solution - Landing Zone Add-On + Owner: AWS Solutions + Description: Install the centralized log aggregation and monitoring solution + ProvisioningArtifactParameters: + - Info: + LoadTemplateFromURL: https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.1/add-on/aws-centralized-logging-solution.template + Name: v1.2 + Description: Updated Node.js runtime to 12.x + + AddLandingZoneAddOnProduct1ToPortfolio: + Type: "AWS::ServiceCatalog::PortfolioProductAssociation" + Properties: + PortfolioId: !Ref LandingZoneAddOnPortfolio + ProductId: !Ref LandingZoneAddOnProduct1 + + LandingZoneAddOnProduct1LaunchConstraint: + Type: "AWS::ServiceCatalog::LaunchRoleConstraint" + DependsOn: + - AddLandingZoneAddOnProduct1ToPortfolio + Properties: + Description: !Sub Constraint for Product ID - ${LandingZoneAddOnProduct1} + PortfolioId: !Ref LandingZoneAddOnPortfolio + ProductId: !Ref LandingZoneAddOnProduct1 + RoleArn: !Sub ${LandingZoneSCProductConstraintRole.Arn} + + #Service Catalog Add-On Product2 + LandingZoneAddOnProduct2: + Type: "AWS::ServiceCatalog::CloudFormationProduct" + Properties: + Name: AWS Managed AD and Directory Connector for AWS SSO - Landing Zone Add-On + Owner: AWS Solutions + Description: This AWS Landing Zone add-on will deploy Directory Connector for AWS SSO peered with AWS Managed Active Directory and a Remote Desktop Gateway in the shared service account. Use this add-on to provide an AWS managed AD infrastructure for controlling user access to AWS and your EC2 instances. + ProvisioningArtifactParameters: + - Info: + LoadTemplateFromURL: https://s3.amazonaws.com/solutions-reference/aws-landing-zone/v2.3.1/add-on/aws-ad-with-rdgw-ad-connector.template + Name: v1.3 + Description: This version corrects an issue impacting pipeline execution during add-on installation. + + AddLandingZoneAddOnProduct2ToPortfolio: + Type: "AWS::ServiceCatalog::PortfolioProductAssociation" + Properties: + PortfolioId: !Ref LandingZoneAddOnPortfolio + ProductId: !Ref LandingZoneAddOnProduct2 + + LandingZoneAddOnProduct2LaunchConstraint: + Type: "AWS::ServiceCatalog::LaunchRoleConstraint" + DependsOn: + - AddLandingZoneAddOnProduct2ToPortfolio + Properties: + Description: !Sub Constraint for Product ID - ${LandingZoneAddOnProduct2} + PortfolioId: !Ref LandingZoneAddOnPortfolio + ProductId: !Ref LandingZoneAddOnProduct2 + RoleArn: !Sub ${LandingZoneSCProductConstraintRole.Arn} + +Outputs: + LandingZoneCodePipeline: + Description: AWS Landing Zone CodePipieline + Value: !Ref LandingZoneCodePipeline + LandingZonePipelineS3Bucket: + Description: AWS Landing Zone Configuration Bucket + Value: !Ref LandingZonePipelineS3Bucket + LandingZoneSolutionVersion: + Description: Version Number + Value: "v2.3.1" + Export: + Name: AWS-Landing-Zone-Version + LandingZoneAddonsVersion: + Description: Addons Version Number + Value: "aov1.0" + Export: + Name: AWS-Landing-Zone-Addons-Version diff --git a/zip/v2.3.1/aws-landing-zone-launch-avm.zip b/zip/v2.3.1/aws-landing-zone-launch-avm.zip new file mode 100644 index 0000000..292ec60 Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-launch-avm.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-state-machine-trigger.zip b/zip/v2.3.1/aws-landing-zone-state-machine-trigger.zip new file mode 100644 index 0000000..29a0e3e Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-state-machine-trigger.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-state-machine.zip b/zip/v2.3.1/aws-landing-zone-state-machine.zip new file mode 100644 index 0000000..49de480 Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-state-machine.zip differ diff --git a/zip/v2.3.1/aws-landing-zone-validation.zip b/zip/v2.3.1/aws-landing-zone-validation.zip new file mode 100644 index 0000000..2a6b839 Binary files /dev/null and b/zip/v2.3.1/aws-landing-zone-validation.zip differ