update

microsoft · Jan 9, 2024 · 2d49c5a · 2d49c5a
1 parent f0d9a76
commit 2d49c5a
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 12 deletions.
diff --git a/azure_arc_data_jumpstart/aks/ARM/aks.json b/azure_arc_data_jumpstart/aks/ARM/aks.json
@@ -63,7 +63,7 @@
       }
     },
     "sshRSAPublicKey": {
-      "type": "string",
+      "type": "securestring",
       "metadata": {
         "description": "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'"
       }

diff --git a/azure_arc_data_jumpstart/aks/ARM/artifacts/dataController.json b/azure_arc_data_jumpstart/aks/ARM/artifacts/dataController.json
@@ -49,7 +49,7 @@
       "type": "string"
     },
     "logAnalyticsPrimaryKey": {
-      "type": "string"
+      "type": "securestring"
     },
     "resourceTags": {
       "type": "object"

diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/aks.json b/azure_arc_data_jumpstart/aks/DR/ARM/aks.json
@@ -56,14 +56,14 @@
       }
     },
     "linuxAdminUsername": {
-      "type": "string",
+      "type": "securestring",
       "defaultValue": "arcdemo",
       "metadata": {
         "description": "User name for the Linux Virtual Machines"
       }
     },
     "sshRSAPublicKey": {
-      "type": "string",
+      "type": "securestring",
       "metadata": {
         "description": "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'"
       }

diff --git a/azure_arc_data_jumpstart/aro/ARM/aro.json b/azure_arc_data_jumpstart/aro/ARM/aro.json
@@ -24,7 +24,7 @@
       "type": "string"
     },
     "spnClientSecret": {
-      "type": "string"
+      "type": "securestring"
     },
     "masterNodesSubnet": {
       "type": "string",

diff --git a/azure_arc_data_jumpstart/aro/ARM/artifacts/dataController.json b/azure_arc_data_jumpstart/aro/ARM/artifacts/dataController.json
@@ -49,7 +49,7 @@
       "type": "string"
     },
     "logAnalyticsPrimaryKey": {
-      "type": "string"
+      "type": "securestring"
     },
     "resourceTags": {
       "type": "object"

diff --git a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/dataController.json b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/dataController.json
@@ -49,7 +49,7 @@
       "type": "string"
     },
     "logAnalyticsPrimaryKey": {
-      "type": "string"
+      "type": "securestring"
     },
     "resourceTags": {
       "type": "object"

diff --git a/azure_arc_data_jumpstart/eks/terraform/artifacts/dataController.json b/azure_arc_data_jumpstart/eks/terraform/artifacts/dataController.json
@@ -49,7 +49,7 @@
       "type": "string"
     },
     "logAnalyticsPrimaryKey": {
-      "type": "string"
+      "type": "securestring"
     },
     "resourceTags": {
       "type": "object"

diff --git a/azure_arc_data_jumpstart/eks/terraform/modules/clientVM/main.tf b/azure_arc_data_jumpstart/eks/terraform/modules/clientVM/main.tf
@@ -6,6 +6,7 @@ variable "awsAccessKeyId" {
 variable "awsSecretAccessKey" {
   type = string
   description = "AWS Access Secret"
+  sensitive = true
 }
 
 variable "awsDefaultRegion" {
@@ -25,6 +26,7 @@ variable "spnClientId" {
 variable "spnClientSecret" {
   type        = string
   description = "Client secret of the service principal"
+  sensitive = true
 }
 
 variable "spnAuthority" {

diff --git a/azure_arc_data_jumpstart/gke/terraform/artifacts/dataController.json b/azure_arc_data_jumpstart/gke/terraform/artifacts/dataController.json
@@ -49,7 +49,7 @@
             "type": "string"
         },
         "logAnalyticsPrimaryKey": {
-            "type": "string"
+            "type": "securestring"
         },
         "resourceTags": {
             "type": "object"

diff --git a/azure_arc_data_jumpstart/gke/terraform/variables.tf b/azure_arc_data_jumpstart/gke/terraform/variables.tf
@@ -36,6 +36,7 @@ variable "admin_username" {
 variable "admin_password" {
   description = "GKE cluster administrator password"
   type        = string
+  sensitive = true
   default     = "ArcDemo1234567!!"
 }
 
@@ -48,6 +49,7 @@ variable "windows_username" {
 variable "windows_password" {
   description = "Windows Server Client compute instance VM administrator password"
   type        = string
+  sensitive = true
   default     = "Passw0rd123!!"
 }
 
@@ -58,6 +60,7 @@ variable "AZDATA_USERNAME" {
 
 variable "AZDATA_PASSWORD" {
   description = "Azure Arc Data Controller admin password (The password must be at least 8 characters long and contain characters from the following four sets: uppercase letters, lowercase letters, numbers, and symbols.)"
+  sensitive = true
   type        = string
 }
 
@@ -94,6 +97,7 @@ variable "SPN_CLIENT_ID" {
 
 variable "SPN_CLIENT_SECRET" {
   description = "Your Azure service principal password"
+  sensitive = true
   type        = string
 }
 

diff --git a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/dataController.json b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/dataController.json
@@ -49,7 +49,7 @@
         "type": "string"
       },
       "logAnalyticsPrimaryKey": {
-        "type": "string"
+        "type": "securestring"
       },
       "resourceTags": {
         "type": "object"

diff --git a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/dataController.json b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/dataController.json
@@ -49,7 +49,7 @@
       "type": "string"
     },
     "logAnalyticsPrimaryKey": {
-      "type": "string"
+      "type": "securestring"
     },
     "resourceTags": {
       "type": "object"

diff --git a/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/variables.tf b/azure_arc_sqlsrv_jumpstart/aws/winsrv/terraform/variables.tf
@@ -19,6 +19,7 @@ variable "key_name" {
 variable "AWS_ACCESS_KEY_ID" {
   description = "Your AWS Access Key ID"
   type        = string
+  sensitive = true
 }
 
 variable "AWS_SECRET_ACCESS_KEY" {

diff --git a/azure_arc_vsphere_jumpstart/vmware_arm_template_win/azuredeploy.json b/azure_arc_vsphere_jumpstart/vmware_arm_template_win/azuredeploy.json
@@ -32,7 +32,7 @@
       "type": "string"
     },
     "adminUserPassword" : {
-      "type": "string"
+      "type": "securestring"
     }
   },
   "variables": {