Merge pull request #26 from avinor/deprecated

Upgrade providers
avinor · Jan 30, 2024 · 510d1b5 · 510d1b5
2 parents 918f823 + 9a29221
commit 510d1b5
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 1,070 deletions.
diff --git a/main.tf b/main.tf
@@ -3,19 +3,19 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.69.0"
+      version = "~> 3.89.0"
     }
     http = {
       source  = "hashicorp/http"
-      version = "~> 3.1.0"
+      version = "~> 3.4.1"
     }
     postgresql = {
       source  = "cyrilgdn/postgresql"
-      version = "~> 1.17.1"
+      version = "~> 1.21.0"
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.4.3"
+      version = "~> 3.6.0"
     }
   }
 }
@@ -145,11 +145,6 @@ resource "azurerm_monitor_diagnostic_setting" "namespace" {
     }
     content {
       category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-        days    = 0
-      }
     }
   }
 
@@ -161,11 +156,6 @@ resource "azurerm_monitor_diagnostic_setting" "namespace" {
     content {
       category = metric.value
       enabled  = contains(local.parsed_diag.metric, "all") || contains(local.parsed_diag.metric, metric.value)
-
-      retention_policy {
-        enabled = false
-        days    = 0
-      }
     }
   }
 }

diff --git a/test/Makefile b/test/Makefile
diff --git a/test/example_ut_test.go b/test/example_ut_test.go
diff --git a/test/go.mod b/test/go.mod
diff --git a/test/go.sum b/test/go.sum
diff --git a/tests/diagnostics.tftest.hcl b/tests/diagnostics.tftest.hcl
@@ -0,0 +1,49 @@
+variables {
+  name                = "simple"
+  resource_group_name = "simple-postgresql-rg"
+  location            = "westeurope"
+
+  sku = {
+    capacity = 1
+    tier     = "Basic"
+    family   = "Gen5"
+  }
+
+  geo_redundant_backup = "Enabled"
+  storage_auto_grow    = "Disabled"
+
+  databases = [
+    {
+      name      = "my_database"
+      charset   = "UTF8"
+      collation = "English_United States.1252"
+      users = [
+        {
+          name     = "a_user"
+          password = null
+          grants = [
+            {
+              object_type : "database"
+              privileges : ["CREATE"]
+            },
+            {
+              object_type : "table"
+              privileges : ["SELECT", "INSERT", "UPDATE"]
+            }
+          ]
+        },
+      ]
+    },
+  ]
+
+  diagnostics = {
+    destination   = "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/my-rg/providers/Microsoft.OperationalInsights/workspaces/my-log-analytics"
+    eventhub_name = null
+    logs          = ["PostgreSQLLogs"]
+    metrics       = ["all"]
+  }
+}
+
+run "simple" {
+  command = plan
+}
diff --git a/tests/password.tftest.hcl b/tests/password.tftest.hcl
@@ -0,0 +1,57 @@
+variables {
+  name                = "password"
+  resource_group_name = "password-postgresql-rg"
+  location            = "westeurope"
+
+  sku = {
+    capacity = 1
+    tier     = "Basic"
+    family   = "Gen5"
+  }
+
+  geo_redundant_backup   = "Enabled"
+  storage_auto_grow      = "Disabled"
+  administrator_password = "secretpassword"
+
+  databases = [
+    {
+      name      = "my_database"
+      charset   = "UTF8"
+      collation = "English_United States.1252"
+      users = [
+        {
+          name     = "a_user"
+          password = null
+          grants = [
+            {
+              object_type : "database"
+              privileges : ["CREATE"]
+            },
+            {
+              object_type : "table"
+              privileges : ["SELECT", "INSERT", "UPDATE"]
+            }
+          ]
+        },
+        {
+          name     = "a_user2"
+          password = "secretpassword"
+          grants = [
+            {
+              object_type : "database"
+              privileges : ["CREATE"]
+            },
+            {
+              object_type : "table"
+              privileges : ["SELECT", "INSERT", "UPDATE"]
+            }
+          ]
+        },
+      ]
+    },
+  ]
+}
+
+run "simple" {
+  command = plan
+}
diff --git a/tests/simple.tftest.hcl b/tests/simple.tftest.hcl
@@ -0,0 +1,42 @@
+variables {
+  name                = "simple"
+  resource_group_name = "simple-postgresql-rg"
+  location            = "westeurope"
+
+  sku = {
+    capacity = 1
+    tier     = "Basic"
+    family   = "Gen5"
+  }
+
+  geo_redundant_backup = "Enabled"
+  storage_auto_grow    = "Disabled"
+
+  databases = [
+    {
+      name      = "my_database"
+      charset   = "UTF8"
+      collation = "English_United States.1252"
+      users = [
+        {
+          name     = "a_user"
+          password = null
+          grants = [
+            {
+              object_type : "database"
+              privileges : ["CREATE"]
+            },
+            {
+              object_type : "table"
+              privileges : ["SELECT", "INSERT", "UPDATE"]
+            }
+          ]
+        },
+      ]
+    },
+  ]
+}
+
+run "simple" {
+  command = plan
+}