Browse Source

remove duplicate env var

pull/1043/head
Phil Lee 4 years ago
parent
commit
4b7a743229
  1. 1
      .github/workflows/production_pipeline.yml
  2. 1
      .github/workflows/review_pipeline.yml
  3. 1
      .github/workflows/staging_pipeline.yml
  4. 2
      app/models/forms/bulk_upload_lettings/upload_your_file.rb
  5. 2
      app/models/forms/bulk_upload_sales/upload_your_file.rb

1
.github/workflows/production_pipeline.yml

@ -253,5 +253,4 @@ jobs:
cf set-env $APP_NAME S3_CONFIG $S3_CONFIG 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 CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE
cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN 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 cf push $APP_NAME --strategy rolling

1
.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 CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE
cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN 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 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 - name: Bind postgres service
env: env:

1
.github/workflows/staging_pipeline.yml

@ -231,5 +231,4 @@ jobs:
cf set-env $APP_NAME S3_CONFIG $S3_CONFIG 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 CSV_DOWNLOAD_PAAS_INSTANCE $CSV_DOWNLOAD_PAAS_INSTANCE
cf set-env $APP_NAME SENTRY_DSN $SENTRY_DSN 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 cf push $APP_NAME --strategy rolling

2
app/models/forms/bulk_upload_lettings/upload_your_file.rb

@ -51,7 +51,7 @@ module Forms
end end
def storage_service 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 end
def validate_file_is_csv def validate_file_is_csv

2
app/models/forms/bulk_upload_sales/upload_your_file.rb

@ -51,7 +51,7 @@ module Forms
end end
def storage_service 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 end
def validate_file_is_csv def validate_file_is_csv

Loading…
Cancel
Save