From e1c438107d5849bd1dfe00d02f721109f3d89c00 Mon Sep 17 00:00:00 2001 From: Michael Stark Date: Fri, 30 Apr 2021 12:04:17 -0700 Subject: [PATCH 1/4] Microsoft.DevTestLab S360 OpenApi Spec Corrections v2018-09-15 --- .../stable/2018-09-15/DTL.json | 47 +++++++++++++++---- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json index 5a0c33a47a1b..6341d9294add 100644 --- a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json +++ b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json @@ -10281,6 +10281,7 @@ }, "labStorageType": { "description": "Type of storage used by the lab. It can be either Premium or Standard. Default is Premium.", + "default": "Premium", "enum": [ "Standard", "Premium", @@ -10575,15 +10576,21 @@ }, "password": { "description": "The password of the virtual machine administrator.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "sshKey": { "description": "The SSH key of the virtual machine administrator.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "isAuthenticationWithSshKey": { "description": "Indicates whether this virtual machine uses an SSH key for authentication.", - "type": "boolean" + "type": "boolean", + "x-ms-mutability": [ + "create", + "update" + ] }, "labSubnetName": { "description": "The lab subnet name of the virtual machine.", @@ -10629,6 +10636,7 @@ }, "storageType": { "description": "Storage type to use for virtual machine (i.e. Standard, Premium).", + "default": "labStorageType", "type": "string" }, "environmentId": { @@ -10640,7 +10648,11 @@ "type": "array", "items": { "$ref": "#/definitions/DataDiskProperties" - } + }, + "x-ms-mutability": [ + "create", + "update" + ] }, "scheduleParameters": { "description": "Virtual Machine schedules to be created", @@ -10739,15 +10751,21 @@ }, "password": { "description": "The password of the virtual machine administrator.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "sshKey": { "description": "The SSH key of the virtual machine administrator.", - "type": "string" + "type": "string", + "x-ms-secret": true }, "isAuthenticationWithSshKey": { "description": "Indicates whether this virtual machine uses an SSH key for authentication.", - "type": "boolean" + "type": "boolean", + "x-ms-mutability": [ + "create", + "update" + ] }, "fqdn": { "description": "The fully-qualified domain name of the virtual machine.", @@ -10813,6 +10831,7 @@ }, "storageType": { "description": "Storage type to use for virtual machine (i.e. Standard, Premium).", + "default": "labStorageType", "type": "string" }, "virtualMachineCreationSource": { @@ -10838,7 +10857,11 @@ "type": "array", "items": { "$ref": "#/definitions/DataDiskProperties" - } + }, + "x-ms-mutability": [ + "create", + "update" + ] }, "scheduleParameters": { "description": "Virtual Machine schedules to be created", @@ -11042,6 +11065,7 @@ "properties": { "status": { "description": "If notifications are enabled for this schedule (i.e. Enabled, Disabled).", + "default": "Disabled", "enum": [ "Enabled", "Disabled" @@ -11565,7 +11589,8 @@ }, "location": { "description": "The location of the new virtual machine or environment", - "type": "string" + "type": "string", + "readOnly": true }, "tags": { "description": "The tags of the resource.", @@ -11587,6 +11612,7 @@ "properties": { "status": { "description": "The status of the schedule (i.e. Enabled, Disabled)", + "default": "Disabled", "enum": [ "Enabled", "Disabled" @@ -11665,6 +11691,7 @@ "properties": { "status": { "description": "The status of the schedule (i.e. Enabled, Disabled)", + "default": "Disabled", "enum": [ "Enabled", "Disabled" @@ -12479,4 +12506,4 @@ ] } ] -} +} \ No newline at end of file From f37b01299e6c7b0f7c58bf4242b75cdd96eadfe8 Mon Sep 17 00:00:00 2001 From: Michael Stark Date: Thu, 6 May 2021 17:15:24 -0700 Subject: [PATCH 2/4] Update isAuthenticationWithSshKey Mutability --- .../Microsoft.DevTestLab/stable/2018-09-15/DTL.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json index 6341d9294add..95e885997622 100644 --- a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json +++ b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json @@ -10586,11 +10586,7 @@ }, "isAuthenticationWithSshKey": { "description": "Indicates whether this virtual machine uses an SSH key for authentication.", - "type": "boolean", - "x-ms-mutability": [ - "create", - "update" - ] + "type": "boolean" }, "labSubnetName": { "description": "The lab subnet name of the virtual machine.", @@ -10761,11 +10757,7 @@ }, "isAuthenticationWithSshKey": { "description": "Indicates whether this virtual machine uses an SSH key for authentication.", - "type": "boolean", - "x-ms-mutability": [ - "create", - "update" - ] + "type": "boolean" }, "fqdn": { "description": "The fully-qualified domain name of the virtual machine.", From 8d9ea8978aa6f32e92ec650f53416bc13dcb1c3c Mon Sep 17 00:00:00 2001 From: Michael Stark Date: Thu, 6 May 2021 17:20:37 -0700 Subject: [PATCH 3/4] Correct dataDiskParameters mutability --- .../Microsoft.DevTestLab/stable/2018-09-15/DTL.json | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json index 95e885997622..7a411ed09e1b 100644 --- a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json +++ b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json @@ -10644,11 +10644,7 @@ "type": "array", "items": { "$ref": "#/definitions/DataDiskProperties" - }, - "x-ms-mutability": [ - "create", - "update" - ] + } }, "scheduleParameters": { "description": "Virtual Machine schedules to be created", @@ -10849,11 +10845,7 @@ "type": "array", "items": { "$ref": "#/definitions/DataDiskProperties" - }, - "x-ms-mutability": [ - "create", - "update" - ] + } }, "scheduleParameters": { "description": "Virtual Machine schedules to be created", From 358cd4a37bc24d737ee1e3836337616ddf72fdb1 Mon Sep 17 00:00:00 2001 From: Michael Stark Date: Thu, 6 May 2021 17:37:52 -0700 Subject: [PATCH 4/4] Fix Prettier Issues --- .../Microsoft.DevTestLab/stable/2018-09-15/DTL.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json index 7a411ed09e1b..6bf4586940af 100644 --- a/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json +++ b/specification/devtestlabs/resource-manager/Microsoft.DevTestLab/stable/2018-09-15/DTL.json @@ -12490,4 +12490,4 @@ ] } ] -} \ No newline at end of file +}