From 4b7a74322903521cd3a9a90bffc58b766ce9dec4 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Thu, 1 Dec 2022 10:47:27 +0000 Subject: [PATCH] remove duplicate env var --- .github/workflows/production_pipeline.yml | 1 - .github/workflows/review_pipeline.yml | 1 - .github/workflows/staging_pipeline.yml | 1 - app/models/forms/bulk_upload_lettings/upload_your_file.rb | 2 +- app/models/forms/bulk_upload_sales/upload_your_file.rb | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/production_pipeline.yml b/.github/workflows/production_pipeline.yml index 2ccbbafcd..23bb69c00 100644 --- a/.github/workflows/production_pipeline.yml +++ b/.github/workflows/production_pipeline.yml @@ -253,5 +253,4 @@ jobs: cf set-env $APP_NAME S3_CONFIG $S3_CONFIG cf set-env $APP_NAME CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN - cf set-env $APP_NAME CSV_BUCKET "dluhc-core-production-csv-bucket" cf push $APP_NAME --strategy rolling diff --git a/.github/workflows/review_pipeline.yml b/.github/workflows/review_pipeline.yml index ae1cb3c27..603a8315c 100644 --- a/.github/workflows/review_pipeline.yml +++ b/.github/workflows/review_pipeline.yml @@ -123,7 +123,6 @@ jobs: cf set-env $APP_NAME CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN cf set-env $APP_NAME APP_HOST "https://dluhc-core-review-${{ github.event.pull_request.number }}.london.cloudapps.digital" - cf set-env $APP_NAME CSV_BUCKET "dluhc-core-review-csv-bucket" - name: Bind postgres service env: diff --git a/.github/workflows/staging_pipeline.yml b/.github/workflows/staging_pipeline.yml index 01c7943e8..d59024cd3 100644 --- a/.github/workflows/staging_pipeline.yml +++ b/.github/workflows/staging_pipeline.yml @@ -231,5 +231,4 @@ jobs: cf set-env $APP_NAME S3_CONFIG $S3_CONFIG cf set-env $APP_NAME CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN - cf set-env $APP_NAME CSV_BUCKET "dluhc-core-staging-csv-bucket" cf push $APP_NAME --strategy rolling diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb index d0e1b96d5..55ab77a1d 100644 --- a/app/models/forms/bulk_upload_lettings/upload_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb @@ -51,7 +51,7 @@ module Forms end def storage_service - @storage_service ||= Storage::S3Service.new(Configuration::PaasConfigurationService.new, ENV["CSV_BUCKET"]) + @storage_service ||= Storage::S3Service.new(Configuration::PaasConfigurationService.new, ENV["CSV_DOWNLOAD_PAAS_INSTANCE"]) end def validate_file_is_csv diff --git a/app/models/forms/bulk_upload_sales/upload_your_file.rb b/app/models/forms/bulk_upload_sales/upload_your_file.rb index 2ce2769dc..7211d67a7 100644 --- a/app/models/forms/bulk_upload_sales/upload_your_file.rb +++ b/app/models/forms/bulk_upload_sales/upload_your_file.rb @@ -51,7 +51,7 @@ module Forms end def storage_service - @storage_service ||= Storage::S3Service.new(Configuration::PaasConfigurationService.new, ENV["CSV_BUCKET"]) + @storage_service ||= Storage::S3Service.new(Configuration::PaasConfigurationService.new, ENV["CSV_DOWNLOAD_PAAS_INSTANCE"]) end def validate_file_is_csv