From ac4360a6f493f68cdc3867ac4b8e00a86b4fdddd Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 11:32:32 +0530 Subject: [PATCH 01/13] add swagger definitions for deletedAutomationAccounts resource type --- .../2022-01-31/deletedAutomationAccount.json | 149 ++++++++++++++++++ .../examples/getDeletedAutomationAccount.json | 30 ++++ 2 files changed, 179 insertions(+) create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json create mode 100644 specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json new file mode 100644 index 000000000000..dafb5073727b --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -0,0 +1,149 @@ +{ + "swagger":"2.0", + "info":{ + "title":"AutomationManagement", + "version":"2022-01-31", + "x-ms-code-generation-settings":{ + "useDateTimeOffset":true + } + }, + "host":"management.azure.com", + "schemes":[ + "https" + ], + "consumes":[ + "application/json" + ], + "produces":[ + "application/json" + ], + "security":[ + { + "azure_auth":[ + "user_impersonation" + ] + } + ], + "securityDefinitions":{ + "azure_auth":{ + "type":"oauth2", + "authorizationUrl":"https://login.microsoftonline.com/common/oauth2/authorize", + "flow":"implicit", + "description":"Azure Active Directory OAuth2 Flow", + "scopes":{ + "user_impersonation":"impersonate your user account" + } + } + }, + "paths":{ + "/subscriptions/{subscriptionId}/providers/Microsoft.Automation/deletedAutomationAccounts/{automationAccountName}":{ + "get":{ + "tags":[ + "DeletedAutomationAccounts" + ], + "operationId":"deletedAutomationAccounts_Get", + "description":"Retrieve deleted automation account.", + "externalDocs":{ + "url":"http://aka.ms/azureautomationsdk/hybridrunbookworkergroupoperations" + }, + "x-ms-examples":{ + "Get deleted automation account":{ + "$ref":"./examples/getdeletedAutomationAccount.json" + } + }, + "parameters":[ + { + "$ref":"../../common/v1/definitions.json#/parameters/AutomationAccountNameParameter" + }, + { + "$ref":"../../common/v1/definitions.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref":"../../common/v1/definitions.json#/parameters/ApiVersionParameter" + } + ], + "responses":{ + "200":{ + "description":"OK", + "schema":{ + "$ref":"#/definitions/DeletedAutomationAccountListResult" + } + }, + "default":{ + "description":"Automation error response describing why the operation failed.", + "schema":{ + "$ref":"../../common/v1/definitions.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions":{ + "DeletedAutomationAccountListResult":{ + "properties":{ + "value":{ + "type":"array", + "items":{ + "$ref":"#/definitions/DeletedAutomationAccount" + }, + "description":"Gets or sets the list of deleted automation accounts." + } + }, + "description":"The response model for the list deleted automation account." + }, + "DeletedAutomationAccount":{ + "properties":{ + "properties":{ + "$ref":"#/definitions/DeletedAutomationAccountProperties", + "x-ms-client-flatten":true, + "description":"Gets or sets the automation account properties." + }, + "id":{ + "description":"The resource id.", + "type":"string" + }, + "name":{ + "type":"string", + "description":"Gets or sets name of the resource." + }, + "type":{ + "type":"string", + "description":"The resource type." + }, + "location":{ + "type":"string", + "description":"Gets or sets the location of the resource." + } + }, + "description":"Definition of the deleted automation account type." + }, + "DeletedAutomationAccountProperties":{ + "properties":{ + "automationAccountResourceId":{ + "type":"string", + "description":"Gets or sets the Automation Account Resource Id." + }, + "automationAccountId":{ + "type":"string", + "description":"Gets or sets the Automation Account Id." + }, + "location":{ + "type":"string", + "description":"Gets or sets the location of the resource." + }, + "deletedTime":{ + "type":"string", + "format":"date-time", + "readOnly":true, + "description":"Gets the creation time.", + "x-nullable":false + } + }, + "description":"Definition of the deleted automation account properties." + } + }, + "parameters":{ + + } +} \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json new file mode 100644 index 000000000000..731ab712fe22 --- /dev/null +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json @@ -0,0 +1,30 @@ +{ + "parameters":{ + "subscriptionId":"subid", + "automationAccountName":"myAutomationAccount", + "api-version":"2022-01-31" + }, + "responses":{ + "200":{ + "headers":{ + + }, + "body":{ + "value":[ + { + "Id":"/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/deletedAutomationAccounts/myAutomationAccount", + "Name":"myAutomationAccount", + "Type":"Microsoft.Automation/deletedAutomationAccounts", + "Location":"westus", + "Properties":{ + "AutomationAccountResourceId":"/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/automationAccounts/myAutomationAccount", + "AutomationAccountId":"cb855f13-0223-4fe4-8260-9e6583dfef24", + "Location":"westus", + "DeletedTime":"2021-08-05T09:07:56.7" + } + } + ] + } + } + } +} \ No newline at end of file From fd4b9b6f3d5490def31b2faa5b8672e2f7fce608 Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 12:31:03 +0530 Subject: [PATCH 02/13] fix semantic and model validation error --- .../2022-01-31/deletedAutomationAccount.json | 281 +++++++++--------- .../examples/getDeletedAutomationAccount.json | 54 ++-- .../automation/resource-manager/readme.md | 1 + 3 files changed, 165 insertions(+), 171 deletions(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index dafb5073727b..92569a122c06 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -1,149 +1,144 @@ { - "swagger":"2.0", - "info":{ - "title":"AutomationManagement", - "version":"2022-01-31", - "x-ms-code-generation-settings":{ - "useDateTimeOffset":true + "swagger": "2.0", + "info": { + "title": "AutomationManagement", + "version": "2022-01-31", + "x-ms-code-generation-settings": { + "useDateTimeOffset": true + } + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" } - }, - "host":"management.azure.com", - "schemes":[ - "https" - ], - "consumes":[ - "application/json" - ], - "produces":[ - "application/json" - ], - "security":[ - { - "azure_auth":[ - "user_impersonation" - ] - } - ], - "securityDefinitions":{ - "azure_auth":{ - "type":"oauth2", - "authorizationUrl":"https://login.microsoftonline.com/common/oauth2/authorize", - "flow":"implicit", - "description":"Azure Active Directory OAuth2 Flow", - "scopes":{ - "user_impersonation":"impersonate your user account" - } - } - }, - "paths":{ - "/subscriptions/{subscriptionId}/providers/Microsoft.Automation/deletedAutomationAccounts/{automationAccountName}":{ - "get":{ - "tags":[ - "DeletedAutomationAccounts" - ], - "operationId":"deletedAutomationAccounts_Get", - "description":"Retrieve deleted automation account.", - "externalDocs":{ - "url":"http://aka.ms/azureautomationsdk/hybridrunbookworkergroupoperations" - }, - "x-ms-examples":{ - "Get deleted automation account":{ - "$ref":"./examples/getdeletedAutomationAccount.json" - } - }, - "parameters":[ - { - "$ref":"../../common/v1/definitions.json#/parameters/AutomationAccountNameParameter" - }, - { - "$ref":"../../common/v1/definitions.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref":"../../common/v1/definitions.json#/parameters/ApiVersionParameter" - } - ], - "responses":{ - "200":{ - "description":"OK", - "schema":{ - "$ref":"#/definitions/DeletedAutomationAccountListResult" - } - }, - "default":{ - "description":"Automation error response describing why the operation failed.", - "schema":{ - "$ref":"../../common/v1/definitions.json#/definitions/ErrorResponse" - } - } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Automation/deletedAutomationAccounts/{automationAccountName}": { + "get": { + "tags": [ + "DeletedAutomationAccounts" + ], + "operationId": "deletedAutomationAccounts_Get", + "description": "Retrieve deleted automation account.", + "x-ms-examples": { + "Get deleted automation account": { + "$ref": "./examples/getDeletedAutomationAccount.json" + } + }, + "parameters": [ + { + "$ref": "../../common/v1/definitions.json#/parameters/AutomationAccountNameParameter" + }, + { + "$ref": "../../common/v1/definitions.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../common/v1/definitions.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DeletedAutomationAccountListResult" } - } - } - }, - "definitions":{ - "DeletedAutomationAccountListResult":{ - "properties":{ - "value":{ - "type":"array", - "items":{ - "$ref":"#/definitions/DeletedAutomationAccount" - }, - "description":"Gets or sets the list of deleted automation accounts." + }, + "default": { + "description": "Automation error response describing why the operation failed.", + "schema": { + "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" } - }, - "description":"The response model for the list deleted automation account." + } + } + } + } + }, + "definitions": { + "DeletedAutomationAccountListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/DeletedAutomationAccount" + }, + "description": "Gets or sets the list of deleted automation accounts." + } }, - "DeletedAutomationAccount":{ - "properties":{ - "properties":{ - "$ref":"#/definitions/DeletedAutomationAccountProperties", - "x-ms-client-flatten":true, - "description":"Gets or sets the automation account properties." - }, - "id":{ - "description":"The resource id.", - "type":"string" - }, - "name":{ - "type":"string", - "description":"Gets or sets name of the resource." - }, - "type":{ - "type":"string", - "description":"The resource type." - }, - "location":{ - "type":"string", - "description":"Gets or sets the location of the resource." - } - }, - "description":"Definition of the deleted automation account type." + "description": "The response model for the list deleted automation account." + }, + "DeletedAutomationAccount": { + "properties": { + "properties": { + "$ref": "#/definitions/DeletedAutomationAccountProperties", + "x-ms-client-flatten": true, + "description": "Gets or sets the automation account properties." + }, + "id": { + "description": "The resource id.", + "type": "string" + }, + "name": { + "type": "string", + "description": "Gets or sets name of the resource." + }, + "type": { + "type": "string", + "description": "The resource type." + }, + "location": { + "type": "string", + "description": "Gets or sets the location of the resource." + } }, - "DeletedAutomationAccountProperties":{ - "properties":{ - "automationAccountResourceId":{ - "type":"string", - "description":"Gets or sets the Automation Account Resource Id." - }, - "automationAccountId":{ - "type":"string", - "description":"Gets or sets the Automation Account Id." - }, - "location":{ - "type":"string", - "description":"Gets or sets the location of the resource." - }, - "deletedTime":{ - "type":"string", - "format":"date-time", - "readOnly":true, - "description":"Gets the creation time.", - "x-nullable":false - } - }, - "description":"Definition of the deleted automation account properties." - } - }, - "parameters":{ - - } -} \ No newline at end of file + "description": "Definition of the deleted automation account type." + }, + "DeletedAutomationAccountProperties": { + "properties": { + "automationAccountResourceId": { + "type": "string", + "description": "Gets or sets the Automation Account Resource Id." + }, + "automationAccountId": { + "type": "string", + "description": "Gets or sets the Automation Account Id." + }, + "location": { + "type": "string", + "description": "Gets or sets the location of the resource." + }, + "deletedTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "Gets the creation time.", + "x-nullable": false + } + }, + "description": "Definition of the deleted automation account properties." + } + }, + "parameters": {} +} diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json index 731ab712fe22..bca7ebf24c99 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json @@ -1,30 +1,28 @@ { - "parameters":{ - "subscriptionId":"subid", - "automationAccountName":"myAutomationAccount", - "api-version":"2022-01-31" - }, - "responses":{ - "200":{ - "headers":{ - - }, - "body":{ - "value":[ - { - "Id":"/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/deletedAutomationAccounts/myAutomationAccount", - "Name":"myAutomationAccount", - "Type":"Microsoft.Automation/deletedAutomationAccounts", - "Location":"westus", - "Properties":{ - "AutomationAccountResourceId":"/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/automationAccounts/myAutomationAccount", - "AutomationAccountId":"cb855f13-0223-4fe4-8260-9e6583dfef24", - "Location":"westus", - "DeletedTime":"2021-08-05T09:07:56.7" - } - } - ] - } + "parameters": { + "subscriptionId": "subid", + "automationAccountName": "myAutomationAccount", + "api-version": "2022-01-31" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "Id": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/deletedAutomationAccounts/myAutomationAccount", + "Name": "myAutomationAccount", + "Type": "Microsoft.Automation/deletedAutomationAccounts", + "Location": "westus", + "Properties": { + "AutomationAccountResourceId": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/automationAccounts/myAutomationAccount", + "AutomationAccountId": "cb855f13-0223-4fe4-8260-9e6583dfef24", + "Location": "westus", + "DeletedTime": "2021-08-05T09:07:56.7" + } + } + ] } - } -} \ No newline at end of file + } + } +} diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md index 9c5c06b99dbe..e977fd87ae33 100644 --- a/specification/automation/resource-manager/readme.md +++ b/specification/automation/resource-manager/readme.md @@ -269,6 +269,7 @@ input-file: - Microsoft.Automation/stable/2018-06-30/runbook.json - Microsoft.Automation/stable/2015-10-31/webhook.json - Microsoft.Automation/stable/2021-06-22/hybridRunbookWorker.json +- Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json ``` --- From f6c894b42fe73b4c34f87b1259b49487a6faa843 Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 12:39:24 +0530 Subject: [PATCH 03/13] fix model validation error --- .../examples/getDeletedAutomationAccount.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json index bca7ebf24c99..8638227709fa 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json @@ -10,15 +10,15 @@ "body": { "value": [ { - "Id": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/deletedAutomationAccounts/myAutomationAccount", - "Name": "myAutomationAccount", - "Type": "Microsoft.Automation/deletedAutomationAccounts", - "Location": "westus", - "Properties": { - "AutomationAccountResourceId": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/automationAccounts/myAutomationAccount", - "AutomationAccountId": "cb855f13-0223-4fe4-8260-9e6583dfef24", - "Location": "westus", - "DeletedTime": "2021-08-05T09:07:56.7" + "id": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/deletedAutomationAccounts/myAutomationAccount", + "name": "myAutomationAccount", + "type": "Microsoft.Automation/deletedAutomationAccounts", + "location": "westus", + "properties": { + "automationAccountResourceId": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/automationAccounts/myAutomationAccount", + "automationAccountId": "cb855f13-0223-4fe4-8260-9e6583dfef24", + "location": "westus", + "deletedTime": "2021-08-05T09:07:56.7" } } ] From 3ca97c34c65464cd4ec7cf741523e51bbe2cac2c Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 12:56:39 +0530 Subject: [PATCH 04/13] fix date format and schema type --- .../stable/2022-01-31/deletedAutomationAccount.json | 3 +++ .../2022-01-31/examples/getDeletedAutomationAccount.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 92569a122c06..8082eb746d4f 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -78,6 +78,7 @@ }, "definitions": { "DeletedAutomationAccountListResult": { + "type": "object", "properties": { "value": { "type": "array", @@ -90,6 +91,7 @@ "description": "The response model for the list deleted automation account." }, "DeletedAutomationAccount": { + "type": "object", "properties": { "properties": { "$ref": "#/definitions/DeletedAutomationAccountProperties", @@ -116,6 +118,7 @@ "description": "Definition of the deleted automation account type." }, "DeletedAutomationAccountProperties": { + "type": "object", "properties": { "automationAccountResourceId": { "type": "string", diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json index 8638227709fa..d6c3e5669654 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json @@ -18,7 +18,7 @@ "automationAccountResourceId": "/subscriptions/subid/resourceGroups/msitest/providers/Microsoft.Automation/automationAccounts/myAutomationAccount", "automationAccountId": "cb855f13-0223-4fe4-8260-9e6583dfef24", "location": "westus", - "deletedTime": "2021-08-05T09:07:56.7" + "deletedTime": "2018-04-24T16:30:55+00:00" } } ] From 364f754b7f3f2fed490b2e7a04367c867bf3dc9c Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 13:49:29 +0530 Subject: [PATCH 05/13] fix lint diff error --- .../stable/2022-01-31/deletedAutomationAccount.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 8082eb746d4f..871da30f2b5a 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -69,7 +69,7 @@ "default": { "description": "Automation error response describing why the operation failed.", "schema": { - "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/type.json#/definitions/ErrorResponse" } } } @@ -113,6 +113,10 @@ "location": { "type": "string", "description": "Gets or sets the location of the resource." + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Resource system metadata." } }, "description": "Definition of the deleted automation account type." From 01f894f4d5e7f4686a7e98e98f1d9dc0d1c117ba Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 13:50:57 +0530 Subject: [PATCH 06/13] fix paths --- .../stable/2022-01-31/deletedAutomationAccount.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 871da30f2b5a..d64454598e55 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -69,7 +69,7 @@ "default": { "description": "Automation error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/type.json#/definitions/ErrorResponse" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } } From 250289caf34c8b7924d5ca753214669cf78930ec Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 14:14:12 +0530 Subject: [PATCH 07/13] fix lint diff --- .../stable/2022-01-31/deletedAutomationAccount.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index d64454598e55..30997e821eea 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -67,10 +67,10 @@ } }, "default": { - "description": "Automation error response describing why the operation failed.", "schema": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - } + }, + "description": "" } } } @@ -113,10 +113,6 @@ "location": { "type": "string", "description": "Gets or sets the location of the resource." - }, - "systemData": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", - "description": "Resource system metadata." } }, "description": "Definition of the deleted automation account type." From 1b2a5de553bc090d4afeaddc565c611054032d2d Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 14:59:15 +0530 Subject: [PATCH 08/13] remove errorresponse schema --- .../stable/2022-01-31/deletedAutomationAccount.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 30997e821eea..acd7743025f4 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -65,12 +65,6 @@ "schema": { "$ref": "#/definitions/DeletedAutomationAccountListResult" } - }, - "default": { - "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - }, - "description": "" } } } From 29506e7cffb547a670e607554026a53d9155b8d8 Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 15:04:16 +0530 Subject: [PATCH 09/13] add errorresponse schema --- .../stable/2022-01-31/deletedAutomationAccount.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index acd7743025f4..30997e821eea 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -65,6 +65,12 @@ "schema": { "$ref": "#/definitions/DeletedAutomationAccountListResult" } + }, + "default": { + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + }, + "description": "" } } } From 643df92b04b2fc3f3a51d8b6765dafabfd4d3559 Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 15:33:31 +0530 Subject: [PATCH 10/13] add reference in readme --- .../2022-01-31/deletedAutomationAccount.json | 2 +- .../automation/resource-manager/readme.md | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 30997e821eea..7aa2763d846a 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -41,7 +41,7 @@ "tags": [ "DeletedAutomationAccounts" ], - "operationId": "deletedAutomationAccounts_Get", + "operationId": "deletedAutomationAccounts_ListBySubscription", "description": "Retrieve deleted automation account.", "x-ms-examples": { "Get deleted automation account": { diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md index e977fd87ae33..cc4209590989 100644 --- a/specification/automation/resource-manager/readme.md +++ b/specification/automation/resource-manager/readme.md @@ -269,6 +269,45 @@ input-file: - Microsoft.Automation/stable/2018-06-30/runbook.json - Microsoft.Automation/stable/2015-10-31/webhook.json - Microsoft.Automation/stable/2021-06-22/hybridRunbookWorker.json +``` + +### Tag: package-2022-01-31 + +These settings apply only when `--tag=package-2022-01-31` is specified on the command line. + +``` yaml $(tag) == 'package-2022-01-31' +input-file: +- Microsoft.Automation/preview/2020-01-13-preview/privateEndpointConnection.json +- Microsoft.Automation/preview/2020-01-13-preview/privateLinkResources.json +- Microsoft.Automation/preview/2020-01-13-preview/python2package.json +- Microsoft.Automation/preview/2020-01-13-preview/dscNode.json +- Microsoft.Automation/preview/2020-01-13-preview/dscNodeConfiguration.json +- Microsoft.Automation/preview/2020-01-13-preview/dscCompilationJob.json +- Microsoft.Automation/preview/2020-01-13-preview/dscNodeCounts.json +- Microsoft.Automation/preview/2020-01-13-preview/sourceControl.json +- Microsoft.Automation/preview/2020-01-13-preview/sourceControlSyncJob.json +- Microsoft.Automation/preview/2020-01-13-preview/sourceControlSyncJobStreams.json +- Microsoft.Automation/stable/2021-06-22/account.json +- Microsoft.Automation/preview/2020-01-13-preview/certificate.json +- Microsoft.Automation/preview/2020-01-13-preview/connection.json +- Microsoft.Automation/preview/2020-01-13-preview/connectionType.json +- Microsoft.Automation/preview/2020-01-13-preview/credential.json +- Microsoft.Automation/stable/2021-06-22/hybridRunbookWorkerGroup.json +- Microsoft.Automation/preview/2020-01-13-preview/jobSchedule.json +- Microsoft.Automation/preview/2020-01-13-preview/linkedWorkspace.json +- Microsoft.Automation/preview/2020-01-13-preview/module.json +- Microsoft.Automation/preview/2020-01-13-preview/schedule.json +- Microsoft.Automation/preview/2020-01-13-preview/variable.json +- Microsoft.Automation/preview/2020-01-13-preview/watcher.json +- Microsoft.Automation/stable/2019-06-01/dscConfiguration.json +- Microsoft.Automation/stable/2019-06-01/job.json +- Microsoft.Automation/stable/2021-06-22/operations.json +- Microsoft.Automation/stable/2019-06-01/softwareUpdateConfiguration.json +- Microsoft.Automation/stable/2019-06-01/softwareUpdateConfigurationRun.json +- Microsoft.Automation/stable/2019-06-01/softwareUpdateConfigurationMachineRun.json +- Microsoft.Automation/stable/2018-06-30/runbook.json +- Microsoft.Automation/stable/2015-10-31/webhook.json +- Microsoft.Automation/stable/2021-06-22/hybridRunbookWorker.json - Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json ``` From 99df3a1639413fdac1e2e5709a9966fe4a1ab29d Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Thu, 23 Dec 2021 16:01:30 +0530 Subject: [PATCH 11/13] supress error schema --- .../stable/2022-01-31/deletedAutomationAccount.json | 6 +++--- specification/automation/resource-manager/readme.md | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 7aa2763d846a..5b1de72449c7 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -67,10 +67,10 @@ } }, "default": { + "description": "Automation error response describing why the operation failed.", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" - }, - "description": "" + "$ref": "../../common/v1/definitions.json#/definitions/ErrorResponse" + } } } } diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md index cc4209590989..28b48f9ab301 100644 --- a/specification/automation/resource-manager/readme.md +++ b/specification/automation/resource-manager/readme.md @@ -351,6 +351,9 @@ directive: - suppress: RequiredPropertiesMissingInResourceModel from: hybridRunbookWorkerGroup.json reason: This body format is already part of the previous api, cannot change it as it will result in breaking change. + - suppress: DefaultErrorResponseSchema + from: deletedAutomationAccount.json + reason: This error format is already part of the previous api, cannot change it as it will result in breaking change. ``` --- From ace929c1eef06be839ae30fc44b941286863b0fd Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Tue, 11 Jan 2022 12:23:40 +0530 Subject: [PATCH 12/13] fix URI path to return list of deleted accounts --- .../stable/2022-01-31/deletedAutomationAccount.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 5b1de72449c7..308b3b6ab715 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -36,7 +36,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Automation/deletedAutomationAccounts/{automationAccountName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Automation/deletedAutomationAccounts": { "get": { "tags": [ "DeletedAutomationAccounts" From ec4d5888af83c1a3bd6fa25f58d472d16ce06687 Mon Sep 17 00:00:00 2001 From: Ravi Yadav Date: Tue, 11 Jan 2022 12:36:45 +0530 Subject: [PATCH 13/13] remove automation account name parameter --- .../stable/2022-01-31/deletedAutomationAccount.json | 3 --- .../2022-01-31/examples/getDeletedAutomationAccount.json | 1 - 2 files changed, 4 deletions(-) diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json index 308b3b6ab715..7944d4a2c9e3 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/deletedAutomationAccount.json @@ -49,9 +49,6 @@ } }, "parameters": [ - { - "$ref": "../../common/v1/definitions.json#/parameters/AutomationAccountNameParameter" - }, { "$ref": "../../common/v1/definitions.json#/parameters/SubscriptionIdParameter" }, diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json index d6c3e5669654..b84ab0ac04a0 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json +++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2022-01-31/examples/getDeletedAutomationAccount.json @@ -1,7 +1,6 @@ { "parameters": { "subscriptionId": "subid", - "automationAccountName": "myAutomationAccount", "api-version": "2022-01-31" }, "responses": {