Skip to content

Commit

Permalink
[GuestConfiguration]Add version field to ConfigurationInfo (#5199)
Browse files Browse the repository at this point in the history
* Added Version field to ConfigurationInfo object

* Updated SDK from swagger specs

* Update test cases to include version field in ConfigurationInfo class

* Update the version to 1.1.0 and generated sdk from latest swagger specs

* Updated the test json files to reflect the new version

* Reverting Assembly version back to 1.0.0
  • Loading branch information
aashish1987 authored and dsgouda committed Feb 1, 2019
1 parent 0660b95 commit deea705
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"RequestBody": "{\r\n \"properties\": {\r\n \"guestConfiguration\": {\r\n \"name\": \"AuditSecureProtocol\",\r\n \"version\": \"1.0.0.3\"\r\n },\r\n \"context\": \"Azure policy A\"\r\n }\r\n}",
"RequestHeaders": {
"x-ms-client-request-id": [
"180a357f-4f36-4aa4-ad22-39754ca47891"
"dce9504e-3bbb-46c6-9121-814d68b99305"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.6.3.9600.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.0.0"
"OSVersion/Microsoft.Windows.10.0.14393.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.1.0"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -30,7 +30,7 @@
"no-cache"
],
"Date": [
"Fri, 18 Jan 2019 21:32:54 GMT"
"Fri, 01 Feb 2019 20:01:36 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -48,13 +48,13 @@
"1199"
],
"x-ms-request-id": [
"c79cd605-e683-471f-b823-1ecab51473fa"
"c8c69dc6-274f-4ab8-a2ef-2a9f05d56a69"
],
"x-ms-correlation-request-id": [
"c79cd605-e683-471f-b823-1ecab51473fa"
"c8c69dc6-274f-4ab8-a2ef-2a9f05d56a69"
],
"x-ms-routing-request-id": [
"WESTUS2:20190118T213254Z:c79cd605-e683-471f-b823-1ecab51473fa"
"WESTUS2:20190201T200136Z:c8c69dc6-274f-4ab8-a2ef-2a9f05d56a69"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -79,16 +79,16 @@
"RequestBody": "{\r\n \"properties\": {\r\n \"guestConfiguration\": {\r\n \"name\": \"AuditSecureProtocol\",\r\n \"version\": \"1.0.0.3\"\r\n },\r\n \"context\": \"Azure Policy B\"\r\n }\r\n}",
"RequestHeaders": {
"x-ms-client-request-id": [
"656e1de4-cd4d-49da-b241-3f9ce30035b0"
"245c9ea7-2826-4d69-b073-f80ca0aa7d94"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.6.3.9600.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.0.0"
"OSVersion/Microsoft.Windows.10.0.14393.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.1.0"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -102,7 +102,7 @@
"no-cache"
],
"Date": [
"Fri, 18 Jan 2019 21:32:55 GMT"
"Fri, 01 Feb 2019 20:01:36 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -120,13 +120,13 @@
"1198"
],
"x-ms-request-id": [
"a9804b1a-b679-43b1-ad71-a83bb24e94f6"
"bc0e2c01-9537-4964-878e-dfd8246b9c52"
],
"x-ms-correlation-request-id": [
"a9804b1a-b679-43b1-ad71-a83bb24e94f6"
"bc0e2c01-9537-4964-878e-dfd8246b9c52"
],
"x-ms-routing-request-id": [
"WESTUS2:20190118T213255Z:a9804b1a-b679-43b1-ad71-a83bb24e94f6"
"WESTUS2:20190201T200137Z:bc0e2c01-9537-4964-878e-dfd8246b9c52"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -151,24 +151,24 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"dd2baafe-6ae0-4c92-8027-34e36bb0cfbe"
"c40763da-d6c2-47ee-a6da-04dc0b1c0a8e"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.6.3.9600.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.0.0"
"OSVersion/Microsoft.Windows.10.0.14393.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.1.0"
]
},
"ResponseHeaders": {
"Cache-Control": [
"no-cache"
],
"Date": [
"Fri, 18 Jan 2019 21:32:54 GMT"
"Fri, 01 Feb 2019 20:01:36 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -183,16 +183,16 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"11983"
"11999"
],
"x-ms-request-id": [
"54df064f-abd5-498d-8208-3d255243d66c"
"8937fcf5-091a-4252-ac0b-1c10b0801242"
],
"x-ms-correlation-request-id": [
"54df064f-abd5-498d-8208-3d255243d66c"
"8937fcf5-091a-4252-ac0b-1c10b0801242"
],
"x-ms-routing-request-id": [
"WESTUS2:20190118T213255Z:54df064f-abd5-498d-8208-3d255243d66c"
"WESTUS2:20190201T200136Z:8937fcf5-091a-4252-ac0b-1c10b0801242"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -207,7 +207,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol\",\r\n \"name\": \"AuditSecureProtocol\",\r\n \"properties\": {\r\n \"complianceStatus\": \"NonCompliant\",\r\n \"assignmentHash\": \"\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol/reports/f1fb39c6-71ef-4bdb-95df-6f51951db453\",\r\n \"lastComplianceStatusChecked\": \"2019-01-18T21:04:58Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"AuditSecureProtocol\",\r\n \"version\": \"1.0.0.3\",\r\n \"contentUri\": null,\r\n \"contentHash\": null,\r\n \"contentType\": null,\r\n \"configurationParameter\": [],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
"ResponseBody": "{\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol\",\r\n \"name\": \"AuditSecureProtocol\",\r\n \"properties\": {\r\n \"complianceStatus\": \"NonCompliant\",\r\n \"assignmentHash\": \"\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol/reports/28818230-4514-4aaf-ba81-31ba0756c255\",\r\n \"lastComplianceStatusChecked\": \"2019-02-01T19:31:53Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"AuditSecureProtocol\",\r\n \"version\": \"1.0.0.3\",\r\n \"contentUri\": null,\r\n \"contentHash\": null,\r\n \"contentType\": null,\r\n \"configurationParameter\": [],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
"StatusCode": 200
}
],
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"94b360cb-6312-4b72-8c53-61ed7405531b"
"deb0caeb-c74d-4698-b937-135b5a5ef06d"
],
"accept-language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.26328.01",
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.6.3.9600.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.0.0"
"OSVersion/Microsoft.Windows.10.0.14393.",
"Microsoft.Azure.Management.GuestConfiguration.GuestConfigurationClient/1.1.0"
]
},
"ResponseHeaders": {
"Cache-Control": [
"no-cache"
],
"Date": [
"Fri, 18 Jan 2019 21:32:51 GMT"
"Fri, 01 Feb 2019 20:01:33 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -39,16 +39,16 @@
"ASP.NET"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"11997"
"11999"
],
"x-ms-request-id": [
"ac252fea-712c-49af-bfdc-57bdcd422123"
"797a04eb-a0c5-4e1d-9d9f-2eeaea579f28"
],
"x-ms-correlation-request-id": [
"ac252fea-712c-49af-bfdc-57bdcd422123"
"797a04eb-a0c5-4e1d-9d9f-2eeaea579f28"
],
"x-ms-routing-request-id": [
"WESTUS2:20190118T213252Z:ac252fea-712c-49af-bfdc-57bdcd422123"
"WESTUS2:20190201T200134Z:797a04eb-a0c5-4e1d-9d9f-2eeaea579f28"
],
"X-Content-Type-Options": [
"nosniff"
Expand All @@ -63,7 +63,7 @@
"-1"
]
},
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol\",\r\n \"name\": \"AuditSecureProtocol\",\r\n \"properties\": {\r\n \"complianceStatus\": \"NonCompliant\",\r\n \"assignmentHash\": \"98ACBE11E578A78AC17C43A19045E3E80D08E764CC90C4B3BC1BFD48E8243140.E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol/reports/f1fb39c6-71ef-4bdb-95df-6f51951db453\",\r\n \"lastComplianceStatusChecked\": \"2019-01-18T21:04:58Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"AuditSecureProtocol\",\r\n \"version\": \"1.*\",\r\n \"contentUri\": \"https://oaasguestconfigwcuss1.blob.core.windows.net/builtinconfig/AuditSecureProtocol/AuditSecureProtocol_1.1.0.0.zip\",\r\n \"contentHash\": \"98ACBE11E578A78AC17C43A19045E3E80D08E764CC90C4B3BC1BFD48E8243140\",\r\n \"contentType\": null,\r\n \"configurationParameter\": [],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/NotInstalledApplication\",\r\n \"name\": \"NotInstalledApplication\",\r\n \"properties\": {\r\n \"complianceStatus\": \"Compliant\",\r\n \"assignmentHash\": \"520E428984E2C33C0BCC7BC1CF8982D6AF065B14BD8D36DA5082D7BE7FF4E578.2C5D17ECE6FA069B3EBC5A9C1790E443FB8CD58E0B2332E4F8BAE86C915DA89A\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/NotInstalledApplication/reports/2ef6dd19-c6e4-4638-a7fd-a476b73a9335\",\r\n \"lastComplianceStatusChecked\": \"2019-01-18T18:49:56Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"NotInstalledApplication\",\r\n \"version\": \"1.*\",\r\n \"contentUri\": \"https://oaasguestconfigwcuss1.blob.core.windows.net/builtinconfig/NotInstalledApplication/NotInstalledApplication_1.0.0.0.zip\",\r\n \"contentHash\": \"520E428984E2C33C0BCC7BC1CF8982D6AF065B14BD8D36DA5082D7BE7FF4E578\",\r\n \"contentType\": null,\r\n \"configurationParameter\": [\r\n {\r\n \"name\": \"[InstalledApplication]NotInstalledApplicationResource1;Name\",\r\n \"value\": \"*Chrome*\"\r\n }\r\n ],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/WhitelistedApplication\",\r\n \"name\": \"WhitelistedApplication\",\r\n \"properties\": {\r\n \"complianceStatus\": \"NonCompliant\",\r\n \"assignmentHash\": \"F606DAC934FA367A32FCF695F7CA7399F009AF1A1B45CDFCBD34B89972E73394.E381A1748D08855C4004123F85A5DAE5D26E33B38FFDAACE715AB39B88F8BF04\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/WhitelistedApplication/reports/e0628ede-dbe4-48ac-a490-156489f8da3b\",\r\n \"lastComplianceStatusChecked\": \"2019-01-18T18:49:53Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"WhitelistedApplication\",\r\n \"version\": \"1.*\",\r\n \"contentUri\": \"https://oaasguestconfigwcuss1.blob.core.windows.net/builtinconfig/WhitelistedApplication/WhitelistedApplication_1.3.0.0.zip\",\r\n \"contentHash\": \"F606DAC934FA367A32FCF695F7CA7399F009AF1A1B45CDFCBD34B89972E73394\",\r\n \"contentType\": null,\r\n \"configurationParameter\": [\r\n {\r\n \"name\": \"[InstalledApplication]bwhitelistedapp;Name\",\r\n \"value\": \"*Chrome*\"\r\n }\r\n ],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": null\r\n }\r\n }\r\n ]\r\n}",
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol\",\r\n \"name\": \"AuditSecureProtocol\",\r\n \"properties\": {\r\n \"complianceStatus\": \"NonCompliant\",\r\n \"assignmentHash\": \"98ACBE11E578A78AC17C43A19045E3E80D08E764CC90C4B3BC1BFD48E8243140.E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/AuditSecureProtocol/reports/28818230-4514-4aaf-ba81-31ba0756c255\",\r\n \"lastComplianceStatusChecked\": \"2019-02-01T19:31:53Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"AuditSecureProtocol\",\r\n \"version\": \"1.*\",\r\n \"contentUri\": \"https://oaasguestconfigwcuss1.blob.core.windows.net/builtinconfig/AuditSecureProtocol/AuditSecureProtocol_1.1.0.0.zip\",\r\n \"contentHash\": \"98ACBE11E578A78AC17C43A19045E3E80D08E764CC90C4B3BC1BFD48E8243140\",\r\n \"contentType\": null,\r\n \"configurationParameter\": [],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/NotInstalledApplication\",\r\n \"name\": \"NotInstalledApplication\",\r\n \"properties\": {\r\n \"complianceStatus\": \"Compliant\",\r\n \"assignmentHash\": \"520E428984E2C33C0BCC7BC1CF8982D6AF065B14BD8D36DA5082D7BE7FF4E578.2C5D17ECE6FA069B3EBC5A9C1790E443FB8CD58E0B2332E4F8BAE86C915DA89A\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/NotInstalledApplication/reports/2ef6dd19-c6e4-4638-a7fd-a476b73a9335\",\r\n \"lastComplianceStatusChecked\": \"2019-01-18T18:49:56Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"NotInstalledApplication\",\r\n \"version\": \"1.*\",\r\n \"contentUri\": \"https://oaasguestconfigwcuss1.blob.core.windows.net/builtinconfig/NotInstalledApplication/NotInstalledApplication_1.0.0.0.zip\",\r\n \"contentHash\": \"520E428984E2C33C0BCC7BC1CF8982D6AF065B14BD8D36DA5082D7BE7FF4E578\",\r\n \"contentType\": null,\r\n \"configurationParameter\": [\r\n {\r\n \"name\": \"[InstalledApplication]NotInstalledApplicationResource1;Name\",\r\n \"value\": \"*Chrome*\"\r\n }\r\n ],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": null\r\n }\r\n },\r\n {\r\n \"location\": \"westcentralus\",\r\n \"id\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/WhitelistedApplication\",\r\n \"name\": \"WhitelistedApplication\",\r\n \"properties\": {\r\n \"complianceStatus\": \"NonCompliant\",\r\n \"assignmentHash\": \"F606DAC934FA367A32FCF695F7CA7399F009AF1A1B45CDFCBD34B89972E73394.E381A1748D08855C4004123F85A5DAE5D26E33B38FFDAACE715AB39B88F8BF04\",\r\n \"latestReportId\": \"/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/resourceGroups/vivga/providers/Microsoft.Compute/virtualMachines/vivga0/providers/Microsoft.GuestConfiguration/guestConfigurationAssignments/WhitelistedApplication/reports/e0628ede-dbe4-48ac-a490-156489f8da3b\",\r\n \"lastComplianceStatusChecked\": \"2019-01-18T18:49:53Z\",\r\n \"context\": null,\r\n \"guestConfiguration\": {\r\n \"kind\": null,\r\n \"name\": \"WhitelistedApplication\",\r\n \"version\": \"1.*\",\r\n \"contentUri\": \"https://oaasguestconfigwcuss1.blob.core.windows.net/builtinconfig/WhitelistedApplication/WhitelistedApplication_1.3.0.0.zip\",\r\n \"contentHash\": \"F606DAC934FA367A32FCF695F7CA7399F009AF1A1B45CDFCBD34B89972E73394\",\r\n \"contentType\": null,\r\n \"configurationParameter\": [\r\n {\r\n \"name\": \"[InstalledApplication]bwhitelistedapp;Name\",\r\n \"value\": \"*Chrome*\"\r\n }\r\n ],\r\n \"configurationSetting\": null\r\n },\r\n \"provisioningState\": null\r\n }\r\n }\r\n ]\r\n}",
"StatusCode": 200
}
],
Expand Down
Loading

0 comments on commit deea705

Please sign in to comment.