diff --git a/.github/workflows/deploy_fastapi_backend.yml b/.github/workflows/deploy_fastapi_backend.yml index 14d47168..7b00d3f2 100644 --- a/.github/workflows/deploy_fastapi_backend.yml +++ b/.github/workflows/deploy_fastapi_backend.yml @@ -77,8 +77,6 @@ jobs: echo "::set-output name=hotwater_kwh_predictions_bucket::${{ secrets[format('{0}_HOTWATER_KWH_PREDICTIONS_BUCKET', github.ref_name)] }}" echo "::set-output name=energy_asessments_bucket::${{ secrets[format('{0}_ENERGY_ASSESSMENTS_BUCKET', github.ref_name)] }}" echo "::set-output name=google_solar_api_key::${{ secrets[format('{0}_GOOGLE_SOLAR_API_KEY', github.ref_name)] }}" - echo "::set-output name=categorisation_sqs_url::${{ secrets[format('{0}_CATEGORISATION_SQS_URL', github.ref_name)] }}" - echo "::set-output name=categorisation_sqs_arn::${{ secrets[format('{0}_CATEGORISATION_SQS_ARN', github.ref_name)] }}" - name: Setup Docker uses: docker/setup-buildx-action@v1 @@ -124,8 +122,6 @@ jobs: HOTWATER_KWH_PREDICTIONS_BUCKET: ${{ steps.set_api_secrets.outputs.hotwater_kwh_predictions_bucket }} ENERGY_ASSESSMENTS_BUCKET: ${{ steps.set_api_secrets.outputs.energy_asessments_bucket }} GOOGLE_SOLAR_API_KEY: ${{ steps.set_api_secrets.outputs.google_solar_api_key }} - CATEGORISATION_SQS_URL: ${{ steps.set_api_secrets.outputs.categorisation_sqs_url }} - CATEGORISATION_SQS_ARN: ${{ steps.set_api_secrets.outputs.categorisation_sqs_arn }} DOMAIN_NAME: ${{ steps.set_domain.outputs.domain }} EPC_AUTH_TOKEN: ${{ steps.set_auth_token.outputs.auth_token }} DB_HOST: ${{ steps.set_db_credentials.outputs.db_host }} diff --git a/serverless.yml b/serverless.yml index 0e3e56fc..3dde5511 100644 --- a/serverless.yml +++ b/serverless.yml @@ -31,7 +31,7 @@ provider: ENGINE_SQS_URL: Ref: EngineQueue # hardcode the categorisation queue for now as it's created in terraform - CATEGORISATION_SQS_URL: ${env:CATEGORISATION_SQS_URL} + CATEGORISATION_SQS_URL: "https://sqs.eu-west-2.amazonaws.com/337213553626/categorisation-queue-dev" plugins: - serverless-python-requirements @@ -108,7 +108,7 @@ resources: - sqs:SendMessage Resource: - Fn::GetAtt: [ EngineQueue, Arn ] - - ${env:CATEGORISATION_SQS_ARN} + - "arn:aws:sqs:eu-west-2:337213553626:categorisation-queue-dev" - Effect: Allow Action: - s3:GetObject