Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.

Commit 682acd5

Browse files
author
IA Automator
committed
(automated) Updates from project type
1 parent 4363a4c commit 682acd5

File tree

5 files changed

+13
-25
lines changed

5 files changed

+13
-25
lines changed

.copier-answers.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is auto-generated, changes will be overwritten
2-
_commit: v0.1.2
3-
_src_path: /task/b6167800-24f8-11ee-9cb9-d2ab01714b57/projecttype
2+
_commit: v0.1.6
3+
_src_path: /task/d212130c-f157-11ee-bfe8-8e8bad6d43a2/projecttype
44
starting_version: v0.0.0
55
version_file: VERSION
66

.project_automation/functional_tests/entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ secret_region="us-east-1"
4848
set +e
4949
overrides=$(aws secretsmanager get-secret-value --secret-id $secret_name --query SecretString --output text --region $secret_region)
5050
# convert the JSON string to YAML and save it to a file
51-
if [ "#?" -eq 0 ]; then
51+
if [ "$?" -eq 0 ]; then
5252
echo "$overrides" > .taskcat_overrides.yml
5353
fi
5454
set -e
+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
FROM public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:4.0
22
RUN yum install -y yum-utils && yum-config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && yum install -y gh
3-
RUN pip install copier taskcat yq jq awscli cfn-flip
3+
RUN pip install taskcat yq jq awscli
4+
RUN pip3 install 'copier==8.3.0'
5+
RUN pip install 'cfn-lint==0.83.2'
6+
RUN pip install bump2version

.project_automation/publication/s3_publish.sh

+1-20
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,4 @@ aws sts get-caller-identity --debug
6464

6565
chmod 755 ${project_root}/.project_automation/publication/assets/cred_helper.py
6666
# push to regional S3 buckets
67-
export TASKCAT_PROJECT_S3_REGIONAL_BUCKETS=true; taskcat -d upload -p ${project_root} -c "${automation_scripts_path}tmp.yml"
68-
69-
PUBLICATIONS_ASSETS_BUCKET=$(aws ssm get-parameter --region us-east-1 --name PUBLICATIONS_ASSETS_BUCKET --with-decryption | jq -r '.Parameter|.Value')
70-
71-
upload_assets_to_ssm(){
72-
cd ${project_root}
73-
APP_MGR_MANIFEST=${project_root}/manifests/app-manager/app-manager-manifest.yaml
74-
if [[ -f "$APP_MGR_MANIFEST" ]]; then
75-
aws s3 cp --region us-east-1 s3://${PUBLICATIONS_ASSETS_BUCKET}/template_to_ssm_doc_pusher.py ${project_root}/.project_automation/publication/assets/
76-
PUBLISH_SSM_DOC_ACCOUNT_ID=$(aws ssm get-parameter --region us-east-1 --name PUBLISH_SSM_DOC_ACCOUNT_ID --with-decryption | jq -r '.Parameter|.Value')
77-
version_suffix=$(date "+%Y-%m-%d-%H-%M-%S")
78-
regions=$(aws ec2 describe-regions --region us-east-1 --output text | cut -f4)
79-
aws sts get-caller-identity
80-
for region in ${regions}; do
81-
python ${project_root}/.project_automation/publication/assets/template_to_ssm_doc_pusher.py -a ${PUBLISH_SSM_DOC_ACCOUNT_ID} -f ${project_root}/manifests/app-manager/app-manager-manifest.yaml -r ${region} -v ${version_suffix} -d true
82-
done
83-
fi
84-
}
85-
86-
upload_assets_to_ssm
67+
export TASKCAT_PROJECT_S3_REGIONAL_BUCKETS=true; taskcat -d upload -p ${project_root} -c "${automation_scripts_path}tmp.yml"
+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
FROM public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:4.0
22
RUN git clone https://github.com/aws-quickstart/qs-cfn-lint-rules.git /tmp/qs-cfn-lint-rules
3+
<<<<<<< before updating
34
RUN cd /tmp/qs-cfn-lint-rules && git checkout 8268db9df3407ccf5383def635bc22e0f99d6b39 && pip install .
4-
#RUN cfn-lint -u
5+
#RUN cfn-lint -u
6+
=======
7+
RUN cd /tmp/qs-cfn-lint-rules && pip install .
8+
>>>>>>> after updating

0 commit comments

Comments
 (0)