chore: updating azurerm to v3 (#68)

lacework · Jan 20, 2023 · 430e750 · 430e750
1 parent 44dea77
commit 430e750
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -13,15 +13,15 @@ It configures a Diagnostic Setting that puts logs in an storage account, from wh
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 2.28 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.0 |
 | <a name="requirement_lacework"></a> [lacework](#requirement\_lacework) | ~> 1.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | ~> 2.28 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | ~> 3.0 |
 | <a name="provider_lacework"></a> [lacework](#provider\_lacework) | ~> 1.0 |
 | <a name="provider_random"></a> [random](#provider\_random) | >= 2.1 |
 | <a name="provider_time"></a> [time](#provider\_time) | n/a |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.2-dev
+2.0.0-dev
diff --git a/examples/custom-activity-log/README.md b/examples/custom-activity-log/README.md
@@ -13,7 +13,7 @@ provider "lacework" {}
 
 module "az_activity_log" {
   source                    = "lacework/activity-log/azure"
-  version                   = "~> 1.0"
+  version                   = "~> 2.0"
   application_name          = "my-custom-application-name"
   lacework_integration_name = "custom name"
   prefix                    = "customprefix"

diff --git a/examples/default-activity-log/README.md b/examples/default-activity-log/README.md
@@ -13,7 +13,7 @@ provider "lacework" {}
 
 module "az_activity_log" {
   source  = "lacework/activity-log/azure"
-  version = "~> 1.0"
+  version = "~> 2.0"
 }
 ```
 

diff --git a/examples/existing-storage-account/README.md b/examples/existing-storage-account/README.md
@@ -11,7 +11,7 @@ provider "lacework" {}
 
 module "az_activity_log" {
   source  = "lacework/activity-log/azure"
-  version = "~> 1.0"
+  version = "~> 2.0"
 
   use_existing_storage_account   = true
   storage_account_name           = "storageaccountname"

diff --git a/main.tf b/main.tf
@@ -92,8 +92,9 @@ resource "azurerm_eventgrid_event_subscription" "lacework" {
 
 # create Diag Settings on all subscriptions requested by user, centralizing logs in single storage
 resource "azurerm_monitor_diagnostic_setting" "lacework" {
+  count = length(local.subscription_ids)
+
   name               = "${var.prefix}-${var.diagnostic_settings_name}-${random_id.uniq.hex}"
-  count              = length(local.subscription_ids)
   target_resource_id = "/subscriptions/${local.subscription_ids[count.index]}"
   storage_account_id = local.storage_account_id
 
@@ -129,6 +130,13 @@ resource "azurerm_monitor_diagnostic_setting" "lacework" {
     category = "ServiceHealth"
     enabled  = false
   }
+
+  # Currently required for https://github.com/hashicorp/terraform-provider-azurerm/issues/8131
+  lifecycle {
+    ignore_changes = [
+      log_analytics_destination_type
+    ]
+  }
 }
 
 # we take the current AZ CLI context subscription as the placeholder for the centralized storage account

diff --git a/variables.tf b/variables.tf
@@ -20,7 +20,7 @@ variable "application_password" {
 }
 variable "diagnostic_settings_name" {
   type        = string
-  default     = "lacework_activity_logs"
+  default     = "activity-logs"
   description = "The name of the subscription's Diagnostic Setting for Activity Logs"
 }
 variable "lacework_integration_name" {
@@ -62,8 +62,8 @@ variable "subscription_ids" {
   default     = []
 }
 variable "tags" {
-  type = map(string)
-  default = {}
+  type        = map(string)
+  default     = {}
   description = "Key-value map of Tag names and Tag values"
 }
 variable "use_existing_ad_application" {

diff --git a/versions.tf b/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_version = ">= 0.14"
 
   required_providers {
-    azurerm = "~> 2.28"
+    azurerm = "~> 3.0"
     random  = ">= 2.1"
     lacework = {
       source  = "lacework/lacework"