Upgrade azapi dependency to 2.0´ (#45)

Signed-off-by: Jan-Otto Kröpke <[email protected]>
cloudeteer · Dec 3, 2024 · 35c9c02 · 35c9c02
1 parent 5d31502
commit 35c9c02
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ module "example" {
 
 The following providers are used by this module:
 
-- <a name="provider_azapi"></a> [azapi](#provider\_azapi) (~> 1.14)
+- <a name="provider_azapi"></a> [azapi](#provider\_azapi) (~> 2.0)
 
 - <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) (>= 4.1)
 

diff --git a/d-image.tf b/d-image.tf
@@ -29,7 +29,7 @@ locals {
 
   virtual_machine_image = (
     length(data.azapi_resource.virtual_machine_image) > 0 ?
-    jsondecode(one(data.azapi_resource.virtual_machine_image[*].output)) :
+    one(data.azapi_resource.virtual_machine_image[*].output) :
     null
   )
 
@@ -49,7 +49,7 @@ locals {
 
   virtual_machine_images = (
     length(data.azapi_resource_list.virtual_machine_images) > 0 ?
-    jsondecode(one(data.azapi_resource_list.virtual_machine_images[*].output)) :
+    one(data.azapi_resource_list.virtual_machine_images[*].output) :
     []
   )
 

diff --git a/tests/examples/mocks/azapi_resource.tfmock.hcl b/tests/examples/mocks/azapi_resource.tfmock.hcl
@@ -1,31 +1,29 @@
 mock_data "azapi_resource" {
   defaults = {
-    output = <<-JSON
-      {
-        "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/MOCK_LOCATION/Publishers/MOCK_PUBLISHER/ArtifactTypes/MOCK_TYPE/Skus/MOCK_SKU/Versions/0.0.1",
-        "location": "MOCK_LOCATION",
-        "name": "0.0.1",
-        "properties": {
-          "architecture": "x64",
-          "automaticOSUpgradeProperties": { "automaticOSUpgradeSupported": false },
-          "dataDiskImages": [],
-          "disallowed": { "vmDiskType": "Unmanaged" },
-          "features": [
-            {
-              "name": "SecurityType",
-              "value": "TrustedLaunchAndConfidentialVmSupported"
-            },
-            { "name": "IsAcceleratedNetworkSupported", "value": "True" },
-            { "name": "DiskControllerTypes", "value": "SCSI, NVMe" },
-            { "name": "IsHibernateSupported", "value": "True" }
-          ],
-          "hyperVGeneration": "V2",
-          "imageDeprecationStatus": { "imageState": "Active" },
-          "osDiskImage": { "operatingSystem": "Windows", "sizeInGb": 127 },
-          "replicaCount": 10,
-          "replicaType": "Managed"
-        }
+    output = {
+      id       = "/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/MOCK_LOCATION/Publishers/MOCK_PUBLISHER/ArtifactTypes/MOCK_TYPE/Skus/MOCK_SKU/Versions/0.0.1",
+      location = "MOCK_LOCATION",
+      name     = "0.0.1",
+      properties = {
+        architecture                 = "x64",
+        automaticOSUpgradeProperties = { "automaticOSUpgradeSupported" : false },
+        dataDiskImages               = [],
+        disallowed                   = { "vmDiskType" : "Unmanaged" },
+        features = [
+          {
+            name  = "SecurityType",
+            value = "TrustedLaunchAndConfidentialVmSupported"
+          },
+          { name = "IsAcceleratedNetworkSupported", value = "True" },
+          { name = "DiskControllerTypes", value = "SCSI, NVMe" },
+          { name = "IsHibernateSupported", value = "True" }
+        ],
+        hyperVGeneration       = "V2",
+        imageDeprecationStatus = { "imageState" : "Active" },
+        osDiskImage            = { "operatingSystem" : "Windows", "sizeInGb" : 127 },
+        replicaCount           = 10,
+        replicaType            = "Managed"
       }
-    JSON
+    }
   }
 }
diff --git a/tests/local/input_image.tftest.hcl b/tests/local/input_image.tftest.hcl
@@ -9,14 +9,14 @@ mock_provider "azapi" {
 
   mock_data "azapi_resource" {
     defaults = {
-      output = <<-JSON
-      {
-        "properties": {
-          "architecture": "x64",
-          "osDiskImage": { "operatingSystem": "Linux" }
+      output = {
+        properties = {
+          architecture = "x64",
+          osDiskImage = {
+            operatingSystem = "Linux"
+          }
         }
       }
-    JSON
     }
   }
 }

diff --git a/tests/local/mocks/azapi_resource.tfmock.hcl b/tests/local/mocks/azapi_resource.tfmock.hcl
@@ -1,31 +1,29 @@
 mock_data "azapi_resource" {
   defaults = {
-    output = <<-JSON
-      {
-        "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/MOCK_LOCATION/Publishers/MOCK_PUBLISHER/ArtifactTypes/MOCK_TYPE/Skus/MOCK_SKU/Versions/0.0.1",
-        "location": "MOCK_LOCATION",
-        "name": "0.0.1",
-        "properties": {
-          "architecture": "x64",
-          "automaticOSUpgradeProperties": { "automaticOSUpgradeSupported": false },
-          "dataDiskImages": [],
-          "disallowed": { "vmDiskType": "Unmanaged" },
-          "features": [
-            {
-              "name": "SecurityType",
-              "value": "TrustedLaunchAndConfidentialVmSupported"
-            },
-            { "name": "IsAcceleratedNetworkSupported", "value": "True" },
-            { "name": "DiskControllerTypes", "value": "SCSI, NVMe" },
-            { "name": "IsHibernateSupported", "value": "True" }
-          ],
-          "hyperVGeneration": "V2",
-          "imageDeprecationStatus": { "imageState": "Active" },
-          "osDiskImage": { "operatingSystem": "Windows", "sizeInGb": 127 },
-          "replicaCount": 10,
-          "replicaType": "Managed"
-        }
+    output = {
+      id       = "/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/MOCK_LOCATION/Publishers/MOCK_PUBLISHER/ArtifactTypes/MOCK_TYPE/Skus/MOCK_SKU/Versions/0.0.1",
+      location = "MOCK_LOCATION",
+      name     = "0.0.1",
+      properties = {
+        architecture                 = "x64",
+        automaticOSUpgradeProperties = { automaticOSUpgradeSupported = false },
+        dataDiskImages               = [],
+        disallowed                   = { vmDiskType = "Unmanaged" },
+        features = [
+          {
+            name  = "SecurityType",
+            value = "TrustedLaunchAndConfidentialVmSupported"
+          },
+          { name = "IsAcceleratedNetworkSupported", value = "True" },
+          { name = "DiskControllerTypes", value = "SCSI, NVMe" },
+          { name = "IsHibernateSupported", value = "True" }
+        ],
+        hyperVGeneration       = "V2",
+        imageDeprecationStatus = { imageState = "Active" },
+        osDiskImage            = { operatingSystem = "Windows", sizeInGb = 127 },
+        replicaCount           = 10,
+        replicaType            = "Managed"
       }
-    JSON
+    }
   }
 }
diff --git a/tests/local/mocks/azapi_resource_list.tfmock.hcl b/tests/local/mocks/azapi_resource_list.tfmock.hcl
@@ -1,13 +1,11 @@
 mock_data "azapi_resource_list" {
   defaults = {
-    output = <<-JSON
-      [
-        {
-          "id": "/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/MOCK_LOCATION/Publishers/MOCK_PUBLISHER/ArtifactTypes/MOCK_TYPE/Skus/MOCK_SKU/Versions/0.0.1",
-          "location": "MOCK_LOCATION",
-          "name": "0.0.1"
-        }
-      ]
-    JSON
+    output = [
+      {
+        id       = "/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/MOCK_LOCATION/Publishers/MOCK_PUBLISHER/ArtifactTypes/MOCK_TYPE/Skus/MOCK_SKU/Versions/0.0.1",
+        location = "MOCK_LOCATION",
+        name     = "0.0.1"
+      }
+    ]
   }
 }
diff --git a/tests/remote/terraform.tf b/tests/remote/terraform.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azapi = {
       source  = "azure/azapi"
-      version = "1.14.0"
+      version = "2.0.1"
     }
 
     azurerm = {

diff --git a/versions.tf b/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azapi = {
       source  = "azure/azapi"
-      version = "~> 1.14"
+      version = "~> 2.0"
     }
 
     azurerm = {