fix: resource naming update and azurerm major version update (#22)

* feat: resource naming update and azure rm major version update * fix minor changes * fix fmt error * Update CODEOWNERS --------- Co-authored-by: Archit Chopra <[email protected]>
clouddrove · Oct 18, 2024 · 43edd80 · 43edd80
1 parent 1bea796
commit 43edd80
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 62 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -0,0 +1,4 @@
+version = 1
+
+[[analyzers]]
+name = "terraform"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # These owners will be the default owners for everything in the repo.
-*    @anmolnagpal @clouddrove-ci
+*    @anmolnagpal @clouddrove/terraform-azure-admins @clouddrove-ci
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,12 +5,42 @@
 
 version: 2
 updates:
+
   - package-ecosystem: "terraform" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
+
   - package-ecosystem: "terraform" # See documentation for possible values
-    directory: "examples" # Location of package manifests
+    directory: "/examples/basic" # Location of package manifests
     schedule:
       interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
 
+  - package-ecosystem: "terraform" # See documentation for possible values
+    directory: "/examples/complete" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml
@@ -11,4 +11,4 @@ jobs:
     secrets:
       GITHUB: ${{ secrets.GITHUB }}
     with:
-      assignees: 'clouddrove-ci'
+      assignees: 'clouddrove-ci'
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -1,11 +1,11 @@
-
-  name: Auto merge
-  on:
-    pull_request:
-  jobs:
-    auto-merge:
-      uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@master
-      secrets:
-        GITHUB: ${{ secrets.GITHUB }}
-      with:
-        tfcheck: 'complete-example / Check code format'
+---
+name: Auto merge
+on:
+  pull_request:
+jobs:
+  auto-merge:
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@master
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      tfcheck: 'complete-example / Check code format'
diff --git a/.github/workflows/changelog.yml → .github/workflows/changelog.yaml b/.github/workflows/changelog.yml → .github/workflows/changelog.yaml
@@ -10,4 +10,4 @@ jobs:
     uses: clouddrove/github-shared-workflows/.github/workflows/changelog.yml@master
     secrets: inherit
     with:
-      branch: 'master'
+      branch: 'master'
diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml
@@ -5,8 +5,12 @@ on:
   pull_request:
   workflow_dispatch:
 jobs:
-   complete-example:
+  basic-example:
     uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
-    secrets: inherit
     with:
-      working_directory: './examples/'
+      working_directory: './examples/basic/'
+
+  complete-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    with:
+      working_directory: './examples/complete/'
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
@@ -8,4 +8,4 @@ jobs:
   tf-lint:
     uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master
     secrets:
-      GITHUB: ${{ secrets.GITHUB }}
+      GITHUB: ${{ secrets.GITHUB }}
diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml
@@ -8,4 +8,4 @@ jobs:
     uses: clouddrove/github-shared-workflows/.github/workflows/tfsec.yml@master
     secrets: inherit
     with:
-      working_directory: '.'
+      working_directory: '.'
diff --git a/_test/log_analytics_test.go b/_test/log_analytics_test.go
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -0,0 +1,15 @@
+provider "azurerm" {
+  features {}
+  subscription_id = "01110-12010122022111111c"
+}
+
+module "log-analytics" {
+  source                           = "./../../"
+  name                             = "app"
+  environment                      = "test"
+  resource_group_name              = "test"
+  log_analytics_workspace_location = "test"
+
+  #### diagnostic setting
+  log_analytics_workspace_id = "333-2343-343"
+}
diff --git a/examples/verstion.tf → examples/basic/version.tf b/examples/verstion.tf → examples/basic/version.tf
@@ -6,7 +6,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.3.0"
+      version = ">=3.85.0"
     }
   }
 }
diff --git a/examples/example.tf → examples/complete/main.tf b/examples/example.tf → examples/complete/main.tf
@@ -1,6 +1,6 @@
 provider "azurerm" {
   features {}
-  subscription_id = "<subscription-id>"
+  subscription_id = "000001-11111-1223-XXX-XXXXXXXXXXXX"
 }
 
 module "resource_group" {
@@ -14,7 +14,7 @@ module "resource_group" {
 }
 
 module "log-analytics" {
-  source                           = "./../"
+  source                           = "./../../"
   name                             = "app"
   environment                      = "test"
   resource_group_name              = module.resource_group.resource_group_name

diff --git a/examples/complete/version.tf b/examples/complete/version.tf
@@ -0,0 +1,12 @@
+terraform {
+  required_version = ">= 1.0.0"
+}
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">=3.85.0"
+    }
+  }
+}
diff --git a/examples/outputs.tf b/examples/outputs.tf
diff --git a/main.tf b/main.tf
@@ -12,7 +12,7 @@ module "labels" {
 
 resource "azurerm_log_analytics_workspace" "main" {
   count                      = var.enabled && var.create_log_analytics_workspace == true ? 1 : 0
-  name                       = format("%s-logs", module.labels.id)
+  name                       = format("%s-law", module.labels.id)
   location                   = var.log_analytics_workspace_location
   resource_group_name        = var.resource_group_name
   sku                        = var.log_analytics_workspace_sku
@@ -24,7 +24,7 @@ resource "azurerm_log_analytics_workspace" "main" {
 }
 resource "azurerm_monitor_diagnostic_setting" "example" {
   count                          = var.enabled && var.diagnostic_setting_enable ? 1 : 0
-  name                           = format("%s-log-analytics-diagnostic-log", module.labels.id)
+  name                           = format("%s-law-diag", module.labels.id)
   target_resource_id             = join("", azurerm_log_analytics_workspace.main[*].id)
   storage_account_id             = var.storage_account_id
   eventhub_name                  = var.eventhub_name

diff --git a/variable.tf b/variable.tf
@@ -56,6 +56,7 @@ variable "log_analytics_workspace_sku" {
   description = "pecifies the Sku of the Log Analytics Workspace. Possible values are Free, PerNode, Premium, Standard, Standalone, Unlimited, CapacityReservation, and PerGB2018 (new Sku as of 2018-04-03). Defaults to PerGB2018"
 
 }
+
 variable "create_log_analytics_workspace" {
   type        = bool
   default     = true
@@ -67,6 +68,7 @@ variable "retention_in_days" {
   default     = null
   description = "The workspace data retention in days. Possible values are either 7 (Free Tier only) or range between 30 and 730."
 }
+
 variable "daily_quota_gb" {
   type        = string
   default     = "-1"
@@ -78,11 +80,13 @@ variable "internet_ingestion_enabled" {
   default     = true
   description = "Should the Log Analytics Workspace support ingestion over the Public Internet? Defaults to true."
 }
+
 variable "internet_query_enabled" {
   type        = bool
   default     = true
   description = "Should the Log Analytics Workspace support querying over the Public Internet? Defaults to true."
 }
+
 #### enable diagnostic setting
 variable "log_analytics_destination_type" {
   type        = string
@@ -95,10 +99,12 @@ variable "Metric_enable" {
   default     = true
   description = "Is this Diagnostic Metric enabled? Defaults to true."
 }
+
 variable "diagnostic_setting_enable" {
   type    = bool
-  default = true
+  default = false
 }
+
 variable "log_analytics_workspace_id" {
   type    = string
   default = null
@@ -115,11 +121,13 @@ variable "storage_account_id" {
   default     = null
   description = "The ID of the Storage Account where logs should be sent."
 }
+
 variable "eventhub_name" {
   type        = string
   default     = null
   description = "Specifies the name of the Event Hub where Diagnostics Data should be sent."
 }
+
 variable "eventhub_authorization_rule_id" {
   type        = string
   default     = null