diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml index 75b98c5..57ce982 100644 --- a/.github/workflows/auto_assignee.yml +++ b/.github/workflows/auto_assignee.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: jobs: assignee: - uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.2.7 secrets: GITHUB: ${{ secrets.GITHUB }} with: diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index a03c54c..4f2ad2e 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -4,7 +4,7 @@ on: pull_request: jobs: auto-merge: - uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.2.7 secrets: GITHUB: ${{ secrets.GITHUB }} with: diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 84a914b..f4a6eff 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: jobs: changelog: - uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.2.7 secrets: inherit with: branch: 'master' diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index 6a70e3d..b3ac021 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -6,21 +6,21 @@ on: workflow_dispatch: jobs: basic-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.7 with: working_directory: './_example/basic/' complete-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.7 with: working_directory: './_example/complete/' name-specific_subnet: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.7 with: working_directory: './_example/name-specific_subnet/' nat-gateway_subnet: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.7 with: working_directory: './_example/nat-gateway_subnet/' diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml index c8f06af..a517dbb 100644 --- a/.github/workflows/tflint.yml +++ b/.github/workflows/tflint.yml @@ -6,6 +6,6 @@ on: workflow_dispatch: jobs: tf-lint: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.2.7 secrets: GITHUB: ${{ secrets.GITHUB }} diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml index 2f1ffab..e51c80c 100644 --- a/.github/workflows/tfsec.yml +++ b/.github/workflows/tfsec.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: tfsec: - uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.2.5 + uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.2.7 secrets: inherit with: working_directory: '.' diff --git a/main.tf b/main.tf index 2579d6e..e7181df 100644 --- a/main.tf +++ b/main.tf @@ -34,7 +34,7 @@ resource "azurerm_subnet" "subnet" { service_endpoints = var.service_endpoints service_endpoint_policy_ids = var.service_endpoint_policy_ids private_link_service_network_policies_enabled = var.subnet_enforce_private_link_service_network_policies - private_endpoint_network_policies_enabled = var.subnet_enforce_private_link_endpoint_network_policies + private_endpoint_network_policies = var.private_endpoint_network_policies dynamic "delegation" { for_each = var.delegation @@ -95,7 +95,7 @@ resource "azurerm_route_table" "rt" { name = var.route_table_name == null ? format("%s-route-table", module.labels.id) : format("%s-%s-route-table", module.labels.id, var.route_table_name) location = var.location resource_group_name = var.resource_group_name - disable_bgp_route_propagation = var.disable_bgp_route_propagation + bgp_route_propagation_enabled = var.bgp_route_propagation_enabled tags = module.labels.tags dynamic "route" { diff --git a/variables.tf b/variables.tf index 6669420..453793d 100644 --- a/variables.tf +++ b/variables.tf @@ -70,10 +70,10 @@ variable "subnet_names" { description = "A list of public subnets inside the vNet." } -variable "subnet_enforce_private_link_endpoint_network_policies" { - type = bool - default = false - description = "A map with key (string) `subnet name`, value (bool) `true` or `false` to indicate enable or disable network policies for the private link endpoint on the subnet. Default value is false." +variable "private_endpoint_network_policies" { + type = string + default = "Disabled" + description = "Possible values are Disabled, Enabled, NetworkSecurityGroupEnabled and RouteTableEnabled. Defaults to Disabled.." } variable "service_endpoints" { @@ -156,9 +156,9 @@ variable "route_table_name" { description = "The name of the route table." } -variable "disable_bgp_route_propagation" { +variable "bgp_route_propagation_enabled" { type = bool - default = false + default = true description = "Boolean flag which controls propagation of routes learned by BGP on that route table." } diff --git a/versions.tf b/versions.tf index 9ffba34..bc0a81f 100644 --- a/versions.tf +++ b/versions.tf @@ -1,13 +1,13 @@ # Terraform version terraform { - required_version = ">= 1.6.6" + required_version = ">= 1.7.8" } terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">=3.85.0" + version = ">=3.112.0" } } }