From ee62d41edbaea20b47969a80a7d452dcdf90c0ba Mon Sep 17 00:00:00 2001 From: Aashish Rajaram Salokhe Date: Fri, 25 Jun 2021 16:26:12 -0700 Subject: [PATCH 1/4] Bug-Fix: Remove read-only properties from Guest Configuration objects --- .../stable/2018-11-20/guestconfiguration.json | 14 ++++++------ .../stable/2020-06-25/guestconfiguration.json | 16 +++++++------- .../stable/2021-01-25/guestconfiguration.json | 22 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json index 239870a2cec5..478cd89914af 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json @@ -803,12 +803,12 @@ "description": "Version of the guest configuration." }, "contentUri": { - "readOnly": true, + "readOnly": false, "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, "contentHash": { - "readOnly": true, + "readOnly": false, "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, @@ -1039,7 +1039,7 @@ "properties": { "name": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Name of the guest configuration assignment." }, "configuration": { @@ -1053,12 +1053,12 @@ "properties": { "id": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Azure resource Id of the VM." }, "uuid": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "UUID(Universally Unique Identifier) of the VM." } }, @@ -1068,12 +1068,12 @@ "properties": { "name": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Name of the configuration." }, "version": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Version of the configuration." } }, diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json index 7f896d2ac18a..0142abcf9068 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json @@ -803,12 +803,12 @@ "description": "Version of the guest configuration." }, "contentUri": { - "readOnly": true, + "readOnly": false, "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, "contentHash": { - "readOnly": true, + "readOnly": false, "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, @@ -965,7 +965,7 @@ "properties": { "targetResourceId": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "VM resource Id.", "x-nullable": true }, @@ -1117,7 +1117,7 @@ "properties": { "name": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Name of the guest configuration assignment." }, "configuration": { @@ -1131,12 +1131,12 @@ "properties": { "id": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Azure resource Id of the VM." }, "uuid": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "UUID(Universally Unique Identifier) of the VM." } }, @@ -1146,12 +1146,12 @@ "properties": { "name": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Name of the configuration." }, "version": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Version of the configuration." } }, diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json index fac640dcaa9b..7de553cfa19f 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json @@ -1088,12 +1088,12 @@ "description": "Version of the guest configuration." }, "contentUri": { - "readOnly": true, + "readOnly": false, "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, "contentHash": { - "readOnly": true, + "readOnly": false, "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, @@ -1250,7 +1250,7 @@ "properties": { "targetResourceId": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "VM resource Id.", "x-nullable": true }, @@ -1317,7 +1317,7 @@ }, "resourceType": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Type of the resource - VMSS / VM", "x-nullable": true }, @@ -1420,7 +1420,7 @@ "properties": { "name": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Name of the guest configuration assignment." }, "configuration": { @@ -1434,12 +1434,12 @@ "properties": { "id": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Azure resource Id of the VM." }, "uuid": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "UUID(Universally Unique Identifier) of the VM." } }, @@ -1449,12 +1449,12 @@ "properties": { "name": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Name of the configuration." }, "version": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Version of the configuration." } }, @@ -1571,12 +1571,12 @@ "properties": { "vmId": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "UUID of the VM." }, "vmResourceId": { "type": "string", - "readOnly": true, + "readOnly": false, "description": "Azure resource Id of the VM." }, "complianceStatus": { From 150769b908e15a30bbdc1667fc3b1a7d3550629f Mon Sep 17 00:00:00 2001 From: Aashish Rajaram Salokhe Date: Tue, 29 Jun 2021 12:44:17 -0700 Subject: [PATCH 2/4] Resolved PR comments. Updated examples --- ...teOrUpdateGuestConfigurationAssignment.json | 2 ++ ...UpdateGuestConfigurationHCRPAssignment.json | 2 ++ .../stable/2018-11-20/guestconfiguration.json | 10 +++++----- ...teOrUpdateGuestConfigurationAssignment.json | 2 ++ ...UpdateGuestConfigurationHCRPAssignment.json | 2 ++ .../stable/2020-06-25/guestconfiguration.json | 12 ++++++------ ...teOrUpdateGuestConfigurationAssignment.json | 2 ++ ...UpdateGuestConfigurationHCRPAssignment.json | 2 ++ .../stable/2021-01-25/guestconfiguration.json | 18 +++++++++--------- 9 files changed, 32 insertions(+), 20 deletions(-) diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json index 13e8b863c2d9..c35a4c31e29d 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json @@ -13,6 +13,8 @@ "guestConfiguration": { "name": "WhitelistedApplication", "version": "1.*", + "contentUri": "https://thisisfake/pacakge", + "contentHash": "123contenthash", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json index 1e767f4eb152..e588e348abe2 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json @@ -13,6 +13,8 @@ "guestConfiguration": { "name": "WhitelistedApplication", "version": "1.*", + "contentUri": "https://thisisfake/pacakge", + "contentHash": "123contenthash", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json index 478cd89914af..f5ca7a686836 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json @@ -1039,7 +1039,7 @@ "properties": { "name": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Name of the guest configuration assignment." }, "configuration": { @@ -1053,12 +1053,12 @@ "properties": { "id": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Azure resource Id of the VM." }, "uuid": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "UUID(Universally Unique Identifier) of the VM." } }, @@ -1068,12 +1068,12 @@ "properties": { "name": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Name of the configuration." }, "version": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Version of the configuration." } }, diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json index 44db64b95018..93c2032898b3 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json @@ -13,6 +13,8 @@ "guestConfiguration": { "name": "WhitelistedApplication", "version": "1.*", + "contentUri": "https://thisisfake/pacakge", + "contentHash": "123contenthash", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json index 330a83431816..d9cf04a93c2a 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json @@ -13,6 +13,8 @@ "guestConfiguration": { "name": "WhitelistedApplication", "version": "1.*", + "contentUri": "https://thisisfake/pacakge", + "contentHash": "123contenthash", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json index 0142abcf9068..660f3170f5b5 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json @@ -965,7 +965,7 @@ "properties": { "targetResourceId": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "VM resource Id.", "x-nullable": true }, @@ -1117,7 +1117,7 @@ "properties": { "name": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Name of the guest configuration assignment." }, "configuration": { @@ -1131,12 +1131,12 @@ "properties": { "id": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Azure resource Id of the VM." }, "uuid": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "UUID(Universally Unique Identifier) of the VM." } }, @@ -1146,12 +1146,12 @@ "properties": { "name": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Name of the configuration." }, "version": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Version of the configuration." } }, diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json index 473c44588a2b..7d2746bed5fe 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json @@ -13,6 +13,8 @@ "guestConfiguration": { "name": "WhitelistedApplication", "version": "1.*", + "contentUri": "https://thisisfake/pacakge", + "contentHash": "123contenthash", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json index 74fd35a92a7f..8d88cf96c9ae 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json @@ -13,6 +13,8 @@ "guestConfiguration": { "name": "WhitelistedApplication", "version": "1.*", + "contentUri": "https://thisisfake/pacakge", + "contentHash": "123contenthash", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json index 7de553cfa19f..2996cb835355 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json @@ -1250,7 +1250,7 @@ "properties": { "targetResourceId": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "VM resource Id.", "x-nullable": true }, @@ -1317,7 +1317,7 @@ }, "resourceType": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Type of the resource - VMSS / VM", "x-nullable": true }, @@ -1420,7 +1420,7 @@ "properties": { "name": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Name of the guest configuration assignment." }, "configuration": { @@ -1434,12 +1434,12 @@ "properties": { "id": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Azure resource Id of the VM." }, "uuid": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "UUID(Universally Unique Identifier) of the VM." } }, @@ -1449,12 +1449,12 @@ "properties": { "name": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Name of the configuration." }, "version": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Version of the configuration." } }, @@ -1571,12 +1571,12 @@ "properties": { "vmId": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "UUID of the VM." }, "vmResourceId": { "type": "string", - "readOnly": false, + "readOnly": true, "description": "Azure resource Id of the VM." }, "complianceStatus": { From 31e74a689702c6faf16187cc16921566cb20aff6 Mon Sep 17 00:00:00 2001 From: Aashish Rajaram Salokhe Date: Wed, 30 Jun 2021 14:36:40 -0700 Subject: [PATCH 3/4] Add Assignment Type --- ...eOrUpdateGuestConfigurationAssignment.json | 1 + ...pdateGuestConfigurationHCRPAssignment.json | 1 + .../stable/2018-11-20/guestconfiguration.json | 20 +++++++++++++++---- ...eOrUpdateGuestConfigurationAssignment.json | 1 + ...pdateGuestConfigurationHCRPAssignment.json | 1 + .../stable/2020-06-25/guestconfiguration.json | 20 +++++++++++++++---- ...eOrUpdateGuestConfigurationAssignment.json | 1 + ...pdateGuestConfigurationHCRPAssignment.json | 1 + .../stable/2021-01-25/guestconfiguration.json | 20 +++++++++++++++---- 9 files changed, 54 insertions(+), 12 deletions(-) diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json index c35a4c31e29d..c2b259c8097a 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationAssignment.json @@ -15,6 +15,7 @@ "version": "1.*", "contentUri": "https://thisisfake/pacakge", "contentHash": "123contenthash", + "assignmentType": "ApplyAndAutoCorrect", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json index e588e348abe2..c1e83dbde488 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/examples/createOrUpdateGuestConfigurationHCRPAssignment.json @@ -15,6 +15,7 @@ "version": "1.*", "contentUri": "https://thisisfake/pacakge", "contentHash": "123contenthash", + "assignmentType": "ApplyAndAutoCorrect", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json index f5ca7a686836..7758e5d3269e 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json @@ -802,16 +802,28 @@ "type": "string", "description": "Version of the guest configuration." }, - "contentUri": { - "readOnly": false, + "contentUri": { "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, - "contentHash": { - "readOnly": false, + "contentHash": { "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, + "assignmentType": { + "type": "string", + "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", + "x-ms-enum": { + "name": "assignmentType", + "modelAsString": true + }, + "enum": [ + "Audit", + "DeployAndAutoCorrect", + "ApplyAndAutoCorrect", + "ApplyAndMonitor" + ] + }, "configurationParameter": { "type": "array", "items": { diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json index 93c2032898b3..f73a5be12239 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationAssignment.json @@ -15,6 +15,7 @@ "version": "1.*", "contentUri": "https://thisisfake/pacakge", "contentHash": "123contenthash", + "assignmentType": "ApplyAndAutoCorrect", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json index d9cf04a93c2a..81f468079d03 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json @@ -15,6 +15,7 @@ "version": "1.*", "contentUri": "https://thisisfake/pacakge", "contentHash": "123contenthash", + "assignmentType": "ApplyAndAutoCorrect", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json index 660f3170f5b5..7f416015e1b2 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json @@ -802,16 +802,28 @@ "type": "string", "description": "Version of the guest configuration." }, - "contentUri": { - "readOnly": false, + "contentUri": { "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, - "contentHash": { - "readOnly": false, + "contentHash": { "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, + "assignmentType": { + "type": "string", + "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", + "x-ms-enum": { + "name": "assignmentType", + "modelAsString": true + }, + "enum": [ + "Audit", + "DeployAndAutoCorrect", + "ApplyAndAutoCorrect", + "ApplyAndMonitor" + ] + }, "configurationParameter": { "type": "array", "items": { diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json index 7d2746bed5fe..d67520d7478d 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationAssignment.json @@ -15,6 +15,7 @@ "version": "1.*", "contentUri": "https://thisisfake/pacakge", "contentHash": "123contenthash", + "assignmentType": "ApplyAndAutoCorrect", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json index 8d88cf96c9ae..a2f7f3a4d03c 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/examples/createOrUpdateGuestConfigurationHCRPAssignment.json @@ -15,6 +15,7 @@ "version": "1.*", "contentUri": "https://thisisfake/pacakge", "contentHash": "123contenthash", + "assignmentType": "ApplyAndAutoCorrect", "configurationParameter": [ { "name": "[InstalledApplication]bwhitelistedapp;Name", diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json index 2996cb835355..b0669ebee546 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json @@ -1087,16 +1087,28 @@ "type": "string", "description": "Version of the guest configuration." }, - "contentUri": { - "readOnly": false, + "contentUri": { "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, - "contentHash": { - "readOnly": false, + "contentHash": { "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, + "assignmentType": { + "type": "string", + "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", + "x-ms-enum": { + "name": "assignmentType", + "modelAsString": true + }, + "enum": [ + "Audit", + "DeployAndAutoCorrect", + "ApplyAndAutoCorrect", + "ApplyAndMonitor" + ] + }, "configurationParameter": { "type": "array", "items": { From d5a3a6c634ff59d537674a021a427975eeaf4e5c Mon Sep 17 00:00:00 2001 From: Aashish Rajaram Salokhe Date: Tue, 6 Jul 2021 17:35:16 -0700 Subject: [PATCH 4/4] Fix Prettier check --- .../stable/2018-11-20/guestconfiguration.json | 16 ++++++++-------- .../stable/2020-06-25/guestconfiguration.json | 16 ++++++++-------- .../stable/2021-01-25/guestconfiguration.json | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json index 7758e5d3269e..2374f0f1f542 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2018-11-20/guestconfiguration.json @@ -802,18 +802,18 @@ "type": "string", "description": "Version of the guest configuration." }, - "contentUri": { + "contentUri": { "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, - "contentHash": { + "contentHash": { "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, - "assignmentType": { - "type": "string", - "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", - "x-ms-enum": { + "assignmentType": { + "type": "string", + "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", + "x-ms-enum": { "name": "assignmentType", "modelAsString": true }, @@ -821,9 +821,9 @@ "Audit", "DeployAndAutoCorrect", "ApplyAndAutoCorrect", - "ApplyAndMonitor" + "ApplyAndMonitor" ] - }, + }, "configurationParameter": { "type": "array", "items": { diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json index 7f416015e1b2..7164a0b561fc 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2020-06-25/guestconfiguration.json @@ -802,18 +802,18 @@ "type": "string", "description": "Version of the guest configuration." }, - "contentUri": { + "contentUri": { "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, - "contentHash": { + "contentHash": { "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, - "assignmentType": { - "type": "string", - "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", - "x-ms-enum": { + "assignmentType": { + "type": "string", + "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", + "x-ms-enum": { "name": "assignmentType", "modelAsString": true }, @@ -821,9 +821,9 @@ "Audit", "DeployAndAutoCorrect", "ApplyAndAutoCorrect", - "ApplyAndMonitor" + "ApplyAndMonitor" ] - }, + }, "configurationParameter": { "type": "array", "items": { diff --git a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json index b0669ebee546..ec65d21e12ba 100644 --- a/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json +++ b/specification/guestconfiguration/resource-manager/Microsoft.GuestConfiguration/stable/2021-01-25/guestconfiguration.json @@ -1087,18 +1087,18 @@ "type": "string", "description": "Version of the guest configuration." }, - "contentUri": { + "contentUri": { "type": "string", "description": "Uri of the storage where guest configuration package is uploaded." }, - "contentHash": { + "contentHash": { "type": "string", "description": "Combined hash of the guest configuration package and configuration parameters." }, - "assignmentType": { - "type": "string", - "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", - "x-ms-enum": { + "assignmentType": { + "type": "string", + "description": "Specifies the assignment type and execution of the configuration. Possible values are Audit, DeployAndAutoCorrect, ApplyAndAutoCorrect and ApplyAndMonitor.", + "x-ms-enum": { "name": "assignmentType", "modelAsString": true }, @@ -1106,9 +1106,9 @@ "Audit", "DeployAndAutoCorrect", "ApplyAndAutoCorrect", - "ApplyAndMonitor" + "ApplyAndMonitor" ] - }, + }, "configurationParameter": { "type": "array", "items": {