AtlasOfLivingAustralia · hamzajaved-csiro · Jul 10, 2024 · Jun 13, 2024 · Jun 13, 2024 · Jun 13, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 Thumbs.db
 .DS_Store
 .gradle
-build/
+/build/
 .idea
 *.iml
 *.ipr

diff --git a/cicd/alerts/app/alerts-cf.yaml b/cicd/alerts/app/alerts-cf.yaml
diff --git a/cicd/alerts/pipeline/alerts_template_config.j2 b/cicd/alerts/pipeline/alerts_template_config.j2
diff --git a/cicd/alerts/pipeline/buildspec-alerts-deploy.yml b/cicd/alerts/pipeline/buildspec-alerts-deploy.yml
diff --git a/cicd/alerts/pipeline/buildspec-alerts.yml b/cicd/alerts/pipeline/buildspec-alerts.yml
diff --git a/cicd/alerts/pipeline/dd_notification.sh b/cicd/alerts/pipeline/dd_notification.sh
diff --git a/cicd/alerts/pipeline/slack_notification.sh b/cicd/alerts/pipeline/slack_notification.sh
diff --git a/cicd/containers/app/base.yaml → cicd/base/app/base.yaml b/cicd/containers/app/base.yaml → cicd/base/app/base.yaml
@@ -52,7 +52,7 @@ Resources:
  - Key: Branch
  Value: !Ref pCleanBranch
 
- AlertsSecrets:
+ AlertsSecret:
  Type: 'AWS::SecretsManager::Secret'
  Properties:
  Name: !Sub 
@@ -73,4 +73,12 @@ Outputs:
 
  AlertsRepositoryArn:
  Description: The ECR repository ARN for the Alerts service
- Value: !GetAtt AlertsRepository.Arn
+ Value: !GetAtt AlertsRepository.Arn
+
+ AlertsRepositoryName:
+ Description: The ECR repository ARN for the Alerts service
+ Value: !Ref AlertsRepository
+
+ AlertsSecret:
+ Description: The Secrets name for alerts 
+ Value: !Ref AlertsSecret
diff --git a/cicd/containers/app/base_template_config.j2 → cicd/base/app/base_template_config.j2 b/cicd/containers/app/base_template_config.j2 → cicd/base/app/base_template_config.j2
diff --git a/cicd/containers/config.ini → cicd/base/config.ini b/cicd/containers/config.ini → cicd/base/config.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-PRODUCT_COMPONENT = containers
+PRODUCT_COMPONENT = base
 PIPELINE_STACK_NAME = ala-${PRODUCT_NAME}-${PRODUCT_COMPONENT}-pipeline-${ENVIRONMENT}
 BASE_STACK_FILE_PFIX = base
 BASE_STACK_NAME = ala-${PRODUCT_NAME}-${PRODUCT_COMPONENT}-${ENVIRONMENT}

diff --git a/...peline/deploy_notification_buildspec.yaml → ...peline/deploy_notification_buildspec.yaml b/...peline/deploy_notification_buildspec.yaml → ...peline/deploy_notification_buildspec.yaml
@@ -15,8 +15,6 @@ env:
 phases:
 
  install:
- runtime-versions:
- python: 3.9
  commands:
  - echo Running on $(lsb_release -d | cut -f2)
  - echo aws-cli version $(aws --version)

diff --git a/cicd/containers/pipeline/deploy_pipeline.sh → cicd/base/pipeline/deploy_pipeline.sh b/cicd/containers/pipeline/deploy_pipeline.sh → cicd/base/pipeline/deploy_pipeline.sh
@@ -137,7 +137,6 @@ aws cloudformation deploy \
  --region $REGION \
  --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM \
  --parameter-overrides \
- pBaseStackName=$BASE_STACK_NAME \
  pAutoDeploy=$AUTO_DEPLOY \
  pBootstrapStackName=$BOOTSTRAP_STACK_NAME \
  pBucketsStackName=$BUCKETS_STACK_NAME \

diff --git a/...ers/pipeline/export_config_buildspec.yaml → ...ase/pipeline/export_config_buildspec.yaml b/...ers/pipeline/export_config_buildspec.yaml → ...ase/pipeline/export_config_buildspec.yaml
@@ -11,6 +11,7 @@ env:
  exported-variables:
  - CODEBUILD_BUILD_NUMBER
  - BASE_STACK_FILE_PFIX
+ - BASE_STACK_NAME
  - PRODUCT_NAME
  - PRODUCT_COMPONENT
  - SLACK_DEPLOY_NOTIFICATION
@@ -19,11 +20,10 @@ env:
 phases:
 
  install:
- runtime-versions:
- python: 3.9
  commands:
  - echo Running on $(lsb_release -d | cut -f2)
  - echo aws-cli version $(aws --version)
+ - pip install jinja2
  - export CUR_PIPELINE_FINGERPRINT=$(md5sum cicd/$PRODUCT_COMPONENT/pipeline/pipeline.yaml | awk '{print $1}')
  - # This next bit checks if the running pipeline is out of sync with the pipeline in the
  - # current code revision. If it is it re-launches itself! For a normal branch commit the