Fix dev pipeline deployment bug

Author: nhatnghiho

tests/ci/cdk/README.md

@@ -3,7 +3,7 @@
 AWS-LC CI uses AWS CDK to define and deploy AWS resources (e.g. AWS CodeBuild, ECR).
 
 ## Table of Contents
-- [CI Setup](#ci-setup)
+- [CDK Setup](#cdk-setup)
   - [Before running CDK command](#before-running-cdk-command)
   - [Minimal permissions](#minimal-permissions)
   - [Pipeline Commands](#pipeline-commands)
@@ -104,7 +104,7 @@ To deploy dev pipeline to the same account as your CI:
 
 To deploy dev pipeline but pipeline is hosted in a separate account:
 ```
-./run-cdk.sh --github-repo-owner ${GITHUB_REPO_OWNER} --github-source-version ${GITHUB_SOURCE_VERSION} --pipeline-acount ${PIPELINE_ACCOUNT_ID} --deploy-account ${DEPLOY_ACCOUNT_ID} --action deploy-dev-pipeline
+./run-cdk.sh --github-repo-owner ${GITHUB_REPO_OWNER} --github-source-version ${GITHUB_SOURCE_VERSION} --pipeline-account ${PIPELINE_ACCOUNT_ID} --deploy-account ${DEPLOY_ACCOUNT_ID} --action deploy-dev-pipeline
 ```
 
 To deploy production pipeline using default parameters:

tests/ci/cdk/cdk/windows_docker_image_build_stack.py

@@ -136,5 +136,5 @@ def __init__(
         Tags.of(instance).add(WIN_EC2_TAG_KEY, WIN_EC2_TAG_VALUE)
 
         self.output = {
-            "s3_bucket_name": bucket.bucket_name,
+            "s3_bucket_name": bucket._generate_physical_name(),
         }

tests/ci/cdk/pipeline/ci_stage.py

@@ -13,7 +13,8 @@
 from cdk.aws_lc_github_ci_stack import AwsLcGitHubCIStack
 from cdk.aws_lc_github_fuzz_ci_stack import AwsLcGitHubFuzzCIStack
 from pipeline.codebuild_batch_step import CodeBuildBatchStep
-from util.metadata import PRE_PROD_ACCOUNT
+from util.metadata import PRE_PROD_ACCOUNT, GITHUB_TOKEN_SECRET_NAME, STAGING_GITHUB_REPO_OWNER, \
+    STAGING_GITHUB_REPO_NAME
 
 
 class CiStage(Stage):
@@ -183,7 +184,7 @@ def add_stage_to_pipeline(
                     environment_variables={
                         "GITHUB_PAT":  codebuild.BuildEnvironmentVariable(
                             type=codebuild.BuildEnvironmentVariableType.SECRETS_MANAGER,
-                            value="aws-lc/ci/github/token",
+                            value=GITHUB_TOKEN_SECRET_NAME,
                         ),
                     }
                 ),
@@ -198,8 +199,8 @@ def add_stage_to_pipeline(
                     # "git push origin main",
                 ],
                 env={
-                    "STAGING_GITHUB_REPO_OWNER": "aws",
-                    "STAGING_GITHUB_REPO_NAME": "private-aws-lc-staging",
+                    "STAGING_GITHUB_REPO_OWNER": STAGING_GITHUB_REPO_OWNER,
+                    "STAGING_GITHUB_REPO_NAME": STAGING_GITHUB_REPO_NAME,
                 },
                 role=role,
                 timeout=Duration.minutes(60),

tests/ci/cdk/pipeline/windows_docker_image_build_stage.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 import typing
 
-from aws_cdk import Stage, Environment, Stack, Duration, aws_iam as iam, pipelines, Fn
+from aws_cdk import Stage, Environment, Stack, Duration, aws_iam as iam, pipelines
 from aws_cdk.pipelines import CodeBuildStep
 from constructs import Construct
 

tests/ci/cdk/run-cdk.sh

@@ -230,7 +230,7 @@ function deploy_production_pipeline() {
 }
 
 function deploy_dev_pipeline() {
-  if [[ -z "${DEPLOY_ACCOUNT:+x}" || -z "${PIPELINE_ACCOUNT}" ]]; then
+  if [[ -z "${DEPLOY_ACCOUNT:+x}" || -z "${DEPLOY_ACCOUNT}" ]]; then
     echo "The pipeline needs a deployment acount to know where to deploy the CI to."
     exit 1
   fi
@@ -241,7 +241,7 @@ function deploy_dev_pipeline() {
   fi
 
   if [[ -z "${PIPELINE_ACCOUNT+x}" || -z "${PIPELINE_ACCOUNT}" ]]; then
-    export PIPELINE_ACCOUNT=DEPLOY_ACCOUNT
+    export PIPELINE_ACCOUNT=${DEPLOY_ACCOUNT}
   fi
 
   if [[ ${PIPELINE_ACCOUNT+x} == '774305600158' ]]; then