From 89050df700815c36e6881e6d94175eaa41cdb678 Mon Sep 17 00:00:00 2001 From: test Date: Fri, 5 Apr 2024 23:09:50 +0530 Subject: [PATCH 1/8] fix: resolved a kms key error in http-api --- _examples/complete/http-api-gateway/example.tf | 4 ++-- main.tf | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/_examples/complete/http-api-gateway/example.tf b/_examples/complete/http-api-gateway/example.tf index 94026e0..487f8e5 100644 --- a/_examples/complete/http-api-gateway/example.tf +++ b/_examples/complete/http-api-gateway/example.tf @@ -13,8 +13,8 @@ locals { name = "api" environment = "test" region = "us-east-1" - domain_name = "clouddrove.ca" - hosted_zone_id = "Z015XXXXXXXXXXXXXXIEP" + domain_name = "tech-tycoons.clouddrove.ca" + hosted_zone_id = "Z01564602K369XB8J3IEP" } ####---------------------------------------------------------------------------------- ## ACM diff --git a/main.tf b/main.tf index e24f286..edd5f03 100644 --- a/main.tf +++ b/main.tf @@ -242,7 +242,7 @@ resource "aws_api_gateway_rest_api" "rest_api" { endpoint_configuration { types = [var.rest_api_endpoint_type] - vpc_endpoint_ids = var.rest_api_endpoint_type == "PRIVATE" ? (var.create_vpc_endpoint ? [aws_vpc_endpoint.rest_api_private[0].id] : var.vpc_endpoint_id) : null + vpc_endpoint_ids = var.rest_api_endpoint_type == "PRIVATE" ? (var.create_vpc_endpoint ? [aws_vpc_endpoint.rest_api_private[0].id] : "${var.vpc_endpoint_id}") : null } } @@ -536,13 +536,14 @@ module "kms_key" { source = "clouddrove/kms/aws" version = "1.3.1" - enabled = var.enabled && var.create_rest_api && var.enable_access_logs && var.create_kms_key ? true : false + enabled = var.enabled && var.enable_access_logs && var.create_kms_key ? true : false name = module.labels.id enable_key_rotation = var.enable_key_rotation multi_region = var.multi_region policy = data.aws_iam_policy_document.cloudwatch[0].json } + ##---------------------------------------------------------------------------------- ## Below resource will Manages an Kms key JSON POlicy. ##---------------------------------------------------------------------------------- @@ -551,7 +552,7 @@ data "aws_partition" "current" {} data "aws_region" "current" {} data "aws_iam_policy_document" "cloudwatch" { - count = var.enabled && var.create_rest_api && var.enable_access_logs && var.create_kms_key ? 1 : 0 + count = var.enabled && var.enable_access_logs && var.create_kms_key ? 1 : 0 policy_id = "key-policy-cloudwatch" statement { sid = "Enable IAM User Permissions" From bd5e39e3ddb0e293dd9db44f50a24beb37cbeb9b Mon Sep 17 00:00:00 2001 From: test Date: Fri, 5 Apr 2024 23:15:56 +0530 Subject: [PATCH 2/8] fix: remove unnecessary comment --- _examples/complete/http-api-gateway/example.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_examples/complete/http-api-gateway/example.tf b/_examples/complete/http-api-gateway/example.tf index 487f8e5..65b1c86 100644 --- a/_examples/complete/http-api-gateway/example.tf +++ b/_examples/complete/http-api-gateway/example.tf @@ -13,8 +13,8 @@ locals { name = "api" environment = "test" region = "us-east-1" - domain_name = "tech-tycoons.clouddrove.ca" - hosted_zone_id = "Z01564602K369XB8J3IEP" + domain_name = "clouddrove.ca" + hosted_zone_id = "Z0xxxxxxxxxxxxxxEP" } ####---------------------------------------------------------------------------------- ## ACM From 26076e6fcd2d3e8320864334eb616f899bf99417 Mon Sep 17 00:00:00 2001 From: test Date: Mon, 8 Apr 2024 16:49:49 +0530 Subject: [PATCH 3/8] fix: resolve a tflint interpolation issue --- main.tf | 2 +- variables.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index edd5f03..0561bcc 100644 --- a/main.tf +++ b/main.tf @@ -242,7 +242,7 @@ resource "aws_api_gateway_rest_api" "rest_api" { endpoint_configuration { types = [var.rest_api_endpoint_type] - vpc_endpoint_ids = var.rest_api_endpoint_type == "PRIVATE" ? (var.create_vpc_endpoint ? [aws_vpc_endpoint.rest_api_private[0].id] : "${var.vpc_endpoint_id}") : null + vpc_endpoint_ids = var.rest_api_endpoint_type == "PRIVATE" ? (var.create_vpc_endpoint ? [aws_vpc_endpoint.rest_api_private[0].id] : var.vpc_endpoint_id) : null } } diff --git a/variables.tf b/variables.tf index ddbd9fd..278f021 100644 --- a/variables.tf +++ b/variables.tf @@ -306,8 +306,8 @@ variable "xray_tracing_enabled" { } variable "vpc_endpoint_id" { - type = string - default = "" + type = set(string) + default = [] description = "ID of the vpc endpoint. Only applicable when " } From 57d98e1f854d1b0435fb7a5802623e3207a367ef Mon Sep 17 00:00:00 2001 From: aatish sharma Date: Mon, 8 Apr 2024 18:21:24 +0530 Subject: [PATCH 4/8] fix: fixed variable default value --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 278f021..6e4bc92 100644 --- a/variables.tf +++ b/variables.tf @@ -307,7 +307,7 @@ variable "xray_tracing_enabled" { variable "vpc_endpoint_id" { type = set(string) - default = [] + default = [""] description = "ID of the vpc endpoint. Only applicable when " } From bfcf84b67d1b22912a19323a9cb7c8c52a2d4d6a Mon Sep 17 00:00:00 2001 From: aatish sharma Date: Tue, 9 Apr 2024 15:11:54 +0530 Subject: [PATCH 5/8] fix: updated a directory structure --- .../{complete => }/http-api-gateway/example.tf | 2 +- .../{complete => }/http-api-gateway/outputs.tf | 0 .../{complete => }/http-api-gateway/version.tf | 0 _examples/{complete => }/lambda_packages/index.py | 0 _examples/{complete => }/lambda_packages/index.zip | Bin .../private-rest-api-gateway/example.tf | 2 +- .../private-rest-api-gateway/outputs.tf | 0 .../private-rest-api-gateway/versions.tf | 0 .../{complete => }/rest-api-gateway/example.tf | 2 +- .../{complete => }/rest-api-gateway/outputs.tf | 0 .../{complete => }/rest-api-gateway/versions.tf | 0 11 files changed, 3 insertions(+), 3 deletions(-) rename _examples/{complete => }/http-api-gateway/example.tf (99%) rename _examples/{complete => }/http-api-gateway/outputs.tf (100%) rename _examples/{complete => }/http-api-gateway/version.tf (100%) rename _examples/{complete => }/lambda_packages/index.py (100%) rename _examples/{complete => }/lambda_packages/index.zip (100%) rename _examples/{complete => }/private-rest-api-gateway/example.tf (99%) rename _examples/{complete => }/private-rest-api-gateway/outputs.tf (100%) rename _examples/{complete => }/private-rest-api-gateway/versions.tf (100%) rename _examples/{complete => }/rest-api-gateway/example.tf (99%) rename _examples/{complete => }/rest-api-gateway/outputs.tf (100%) rename _examples/{complete => }/rest-api-gateway/versions.tf (100%) diff --git a/_examples/complete/http-api-gateway/example.tf b/_examples/http-api-gateway/example.tf similarity index 99% rename from _examples/complete/http-api-gateway/example.tf rename to _examples/http-api-gateway/example.tf index 65b1c86..6a7f3d8 100644 --- a/_examples/complete/http-api-gateway/example.tf +++ b/_examples/http-api-gateway/example.tf @@ -75,7 +75,7 @@ module "lambda" { ## API GATEWAY ####---------------------------------------------------------------------------------- module "api_gateway" { - source = "../../../" + source = "../../." name = local.name environment = local.environment diff --git a/_examples/complete/http-api-gateway/outputs.tf b/_examples/http-api-gateway/outputs.tf similarity index 100% rename from _examples/complete/http-api-gateway/outputs.tf rename to _examples/http-api-gateway/outputs.tf diff --git a/_examples/complete/http-api-gateway/version.tf b/_examples/http-api-gateway/version.tf similarity index 100% rename from _examples/complete/http-api-gateway/version.tf rename to _examples/http-api-gateway/version.tf diff --git a/_examples/complete/lambda_packages/index.py b/_examples/lambda_packages/index.py similarity index 100% rename from _examples/complete/lambda_packages/index.py rename to _examples/lambda_packages/index.py diff --git a/_examples/complete/lambda_packages/index.zip b/_examples/lambda_packages/index.zip similarity index 100% rename from _examples/complete/lambda_packages/index.zip rename to _examples/lambda_packages/index.zip diff --git a/_examples/complete/private-rest-api-gateway/example.tf b/_examples/private-rest-api-gateway/example.tf similarity index 99% rename from _examples/complete/private-rest-api-gateway/example.tf rename to _examples/private-rest-api-gateway/example.tf index d07b532..1eb70b9 100644 --- a/_examples/complete/private-rest-api-gateway/example.tf +++ b/_examples/private-rest-api-gateway/example.tf @@ -193,7 +193,7 @@ module "security_group" { ####---------------------------------------------------------------------------------- module "rest_api_private" { - source = "../../../" + source = "../../." name = "${local.name}-rest-api-private" environment = local.environment diff --git a/_examples/complete/private-rest-api-gateway/outputs.tf b/_examples/private-rest-api-gateway/outputs.tf similarity index 100% rename from _examples/complete/private-rest-api-gateway/outputs.tf rename to _examples/private-rest-api-gateway/outputs.tf diff --git a/_examples/complete/private-rest-api-gateway/versions.tf b/_examples/private-rest-api-gateway/versions.tf similarity index 100% rename from _examples/complete/private-rest-api-gateway/versions.tf rename to _examples/private-rest-api-gateway/versions.tf diff --git a/_examples/complete/rest-api-gateway/example.tf b/_examples/rest-api-gateway/example.tf similarity index 99% rename from _examples/complete/rest-api-gateway/example.tf rename to _examples/rest-api-gateway/example.tf index 89ba1ab..d63d7be 100644 --- a/_examples/complete/rest-api-gateway/example.tf +++ b/_examples/rest-api-gateway/example.tf @@ -77,7 +77,7 @@ module "lambda" { ####---------------------------------------------------------------------------------- module "rest_api" { - source = "../../../" + source = "../../." name = "${local.name}-rest-api" environment = local.environment diff --git a/_examples/complete/rest-api-gateway/outputs.tf b/_examples/rest-api-gateway/outputs.tf similarity index 100% rename from _examples/complete/rest-api-gateway/outputs.tf rename to _examples/rest-api-gateway/outputs.tf diff --git a/_examples/complete/rest-api-gateway/versions.tf b/_examples/rest-api-gateway/versions.tf similarity index 100% rename from _examples/complete/rest-api-gateway/versions.tf rename to _examples/rest-api-gateway/versions.tf From 5c8fe917934aaf312e2886b01c045f1bee93da94 Mon Sep 17 00:00:00 2001 From: aatish sharma Date: Tue, 9 Apr 2024 15:23:07 +0530 Subject: [PATCH 6/8] fix: update a .github/workflow/tf-check.yml file --- .github/workflows/tf-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index 4a5f66a..77087fc 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -9,7 +9,7 @@ jobs: tf-checks-complete-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 with: - working_directory: './_examples/complete/' + working_directory: './_examples/' tf-checks-basic-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 with: From 18bf71e67b289a38fa6cbafc353f8eb99b1ab74c Mon Sep 17 00:00:00 2001 From: aatish sharma Date: Tue, 9 Apr 2024 16:07:18 +0530 Subject: [PATCH 7/8] fix: Change the name of the example file. --- .github/workflows/tf-checks.yml | 2 +- {_examples => examples}/http-api-gateway/example.tf | 0 {_examples => examples}/http-api-gateway/outputs.tf | 0 {_examples => examples}/http-api-gateway/version.tf | 0 {_examples => examples}/lambda_packages/index.py | 0 {_examples => examples}/lambda_packages/index.zip | Bin .../private-rest-api-gateway/example.tf | 0 .../private-rest-api-gateway/outputs.tf | 0 .../private-rest-api-gateway/versions.tf | 0 {_examples => examples}/rest-api-gateway/example.tf | 0 {_examples => examples}/rest-api-gateway/outputs.tf | 0 .../rest-api-gateway/versions.tf | 0 {_examples => examples}/vpc_link_api/example.tf | 0 .../vpc_link_api/lambda-test.zip | Bin .../vpc_link_api/lambda_packages/index.py | 0 {_examples => examples}/vpc_link_api/outputs.tf | 0 {_examples => examples}/vpc_link_api/versions.tf | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename {_examples => examples}/http-api-gateway/example.tf (100%) rename {_examples => examples}/http-api-gateway/outputs.tf (100%) rename {_examples => examples}/http-api-gateway/version.tf (100%) rename {_examples => examples}/lambda_packages/index.py (100%) rename {_examples => examples}/lambda_packages/index.zip (100%) rename {_examples => examples}/private-rest-api-gateway/example.tf (100%) rename {_examples => examples}/private-rest-api-gateway/outputs.tf (100%) rename {_examples => examples}/private-rest-api-gateway/versions.tf (100%) rename {_examples => examples}/rest-api-gateway/example.tf (100%) rename {_examples => examples}/rest-api-gateway/outputs.tf (100%) rename {_examples => examples}/rest-api-gateway/versions.tf (100%) rename {_examples => examples}/vpc_link_api/example.tf (100%) rename {_examples => examples}/vpc_link_api/lambda-test.zip (100%) rename {_examples => examples}/vpc_link_api/lambda_packages/index.py (100%) rename {_examples => examples}/vpc_link_api/outputs.tf (100%) rename {_examples => examples}/vpc_link_api/versions.tf (100%) diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index 77087fc..df10391 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -9,7 +9,7 @@ jobs: tf-checks-complete-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 with: - working_directory: './_examples/' + working_directory: './examples/' tf-checks-basic-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 with: diff --git a/_examples/http-api-gateway/example.tf b/examples/http-api-gateway/example.tf similarity index 100% rename from _examples/http-api-gateway/example.tf rename to examples/http-api-gateway/example.tf diff --git a/_examples/http-api-gateway/outputs.tf b/examples/http-api-gateway/outputs.tf similarity index 100% rename from _examples/http-api-gateway/outputs.tf rename to examples/http-api-gateway/outputs.tf diff --git a/_examples/http-api-gateway/version.tf b/examples/http-api-gateway/version.tf similarity index 100% rename from _examples/http-api-gateway/version.tf rename to examples/http-api-gateway/version.tf diff --git a/_examples/lambda_packages/index.py b/examples/lambda_packages/index.py similarity index 100% rename from _examples/lambda_packages/index.py rename to examples/lambda_packages/index.py diff --git a/_examples/lambda_packages/index.zip b/examples/lambda_packages/index.zip similarity index 100% rename from _examples/lambda_packages/index.zip rename to examples/lambda_packages/index.zip diff --git a/_examples/private-rest-api-gateway/example.tf b/examples/private-rest-api-gateway/example.tf similarity index 100% rename from _examples/private-rest-api-gateway/example.tf rename to examples/private-rest-api-gateway/example.tf diff --git a/_examples/private-rest-api-gateway/outputs.tf b/examples/private-rest-api-gateway/outputs.tf similarity index 100% rename from _examples/private-rest-api-gateway/outputs.tf rename to examples/private-rest-api-gateway/outputs.tf diff --git a/_examples/private-rest-api-gateway/versions.tf b/examples/private-rest-api-gateway/versions.tf similarity index 100% rename from _examples/private-rest-api-gateway/versions.tf rename to examples/private-rest-api-gateway/versions.tf diff --git a/_examples/rest-api-gateway/example.tf b/examples/rest-api-gateway/example.tf similarity index 100% rename from _examples/rest-api-gateway/example.tf rename to examples/rest-api-gateway/example.tf diff --git a/_examples/rest-api-gateway/outputs.tf b/examples/rest-api-gateway/outputs.tf similarity index 100% rename from _examples/rest-api-gateway/outputs.tf rename to examples/rest-api-gateway/outputs.tf diff --git a/_examples/rest-api-gateway/versions.tf b/examples/rest-api-gateway/versions.tf similarity index 100% rename from _examples/rest-api-gateway/versions.tf rename to examples/rest-api-gateway/versions.tf diff --git a/_examples/vpc_link_api/example.tf b/examples/vpc_link_api/example.tf similarity index 100% rename from _examples/vpc_link_api/example.tf rename to examples/vpc_link_api/example.tf diff --git a/_examples/vpc_link_api/lambda-test.zip b/examples/vpc_link_api/lambda-test.zip similarity index 100% rename from _examples/vpc_link_api/lambda-test.zip rename to examples/vpc_link_api/lambda-test.zip diff --git a/_examples/vpc_link_api/lambda_packages/index.py b/examples/vpc_link_api/lambda_packages/index.py similarity index 100% rename from _examples/vpc_link_api/lambda_packages/index.py rename to examples/vpc_link_api/lambda_packages/index.py diff --git a/_examples/vpc_link_api/outputs.tf b/examples/vpc_link_api/outputs.tf similarity index 100% rename from _examples/vpc_link_api/outputs.tf rename to examples/vpc_link_api/outputs.tf diff --git a/_examples/vpc_link_api/versions.tf b/examples/vpc_link_api/versions.tf similarity index 100% rename from _examples/vpc_link_api/versions.tf rename to examples/vpc_link_api/versions.tf From 643cd6c806312e36aed0f45b2723f2a72c902753 Mon Sep 17 00:00:00 2001 From: aatish sharma Date: Tue, 9 Apr 2024 16:11:25 +0530 Subject: [PATCH 8/8] fix: upadate a tf-check file --- .github/workflows/tf-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index df10391..545ff8e 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -13,5 +13,5 @@ jobs: tf-checks-basic-example: uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 with: - working_directory: './_examples/vpc_link_api/' + working_directory: './examples/vpc_link_api/' ...