From 26eed411d1910c4e77483d91aa80d879c37344f2 Mon Sep 17 00:00:00 2001 From: Pranay Deokar Date: Fri, 19 Jan 2024 19:24:47 +0530 Subject: [PATCH] fix: updated azure latest version --- .github/workflows/auto_assignee.yml | 2 +- .github/workflows/automerge.yml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/tf-checks.yml | 4 ++-- .github/workflows/tflint.yml | 2 +- .github/workflows/tfsec.yml | 2 +- _example/basic/versions.tf | 2 +- _example/complete/example.tf | 6 +++--- _example/complete/versions.tf | 2 +- main.tf | 2 +- variables.tf | 1 + versions.tf | 2 +- 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml index 751c4bc..9acc9b8 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.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@1.2.1 secrets: GITHUB: ${{ secrets.GITHUB }} with: diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 5feccaa..101e1d1 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.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@1.2.1 secrets: GITHUB: ${{ secrets.GITHUB }} with: diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index b3d9eb2..b34acec 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.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@1.2.1 secrets: inherit with: branch: 'master' diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml index 6feaa0f..ea520d0 100644 --- a/.github/workflows/tf-checks.yml +++ b/.github/workflows/tf-checks.yml @@ -6,12 +6,12 @@ on: workflow_dispatch: jobs: complete-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1 with: working_directory: './_example/complete/' basic-example: - uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@1.2.1 with: working_directory: './_example/basic/' diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml index 0875a68..04cca22 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.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@1.2.1 secrets: GITHUB: ${{ secrets.GITHUB }} diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml index daefede..7f1003f 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.0.9 + uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@1.2.1 secrets: inherit with: working_directory: '.' diff --git a/_example/basic/versions.tf b/_example/basic/versions.tf index 6a65607..2f5600a 100644 --- a/_example/basic/versions.tf +++ b/_example/basic/versions.tf @@ -7,7 +7,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">=3.85.0" + version = ">=3.87.0" } } } \ No newline at end of file diff --git a/_example/complete/example.tf b/_example/complete/example.tf index 825bcd2..b3a1921 100644 --- a/_example/complete/example.tf +++ b/_example/complete/example.tf @@ -15,7 +15,7 @@ locals { module "resource_group" { source = "clouddrove/resource-group/azure" version = "1.0.2" - name = "app" + name = "app1" environment = "test" label_order = ["name", "environment"] location = "Canada Central" @@ -39,7 +39,7 @@ module "vnet" { ##----------------------------------------------------------------------------- module "name_specific_subnet" { source = "clouddrove/subnet/azure" - version = "1.0.2" + version = "1.1.0" name = "app" environment = "test" resource_group_name = module.resource_group.resource_group_name @@ -48,7 +48,7 @@ module "name_specific_subnet" { #subnet specific_name_subnet = true - specific_subnet_names = "AzureBastionSubnet" + specific_subnet_names = ["AzureBastionSubnet"] subnet_prefixes = ["10.0.1.0/24"] enable_route_table = false diff --git a/_example/complete/versions.tf b/_example/complete/versions.tf index 6a65607..2f5600a 100644 --- a/_example/complete/versions.tf +++ b/_example/complete/versions.tf @@ -7,7 +7,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">=3.85.0" + version = ">=3.87.0" } } } \ No newline at end of file diff --git a/main.tf b/main.tf index 05d4cfb..86c585b 100644 --- a/main.tf +++ b/main.tf @@ -85,7 +85,7 @@ resource "azurerm_monitor_diagnostic_setting" "bastion-diagnostic" { #--------------------------------------------- resource "azurerm_monitor_diagnostic_setting" "pip_diagnostic" { count = var.enabled && var.diagnostic_setting_enable ? 1 : 0 - name = format("%s-bastion-pip-diagnostic-log", module.labels.id) + name = format("%s-bastion_test-pip-diagnostic-log", module.labels.id) target_resource_id = azurerm_public_ip.pip[0].id storage_account_id = var.storage_account_id eventhub_name = var.eventhub_name diff --git a/variables.tf b/variables.tf index 24c5260..1f1b8a9 100644 --- a/variables.tf +++ b/variables.tf @@ -195,5 +195,6 @@ variable "pip_logs" { default = { enabled = true category_group = ["AllLogs"] + description = "Is this Diagnostic logs enabled? Defaults to True." } } diff --git a/versions.tf b/versions.tf index 6a65607..2f5600a 100644 --- a/versions.tf +++ b/versions.tf @@ -7,7 +7,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">=3.85.0" + version = ">=3.87.0" } } } \ No newline at end of file