Fix: Added Latest Version and Removed Depreciated Variables (#10)

vedkops · Hitman · web-flow · commit b42a4508a8f9 · 2024-09-05T16:43:13.000+05:30
* Added Latest Version and Removed Depreciated  Variables

* Added Formmating

* Added min required  Azurerm Version

* Updates Github Workflow

* Renamed Folder

* Fixed Warnings

* Removed Unused Variables

---------

Co-authored-by: Hitman &lt;Hiitman@Hitman&gt;
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,7 +10,7 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "terraform" # See documentation for possible values
-    directory: "_example" # Location of package manifests
+    directory: "examples" # Location of package manifests
     schedule:
       interval: "weekly"
 
diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml
@@ -0,0 +1,14 @@
+name: Auto Assign PRs
+
+on:
+  pull_request:
+    types: [opened, reopened]
+
+  workflow_dispatch:
+jobs:
+  assignee:
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      assignees: 'clouddrove-ci'
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,12 @@
+
+    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: 'basic / Check code format'
+ 
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
@@ -1,54 +1,15 @@
-name: 'Create README.md file'
+name: Readme Workflow
 on:
   push:
     branches:
       - master
-
+    paths-ignore:
+      - 'README.md'
+      - 'docs/**'
+  workflow_dispatch:
 jobs:
-  readme-create:
-    name: 'readme-create'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@master
-
-      - name: 'Set up Python 3.7'
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: 'create readme'
-        uses: 'clouddrove/github-actions@v9.0.2'
-        with:
-          actions_subcommand: 'readme'
-          github_token: '${{ secrets.GITHUB }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
-      - name: 'pre-commit check errors'
-        uses: pre-commit/action@v2.0.0
-        continue-on-error: true
-
-      - name: 'pre-commit fix erros'
-        uses: pre-commit/action@v2.0.0
-        continue-on-error: true
-
-      - name: 'push readme'
-        uses: 'clouddrove/github-actions@v9.0.2'
-        continue-on-error: true
-        with:
-          actions_subcommand: 'push'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 'Slack Notification'
-        uses: clouddrove/action-slack@v2
-        with:
-          status: ${{ job.status }}
-          fields: repo,author
-          author_name: 'CloudDrove'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+  README:
+    uses: clouddrove/github-shared-workflows/.github/workflows/readme.yml@master
+    secrets:
+      TOKEN : ${{ secrets.GITHUB }}
+      SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}
diff --git a/.github/workflows/semantic-releaser.yml b/.github/workflows/semantic-releaser.yml
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml
@@ -0,0 +1,11 @@
+name: tf-checks
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+jobs:
+  tf-checks-aws-managed-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    with:
+      working_directory: './examples/'
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
@@ -0,0 +1,11 @@
+name: tf-lint
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+jobs:
+  tf-lint:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
diff --git a/examples/example.tf b/examples/example.tf
@@ -1,5 +1,6 @@
 provider "azurerm" {
   features {}
+  subscription_id = "<subscription-id>"
 }
 
 module "resource_group" {
diff --git a/examples/outputs.tf b/examples/outputs.tf
diff --git a/examples/verstion.tf b/examples/verstion.tf
@@ -0,0 +1,12 @@
+terraform {
+  required_version = ">= 1.0.0"
+}
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "3.39.0"
+    }
+  }
+}
diff --git a/main.tf b/main.tf
@@ -25,7 +25,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)
-  target_resource_id             = join("", azurerm_log_analytics_workspace.main.*.id)
+  target_resource_id             = join("", azurerm_log_analytics_workspace.main[*].id)
   storage_account_id             = var.storage_account_id
   eventhub_name                  = var.eventhub_name
   eventhub_authorization_rule_id = var.eventhub_authorization_rule_id
@@ -34,29 +34,16 @@ resource "azurerm_monitor_diagnostic_setting" "example" {
   metric {
     category = "AllMetrics"
     enabled  = var.Metric_enable
-    retention_policy {
-      enabled = var.retention_policy_enabled
-      days    = var.days
-    }
+
   }
-  log {
+  enabled_log {
     category       = var.category
     category_group = "AllLogs"
-    retention_policy {
-      enabled = var.retention_policy_enabled
-      days    = var.days
-    }
-    enabled = var.log_enabled
   }
 
-  log {
+  enabled_log {
     category       = var.category
     category_group = "Audit"
-    retention_policy {
-      enabled = var.retention_policy_enabled
-      days    = var.days
-    }
-    enabled = var.log_enabled
   }
   lifecycle {
     ignore_changes = [log_analytics_destination_type]
diff --git a/outputs.tf b/outputs.tf
@@ -1,8 +1,8 @@
 
 output "workspace_id" {
-  value = var.create_log_analytics_workspace == true ? join("", azurerm_log_analytics_workspace.main.*.id) : null
+  value = var.create_log_analytics_workspace == true ? join("", azurerm_log_analytics_workspace.main[*].id) : null
 }
 
 output "workspace_customer_id" {
-  value = var.create_log_analytics_workspace == true ? join("", azurerm_log_analytics_workspace.main.*.workspace_id) : null
+  value = var.create_log_analytics_workspace == true ? join("", azurerm_log_analytics_workspace.main[*].workspace_id) : null
 }
diff --git a/variable.tf b/variable.tf
@@ -38,17 +38,6 @@ variable "enabled" {
 }
 
 
-variable "tags" {
-  type        = map(string)
-  default     = {}
-  description = "A map of tags to add to all resources"
-}
-variable "log_analytics_workspace_name" {
-  type        = string
-  default     = "loganalytics"
-  description = "Name of the Log Analytics Workspace"
-}
-
 variable "log_analytics_workspace_location" {
   type        = string
   default     = "West Us"
@@ -67,20 +56,6 @@ 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 "email_receiver" {
-  type        = list(any)
-  default     = []
-  description = "One or more email_receiver blocks as defined below."
-}
-
-variable "scheduled_query_rules_alert" {
-  type        = any
-  default     = {}
-  description = "Manages an AlertingAction Scheduled Query Rules resource within Azure Monitor."
-}
-
 variable "create_log_analytics_workspace" {
   type        = bool
   default     = true
@@ -114,16 +89,7 @@ variable "log_analytics_destination_type" {
   default     = "AzureDiagnostics"
   description = "Possible values are AzureDiagnostics and Dedicated, default to AzureDiagnostics. When set to Dedicated, logs sent to a Log Analytics workspace will go into resource specific tables, instead of the legacy AzureDiagnostics table."
 }
-variable "retention_policy_enabled" {
-  type        = bool
-  default     = false
-  description = "Is this Retention Policy enabled?"
-}
-variable "days" {
-  type        = number
-  default     = "90"
-  description = " The number of days for which this Retention Policy should apply."
-}
+
 variable "Metric_enable" {
   type        = bool
   default     = true
@@ -143,11 +109,7 @@ variable "category" {
   default     = null
   description = " The name of a Diagnostic Log Category Group for this Resource."
 }
-variable "log_enabled" {
-  type        = string
-  default     = true
-  description = " Is this Diagnostic Log enabled? Defaults to true."
-}
+
 variable "storage_account_id" {
   type        = string
   default     = null
diff --git a/versions.tf b/versions.tf
@@ -1,13 +1,12 @@
-# Terraform version
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.7.8"
 }
 
 terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.0"
+      version = ">=3.39.0"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`provider "azurerm" {`
`2`	`2`	`features {}`
	`3`	`+ subscription_id = "<subscription-id>"`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`module "resource_group" {`