Skip to content

Commit

Permalink
Merge pull request #47 from Open-EO/fix/production-deployment
Browse files Browse the repository at this point in the history
Deployments cleanup
  • Loading branch information
zcernigoj authored Oct 27, 2023
2 parents 8d8e0dd + 2fc1112 commit ace9391
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

env:
DEPLOYMENT_NAME: "production-docker"
DEPLOYMENT_NAME: "production"
PROD_ECR_REGISTRY: ${{ secrets.PROD_ECR_REGISTRY }}
PROD_ECR_REGISTRY_IMAGE: ${{ secrets.PROD_ECR_REGISTRY_IMAGE }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest

env:
DEPLOYMENT_NAME: "testing-docker"
DEPLOYMENT_NAME: "testing"
TESTING_ECR_REGISTRY: ${{ secrets.TESTING_ECR_REGISTRY }}
TESTING_ECR_REGISTRY_IMAGE: ${{ secrets.TESTING_ECR_REGISTRY_IMAGE }}

Expand Down
82 changes: 0 additions & 82 deletions rest/zappa_settings.json.template
Original file line number Diff line number Diff line change
@@ -1,46 +1,5 @@
{
"testing": {
"app_function": "app.app",
"aws_region": "eu-central-1",
"lambda_description": "Testing deploy of Sentinel Hub openEO backend",
"environment_variables": {
"DEPLOYMENT_TYPE": "testing",
"AWS_ACCESS_KEY_ID": "@@AWS_ACCESS_KEY_ID@@",
"AWS_SECRET_ACCESS_KEY": "@@AWS_SECRET_ACCESS_KEY@@",
"SH_CLIENT_ID": "@@TESTING_SH_CLIENT_ID@@",
"SH_CLIENT_SECRET": "@@TESTING_SH_CLIENT_SECRET@@",
"BACKEND_VERSION": "@@BACKEND_VERSION@@",
"RESULTS_S3_BUCKET_NAME_MAIN": "@@RESULTS_S3_BUCKET_NAME_MAIN@@",
"RESULTS_S3_BUCKET_NAME_CREODIAS": "@@RESULTS_S3_BUCKET_NAME_CREODIAS@@",
"RESULTS_S3_BUCKET_NAME_USWEST": "@@RESULTS_S3_BUCKET_NAME_USWEST@@",
"RESULTS_S3_BUCKET_ACCESS_KEY_ID_MAIN": "@@RESULTS_S3_BUCKET_ACCESS_KEY_ID_MAIN@@",
"RESULTS_S3_BUCKET_ACCESS_KEY_ID_CREODIAS": "@@RESULTS_S3_BUCKET_ACCESS_KEY_ID_CREODIAS@@",
"RESULTS_S3_BUCKET_ACCESS_KEY_ID_USWEST": "@@RESULTS_S3_BUCKET_ACCESS_KEY_ID_USWEST@@",
"RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_MAIN": "@@RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_MAIN@@",
"RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_CREODIAS": "@@RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_CREODIAS@@",
"RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_USWEST": "@@RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_USWEST@@",
"USAGE_REPORTING_BASE_URL": "@@USAGE_REPORTING_BASE_URL_TESTING@@",
"USAGE_REPORTING_AUTH_URL": "@@USAGE_REPORTING_AUTH_URL_TESTING@@",
"USAGE_REPORTING_AUTH_CLIENT_ID": "@@USAGE_REPORTING_AUTH_CLIENT_ID_TESTING@@",
"USAGE_REPORTING_AUTH_CLIENT_SECRET": "@@USAGE_REPORTING_AUTH_CLIENT_SECRET_TESTING@@",
"LOGGING_LEVEL": "@@LOGGING_LEVEL@@"
},
"memory_size": 512,
"timeout_seconds": 30,
"profile_name": "default",
"project_name": "openeo",
"runtime": "python3.9",
"manage_roles": false,
"role_arn": "arn:aws:iam::127163565383:role/openEO-dev-role",
"s3_bucket": "openeodevdeploy",
"tags": {
"cost:ou": "frontend",
"cost:contact": "dthiex",
"env": "dev",
"project": "openEO"
}
},
"testing-docker": {
"app_function": "app.app",
"aws_region": "eu-central-1",
"lambda_description": "Testing deploy of Sentinel Hub openEO backend",
Expand Down Expand Up @@ -82,47 +41,6 @@
}
},
"production": {
"app_function": "app.app",
"aws_region": "eu-central-1",
"lambda_description": "Production deploy of Sentinel Hub openEO backend",
"environment_variables": {
"DEPLOYMENT_TYPE": "production",
"AWS_ACCESS_KEY_ID": "@@AWS_ACCESS_KEY_ID@@",
"AWS_SECRET_ACCESS_KEY": "@@AWS_SECRET_ACCESS_KEY@@",
"SH_CLIENT_ID": "@@PRODUCTION_SH_CLIENT_ID@@",
"SH_CLIENT_SECRET": "@@PRODUCTION_SH_CLIENT_SECRET@@",
"BACKEND_VERSION": "@@BACKEND_VERSION@@",
"RESULTS_S3_BUCKET_NAME_MAIN": "@@RESULTS_S3_BUCKET_NAME_MAIN@@",
"RESULTS_S3_BUCKET_NAME_CREODIAS": "@@RESULTS_S3_BUCKET_NAME_CREODIAS@@",
"RESULTS_S3_BUCKET_NAME_USWEST": "@@RESULTS_S3_BUCKET_NAME_USWEST@@",
"RESULTS_S3_BUCKET_ACCESS_KEY_ID_MAIN": "@@RESULTS_S3_BUCKET_ACCESS_KEY_ID_MAIN@@",
"RESULTS_S3_BUCKET_ACCESS_KEY_ID_CREODIAS": "@@RESULTS_S3_BUCKET_ACCESS_KEY_ID_CREODIAS@@",
"RESULTS_S3_BUCKET_ACCESS_KEY_ID_USWEST": "@@RESULTS_S3_BUCKET_ACCESS_KEY_ID_USWEST@@",
"RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_MAIN": "@@RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_MAIN@@",
"RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_CREODIAS": "@@RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_CREODIAS@@",
"RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_USWEST": "@@RESULTS_S3_BUCKET_SECRET_ACCESS_KEY_USWEST@@",
"USAGE_REPORTING_BASE_URL": "@@USAGE_REPORTING_BASE_URL_PRODUCTION@@",
"USAGE_REPORTING_AUTH_URL": "@@USAGE_REPORTING_AUTH_URL_PRODUCTION@@",
"USAGE_REPORTING_AUTH_CLIENT_ID": "@@USAGE_REPORTING_AUTH_CLIENT_ID_PRODUCTION@@",
"USAGE_REPORTING_AUTH_CLIENT_SECRET": "@@USAGE_REPORTING_AUTH_CLIENT_SECRET_PRODUCTION@@",
"LOGGING_LEVEL": "@@LOGGING_LEVEL@@"
},
"memory_size": 512,
"timeout_seconds": 30,
"profile_name": "default",
"project_name": "openeo",
"runtime": "python3.9",
"manage_roles": false,
"role_arn": "arn:aws:iam::707953651112:role/openEO-prod-role",
"s3_bucket": "openeoproddeploy",
"tags": {
"cost:ou": "frontend",
"cost:contact": "dthiex",
"env": "prod",
"project": "openEO"
}
},
"production-docker": {
"app_function": "app.app",
"aws_region": "eu-central-1",
"lambda_description": "Production deploy of Sentinel Hub openEO backend",
Expand Down

0 comments on commit ace9391

Please sign in to comment.