fix: Replace deprecated log field with enabled_log (#95)

* fix: Replace deprecated with * bump azuread and azurerm minimum provider versions * whitespace
sysdiglabs · Sep 7, 2023 · f047e3f · f047e3f
1 parent 1ef7782
commit f047e3f
Show file tree

Hide file tree

Showing 28 changed files with 83 additions and 85 deletions.
diff --git a/examples/single-subscription-k8s/README.md b/examples/single-subscription-k8s/README.md
@@ -71,17 +71,17 @@ See [inputs summary](#inputs) or module module [`variables.tf`](./variables.tf)
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | >=2.3.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.27 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.9.0 |
-| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.7.4 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.11.0 |
+| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 1.12.0 |
 
 ## Modules
 

diff --git a/examples/single-subscription-k8s/versions.tf b/examples/single-subscription-k8s/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     helm = {
       source  = "hashicorp/helm"

diff --git a/examples/single-subscription/README.md b/examples/single-subscription/README.md
@@ -68,15 +68,15 @@ $ terraform apply
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.27 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.7.4 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 1.12.0 |
 
 ## Modules
 

diff --git a/examples/single-subscription/versions.tf b/examples/single-subscription/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     sysdig = {
       source  = "sysdiglabs/sysdig"

diff --git a/examples/tenant-subscriptions-k8s/README.md b/examples/tenant-subscriptions-k8s/README.md
@@ -70,17 +70,17 @@ See [inputs summary](#inputs) or module module [`variables.tf`](./variables.tf)
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | >=2.3.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.27 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.9.0 |
-| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.7.4 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.11.0 |
+| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 1.12.0 |
 
 ## Modules
 

diff --git a/examples/tenant-subscriptions-k8s/versions.tf b/examples/tenant-subscriptions-k8s/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     helm = {
       source  = "hashicorp/helm"

diff --git a/examples/tenant-subscriptions/README.md b/examples/tenant-subscriptions/README.md
@@ -77,15 +77,15 @@ $ terraform apply
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.27 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.7.4 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 1.12.0 |
 
 ## Modules
 

diff --git a/examples/tenant-subscriptions/versions.tf b/examples/tenant-subscriptions/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     sysdig = {
       source  = "sysdiglabs/sysdig"

diff --git a/examples/trigger-events/README.md b/examples/trigger-events/README.md
@@ -55,15 +55,15 @@ Notice that:
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >=3.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
 
 ## Modules
 

diff --git a/examples/trigger-events/versions.tf b/examples/trigger-events/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/modules/infrastructure/container_registry/README.md b/modules/infrastructure/container_registry/README.md
@@ -9,15 +9,15 @@ Deploys a container registry and creates an Event Grid to send Image Push and Ch
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >=3.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
 
 ## Modules
 

diff --git a/modules/infrastructure/container_registry/versions.tf b/modules/infrastructure/container_registry/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/modules/infrastructure/enterprise_app/README.md b/modules/infrastructure/enterprise_app/README.md
@@ -10,15 +10,15 @@ Creates an enterprise application as contributor role to run the inline scanning
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.7.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=2.41.0 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.7.0 |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
+| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.41.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
 
 ## Modules
 
@@ -28,13 +28,13 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [azuread_application.aa](https://registry.terraform.io/providers/hashicorp/azuread/2.7.0/docs/resources/application) | resource |
-| [azuread_application_password.aap](https://registry.terraform.io/providers/hashicorp/azuread/2.7.0/docs/resources/application_password) | resource |
-| [azuread_service_principal.asp](https://registry.terraform.io/providers/hashicorp/azuread/2.7.0/docs/resources/service_principal) | resource |
-| [azuread_service_principal_password.aspp](https://registry.terraform.io/providers/hashicorp/azuread/2.7.0/docs/resources/service_principal_password) | resource |
+| [azuread_application.aa](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application) | resource |
+| [azuread_application_password.aap](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application_password) | resource |
+| [azuread_service_principal.asp](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/service_principal) | resource |
+| [azuread_service_principal_password.aspp](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/service_principal_password) | resource |
 | [azurerm_role_assignment.main](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource |
 | [azurerm_role_definition.ard](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_definition) | resource |
-| [azuread_client_config.current](https://registry.terraform.io/providers/hashicorp/azuread/2.7.0/docs/data-sources/client_config) | data source |
+| [azuread_client_config.current](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/client_config) | data source |
 
 ## Inputs
 

diff --git a/modules/infrastructure/enterprise_app/versions.tf b/modules/infrastructure/enterprise_app/versions.tf
@@ -4,11 +4,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "2.7.0"
+      version = ">=2.41.0"
     }
   }
 }
diff --git a/modules/infrastructure/eventhub/README.md b/modules/infrastructure/eventhub/README.md
@@ -9,15 +9,15 @@ Deploys an Event Hub and a diagnostic setting.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >=3.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
 
 ## Modules
 

diff --git a/modules/infrastructure/eventhub/main.tf b/modules/infrastructure/eventhub/main.tf
@@ -64,7 +64,7 @@ resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   dynamic "enabled_log" {
     for_each = var.logs
     content {
-      category = log.value
+      category = enabled_log.value
 
       retention_policy {
         enabled = false
@@ -79,11 +79,10 @@ resource "azurerm_monitor_aad_diagnostic_setting" "active_directory_diagnostic_s
   eventhub_authorization_rule_id = azurerm_eventhub_namespace_authorization_rule.ns_auth_rule.id
   eventhub_name                  = azurerm_eventhub.aev.name
 
-  dynamic "log" {
+  dynamic "enabled_log" {
     for_each = var.active_directory_logs
     content {
-      category = log.value
-      enabled  = true
+      category = enabled_log.value
 
       retention_policy {
         enabled = false

diff --git a/modules/infrastructure/eventhub/versions.tf b/modules/infrastructure/eventhub/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/modules/infrastructure/resource_group/README.md b/modules/infrastructure/resource_group/README.md
@@ -9,13 +9,13 @@ Deploys a resource group where deploy all the stack. If the name variable is not
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
 
 ## Modules
 

diff --git a/modules/infrastructure/resource_group/versions.tf b/modules/infrastructure/resource_group/versions.tf
@@ -5,7 +5,7 @@ terraform {
     # tflint-ignore: terraform_unused_required_providers
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
   }
 }
diff --git a/modules/services/cloud-bench/trust_relationship/README.md b/modules/services/cloud-bench/trust_relationship/README.md
@@ -4,15 +4,15 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.27 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 0.7.4 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | 1.12.0 |
 
 ## Modules
 

diff --git a/modules/services/cloud-bench/trust_relationship/versions.tf b/modules/services/cloud-bench/trust_relationship/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     sysdig = {
       source  = "sysdiglabs/sysdig"

diff --git a/modules/services/cloud-bench/versions.tf b/modules/services/cloud-bench/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
   }
 }
diff --git a/modules/services/cloud-connector/README.md b/modules/services/cloud-connector/README.md
@@ -8,15 +8,15 @@ A **Container instance** deployment that will detect events in your infrastructu
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.71.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >=3.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.48.0 |
-| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.71.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
 
 ## Modules
 
@@ -54,6 +54,7 @@ No modules.
 | <a name="input_deploy_scanning"></a> [deploy\_scanning](#input\_deploy\_scanning) | whether scanning module is to be deployed | `bool` | `false` | no |
 | <a name="input_image"></a> [image](#input\_image) | Image of the cloud-connector to deploy | `string` | `"quay.io/sysdig/cloud-connector:latest"` | no |
 | <a name="input_is_organizational"></a> [is\_organizational](#input\_is\_organizational) | whether secure-for-cloud should be deployed in an organizational setup | `bool` | `false` | no |
+| <a name="input_logging"></a> [logging](#input\_logging) | log level: info or debug | `string` | `"info"` | no |
 | <a name="input_memory"></a> [memory](#input\_memory) | Number of CPU cores of the containers | `string` | `"1"` | no |
 | <a name="input_name"></a> [name](#input\_name) | Name to be assigned to all child resources. A suffix may be added internally when required. Use default value unless you need to install multiple instances | `string` | `"sfc-connector"` | no |
 | <a name="input_sysdig_secure_endpoint"></a> [sysdig\_secure\_endpoint](#input\_sysdig\_secure\_endpoint) | Sysdig's Secure API URL | `string` | `"https://secure.sysdig.com/"` | no |

diff --git a/modules/services/cloud-connector/versions.tf b/modules/services/cloud-connector/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
+      version = ">=3.71.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/test/fixtures/single-subscription-k8s/main.tf b/test/fixtures/single-subscription-k8s/main.tf
@@ -1,17 +1,3 @@
-terraform {
-  required_version = ">= 0.15.0"
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = ">=3.0.2"
-    }
-    sysdig = {
-      source  = "sysdiglabs/sysdig"
-      version = ">= 0.5.27"
-    }
-  }
-}
-
 provider "azurerm" {
   features {}
   subscription_id = var.subscription_id