diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 409137aa4b6..373f5cabb82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -320,13 +320,17 @@ review-app: {"name": "POSTGRES_WORKER_HOST", "value": "$CI_ENVIRONMENT_SLUG-identity-idp-chart-postgres.review-apps"}, {"name": "POSTGRES_WORKER_USERNAME", "value": "postgres"}, {"name": "POSTGRES_WORKER_PASSWORD", "value": "postgres"}, - {"name": "LOGIN_ENV", "value": "dev"}, {"name": "RAILS_OFFLINE", "value": "true"}, {"name": "REDIS_IRS_ATTEMPTS_API_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/2"}, {"name": "REDIS_THROTTLE_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/1"}, {"name": "REDIS_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379"}, {"name": "ASSET_HOST", "value": "https://$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, - {"name": "DOMAIN_NAME", "value": "$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"} + {"name": "DOMAIN_NAME", "value": "$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, + {"name": "LOGIN_DATACENTER", "value": "true" }, + {"name": "LOGIN_DOMAIN", "value": "identitysandbox.gov"}, + {"name": "LOGIN_ENV", "value": "$CI_ENVIRONMENT_SLUG" }, + {"name": "LOGIN_HOST_ROLE", "value": "idp" }, + {"name": "LOGIN_SKIP_REMOTE_CONFIG", "value": "true" } ] EOF ) @@ -343,13 +347,17 @@ review-app: {"name": "POSTGRES_WORKER_HOST", "value": "$CI_ENVIRONMENT_SLUG-identity-idp-chart-postgres.review-apps"}, {"name": "POSTGRES_WORKER_USERNAME", "value": "postgres"}, {"name": "POSTGRES_WORKER_PASSWORD", "value": "postgres"}, - {"name": "LOGIN_ENV", "value": "dev"}, {"name": "RAILS_OFFLINE", "value": "true"}, {"name": "REDIS_IRS_ATTEMPTS_API_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/2"}, {"name": "REDIS_THROTTLE_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/1"}, {"name": "REDIS_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379"}, {"name": "ASSET_HOST", "value": "https://$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, - {"name": "DOMAIN_NAME", "value": "$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"} + {"name": "DOMAIN_NAME", "value": "$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, + {"name": "LOGIN_DATACENTER", "value": "true" }, + {"name": "LOGIN_DOMAIN", "value": "identitysandbox.gov"}, + {"name": "LOGIN_ENV", "value": "$CI_ENVIRONMENT_SLUG" }, + {"name": "LOGIN_HOST_ROLE", "value": "worker" }, + {"name": "LOGIN_SKIP_REMOTE_CONFIG", "value": "true" } ] EOF ) diff --git a/Gemfile.lock b/Gemfile.lock index 614fd56a66a..12315d2a83e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/18F/identity-hostdata.git - revision: e33cbdb3a9c8826f6fc2b1f857fb713a4a233750 + revision: 9e2e0441cd93307cbfc5d5b8d4b3b7b4219394fb tag: v3.4.2 specs: - identity-hostdata (3.4.1) + identity-hostdata (3.4.2) activesupport (>= 6.1, < 8) aws-sdk-s3 (~> 1.8) @@ -139,17 +139,17 @@ GEM ast (2.4.2) awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.684.0) + aws-partitions (1.792.0) aws-sdk-cloudwatchlogs (1.49.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.168.4) + aws-sdk-core (3.179.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-pinpoint (1.62.0) aws-sdk-core (~> 3, >= 3.122.0) @@ -157,10 +157,10 @@ GEM aws-sdk-pinpointsmsvoice (1.29.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.132.0) + aws-sdk-core (~> 3, >= 3.179.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) + aws-sigv4 (~> 1.6) aws-sdk-ses (1.44.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) @@ -170,7 +170,7 @@ GEM aws-sdk-sqs (1.53.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.3.2) dumb_delegator diff --git a/lib/app_artifacts.rb b/lib/app_artifacts.rb index 9a3d33c797e..82160a429dd 100644 --- a/lib/app_artifacts.rb +++ b/lib/app_artifacts.rb @@ -36,7 +36,7 @@ def add_artifact(name, path) private def read_artifact(path) - if Identity::Hostdata.in_datacenter? + if Identity::Hostdata.in_datacenter? && !ENV['LOGIN_SKIP_REMOTE_CONFIG'] secrets_s3.read_file(path) else read_local_artifact(path)