diff --git a/.github/platform-tg-infra.code-workspace b/.github/platform-tg-infra.code-workspace index d06d1f1..0edd63a 100644 --- a/.github/platform-tg-infra.code-workspace +++ b/.github/platform-tg-infra.code-workspace @@ -101,6 +101,9 @@ }, { "path": "../../../terraform-modules/aws-s3" + }, + { + "path": "../../269244441389-lab-gov-network-nonprod" } ] } diff --git a/buildspecs/deploy.terragrunt.yml b/buildspecs/deploy.terragrunt.yml index 07173bf..d5025c0 100644 --- a/buildspecs/deploy.terragrunt.yml +++ b/buildspecs/deploy.terragrunt.yml @@ -27,12 +27,12 @@ phases: # Set up certificate for proxy access - mkdir -p $CERT_DIR - - cp buildspecs/census-pki.bundle.crt $CERT_DIR/bundle.crt - - export SSL_CERT_FILE=$CERT_DIR/bundle.crt - - export REQUESTS_CA_BUNDLE=$CERT_DIR/bundle.crt - - export NODE_EXTRA_CA_CERTS=$CERT_DIR/bundle.crt - - export CURL_CA_BUNDLE=$CERT_DIR/bundle.crt - - export AWS_CA_BUNDLE=$CERT_DIR/bundle.crt + - cp buildspecs/census-pki.bundle.crt $CERT_DIR/ + - export SSL_CERT_FILE=$CERT_DIR/census-pki.bundle.crt + - export REQUESTS_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + - export NODE_EXTRA_CA_CERTS=$CERT_DIR/census-pki.bundle.crt + - export CURL_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + - export AWS_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt # Create tools directory if it doesn't exist - mkdir -p $TOOLS_DIR/bin diff --git a/buildspecs/security.yml b/buildspecs/security.yml index 93b9263..f14a4e3 100644 --- a/buildspecs/security.yml +++ b/buildspecs/security.yml @@ -22,13 +22,13 @@ phases: # Set up certificate for proxy access - mkdir -p $CERT_DIR - - cp buildspecs/bundle.crt $CERT_DIR/ - - export SSL_CERT_FILE=$CERT_DIR/bundle.crt - - export REQUESTS_CA_BUNDLE=$CERT_DIR/bundle.crt - - export NODE_EXTRA_CA_CERTS=$CERT_DIR/bundle.crt - - export CURL_CA_BUNDLE=$CERT_DIR/bundle.crt - - export AWS_CA_BUNDLE=$CERT_DIR/bundle.crt - + - cp buildspecs/census-pki.bundle.crt $CERT_DIR/ + - export SSL_CERT_FILE=$CERT_DIR/census-pki.bundle.crt + - export REQUESTS_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + - export NODE_EXTRA_CA_CERTS=$CERT_DIR/census-pki.bundle.crt + - export CURL_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + - export AWS_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + # Install security scanning tools - mkdir -p $TOOLS_DIR/bin - pip install checkov -q diff --git a/buildspecs/terragrunt.yml b/buildspecs/terragrunt.yml index 4bb4a58..58e46fe 100644 --- a/buildspecs/terragrunt.yml +++ b/buildspecs/terragrunt.yml @@ -27,12 +27,12 @@ phases: # Set up certificate for proxy access - mkdir -p $CERT_DIR - - cp buildspecs/bundle.crt $CERT_DIR/ - - export SSL_CERT_FILE=$CERT_DIR/bundle.crt - - export REQUESTS_CA_BUNDLE=$CERT_DIR/bundle.crt - - export NODE_EXTRA_CA_CERTS=$CERT_DIR/bundle.crt - - export CURL_CA_BUNDLE=$CERT_DIR/bundle.crt - - export AWS_CA_BUNDLE=$CERT_DIR/bundle.crt + - cp buildspecs/census-pki.bundle.crt $CERT_DIR/ + - export SSL_CERT_FILE=$CERT_DIR/census-pki.bundle.crt + - export REQUESTS_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + - export NODE_EXTRA_CA_CERTS=$CERT_DIR/census-pki.bundle.crt + - export CURL_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt + - export AWS_CA_BUNDLE=$CERT_DIR/census-pki.bundle.crt # Create tools directory if it doesn't exist - mkdir -p $TOOLS_DIR/bin diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-pipeline/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-pipeline/terragrunt.hcl index 85a2765..b7902e7 100644 --- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-pipeline/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-pipeline/terragrunt.hcl @@ -63,7 +63,7 @@ inputs = { REGION = include.root.inputs.aws_region ENVIRONMENT = include.root.inputs.environment_abbr AWS_ACCOUNT_ID = include.root.inputs.aws_account_id - PROXY_CONFIG = "http://proxy.tco.census.gov:3128" + PROXY_CONFIG = "http://vlab-proxy.tco.census.gov:3128" } } @@ -89,7 +89,7 @@ inputs = { REGION = include.root.inputs.aws_region ENVIRONMENT = include.root.inputs.environment_abbr AWS_ACCOUNT_ID = include.root.inputs.aws_account_id - PROXY_CONFIG = "http://proxy.tco.census.gov:3128" + PROXY_CONFIG = "http://vlab-proxy.tco.census.gov:3128" } } }