From 43991cc6337f225cfbcb833c3b9c32cb21ea44f3 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Sun, 26 May 2024 11:10:22 +0200 Subject: [PATCH] Include git hash in env variables for functions --- deploy-dev.sh | 3 +- deploy-prod.sh | 3 +- lambda_config/lambda_config.py | 9 ++- lambda_config/redirects_base.py | 1 + lambda_redirect/lambda_redirect.py | 9 ++- master.tf | 4 ++ terraform.tfstate.d/dev/terraform.tfstate | 58 ++++++++++--------- .../dev/terraform.tfstate.backup | 58 ++++++++++--------- terraform.tfstate.d/prod/terraform.tfstate | 58 ++++++++++--------- .../prod/terraform.tfstate.backup | 38 ++++++------ variable.tf | 5 ++ 11 files changed, 138 insertions(+), 108 deletions(-) diff --git a/deploy-dev.sh b/deploy-dev.sh index 7c44ca8..4af98b5 100755 --- a/deploy-dev.sh +++ b/deploy-dev.sh @@ -2,7 +2,8 @@ terraform workspace select dev # Plan the current execution with variables and verify -terraform plan -var-file dev.tfvars -out plans/dev.plan +GIT_HASH=$(git rev-parse --short HEAD) +terraform plan -var-file dev.tfvars -var git_version=${GIT_HASH}-dev -out plans/dev.plan # Apply Configuration terraform apply plans/dev.plan diff --git a/deploy-prod.sh b/deploy-prod.sh index d8f8e2c..43c919d 100755 --- a/deploy-prod.sh +++ b/deploy-prod.sh @@ -2,7 +2,8 @@ terraform workspace select prod # Plan the current execution with variables and verify -terraform plan -var-file prod.tfvars -out plans/prod.plan +GIT_HASH=$(git rev-parse --short HEAD) +terraform plan -var-file prod.tfvars -var git_version=${GIT_HASH} -out plans/prod.plan # Apply Configuration terraform apply plans/prod.plan diff --git a/lambda_config/lambda_config.py b/lambda_config/lambda_config.py index 892261f..4903286 100644 --- a/lambda_config/lambda_config.py +++ b/lambda_config/lambda_config.py @@ -9,6 +9,7 @@ from redirects_base import Content, Customer, Redirects, Tag bucket_config = '' bucket_data = '' function_url = '' +git_version = '' s3_client = None redirects: Redirects | None = None @@ -35,15 +36,18 @@ class Record(BaseModel): s3: S3Event def lambda_handler(event: dict, context): - global s3_client, bucket_config, bucket_data, function_url, redirects + global s3_client, bucket_config, bucket_data, function_url, redirects, git_version if s3_client is None: print("Init Function") bucket_config = os.environ.get('BUCKET_CONFIG', 'standout-config') bucket_data = os.environ.get('BUCKET_DATA', 'standout-data') function_url = os.environ.get('FUNCTION_URL', 'https://api.standout.it/dev') - print(f'Bucket Config: {bucket_config}') + git_version = os.environ.get('GIT_VERSION', '00000000') + + print(f' Version: {git_version}') print(f' Bucket Data: {bucket_data}') + print(f'Bucket Config: {bucket_config}') s3_client = boto3.client('s3') ### Process records @@ -65,6 +69,7 @@ def lambda_handler(event: dict, context): if redirects is None: try: redirects = downloadRedirects(client = s3_client, context = context) + redirects.version = git_version except s3_client.exceptions.NoSuchKey as e: print(e) return False diff --git a/lambda_config/redirects_base.py b/lambda_config/redirects_base.py index 996a380..93f8dfe 100644 --- a/lambda_config/redirects_base.py +++ b/lambda_config/redirects_base.py @@ -17,4 +17,5 @@ class Customer(BaseModel): tags: Optional[Dict[str, Optional[Tag]] ] class Redirects(BaseModel): + version: str customers: Dict[str, Optional[Customer]] | None = None diff --git a/lambda_redirect/lambda_redirect.py b/lambda_redirect/lambda_redirect.py index b6a1993..8b278ba 100644 --- a/lambda_redirect/lambda_redirect.py +++ b/lambda_redirect/lambda_redirect.py @@ -8,6 +8,7 @@ from typing import Optional s3_client = None bucket_config = '' bucket_data = '' +git_version = '' class RequestParams(BaseModel): id: str @@ -20,14 +21,18 @@ class Content(BaseModel): url: Optional[str] = None def lambda_handler(event: dict, context): - global s3_client, bucket_config, bucket_data + global s3_client, bucket_config, bucket_data, git_version if s3_client is None: print("Init Function") bucket_config = os.environ.get('BUCKET_CONFIG', 'standout-config') bucket_data = os.environ.get('BUCKET_DATA', 'standout-data') - print(f'Bucket Config: {bucket_config}') + git_version = os.environ.get('GIT_VERSION', '00000000') + + print(f' Version: {git_version}') print(f' Bucket Data: {bucket_data}') + print(f'Bucket Config: {bucket_config}') + s3_client = boto3.client('s3') ## Download redirects file diff --git a/master.tf b/master.tf index 90b1167..a3869a5 100644 --- a/master.tf +++ b/master.tf @@ -188,6 +188,8 @@ resource "aws_lambda_function" "lambda_standout_redirect" { variables = { BUCKET_CONFIG = aws_s3_bucket.s3_standout_config.bucket, BUCKET_DATA = aws_s3_bucket.s3_standout.bucket + GIT_VERSION = var.git_version + env = var.env } } } @@ -213,6 +215,8 @@ resource "aws_lambda_function" "lambda_standout_config" { BUCKET_CONFIG = aws_s3_bucket.s3_standout_config.bucket, BUCKET_DATA = aws_s3_bucket.s3_standout.bucket FUNCTION_URL = var.redirect_url + GIT_VERSION = var.git_version + ENV = var.env } } } diff --git a/terraform.tfstate.d/dev/terraform.tfstate b/terraform.tfstate.d/dev/terraform.tfstate index f3f8ac6..b9dec27 100644 --- a/terraform.tfstate.d/dev/terraform.tfstate +++ b/terraform.tfstate.d/dev/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.8.4", - "serial": 107, + "serial": 113, "lineage": "c4760d73-7122-ff64-ba30-f5482ab084b8", "outputs": {}, "resources": [ @@ -48,16 +48,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "515512e32678f33a54e5966a8129eda5c3760a1d", - "output_base64sha256": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", - "output_base64sha512": "12CUIHQhDkHp43k1q5Gy4hXXoxGDNIu29F7ie5pCVd32UVpbTqSDauPSmlt4g8sKir0wvcfbZaYXoTbGrqZPAw==", + "id": "df4af848b8b9b0503c7737f0a00b6dc5038fb93f", + "output_base64sha256": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", + "output_base64sha512": "l9M2naq/XuE5yDE6bU+lzBYWKS1EgzAE+giAC1X8fMh9pUVlvi+Y6ebqB5Y5c13uwb2yC6AI+sKW0BfpOKsP9A==", "output_file_mode": null, - "output_md5": "d84a656b31cd286363d787c80b6abfaf", + "output_md5": "7c618b4d911607ce6d5357e3a7046494", "output_path": "./lambda_zip/standout_lambda_config-dev.zip", - "output_sha": "515512e32678f33a54e5966a8129eda5c3760a1d", - "output_sha256": "079272356231dddc3e1b519c54e99fadd1869e11ef64059860fdfca045f77699", - "output_sha512": "d760942074210e41e9e37935ab91b2e215d7a31183348bb6f45ee27b9a4255ddf6515a5b4ea4836ae3d29a5b7883cb0a8abd30bdc7db65a617a136c6aea64f03", - "output_size": 4971, + "output_sha": "df4af848b8b9b0503c7737f0a00b6dc5038fb93f", + "output_sha256": "40932c4abe827f31b1ffd03a86b99ea70755104c845845d2ea7c5f329ec4d3d0", + "output_sha512": "97d3369daabf5ee139c8313a6d4fa5cc1616292d44833004fa08800b55fc7cc87da54565be2f98e9e6ea079639735deec1bdb20ba008fac296d017e938ab0ff4", + "output_size": 5026, "source": [], "source_content": null, "source_content_filename": null, @@ -80,16 +80,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "bf96d8f34aad3a86e985be53a3a6682d62164e73", - "output_base64sha256": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", - "output_base64sha512": "R+OeVTikvIPAsYIjKtRdZdFCZQWLp/PUtIvpTIwc726mIuccBlur53ethzlJezoXubQmtF9CEiUdjzsrfb3/pQ==", + "id": "5b31887667c168e055edce9547e5c153b11d788b", + "output_base64sha256": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", + "output_base64sha512": "qypkIsLEkMI380rgBAFuzgNsJQQF/OXHBHgpLOWfKpZFyHtptzLzO3Kn+NPzjcJa0WA12qwGuV6DYxLFcdY27Q==", "output_file_mode": null, - "output_md5": "6971a02ee30cd8591ded93920a6b994a", + "output_md5": "11a75e4d67a7ec23f7d681a670af9bab", "output_path": "./lambda_zip/standout_lambda_redirect-dev.zip", - "output_sha": "bf96d8f34aad3a86e985be53a3a6682d62164e73", - "output_sha256": "9a41356c2426097b20764a495f5cac7086c034b626716953c802f37f1d81a9b2", - "output_sha512": "47e39e5538a4bc83c0b182232ad45d65d14265058ba7f3d4b48be94c8c1cef6ea622e71c065babe777ad8739497b3a17b9b426b45f4212251d8f3b2b7dbdffa5", - "output_size": 51368, + "output_sha": "5b31887667c168e055edce9547e5c153b11d788b", + "output_sha256": "272f4d0d3e1f88e1e6fffa96cb106f0547ffc5b480d28752206cfb154ed17e5d", + "output_sha512": "ab2a6422c2c490c237f34ae004016ece036c250405fce5c70478292ce59f2a9645c87b69b732f33b72a7f8d3f38dc25ad16035daac06b95e836312c571d636ed", + "output_size": 51416, "source": [], "source_content": null, "source_content_filename": null, @@ -475,7 +475,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-west-1:654654203111:function:standout-config-dev", - "code_sha256": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", + "code_sha256": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -484,7 +484,9 @@ "variables": { "BUCKET_CONFIG": "standout-config-dev", "BUCKET_DATA": "standout-data-dev", - "FUNCTION_URL": "https://nfc.standout.it/dev" + "ENV": "dev", + "FUNCTION_URL": "https://nfc.standout.it/dev", + "GIT_VERSION": "d2b05f7-dev" } } ], @@ -502,7 +504,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-west-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-1:654654203111:function:standout-config-dev/invocations", "kms_key_arn": "", - "last_modified": "2024-05-26T08:30:30.000+0000", + "last_modified": "2024-05-26T09:01:44.000+0000", "layers": [ "arn:aws:lambda:eu-west-1:654654203111:layer:lambda_deps:7" ], @@ -531,8 +533,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", - "source_code_size": 4971, + "source_code_hash": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", + "source_code_size": 5026, "tags": {}, "tags_all": {}, "timeout": 10, @@ -571,7 +573,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-west-1:654654203111:function:standout-redirect-dev", - "code_sha256": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", + "code_sha256": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -579,7 +581,9 @@ { "variables": { "BUCKET_CONFIG": "standout-config-dev", - "BUCKET_DATA": "standout-data-dev" + "BUCKET_DATA": "standout-data-dev", + "GIT_VERSION": "d2b05f7-dev", + "env": "dev" } } ], @@ -597,7 +601,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-west-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-1:654654203111:function:standout-redirect-dev/invocations", "kms_key_arn": "", - "last_modified": "2024-05-25T12:28:45.157+0000", + "last_modified": "2024-05-26T09:01:44.000+0000", "layers": [ "arn:aws:lambda:eu-west-1:654654203111:layer:lambda_deps:7" ], @@ -626,8 +630,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", - "source_code_size": 51368, + "source_code_hash": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", + "source_code_size": 51416, "tags": {}, "tags_all": {}, "timeout": 10, diff --git a/terraform.tfstate.d/dev/terraform.tfstate.backup b/terraform.tfstate.d/dev/terraform.tfstate.backup index 934f5ed..c4d7007 100644 --- a/terraform.tfstate.d/dev/terraform.tfstate.backup +++ b/terraform.tfstate.d/dev/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.8.4", - "serial": 105, + "serial": 110, "lineage": "c4760d73-7122-ff64-ba30-f5482ab084b8", "outputs": {}, "resources": [ @@ -48,16 +48,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "b71f32517224e8488af8a6261e0d77faa07b322c", - "output_base64sha256": "CvOhFoZXqUcFozUduJh8QZOOrf5veK1m8vK9wvV559g=", - "output_base64sha512": "I6CznERTeZVSL1wZrJsLNNuehUKF7z7hcJJIGUDzsNahiznOWxzYdSDAONuDeZeiVVUiWEgLzdIWwqH+k1CkUA==", + "id": "df4af848b8b9b0503c7737f0a00b6dc5038fb93f", + "output_base64sha256": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", + "output_base64sha512": "l9M2naq/XuE5yDE6bU+lzBYWKS1EgzAE+giAC1X8fMh9pUVlvi+Y6ebqB5Y5c13uwb2yC6AI+sKW0BfpOKsP9A==", "output_file_mode": null, - "output_md5": "44112bffcda59ca0e2f0b975518a9942", + "output_md5": "7c618b4d911607ce6d5357e3a7046494", "output_path": "./lambda_zip/standout_lambda_config-dev.zip", - "output_sha": "b71f32517224e8488af8a6261e0d77faa07b322c", - "output_sha256": "0af3a1168657a94705a3351db8987c41938eadfe6f78ad66f2f2bdc2f579e7d8", - "output_sha512": "23a0b39c44537995522f5c19ac9b0b34db9e854285ef3ee17092481940f3b0d6a18b39ce5b1cd87520c038db837997a255552258480bcdd216c2a1fe9350a450", - "output_size": 4993, + "output_sha": "df4af848b8b9b0503c7737f0a00b6dc5038fb93f", + "output_sha256": "40932c4abe827f31b1ffd03a86b99ea70755104c845845d2ea7c5f329ec4d3d0", + "output_sha512": "97d3369daabf5ee139c8313a6d4fa5cc1616292d44833004fa08800b55fc7cc87da54565be2f98e9e6ea079639735deec1bdb20ba008fac296d017e938ab0ff4", + "output_size": 5026, "source": [], "source_content": null, "source_content_filename": null, @@ -80,16 +80,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "bf96d8f34aad3a86e985be53a3a6682d62164e73", - "output_base64sha256": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", - "output_base64sha512": "R+OeVTikvIPAsYIjKtRdZdFCZQWLp/PUtIvpTIwc726mIuccBlur53ethzlJezoXubQmtF9CEiUdjzsrfb3/pQ==", + "id": "5b31887667c168e055edce9547e5c153b11d788b", + "output_base64sha256": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", + "output_base64sha512": "qypkIsLEkMI380rgBAFuzgNsJQQF/OXHBHgpLOWfKpZFyHtptzLzO3Kn+NPzjcJa0WA12qwGuV6DYxLFcdY27Q==", "output_file_mode": null, - "output_md5": "6971a02ee30cd8591ded93920a6b994a", + "output_md5": "11a75e4d67a7ec23f7d681a670af9bab", "output_path": "./lambda_zip/standout_lambda_redirect-dev.zip", - "output_sha": "bf96d8f34aad3a86e985be53a3a6682d62164e73", - "output_sha256": "9a41356c2426097b20764a495f5cac7086c034b626716953c802f37f1d81a9b2", - "output_sha512": "47e39e5538a4bc83c0b182232ad45d65d14265058ba7f3d4b48be94c8c1cef6ea622e71c065babe777ad8739497b3a17b9b426b45f4212251d8f3b2b7dbdffa5", - "output_size": 51368, + "output_sha": "5b31887667c168e055edce9547e5c153b11d788b", + "output_sha256": "272f4d0d3e1f88e1e6fffa96cb106f0547ffc5b480d28752206cfb154ed17e5d", + "output_sha512": "ab2a6422c2c490c237f34ae004016ece036c250405fce5c70478292ce59f2a9645c87b69b732f33b72a7f8d3f38dc25ad16035daac06b95e836312c571d636ed", + "output_size": 51416, "source": [], "source_content": null, "source_content_filename": null, @@ -475,7 +475,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-west-1:654654203111:function:standout-config-dev", - "code_sha256": "CvOhFoZXqUcFozUduJh8QZOOrf5veK1m8vK9wvV559g=", + "code_sha256": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -484,7 +484,9 @@ "variables": { "BUCKET_CONFIG": "standout-config-dev", "BUCKET_DATA": "standout-data-dev", - "FUNCTION_URL": "https://nfc.standout.it/dev" + "ENV": "dev", + "FUNCTION_URL": "https://nfc.standout.it/dev", + "GIT_VERSION": "${GIT_HASH}-dev" } } ], @@ -502,7 +504,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-west-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-1:654654203111:function:standout-config-dev/invocations", "kms_key_arn": "", - "last_modified": "2024-05-26T08:26:41.000+0000", + "last_modified": "2024-05-26T09:00:06.000+0000", "layers": [ "arn:aws:lambda:eu-west-1:654654203111:layer:lambda_deps:7" ], @@ -531,8 +533,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "CvOhFoZXqUcFozUduJh8QZOOrf5veK1m8vK9wvV559g=", - "source_code_size": 4993, + "source_code_hash": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", + "source_code_size": 5026, "tags": {}, "tags_all": {}, "timeout": 10, @@ -571,7 +573,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-west-1:654654203111:function:standout-redirect-dev", - "code_sha256": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", + "code_sha256": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -579,7 +581,9 @@ { "variables": { "BUCKET_CONFIG": "standout-config-dev", - "BUCKET_DATA": "standout-data-dev" + "BUCKET_DATA": "standout-data-dev", + "GIT_VERSION": "${GIT_HASH}-dev", + "env": "dev" } } ], @@ -597,7 +601,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-west-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-1:654654203111:function:standout-redirect-dev/invocations", "kms_key_arn": "", - "last_modified": "2024-05-25T12:28:45.157+0000", + "last_modified": "2024-05-26T08:59:56.000+0000", "layers": [ "arn:aws:lambda:eu-west-1:654654203111:layer:lambda_deps:7" ], @@ -626,8 +630,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", - "source_code_size": 51368, + "source_code_hash": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", + "source_code_size": 51416, "tags": {}, "tags_all": {}, "timeout": 10, diff --git a/terraform.tfstate.d/prod/terraform.tfstate b/terraform.tfstate.d/prod/terraform.tfstate index 7f0b2b4..db672a1 100644 --- a/terraform.tfstate.d/prod/terraform.tfstate +++ b/terraform.tfstate.d/prod/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.8.4", - "serial": 39, + "serial": 42, "lineage": "bfb14822-28e1-8bec-1200-85cd7662a2f9", "outputs": {}, "resources": [ @@ -48,16 +48,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "515512e32678f33a54e5966a8129eda5c3760a1d", - "output_base64sha256": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", - "output_base64sha512": "12CUIHQhDkHp43k1q5Gy4hXXoxGDNIu29F7ie5pCVd32UVpbTqSDauPSmlt4g8sKir0wvcfbZaYXoTbGrqZPAw==", + "id": "df4af848b8b9b0503c7737f0a00b6dc5038fb93f", + "output_base64sha256": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", + "output_base64sha512": "l9M2naq/XuE5yDE6bU+lzBYWKS1EgzAE+giAC1X8fMh9pUVlvi+Y6ebqB5Y5c13uwb2yC6AI+sKW0BfpOKsP9A==", "output_file_mode": null, - "output_md5": "d84a656b31cd286363d787c80b6abfaf", + "output_md5": "7c618b4d911607ce6d5357e3a7046494", "output_path": "./lambda_zip/standout_lambda_config-prod.zip", - "output_sha": "515512e32678f33a54e5966a8129eda5c3760a1d", - "output_sha256": "079272356231dddc3e1b519c54e99fadd1869e11ef64059860fdfca045f77699", - "output_sha512": "d760942074210e41e9e37935ab91b2e215d7a31183348bb6f45ee27b9a4255ddf6515a5b4ea4836ae3d29a5b7883cb0a8abd30bdc7db65a617a136c6aea64f03", - "output_size": 4971, + "output_sha": "df4af848b8b9b0503c7737f0a00b6dc5038fb93f", + "output_sha256": "40932c4abe827f31b1ffd03a86b99ea70755104c845845d2ea7c5f329ec4d3d0", + "output_sha512": "97d3369daabf5ee139c8313a6d4fa5cc1616292d44833004fa08800b55fc7cc87da54565be2f98e9e6ea079639735deec1bdb20ba008fac296d017e938ab0ff4", + "output_size": 5026, "source": [], "source_content": null, "source_content_filename": null, @@ -80,16 +80,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "bf96d8f34aad3a86e985be53a3a6682d62164e73", - "output_base64sha256": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", - "output_base64sha512": "R+OeVTikvIPAsYIjKtRdZdFCZQWLp/PUtIvpTIwc726mIuccBlur53ethzlJezoXubQmtF9CEiUdjzsrfb3/pQ==", + "id": "5b31887667c168e055edce9547e5c153b11d788b", + "output_base64sha256": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", + "output_base64sha512": "qypkIsLEkMI380rgBAFuzgNsJQQF/OXHBHgpLOWfKpZFyHtptzLzO3Kn+NPzjcJa0WA12qwGuV6DYxLFcdY27Q==", "output_file_mode": null, - "output_md5": "6971a02ee30cd8591ded93920a6b994a", + "output_md5": "11a75e4d67a7ec23f7d681a670af9bab", "output_path": "./lambda_zip/standout_lambda_redirect-prod.zip", - "output_sha": "bf96d8f34aad3a86e985be53a3a6682d62164e73", - "output_sha256": "9a41356c2426097b20764a495f5cac7086c034b626716953c802f37f1d81a9b2", - "output_sha512": "47e39e5538a4bc83c0b182232ad45d65d14265058ba7f3d4b48be94c8c1cef6ea622e71c065babe777ad8739497b3a17b9b426b45f4212251d8f3b2b7dbdffa5", - "output_size": 51368, + "output_sha": "5b31887667c168e055edce9547e5c153b11d788b", + "output_sha256": "272f4d0d3e1f88e1e6fffa96cb106f0547ffc5b480d28752206cfb154ed17e5d", + "output_sha512": "ab2a6422c2c490c237f34ae004016ece036c250405fce5c70478292ce59f2a9645c87b69b732f33b72a7f8d3f38dc25ad16035daac06b95e836312c571d636ed", + "output_size": 51416, "source": [], "source_content": null, "source_content_filename": null, @@ -475,7 +475,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-central-1:654654203111:function:standout-config-prod", - "code_sha256": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", + "code_sha256": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -484,7 +484,9 @@ "variables": { "BUCKET_CONFIG": "standout-config-prod", "BUCKET_DATA": "standout-data-prod", - "FUNCTION_URL": "https://nfc.standout.it/prod" + "ENV": "prod", + "FUNCTION_URL": "https://nfc.standout.it/prod", + "GIT_VERSION": "d2b05f7" } } ], @@ -502,7 +504,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-central-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-central-1:654654203111:function:standout-config-prod/invocations", "kms_key_arn": "", - "last_modified": "2024-05-26T08:43:12.000+0000", + "last_modified": "2024-05-26T09:03:55.000+0000", "layers": [ "arn:aws:lambda:eu-central-1:654654203111:layer:lambda_deps:2" ], @@ -531,8 +533,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", - "source_code_size": 4971, + "source_code_hash": "QJMsSr6CfzGx/9A6hrmepwdVEEyEWEXS6nxfMp7E09A=", + "source_code_size": 5026, "tags": {}, "tags_all": {}, "timeout": 10, @@ -571,7 +573,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-central-1:654654203111:function:standout-redirect-prod", - "code_sha256": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", + "code_sha256": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -579,7 +581,9 @@ { "variables": { "BUCKET_CONFIG": "standout-config-prod", - "BUCKET_DATA": "standout-data-prod" + "BUCKET_DATA": "standout-data-prod", + "GIT_VERSION": "d2b05f7", + "env": "prod" } } ], @@ -597,7 +601,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-central-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-central-1:654654203111:function:standout-redirect-prod/invocations", "kms_key_arn": "", - "last_modified": "2024-05-25T12:34:06.514+0000", + "last_modified": "2024-05-26T09:04:06.000+0000", "layers": [ "arn:aws:lambda:eu-central-1:654654203111:layer:lambda_deps:2" ], @@ -626,8 +630,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "mkE1bCQmCXsgdkpJX1yscIbANLYmcWlTyALzfx2BqbI=", - "source_code_size": 51368, + "source_code_hash": "Jy9NDT4fiOHm//qWyxBvBUf/xbSA0odSIGz7FU7Rfl0=", + "source_code_size": 51416, "tags": {}, "tags_all": {}, "timeout": 10, diff --git a/terraform.tfstate.d/prod/terraform.tfstate.backup b/terraform.tfstate.d/prod/terraform.tfstate.backup index d4363e1..7f0b2b4 100644 --- a/terraform.tfstate.d/prod/terraform.tfstate.backup +++ b/terraform.tfstate.d/prod/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.8.4", - "serial": 37, + "serial": 39, "lineage": "bfb14822-28e1-8bec-1200-85cd7662a2f9", "outputs": {}, "resources": [ @@ -48,16 +48,16 @@ "attributes": { "exclude_symlink_directories": null, "excludes": null, - "id": "c70e679bb3c7f54d8ebf05e81f2757cae660be79", - "output_base64sha256": "3BgVU1LZIANGSqFRswtfcKOPZUbQRntyXkYBvalUo/Y=", - "output_base64sha512": "39KD5BHf3LEcSJpNUHrQ6R9mzmNWSVojgsdDlZIHAhy7c5tjNepQbdaquHGE18mVEAuOXc0mD8wSQrTO5kIcEA==", + "id": "515512e32678f33a54e5966a8129eda5c3760a1d", + "output_base64sha256": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", + "output_base64sha512": "12CUIHQhDkHp43k1q5Gy4hXXoxGDNIu29F7ie5pCVd32UVpbTqSDauPSmlt4g8sKir0wvcfbZaYXoTbGrqZPAw==", "output_file_mode": null, - "output_md5": "1b73b73d80a3b5095ea415fd5665b397", + "output_md5": "d84a656b31cd286363d787c80b6abfaf", "output_path": "./lambda_zip/standout_lambda_config-prod.zip", - "output_sha": "c70e679bb3c7f54d8ebf05e81f2757cae660be79", - "output_sha256": "dc18155352d92003464aa151b30b5f70a38f6546d0467b725e4601bda954a3f6", - "output_sha512": "dfd283e411dfdcb11c489a4d507ad0e91f66ce6356495a2382c743959207021cbb739b6335ea506dd6aab87184d7c995100b8e5dcd260fcc1242b4cee6421c10", - "output_size": 4619, + "output_sha": "515512e32678f33a54e5966a8129eda5c3760a1d", + "output_sha256": "079272356231dddc3e1b519c54e99fadd1869e11ef64059860fdfca045f77699", + "output_sha512": "d760942074210e41e9e37935ab91b2e215d7a31183348bb6f45ee27b9a4255ddf6515a5b4ea4836ae3d29a5b7883cb0a8abd30bdc7db65a617a136c6aea64f03", + "output_size": 4971, "source": [], "source_content": null, "source_content_filename": null, @@ -420,7 +420,9 @@ "force_detach_policies": false, "id": "iam_for_lambda-prod", "inline_policy": [], - "managed_policy_arns": [], + "managed_policy_arns": [ + "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" + ], "max_session_duration": 3600, "name": "iam_for_lambda-prod", "name_prefix": "", @@ -473,7 +475,7 @@ "x86_64" ], "arn": "arn:aws:lambda:eu-central-1:654654203111:function:standout-config-prod", - "code_sha256": "3BgVU1LZIANGSqFRswtfcKOPZUbQRntyXkYBvalUo/Y=", + "code_sha256": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", "code_signing_config_arn": "", "dead_letter_config": [], "description": "", @@ -482,7 +484,7 @@ "variables": { "BUCKET_CONFIG": "standout-config-prod", "BUCKET_DATA": "standout-data-prod", - "FUNCTION_URL": "https://2kvqe64ca1.execute-api.eu-central-1.amazonaws.com/prod" + "FUNCTION_URL": "https://nfc.standout.it/prod" } } ], @@ -500,7 +502,7 @@ "image_uri": "", "invoke_arn": "arn:aws:apigateway:eu-central-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-central-1:654654203111:function:standout-config-prod/invocations", "kms_key_arn": "", - "last_modified": "2024-05-25T13:19:36.000+0000", + "last_modified": "2024-05-26T08:43:12.000+0000", "layers": [ "arn:aws:lambda:eu-central-1:654654203111:layer:lambda_deps:2" ], @@ -529,8 +531,8 @@ "signing_profile_version_arn": "", "skip_destroy": false, "snap_start": [], - "source_code_hash": "3BgVU1LZIANGSqFRswtfcKOPZUbQRntyXkYBvalUo/Y=", - "source_code_size": 4619, + "source_code_hash": "B5JyNWIx3dw+G1GcVOmfrdGGnhHvZAWYYP38oEX3dpk=", + "source_code_size": 4971, "tags": {}, "tags_all": {}, "timeout": 10, @@ -546,8 +548,6 @@ "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", "dependencies": [ - "aws_apigatewayv2_api.api_standout_gateway", - "aws_apigatewayv2_stage.api_standout_lambda_stage", "aws_iam_role.iam_for_lambda", "aws_lambda_layer_version.lambda_layer", "aws_s3_bucket.s3_standout", @@ -752,8 +752,6 @@ "sensitive_attributes": [], "private": "bnVsbA==", "dependencies": [ - "aws_apigatewayv2_api.api_standout_gateway", - "aws_apigatewayv2_stage.api_standout_lambda_stage", "aws_iam_role.iam_for_lambda", "aws_lambda_function.lambda_standout_config", "aws_lambda_layer_version.lambda_layer", @@ -985,8 +983,6 @@ "sensitive_attributes": [], "private": "bnVsbA==", "dependencies": [ - "aws_apigatewayv2_api.api_standout_gateway", - "aws_apigatewayv2_stage.api_standout_lambda_stage", "aws_iam_role.iam_for_lambda", "aws_lambda_function.lambda_standout_config", "aws_lambda_layer_version.lambda_layer", diff --git a/variable.tf b/variable.tf index 7a88950..51da246 100644 --- a/variable.tf +++ b/variable.tf @@ -12,3 +12,8 @@ variable "redirect_url" { type = string default = "https://nfc.standout.it/dev" } + +variable "git_version" { + type = string + default = "00000000" +}