Skip to content

Commit

Permalink
Swagger change for pre and post script (#4298)
Browse files Browse the repository at this point in the history 
* Swagger change for Pre and post script

* fixing semantic and model validation error

* fixing the Required filed

* changing the capitalization on the description

* fixing the model validation error

* addressing PR feedback

* fix description
  • Loading branch information
@jemex @annatisch
jemex authored and annatisch committed Oct 23, 2018
1 parent 631e5b5 commit 605dd0c
Show file tree
Hide file tree
Showing 13 changed files with 972 additions and 601 deletions.
415 changes: 256 additions & 159 deletions ...05-15-preview/examples/softwareUpdateConfiguration/createSoftwareUpdateConfiguration.json
View file

Large diffs are not rendered by default.

142 changes: 89 additions & 53 deletions ...15-preview/examples/softwareUpdateConfiguration/getSoftwareUpdateConfigurationByName.json
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,99 @@
{
"parameters": {
"subscriptionId": "51766542-3ed7-4a72-a187-0c8ab644ddab",
"resourceGroupName": "mygroup",
"automationAccountName": "myaccount",
"softwareUpdateConfigurationName": "mypatch",
"api-version": "2017-05-15-preview",
"body": {}
"subscriptionId": "51766542-3ed7-4a72-a187-0c8ab644ddab",
"resourceGroupName": "mygroup",
"automationAccountName": "myaccount",
"softwareUpdateConfigurationName": "mypatch",
"api-version": "2017-05-15-preview",
"body": {}
},
"responses": {
"200": {
"headers": {},
"body": {
"name": "testpatch",
"id": "/subscriptions/51766542-3ed7-4a72-a187-0c8ab644ddab/resourceGroups/mygroup/providers/Microsoft.Automation/automationAccounts/myaccount/softwareUpdateConfigurations/testpatch",
"properties": {
"updateConfiguration": {
"operatingSystem": "Windows",
"windows": {
"includedUpdateClassifications": "Critical",
"excludedKbNumbers": [
"168934",
"168973"
]
},
"linux": {},
"duration": "PT2H",
"azureVirtualMachines": [
"/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-01",
"/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-02",
"/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-03"
"200": {
"headers": {},
"body": {
"name": "testpatch",
"id": "/subscriptions/51766542-3ed7-4a72-a187-0c8ab644ddab/resourceGroups/mygroup/providers/Microsoft.Automation/automationAccounts/myaccount/softwareUpdateConfigurations/testpatch",
"properties": {
"updateConfiguration": {
"operatingSystem": "Windows",
"windows": {
"includedUpdateClassifications": "Critical",
"excludedKbNumbers": [
"168934",
"168973"
]
},
"linux": {},
"targets": {
"azureQueries": [
{
"scope": [
"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/a-stasku-rg0",
"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d"
],
"tagSettings": {
"tags": {
"tag1": [
"tag1Value1",
"tag1Value2"
],
"nonAzureComputerNames": [
"box1.contoso.com",
"box2.contoso.com"
"tag2": [
"tag2Value1",
"tag2Value2"
]
},
"filterOperator": "All"
},
"scheduleInfo": {
"description": "",
"startTime": "2017-10-19T12:22:00-07:00",
"startTimeOffsetMinutes": -420.0,
"expiryTime": "2018-11-09T11:22:00-08:00",
"expiryTimeOffsetMinutes": -480.0,
"isEnabled": true,
"nextRun": "2017-10-19T12:22:00-07:00",
"nextRunOffsetMinutes": -420.0,
"interval": 1,
"frequency": "Week",
"creationTime": "2017-10-19T18:54:50.5233333+00:00",
"lastModifiedTime": "2017-10-19T18:54:50.5233333+00:00",
"timeZone": "America/Los_Angeles"
},
"provisioningState": "Provisioning",
"createdBy": "eve@contoso.com",
"error": {},
"creationTime": "2017-10-19T18:54:50.5233333+00:00",
"lastModifiedBy": "",
"lastModifiedTime": "2017-10-19T18:54:50.68+00:00"
"locations": null
}
]
},
"duration": "PT2H",
"azureVirtualMachines": [
"/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-01",
"/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-02",
"/subscriptions/5ae68d89-69a4-454f-b5ce-e443cc4e0067/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-03"
],
"nonAzureComputerNames": [
"box1.contoso.com",
"box2.contoso.com"
]
},
"scheduleInfo": {
"description": "",
"startTime": "2017-10-19T12:22:00-07:00",
"startTimeOffsetMinutes": -420,
"expiryTime": "2018-11-09T11:22:00-08:00",
"expiryTimeOffsetMinutes": -480,
"isEnabled": true,
"nextRun": "2017-10-19T12:22:00-07:00",
"nextRunOffsetMinutes": -420,
"interval": 1,
"frequency": "Week",
"creationTime": "2017-10-19T18:54:50.5233333+00:00",
"lastModifiedTime": "2017-10-19T18:54:50.5233333+00:00",
"timeZone": "America/Los_Angeles"
},
"tasks": {
"preTask": {
"source": "HelloWorld",
"parameters": {
"COMPUTERNAME": "Computer1"
}
}
},
"postTask": {
"source": "GetCache",
"parameters": null
}
},
"provisioningState": "Provisioning",
"createdBy": "eve@contoso.com",
"error": {},
"creationTime": "2017-10-19T18:54:50.5233333+00:00",
"lastModifiedBy": "",
"lastModifiedTime": "2017-10-19T18:54:50.68+00:00"
}
}
}
}
}
}
190 changes: 132 additions & 58 deletions ...-05-15-preview/examples/softwareUpdateConfiguration/listSoftwareUpdateConfigurations.json
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,143 @@
{
"parameters": {
"subscriptionId": "1a7d4044-286c-4acb-969a-96639265bf2e",
"resourceGroupName": "mygroup",
"automationAccountName": "myaccount",
"api-version": "2017-05-15-preview",
"body": {}
"subscriptionId": "1a7d4044-286c-4acb-969a-96639265bf2e",
"resourceGroupName": "mygroup",
"automationAccountName": "myaccount",
"api-version": "2017-05-15-preview",
"body": {}
},
"responses": {
"200": {
"value": [
{
"name": "testpatch-01",
"id": "/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/Mo-Resources-WCUS/providers/Microsoft.Automation/automationAccounts/Mo-AAA-WCUS/softwareUpdateConfigurations/testpatch-01",
"properties": {
"updateConfiguration": {
"operatingSystem": "Windows",
"windows": {
"includedUpdateClassifications": "Critical, Security, UpdateRollup, FeaturePack, ServicePack, Definition, Tools, Updates",
"excludedKbNumbers": null
},
"linux": null,
"duration": "PT2H",
"azureVirtualMachines": [
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-01",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-02",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-03"
],
"nonAzureComputerNames": null
"200": {
"value": [
{
"name": "testpatch-01",
"id": "/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/Mo-Resources-WCUS/providers/Microsoft.Automation/automationAccounts/Mo-AAA-WCUS/softwareUpdateConfigurations/testpatch-01",
"properties": {
"updateConfiguration": {
"operatingSystem": "Windows",
"windows": {
"includedUpdateClassifications": "Critical, Security, UpdateRollup, FeaturePack, ServicePack, Definition, Tools, Updates",
"excludedKbNumbers": null
},
"linux": null,
"targets": {
"azureQueries": [
{
"scope": [
"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/a-stasku-rg0",
"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d"
],
"tagSettings": {
"tags": {
"tag1": [
"tag1Value1",
"tag1Value2"
],
"tag2": [
"tag2Value1",
"tag2Value2"
]
},
"frequency": "Week",
"startTime": "2017-10-19T12:22:00-07:00",
"creationTime": "2017-10-19T18:54:50.5233333+00:00",
"lastModifiedTime": "2017-10-19T18:54:50.68+00:00",
"provisioningState": "Succeeded",
"nextRun": "2017-10-23T12:22:00-07:00"
"filterOperator": "All"
},
"locations": null
}
]
},
"duration": "PT2H",
"azureVirtualMachines": [
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-01",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-02",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-03"
],
"nonAzureComputerNames": null
},
"tasks": {
"preTask": {
"source": "HelloWorld",
"parameters": {
"COMPUTERNAME": "Computer1"
}
},
"postTask": {
"source": "GetCache",
"parameters": null
}
},
"frequency": "Week",
"startTime": "2017-10-19T12:22:00-07:00",
"creationTime": "2017-10-19T18:54:50.5233333+00:00",
"lastModifiedTime": "2017-10-19T18:54:50.68+00:00",
"provisioningState": "Succeeded",
"nextRun": "2017-10-23T12:22:00-07:00"
}
},
{
"name": "testpatch-02",
"id": "/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/Mo-Resources-WCUS/providers/Microsoft.Automation/automationAccounts/Mo-AAA-WCUS/softwareUpdateConfigurations/testpatch-02",
"properties": {
"updateConfiguration": {
"operatingSystem": "Windows",
"windows": {
"includedUpdateClassifications": "Critical, FeaturePack",
"excludedKbNumbers": null
},
{
"name": "testpatch-02",
"id": "/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/Mo-Resources-WCUS/providers/Microsoft.Automation/automationAccounts/Mo-AAA-WCUS/softwareUpdateConfigurations/testpatch-02",
"properties": {
"updateConfiguration": {
"operatingSystem": "Windows",
"windows": {
"includedUpdateClassifications": "Critical, FeaturePack",
"excludedKbNumbers":null
},
"linux": null,
"duration": "PT2H30M",
"azureVirtualMachines": [
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-04",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-05",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-06"
],
"nonAzureComputerNames": null
"linux": null,
"targets": {
"azureQueries": [
{
"scope": [
"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d/resourceGroups/a-stasku-rg0",
"/subscriptions/422b6c61-95b0-4213-b3be-7282315df71d"
],
"tagSettings": {
"tags": {
"tag1": [
"tag1Value1",
"tag1Value2"
],
"tag2": [
"tag2Value1",
"tag2Value2"
]
},
"frequency": "Hour",
"startTime": "2018-05-05T12:26:00-07:00",
"creationTime": "2017-08-11T21:52:02.7733333+00:00",
"lastModifiedTime": "2017-08-11T21:52:22.88+00:00",
"provisioningState": "Succeeded",
"nextRun":"2018-05-05T12:26:00-07:00"
"filterOperator": "All"
},
"locations": [
"Japan East",
"UK South"]
}
]
},
"duration": "PT2H30M",
"azureVirtualMachines": [
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-04",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-05",
"/subscriptions/1a7d4044-286c-4acb-969a-96639265bf2e/resourceGroups/myresources/providers/Microsoft.Compute/virtualMachines/vm-06"
],
"nonAzureComputerNames": null
},
"tasks": {
"preTask": {
"source": "HelloWorld",
"parameters": {
"COMPUTERNAME": "Computer1"
}
},
"postTask": {
"source": "GetCache",
"parameters": null
}
]
}
},
"frequency": "Hour",
"startTime": "2018-05-05T12:26:00-07:00",
"creationTime": "2017-08-11T21:52:02.7733333+00:00",
"lastModifiedTime": "2017-08-11T21:52:22.88+00:00",
"provisioningState": "Succeeded",
"nextRun": "2018-05-05T12:26:00-07:00"
}
}
]
}
}
}
}
Loading

0 comments on commit 605dd0c

Please sign in to comment.