Merge branch 'aws-ia:main' into main

.copier-answers.yml

@@ -1,6 +1,6 @@
 # This file is auto-generated, changes will be overwritten
-_commit: v0.0.9
-_src_path: /task/32bef40b-d957-11ed-9e53-1a1b0d003a1d/projecttype
+_commit: v0.0.12
+_src_path: /task/fe46e51f-f5a9-11ed-9ff0-beb0a8d9c9fe/projecttype
 starting_version: v0.0.0
 version_file: VERSION
 

.project_automation/functional_tests/entrypoint.sh

@@ -1,20 +1,28 @@
 #!/bin/bash -ex
 
+
 ## NOTE: paths may differ when running in a managed task. To ensure behavior is consistent between
 # managed and local tasks always use these variables for the project and project type path
 PROJECT_PATH=${BASE_PATH}/project
 PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
 
 cd ${PROJECT_PATH}
 
+regions=(us-east-1 us-east-2 us-west-2 us-west-1)
+for region in ${regions[@]}
+do
+    echo "Cleanup running in region: $region"
+    export AWS_DEFAULT_REGION=$region
+    python3 scripts/cleanup_config.py -C scripts/cleanup_config.json
+done
+
+echo $AWS_DEFAULT_REGION
+unset AWS_DEFAULT_REGION
+
+echo $AWS_DEFAULT_REGION
 # Run taskcat e2e test
 taskcat test run
 
-
-#export AWS_DEFAULT_REGION=us-east-1
-#ls -l ${PROJECT_PATH}/scripts/cleanup_config.py
-#ls -l ${PROJECT_PATH}/scripts/cleanup_config.json 
-#python3 scripts/cleanup_config.py -C scripts/cleanup_config.json
 ## Executing ash tool
 
 #find ${PROJECT_PATH} -name lambda.zip -exec rm -rf {} \;

.project_automation/publication/entrypoint.sh

@@ -7,11 +7,13 @@ PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
 
 cd ${PROJECT_PATH}
 
-if [ -n "${BASE_PATH}" ]
-then
-  echo "Running Publication"
-  taskcat upload
-else
-  echo "Local build mode (skipping publication)"
-fi
+taskcat upload --bucket-name aws-abi-pilot --object-acl public-read
+
+# if [ -n "${BASE_PATH}" ]
+# then
+#   echo "Running Publication"
+#   taskcat upload
+# else
+#   echo "Local build mode (skipping publication)"
+# fi
 

.project_automation/static_tests/entrypoint.sh

@@ -7,5 +7,6 @@ PROJECT_TYPE_PATH=${BASE_PATH}/projecttype
 
 cd ${PROJECT_PATH}
 
-cfn-lint templates/*.yaml
+find templates -name *.yaml -o -name *.yml -o -name *.json | xargs cfn-lint
 taskcat lint
+

.taskcat.yml

@@ -1,33 +1,19 @@
 project:
-  name: update-me-to-project-repo-name
-  owner: quickstart@amazon.com
-  package_lambda: false
+  name: cfn-abi-crowdstrike-fcs
+  owner: support@crowdstrike.com # to be updated
+  shorten_stack_name: true
+  s3_regional_buckets: true
   regions:
-  - ap-northeast-1
-  - ap-northeast-2
-  - ap-southeast-1
-  - ap-southeast-2
-  - eu-central-1
-  - eu-west-1
-  - sa-east-1
   - us-east-1
-  - us-west-1
-  - us-west-2
+
 tests:
-  sample:
+  horizon-test:
     parameters:
-      Param1: 'Inputs to Stack'
-      # Examples: of other taskcat dynamic input parameters for more into see http://taskcat.io
-      #
-      #      AvailabilityZones: $[taskcat_genaz_3]
-      #      ByteValue: 1
-      #      PasswordA: $[taskcat_genpass_8A]
-      #      PasswordB: $[taskcat_genpass_32S]
-      #      RandomNumber: $[taskcat_random-numbers]
-      #      RandomString: $[taskcat_random-string]
-      #      StackName: TestStack
-      #      UUID: $[taskcat_genuuid]
-      #
+      FalconClientID: $[taskcat_ssm_/crowdstrike/falcon_client_id]
+      FalconSecret: $[taskcat_ssm_/crowdstrike/falcon_secret]
+      SourceS3BucketName: $[taskcat_autobucket]
+      S3BucketRegion: $[taskcat_current_region]
+      pOrganizationId: $[taskcat_ssm_/crowdstrike/organization-id]
     regions:
     - us-east-1
-    template: templates/sample-workload.template.yaml
+    template: templates/horizon_init_stack.yaml

scripts/cleanup_config.json

@@ -0,0 +1,10 @@
+[
+    {
+        "Type" : "S3_BUCKET",
+        "Filter" : "tcat-"
+    },
+    {
+        "Type" : "S3_BUCKET",
+        "Filter" : "cfn-abi-crowdstrike-fcs-"
+    }
+]