From 0fd2a5d1297aa61e8c08c4ea849428ab5f6c360d Mon Sep 17 00:00:00 2001
From: Tom Archer <tarcher@microsoft.com>
Date: Fri, 7 Jun 2024 05:41:16 -0700
Subject: [PATCH] Fixing command to get public key

---
 quickstart/101-nat-gateway-create/main.tf          | 2 +-
 quickstart/101-nat-gateway-create/ssh.tf           | 2 +-
 quickstart/101-vm-cluster-linux/main.tf            | 2 +-
 quickstart/101-vm-cluster-linux/ssh.tf             | 2 +-
 quickstart/101-vm-with-infrastructure/main.tf      | 2 +-
 quickstart/101-vm-with-infrastructure/ssh.tf       | 2 +-
 quickstart/201-azfw-with-ipgroups/main.tf          | 4 ++--
 quickstart/201-azfw-with-ipgroups/ssh.tf           | 2 +-
 quickstart/201-k8s-cluster-with-tf-and-aks/main.tf | 2 +-
 quickstart/201-k8s-cluster-with-tf-and-aks/ssh.tf  | 2 +-
 quickstart/201-private-link-sql-database/main.tf   | 2 +-
 quickstart/201-private-link-sql-database/ssh.tf    | 2 +-
 quickstart/201-vmss-packer-jumpbox/main.tf         | 4 ++--
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/quickstart/101-nat-gateway-create/main.tf b/quickstart/101-nat-gateway-create/main.tf
index fef31a83..440c9e32 100644
--- a/quickstart/101-nat-gateway-create/main.tf
+++ b/quickstart/101-nat-gateway-create/main.tf
@@ -141,7 +141,7 @@ resource "azurerm_linux_virtual_machine" "my_terraform_vm" {
 
   admin_ssh_key {
     username   = var.username
-    public_key = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+    public_key = azapi_resource_action.ssh_public_key_gen.output.publicKey
   }
 
   boot_diagnostics {
diff --git a/quickstart/101-nat-gateway-create/ssh.tf b/quickstart/101-nat-gateway-create/ssh.tf
index b7a8a2e5..7dbe345a 100644
--- a/quickstart/101-nat-gateway-create/ssh.tf
+++ b/quickstart/101-nat-gateway-create/ssh.tf
@@ -20,5 +20,5 @@ resource "azapi_resource" "ssh_public_key" {
 }
 
 output "key_data" {
-  value = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+  value = azapi_resource_action.ssh_public_key_gen.output.publicKey
 }
\ No newline at end of file
diff --git a/quickstart/101-vm-cluster-linux/main.tf b/quickstart/101-vm-cluster-linux/main.tf
index 06200241..d1a7cc08 100644
--- a/quickstart/101-vm-cluster-linux/main.tf
+++ b/quickstart/101-vm-cluster-linux/main.tf
@@ -102,7 +102,7 @@ resource "azurerm_linux_virtual_machine" "test" {
 
   admin_ssh_key {
     username   = var.username
-    public_key = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+    public_key = azapi_resource_action.ssh_public_key_gen.output.publicKey
   }
 
   os_disk {
diff --git a/quickstart/101-vm-cluster-linux/ssh.tf b/quickstart/101-vm-cluster-linux/ssh.tf
index b7a8a2e5..7dbe345a 100644
--- a/quickstart/101-vm-cluster-linux/ssh.tf
+++ b/quickstart/101-vm-cluster-linux/ssh.tf
@@ -20,5 +20,5 @@ resource "azapi_resource" "ssh_public_key" {
 }
 
 output "key_data" {
-  value = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+  value = azapi_resource_action.ssh_public_key_gen.output.publicKey
 }
\ No newline at end of file
diff --git a/quickstart/101-vm-with-infrastructure/main.tf b/quickstart/101-vm-with-infrastructure/main.tf
index e8c27392..9482a95f 100644
--- a/quickstart/101-vm-with-infrastructure/main.tf
+++ b/quickstart/101-vm-with-infrastructure/main.tf
@@ -115,7 +115,7 @@ resource "azurerm_linux_virtual_machine" "my_terraform_vm" {
 
   admin_ssh_key {
     username   = var.username
-    public_key = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+    public_key = azapi_resource_action.ssh_public_key_gen.output.publicKey
   }
 
   boot_diagnostics {
diff --git a/quickstart/101-vm-with-infrastructure/ssh.tf b/quickstart/101-vm-with-infrastructure/ssh.tf
index b7a8a2e5..7dbe345a 100644
--- a/quickstart/101-vm-with-infrastructure/ssh.tf
+++ b/quickstart/101-vm-with-infrastructure/ssh.tf
@@ -20,5 +20,5 @@ resource "azapi_resource" "ssh_public_key" {
 }
 
 output "key_data" {
-  value = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+  value = azapi_resource_action.ssh_public_key_gen.output.publicKey
 }
\ No newline at end of file
diff --git a/quickstart/201-azfw-with-ipgroups/main.tf b/quickstart/201-azfw-with-ipgroups/main.tf
index 68d506a0..79da8555 100644
--- a/quickstart/201-azfw-with-ipgroups/main.tf
+++ b/quickstart/201-azfw-with-ipgroups/main.tf
@@ -210,7 +210,7 @@ resource "azurerm_linux_virtual_machine" "vm_server" {
   admin_username      = var.admin_username
   admin_ssh_key {
     username   = var.admin_username
-    public_key = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+    public_key = azapi_resource_action.ssh_public_key_gen.output.publicKey
   }
   network_interface_ids = [azurerm_network_interface.vm_server_nic.id]
   os_disk {
@@ -241,7 +241,7 @@ resource "azurerm_linux_virtual_machine" "vm_jump" {
   }
   admin_ssh_key {
     username   = var.admin_username
-    public_key = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+    public_key = azapi_resource_action.ssh_public_key_gen.output.publicKey
   }
   source_image_reference {
     publisher = "Canonical"
diff --git a/quickstart/201-azfw-with-ipgroups/ssh.tf b/quickstart/201-azfw-with-ipgroups/ssh.tf
index fcdb482b..3ff75ab4 100644
--- a/quickstart/201-azfw-with-ipgroups/ssh.tf
+++ b/quickstart/201-azfw-with-ipgroups/ssh.tf
@@ -20,6 +20,6 @@ resource "azapi_resource" "ssh_public_key" {
 }
 
 output "key_data" {
-  value = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+  value = azapi_resource_action.ssh_public_key_gen.output.publicKey
 }
 
diff --git a/quickstart/201-k8s-cluster-with-tf-and-aks/main.tf b/quickstart/201-k8s-cluster-with-tf-and-aks/main.tf
index 014d7b12..4c06f732 100644
--- a/quickstart/201-k8s-cluster-with-tf-and-aks/main.tf
+++ b/quickstart/201-k8s-cluster-with-tf-and-aks/main.tf
@@ -35,7 +35,7 @@ resource "azurerm_kubernetes_cluster" "k8s" {
     admin_username = var.username
 
     ssh_key {
-      key_data = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+      key_data = azapi_resource_action.ssh_public_key_gen.output.publicKey
     }
   }
   network_profile {
diff --git a/quickstart/201-k8s-cluster-with-tf-and-aks/ssh.tf b/quickstart/201-k8s-cluster-with-tf-and-aks/ssh.tf
index b7a8a2e5..7dbe345a 100644
--- a/quickstart/201-k8s-cluster-with-tf-and-aks/ssh.tf
+++ b/quickstart/201-k8s-cluster-with-tf-and-aks/ssh.tf
@@ -20,5 +20,5 @@ resource "azapi_resource" "ssh_public_key" {
 }
 
 output "key_data" {
-  value = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+  value = azapi_resource_action.ssh_public_key_gen.output.publicKey
 }
\ No newline at end of file
diff --git a/quickstart/201-private-link-sql-database/main.tf b/quickstart/201-private-link-sql-database/main.tf
index eb36986c..7e4ff3d9 100644
--- a/quickstart/201-private-link-sql-database/main.tf
+++ b/quickstart/201-private-link-sql-database/main.tf
@@ -146,7 +146,7 @@ resource "azurerm_linux_virtual_machine" "my_terraform_vm" {
 
   admin_ssh_key {
     username   = var.username
-    public_key = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+    public_key = azapi_resource_action.ssh_public_key_gen.output.publicKey
   }
 
   boot_diagnostics {
diff --git a/quickstart/201-private-link-sql-database/ssh.tf b/quickstart/201-private-link-sql-database/ssh.tf
index b7a8a2e5..7dbe345a 100644
--- a/quickstart/201-private-link-sql-database/ssh.tf
+++ b/quickstart/201-private-link-sql-database/ssh.tf
@@ -20,5 +20,5 @@ resource "azapi_resource" "ssh_public_key" {
 }
 
 output "key_data" {
-  value = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+  value = azapi_resource_action.ssh_public_key_gen.output.publicKey
 }
\ No newline at end of file
diff --git a/quickstart/201-vmss-packer-jumpbox/main.tf b/quickstart/201-vmss-packer-jumpbox/main.tf
index e5e4dc4f..8525398a 100644
--- a/quickstart/201-vmss-packer-jumpbox/main.tf
+++ b/quickstart/201-vmss-packer-jumpbox/main.tf
@@ -181,7 +181,7 @@ resource "azurerm_virtual_machine_scale_set" "vmss" {
 
     ssh_keys {
       path     = "/home/azureuser/.ssh/authorized_keys"
-      key_data = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+      key_data = azapi_resource_action.ssh_public_key_gen.output.publicKey
     }
   }
 
@@ -256,7 +256,7 @@ resource "azurerm_virtual_machine" "jumpbox" {
 
     ssh_keys {
       path     = "/home/azureuser/.ssh/authorized_keys"
-      key_data = jsondecode(azapi_resource_action.ssh_public_key_gen.output).publicKey
+      key_data = azapi_resource_action.ssh_public_key_gen.output.publicKey
     }
   }