Merge branch 'feature/vincilb/credential-vendor-cicd' into 'develop'

Migrated CICD Integration Account

See merge request genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator!181

Author: rstrahan

.gitlab-ci.yml

@@ -46,11 +46,11 @@ developer_tests:
 
 integration_tests:
   stage: integration_tests
-  variables:
-    # In order to run tests in another account, add a AWS_CREDS_TARGET_ROLE variable to the Gitlab pipeline variables.
-    AWS_CREDS_TARGET_ROLE: ${AWS_CREDS_TARGET_ROLE}
-    AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
-    IDP_ACCOUNT_ID: ${IDP_ACCOUNT_ID}
+  # variables:
+  #   # In order to run tests in another account, add a AWS_CREDS_TARGET_ROLE variable to the Gitlab pipeline variables.
+  #   AWS_CREDS_TARGET_ROLE: ${AWS_CREDS_TARGET_ROLE}
+  #   AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
+  #   IDP_ACCOUNT_ID: ${IDP_ACCOUNT_ID}
 
   # Add rules to only run on develop branch
   rules:

scripts/sdlc/cfn/codepipeline-s3.yml

@@ -13,7 +13,7 @@ Parameters:
   BucketName:
     Type: String
     Description: 'Name of the S3 bucket containing the deployment assets'
-    Default: idp-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION
+    Default: idp-sdlc-sourcecode-YOUR_AWS_ACCOUNT-YOUR_REGION
 
   FileKey:
     Type: String

scripts/sdlc/cfn/credential-vendor.yml

@@ -27,7 +27,7 @@ Parameters:
     Type: String
     Description: Source code bucket name
     AllowedPattern: .+
-    Default: idp-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION
+    Default: idp-sdlc-sourcecode-YOUR_AWS_ACCOUNT-YOUR_REGION
     ConstraintDescription: Source code bucket must be provided
 
 Resources:

scripts/sdlc/cfn/s3-sourcecode.yml

@@ -8,10 +8,10 @@ Parameters:
   BucketName:
     Type: String
     Description: Name of the S3 bucket to create
-    Default: idp-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION
+    Default: idp-sdlc-sourcecode-YOUR_AWS_ACCOUNT-YOUR_REGION
 
 Resources:
-  IdkInitialInstallAsset:
+  InitialInstallBucket:
     Type: 'AWS::S3::Bucket'
     Metadata:
       cfn_nag:
@@ -34,8 +34,3 @@ Resources:
         ServerSideEncryptionConfiguration:
           - ServerSideEncryptionByDefault:
               SSEAlgorithm: AES256
-
-Outputs:
-  BucketName:
-    Description: Name of the created S3 bucket
-    Value: !Ref IdkInitialInstallAsset

scripts/sdlc/idp-cli/Makefile

@@ -1,11 +1,11 @@
 IDP_ACCOUNT_ID?=715841340161
 AWS_REGION?=us-east-1
-IDP_ADMIN_EMAIL?=vincilb@amazon.com
+IDP_ADMIN_EMAIL?=strahanr@amazon.com
 IDP_CWD?=../../../
 DEBUG?=True
 
 INSTALL_BUCKET?=none
-SDLC_SOURCE_CODE_BUCKET?=idp-sdlc-source-code-$(IDP_ACCOUNT_ID)-$(AWS_REGION)
+SDLC_SOURCE_CODE_BUCKET?=idp-sdlc-sourcecode-$(IDP_ACCOUNT_ID)-$(AWS_REGION)
 IDP_CFN_PREFIX?=idp-dev
 IDP_STACK_NAME?=$(IDP_CFN_PREFIX)
 IDP_PIPELINE_NAME?=idp-sdlc-deploy-pipeline