From 3d297d729bd2ce9ed9d07cfbdd4142d831f0de2c Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Tue, 14 Mar 2023 14:25:04 -0700 Subject: [PATCH 01/28] add container security context property --- .../stable/2023-05-01/containerInstance.json | 77 ++++++++--- .../ContainerGroupsCreatePriority.json | 120 ------------------ .../examples/ContainerGroupsGetPriority.json | 87 ------------- 3 files changed, 59 insertions(+), 225 deletions(-) delete mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json delete mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 274b6a961604..82f5ae377850 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -119,9 +119,6 @@ }, "ContainerGroupsGet_Failed": { "$ref": "./examples/ContainerGroupsGet_Failed.json" - }, - "ContainerGroupsGetWithPriority": { - "$ref": "./examples/ContainerGroupsGetPriority.json" } }, "summary": "Get the properties of the specified container group.", @@ -169,9 +166,6 @@ }, "ConfidentialContainerGroup": { "$ref": "./examples/ContainerGroupCreateConfidential.json" - }, - "ContainerGroupsCreateWithPriority": { - "$ref": "./examples/ContainerGroupsCreatePriority.json" } }, "summary": "Create or update container groups.", @@ -947,6 +941,61 @@ "readinessProbe": { "description": "The readiness probe.", "$ref": "#/definitions/ContainerProbe" + }, + "securityContext": { + "description": "The container security properties.", + "$ref": "#/definitions/SecurityContextDefinition" + } + } + }, + "SecurityContextDefinition": { + "description": "The security context for the container.", + "type": "object", + "properties": { + "privileged": { + "type": "boolean", + "description": "The flag to determine if the container permissions is eleveted to Privileged." + }, + "allowPrivilegeEscalation": { + "type": "boolean", + "description": "A boolean value indicating whether the init process can elevate its privileges" + }, + "capabilities": { + "description": "The capabilities to add or drop from a container.", + "$ref": "#/definitions/SecurityContextCapabilitiesDefinition" + }, + "runAsGroup": { + "type": "integer", + "format": "int32", + "description": "Sets the User GID for the container." + }, + "runAsUser": { + "type": "integer", + "format": "int32", + "description": "Sets the User UID for the container." + }, + "seccompProfile": { + "type": "string", + "description": "a base64 encoded string containing the contents of the JSON in the Seccomp profile" + } + } + }, + "SecurityContextCapabilitiesDefinition": { + "description": "The capabilities to add or drop from a container.", + "properties": { + "add": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The capabilities to add to the container." + }, + "drop": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The capabilities to drop from the container." } } }, @@ -1476,18 +1525,6 @@ "confidentialComputeProperties": { "description": "The properties for confidential container group", "$ref": "#/definitions/ConfidentialComputeProperties" - }, - "priority": { - "type": "string", - "description": "The priority of the container group.", - "enum": [ - "Regular", - "Spot" - ], - "x-ms-enum": { - "name": "ContainerGroupPriority", - "modelAsString": true - } } }, "required": [ @@ -2361,6 +2398,10 @@ "x-ms-identifiers": [ "name" ] + }, + "securityContext": { + "description": "The container security properties.", + "$ref": "#/definitions/SecurityContextDefinition" } } }, diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json deleted file mode 100644 index 8abebd18f27a..000000000000 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subid", - "api-version": "2023-05-01", - "resourceGroupName": "demo", - "containerGroupName": "demo1", - "containerGroup": { - "properties": { - "sku": "Standard", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "restartPolicy": "Never", - "osType": "Linux", - "priority": "Spot" - }, - "location": "eastus" - } - }, - "responses": { - "200": { - "body": { - "properties": { - "sku": "Standard", - "provisioningState": "Succeeded", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "ports": [], - "environmentVariables": [], - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "initContainers": [], - "restartPolicy": "Never", - "osType": "Linux", - "instanceView": { - "events": [], - "state": "Succeeded" - }, - "priority": "Spot" - }, - "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", - "name": "demo1", - "type": "Microsoft.ContainerInstance/containerGroups", - "location": "eastus" - } - }, - "201": { - "body": { - "properties": { - "sku": "Standard", - "provisioningState": "Created", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "ports": [], - "environmentVariables": [], - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "initContainers": [], - "restartPolicy": "Never", - "osType": "Linux", - "instanceView": { - "events": [], - "state": "Created" - }, - "priority": "Spot" - }, - "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", - "name": "demo1", - "type": "Microsoft.ContainerInstance/containerGroups", - "location": "eastus" - } - } - } -} diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json deleted file mode 100644 index 16980f61d8ac..000000000000 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parameters": { - "subscriptionId": "subid", - "resourceGroupName": "demo", - "containerGroupName": "demo1", - "api-version": "2023-05-01" - }, - "responses": { - "200": { - "body": { - "properties": { - "sku": "Standard", - "provisioningState": "Succeeded", - "containers": [ - { - "name": "test-container-001", - "properties": { - "image": "alpine:latest", - "command": [ - "/bin/sh", - "-c", - "sleep 10" - ], - "ports": [], - "environmentVariables": [], - "instanceView": { - "restartCount": 0, - "currentState": { - "state": "Terminated", - "startTime": "2022-11-11T19:33:44.217Z", - "exitCode": 0, - "finishTime": "2022-11-11T19:33:55.565Z", - "detailStatus": "Completed" - }, - "events": [ - { - "count": 2, - "firstTimestamp": "2022-11-11T19:28:22Z", - "lastTimestamp": "2022-11-11T19:32:09Z", - "name": "Pulling", - "message": "pulling image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", - "type": "Normal" - }, - { - "count": 2, - "firstTimestamp": "2022-11-11T19:32:08Z", - "lastTimestamp": "2022-11-11T19:32:38Z", - "name": "Pulled", - "message": "Successfully pulled image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", - "type": "Normal" - }, - { - "count": 1, - "firstTimestamp": "2022-11-11T19:33:44Z", - "lastTimestamp": "2022-11-11T19:33:44Z", - "name": "Started", - "message": "Started container", - "type": "Normal" - } - ] - }, - "resources": { - "requests": { - "memoryInGB": 1, - "cpu": 1 - } - } - } - } - ], - "initContainers": [], - "restartPolicy": "Never", - "osType": "Linux", - "instanceView": { - "events": [], - "state": "Succeeded" - }, - "priority": "Spot" - }, - "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", - "name": "demo1", - "type": "Microsoft.ContainerInstance/containerGroups", - "location": "eastus" - } - } - } -} From d28d82b6e311455f116d2cb3ece8deae7df7fac8 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Tue, 14 Mar 2023 14:26:22 -0700 Subject: [PATCH 02/28] update readme tag to previous stable version --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index 60df22de90c1..a6091f0e0e39 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2023-05 +tag: package-2022-09 ``` From 4156b8a0d3be344136d45e55c04ec0f22cea6091 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Thu, 16 Mar 2023 21:08:28 -0700 Subject: [PATCH 03/28] add example with security context --- .../examples/ContainerGroupCreateConfidential.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json index 40c1b66429b3..40b178eaec35 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json @@ -72,7 +72,10 @@ "memoryInGB": 1.5, "cpu": 1.0 } - } + }, + "securityContext": { + "privileged": true + } } } ], @@ -124,7 +127,10 @@ "memoryInGB": 1.5, "cpu": 1.0 } - } + }, + "securityContext": { + "privileged": true + } } } ], From 6063a49914d6c94cb57482d14658c02e95b8dd58 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Thu, 16 Mar 2023 21:38:46 -0700 Subject: [PATCH 04/28] avocado fix default tag should contain all endpoints --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index a6091f0e0e39..60df22de90c1 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2022-09 +tag: package-2023-05 ``` From b925c2a01cfb8798b2b20f561884debfe137f10c Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 13:24:25 -0700 Subject: [PATCH 05/28] add back spot priority changes --- .../stable/2023-05-01/containerInstance.json | 19 +++ .../ContainerGroupsCreatePriority.json | 120 ++++++++++++++++++ .../examples/ContainerGroupsGetPriority.json | 87 +++++++++++++ 3 files changed, 226 insertions(+) create mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json create mode 100644 specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 82f5ae377850..08f0f982c7b4 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -119,6 +119,9 @@ }, "ContainerGroupsGet_Failed": { "$ref": "./examples/ContainerGroupsGet_Failed.json" + }, + "ContainerGroupsGetWithPriority": { + "$ref": "./examples/ContainerGroupsGetPriority.json" } }, "summary": "Get the properties of the specified container group.", @@ -166,6 +169,9 @@ }, "ConfidentialContainerGroup": { "$ref": "./examples/ContainerGroupCreateConfidential.json" + }, + "ContainerGroupsCreateWithPriority": { + "$ref": "./examples/ContainerGroupsCreatePriority.json" } }, "summary": "Create or update container groups.", @@ -1527,6 +1533,19 @@ "$ref": "#/definitions/ConfidentialComputeProperties" } }, + "priority": { + "type": "string", + "description": "The priority of the container group.", + "enum": [ + "Regular", + "Spot" + ], + "x-ms-enum": { + "name": "ContainerGroupPriority", + "modelAsString": true + } + } + }, "required": [ "containers", "osType" diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json new file mode 100644 index 000000000000..5719bd28b887 --- /dev/null +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json @@ -0,0 +1,120 @@ +{ + "parameters": { + "subscriptionId": "subid", + "api-version": "2022-10-01-preview", + "resourceGroupName": "demo", + "containerGroupName": "demo1", + "containerGroup": { + "properties": { + "sku": "Standard", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "restartPolicy": "Never", + "osType": "Linux", + "priority": "Spot" + }, + "location": "eastus" + } + }, + "responses": { + "200": { + "body": { + "properties": { + "sku": "Standard", + "provisioningState": "Succeeded", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "ports": [], + "environmentVariables": [], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "initContainers": [], + "restartPolicy": "Never", + "osType": "Linux", + "instanceView": { + "events": [], + "state": "Succeeded" + }, + "priority": "Spot" + }, + "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", + "name": "demo1", + "type": "Microsoft.ContainerInstance/containerGroups", + "location": "eastus" + } + }, + "201": { + "body": { + "properties": { + "sku": "Standard", + "provisioningState": "Created", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "ports": [], + "environmentVariables": [], + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "initContainers": [], + "restartPolicy": "Never", + "osType": "Linux", + "instanceView": { + "events": [], + "state": "Created" + }, + "priority": "Spot" + }, + "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", + "name": "demo1", + "type": "Microsoft.ContainerInstance/containerGroups", + "location": "eastus" + } + } + } +} diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json new file mode 100644 index 000000000000..d480e6ef016a --- /dev/null +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json @@ -0,0 +1,87 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "demo", + "containerGroupName": "demo1", + "api-version": "2022-10-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "sku": "Standard", + "provisioningState": "Succeeded", + "containers": [ + { + "name": "test-container-001", + "properties": { + "image": "alpine:latest", + "command": [ + "/bin/sh", + "-c", + "sleep 10" + ], + "ports": [], + "environmentVariables": [], + "instanceView": { + "restartCount": 0, + "currentState": { + "state": "Terminated", + "startTime": "2022-11-11T19:33:44.217Z", + "exitCode": 0, + "finishTime": "2022-11-11T19:33:55.565Z", + "detailStatus": "Completed" + }, + "events": [ + { + "count": 2, + "firstTimestamp": "2022-11-11T19:28:22Z", + "lastTimestamp": "2022-11-11T19:32:09Z", + "name": "Pulling", + "message": "pulling image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", + "type": "Normal" + }, + { + "count": 2, + "firstTimestamp": "2022-11-11T19:32:08Z", + "lastTimestamp": "2022-11-11T19:32:38Z", + "name": "Pulled", + "message": "Successfully pulled image \"alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870\"", + "type": "Normal" + }, + { + "count": 1, + "firstTimestamp": "2022-11-11T19:33:44Z", + "lastTimestamp": "2022-11-11T19:33:44Z", + "name": "Started", + "message": "Started container", + "type": "Normal" + } + ] + }, + "resources": { + "requests": { + "memoryInGB": 1, + "cpu": 1 + } + } + } + } + ], + "initContainers": [], + "restartPolicy": "Never", + "osType": "Linux", + "instanceView": { + "events": [], + "state": "Succeeded" + }, + "priority": "Spot" + }, + "id": "/subscriptions/subId/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/demo1", + "name": "demo1", + "type": "Microsoft.ContainerInstance/containerGroups", + "location": "eastus" + } + } + } +} From dce49f7286cc99c1e8d8ae3202066f0b49cea20e Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 13:40:56 -0700 Subject: [PATCH 06/28] use previous stable version as default tag --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index 60df22de90c1..a6091f0e0e39 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2023-05 +tag: package-2022-09 ``` From 5b68095ad50b991809ad64f8b710388eee077398 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:01:20 -0700 Subject: [PATCH 07/28] prettier fix --- .../examples/ContainerGroupCreateConfidential.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json index 40b178eaec35..81823f813c08 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupCreateConfidential.json @@ -73,9 +73,9 @@ "cpu": 1.0 } }, - "securityContext": { - "privileged": true - } + "securityContext": { + "privileged": true + } } } ], @@ -128,9 +128,9 @@ "cpu": 1.0 } }, - "securityContext": { - "privileged": true - } + "securityContext": { + "privileged": true + } } } ], From 5c0e698a3c83555f013626c55c2b948a85146e28 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:05:28 -0700 Subject: [PATCH 08/28] use spaces --- .../stable/2023-05-01/containerInstance.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 08f0f982c7b4..eb07c03fe390 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -120,7 +120,7 @@ "ContainerGroupsGet_Failed": { "$ref": "./examples/ContainerGroupsGet_Failed.json" }, - "ContainerGroupsGetWithPriority": { + "ContainerGroupsGetWithPriority": { "$ref": "./examples/ContainerGroupsGetPriority.json" } }, @@ -170,7 +170,7 @@ "ConfidentialContainerGroup": { "$ref": "./examples/ContainerGroupCreateConfidential.json" }, - "ContainerGroupsCreateWithPriority": { + "ContainerGroupsCreateWithPriority": { "$ref": "./examples/ContainerGroupsCreatePriority.json" } }, From d4491b420c93891b787da43d926e74031dd6b760 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:54:31 -0700 Subject: [PATCH 09/28] fix error --- .../stable/2023-05-01/containerInstance.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index eb07c03fe390..1164670ec281 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -1532,8 +1532,7 @@ "description": "The properties for confidential container group", "$ref": "#/definitions/ConfidentialComputeProperties" } - }, - "priority": { + "priority": { "type": "string", "description": "The priority of the container group.", "enum": [ From 1b729c6306a8f98235ef0e97e402897cb83e5925 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 14:59:50 -0700 Subject: [PATCH 10/28] use spaces --- .../stable/2023-05-01/containerInstance.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 1164670ec281..8d61a3b16d79 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -1531,8 +1531,8 @@ "confidentialComputeProperties": { "description": "The properties for confidential container group", "$ref": "#/definitions/ConfidentialComputeProperties" - } - "priority": { + }, + "priority": { "type": "string", "description": "The priority of the container group.", "enum": [ From e533946833578c66d00f430672545873a650e9cd Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 15:22:17 -0700 Subject: [PATCH 11/28] fix CI errors --- custom-words.txt | 4 +++- .../stable/2023-05-01/containerInstance.json | 5 +++-- .../2023-05-01/examples/ContainerGroupsCreatePriority.json | 2 +- .../2023-05-01/examples/ContainerGroupsGetPriority.json | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index f7cb0a9e1823..0b097b6ec18e 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1448,6 +1448,7 @@ nonreadable nonstarted Nonsupported nopublicipaddresses +Noreuse northcentralus northeurope norwayeast @@ -2703,6 +2704,7 @@ routesets wayfind wayfinding Securitytypes +seccomp leadgen dryruns Dryrun @@ -2755,4 +2757,4 @@ Ochestrator remediatable Overprovisioning Unprepares -Unpreparing \ No newline at end of file +Unpreparing diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 8d61a3b16d79..6b4540674ca7 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -960,7 +960,7 @@ "properties": { "privileged": { "type": "boolean", - "description": "The flag to determine if the container permissions is eleveted to Privileged." + "description": "The flag to determine if the container permissions is elevated to Privileged." }, "allowPrivilegeEscalation": { "type": "boolean", @@ -982,12 +982,13 @@ }, "seccompProfile": { "type": "string", - "description": "a base64 encoded string containing the contents of the JSON in the Seccomp profile" + "description": "a base64 encoded string containing the contents of the JSON in the seccomp profile" } } }, "SecurityContextCapabilitiesDefinition": { "description": "The capabilities to add or drop from a container.", + "type": "object", "properties": { "add": { "type": "array", diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json index 5719bd28b887..8abebd18f27a 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsCreatePriority.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "subid", - "api-version": "2022-10-01-preview", + "api-version": "2023-05-01", "resourceGroupName": "demo", "containerGroupName": "demo1", "containerGroup": { diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json index d480e6ef016a..16980f61d8ac 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/ContainerGroupsGetPriority.json @@ -3,7 +3,7 @@ "subscriptionId": "subid", "resourceGroupName": "demo", "containerGroupName": "demo1", - "api-version": "2022-10-01-preview" + "api-version": "2023-05-01" }, "responses": { "200": { From 981b2771837713fb00146f477d56be9d7a679498 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 17 Mar 2023 16:02:08 -0700 Subject: [PATCH 12/28] use altest api version as default for Avocado --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index a6091f0e0e39..60df22de90c1 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the ContainerInstance API. ``` yaml openapi-type: arm -tag: package-2022-09 +tag: package-2023-05 ``` From 8c1121d1a85e9862eb4917dc3099b9175958876a Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Wed, 5 Apr 2023 17:10:44 -0700 Subject: [PATCH 13/28] update host to eastus2euap endpoint to check manifest --- .../stable/2023-05-01/containerInstance.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 6b4540674ca7..35ea97365c2d 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -4,7 +4,7 @@ "version": "2023-05-01", "title": "ContainerInstanceManagementClient" }, - "host": "management.azure.com", + "host": "eastus2euap.management.azure.com", "schemes": [ "https" ], From 7ef6c7036bb5bbdb2655b60eb6c19695050797dd Mon Sep 17 00:00:00 2001 From: ramoka178 <57157576+ramoka178@users.noreply.github.com> Date: Wed, 5 Apr 2023 17:57:51 -0700 Subject: [PATCH 14/28] MGRP S360 Vuln (#22832) * Add blockchain to latest profile * Add additional types * Fix Swagger issues * Solve validation --------- Co-authored-by: Mark Cowlishaw --- .../examples/DeleteManagementGroup.json | 3 +++ .../examples/ListHierarchySettings.json | 2 +- .../examples/ListManagementGroups.json | 2 +- .../2020-05-01/examples/ListOperations.json | 23 ++++++++++++++++ .../stable/2020-05-01/management.json | 11 +++++--- ...etAllSubscriptionsFromManagementGroup.json | 4 +-- .../examples/ListHierarchySettings.json | 2 +- .../examples/ListManagementGroups.json | 2 +- .../stable/2020-10-01/management.json | 26 +++---------------- .../AddManagementGroupSubscription.json | 4 +-- ...etAllSubscriptionsFromManagementGroup.json | 4 +-- .../stable/2021-04-01/management.json | 20 +------------- 12 files changed, 46 insertions(+), 57 deletions(-) create mode 100644 specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json index 8c4dd0f49cc1..26afc66e1f53 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/DeleteManagementGroup.json @@ -11,6 +11,9 @@ "type": "Microsoft.Management/managementGroups", "name": "GroupToDelete", "status": "NotStarted" + }, + "headers": { + "azure-asyncoperation": "https://management.azure.com/providers/Microsoft.Management/operationResults/delete/asyncOperation/status/managementGroups/GroupToDelete?api-version=2020-05-01" } }, "204": {} diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json index feb1fbbd26a7..d2a671a7321e 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListHierarchySettings.json @@ -18,7 +18,7 @@ } } ], - "nextLink": null + "@nextLink": null } } } diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json index d855dc9f2a46..05edff6d6897 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListManagementGroups.json @@ -26,7 +26,7 @@ } } ], - "nextLink": null + "@nextLink": null } } } diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json new file mode 100644 index 000000000000..f3e4f5af369e --- /dev/null +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/examples/ListOperations.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2020-05-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "display": { + "provider": "aaaaaaaaaaaaaaaaaaaaa", + "resource": "aaaaaaaaaaaaa", + "operation": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "description": "aaaaaaaaaaaaaaaaaaaaaa" + } + } + ], + "nextLink": "aaaaaaaaaaaaaaaaaaa" + } + } + } +} diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json index 9b17bfba4f29..f2e63e799a95 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-05-01/management.json @@ -81,7 +81,7 @@ } }, "x-ms-pageable": { - "nextLinkName": "nextLink" + "nextLinkName": "@nextLink" }, "x-ms-examples": { "ListManagementGroups": { @@ -712,6 +712,11 @@ }, "x-ms-pageable": { "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Operations": { + "$ref": "./examples/ListOperations.json" + } } } }, @@ -1059,7 +1064,7 @@ "$ref": "#/definitions/ManagementGroupInfo" } }, - "nextLink": { + "@nextLink": { "description": "The URL to use for getting the next set of results.", "type": "string", "readOnly": true @@ -1431,7 +1436,7 @@ "$ref": "#/definitions/HierarchySettingsInfo" } }, - "nextLink": { + "@nextLink": { "description": "The URL to use for getting the next set of results.", "type": "string", "readOnly": true diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json index 5f72aeeeeba6..c7f222b00311 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/GetAllSubscriptionsFromManagementGroup.json @@ -14,9 +14,7 @@ "properties": { "displayName": "S5", "parent": { - "id": "/providers/Microsoft.Management/managementGroups/Group", - "name": "name", - "displayName": "displayName" + "id": "/providers/Microsoft.Management/managementGroups/Group" }, "state": "Active", "tenant": "e751ac82-623b-4913-8d74-22637c832373" diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json index 05aa8a9e391b..66c937743621 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListHierarchySettings.json @@ -18,7 +18,7 @@ } } ], - "nextLink": null + "@nextLink": null } } } diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json index 707b791f87e7..cfaa77bb35d8 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/examples/ListManagementGroups.json @@ -26,7 +26,7 @@ } } ], - "nextLink": null + "@nextLink": null } } } diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json index 2f1c71e11430..7b41f52b9cf9 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2020-10-01/management.json @@ -81,7 +81,7 @@ } }, "x-ms-pageable": { - "nextLinkName": "nextLink" + "nextLinkName": "@nextLink" }, "x-ms-examples": { "ListManagementGroups": { @@ -1070,7 +1070,7 @@ "$ref": "#/definitions/ManagementGroupInfo" } }, - "nextLink": { + "@nextLink": { "description": "The URL to use for getting the next set of results.", "type": "string", "readOnly": true @@ -1173,7 +1173,7 @@ }, "parent": { "title": "Parent", - "$ref": "#/definitions/ParentGroupBagInfo", + "$ref": "#/definitions/DescendantParentGroupInfo", "x-nullable": true }, "state": { @@ -1450,7 +1450,7 @@ "$ref": "#/definitions/HierarchySettingsInfo" } }, - "nextLink": { + "@nextLink": { "description": "The URL to use for getting the next set of results.", "type": "string", "readOnly": true @@ -1579,24 +1579,6 @@ } } }, - "ParentGroupBagInfo": { - "description": "The ID, name and displayName of the parent management group.", - "type": "object", - "properties": { - "id": { - "type": "string", - "description": "The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000" - }, - "name": { - "type": "string", - "description": "The name of the parent management group. For example, 00000000-0000-0000-0000-000000000000" - }, - "displayName": { - "type": "string", - "description": "The friendly name of the parent management group." - } - } - }, "EntityListResult": { "description": "Describes the result of the request to view entities.", "properties": { diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json index 56f591f1177d..1e62ffcd9c5b 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/AddManagementGroupSubscription.json @@ -14,9 +14,7 @@ "properties": { "displayName": "Group", "parent": { - "id": "/providers/Microsoft.Management/managementGroups/Group", - "name": "name", - "displayName": "displayName" + "id": "/providers/Microsoft.Management/managementGroups/Group" }, "state": "Active", "tenant": "e751ac82-623b-4913-8d74-22637c832373" diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json index 711fb0738a62..ef5c1c9161eb 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/examples/GetAllSubscriptionsFromManagementGroup.json @@ -14,9 +14,7 @@ "properties": { "displayName": "S5", "parent": { - "id": "/providers/Microsoft.Management/managementGroups/Group", - "name": "name", - "displayName": "displayName" + "id": "/providers/Microsoft.Management/managementGroups/Group" }, "state": "Active", "tenant": "e751ac82-623b-4913-8d74-22637c832373" diff --git a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/management.json b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/management.json index 3bdcb8d6d739..cf453e867241 100644 --- a/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/management.json +++ b/specification/managementgroups/resource-manager/Microsoft.Management/stable/2021-04-01/management.json @@ -1176,7 +1176,7 @@ }, "parent": { "title": "Parent", - "$ref": "#/definitions/ParentGroupBagInfo", + "$ref": "#/definitions/DescendantParentGroupInfo", "x-nullable": true }, "state": { @@ -1608,24 +1608,6 @@ } } }, - "ParentGroupBagInfo": { - "description": "The ID, name and displayName of the parent management group.", - "type": "object", - "properties": { - "id": { - "type": "string", - "description": "The fully qualified ID for the parent management group. For example, /providers/Microsoft.Management/managementGroups/0000000-0000-0000-0000-000000000000" - }, - "name": { - "type": "string", - "description": "The name of the parent management group. For example, 00000000-0000-0000-0000-000000000000" - }, - "displayName": { - "type": "string", - "description": "The friendly name of the parent management group." - } - } - }, "EntityListResult": { "description": "Describes the result of the request to view entities.", "properties": { From d30e95bdcd7dae0c060f01a8579269401fa5eeca Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Wed, 5 Apr 2023 18:14:23 -0700 Subject: [PATCH 15/28] use old api versionf or operations --- .../stable/2023-05-01/examples/OperationsList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json index 57267e685a7c..7b53de49f9e2 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2023-05-01" + "api-version": "2022-09-01" }, "responses": { "200": { From 8725e0700974d2c8cba436b5696728ebc5a80f1b Mon Sep 17 00:00:00 2001 From: Stuti Kumar <113545470+stuti-1807@users.noreply.github.com> Date: Wed, 5 Apr 2023 18:40:55 -0700 Subject: [PATCH 16/28] Azure Orbital - swagger fix for api-version 2022-11-01 (#23441) * added example for the new field * updated the double ref that was causing build failure --- .../examples/OperationResultsGet.json | 37 +++++++++++++++++++ .../stable/2022-11-01/orbital.json | 7 +--- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/examples/OperationResultsGet.json b/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/examples/OperationResultsGet.json index 5656d6c36e31..4bcd9f306c5e 100644 --- a/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/examples/OperationResultsGet.json +++ b/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/examples/OperationResultsGet.json @@ -14,6 +14,43 @@ "startTime": "2022-06-10T13:54:53.6554616Z", "endTime": "2022-06-10T13:54:55.7025301Z", "percentComplete": 1.0, + "value": [ + { + "spacecraft": { + "id": "/subscriptions/c1be1141-a7c9-4aac-9608-3c2e2f1152c3/resourceGroups/contoso-Rgp/providers/Microsoft.Orbital/spacecrafts/CONTOSO_SAT" + }, + "groundStationName": "EASTUS2_0", + "properties": { + "maximumElevationDegrees": 26.617297, + "txStartTime": "2022-11-01T11:55:01Z", + "txEndTime": "2022-11-01T12:05:25Z", + "rxStartTime": "2022-11-01T11:55:01Z", + "rxEndTime": "2022-11-01T12:05:25Z", + "startAzimuthDegrees": 201.340472, + "endAzimuthDegrees": 330.489627, + "startElevationDegrees": 5.0, + "endElevationDegrees": 5.040625 + } + }, + { + "spacecraft": { + "id": "/subscriptions/c1be1141-a7c9-4aac-9608-3c2e2f1152c3/resourceGroups/contoso-Rgp/providers/Microsoft.Orbital/spacecrafts/CONTOSO_SAT" + }, + "groundStationName": "EASTUS2_0", + "properties": { + "maximumElevationDegrees": 85.9796, + "txStartTime": "2022-11-02T10:58:30Z", + "txEndTime": "2022-11-02T11:10:45Z", + "rxStartTime": "2022-11-02T10:58:30Z", + "rxEndTime": "2022-11-02T11:10:45Z", + "startAzimuthDegrees": 165.758896, + "endAzimuthDegrees": 345.848482, + "startElevationDegrees": 5.0, + "endElevationDegrees": 5.048656 + } + } + ], + "nextLink": "https://management.azure.com/subscriptions/c1be1141-a7c9-4aac-9608-3c2e2f1152c3/resourceGroups/contoso-Rgp/providers/Microsoft.Orbital/spacecrafts/CONTOSO_SAT/listAvailableContacts?api-version=2022-11-01&$skiptoken=opaqueString", "properties": {}, "error": { "code": "ReadOnlyPropertyError", diff --git a/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/orbital.json b/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/orbital.json index a1ac3b5b8142..560c972bbdad 100644 --- a/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/orbital.json +++ b/specification/orbital/resource-manager/Microsoft.Orbital/stable/2022-11-01/orbital.json @@ -1239,12 +1239,7 @@ "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/SpacecraftsProperties", - "description": "Spacecraft Properties", - "allOf": [ - { - "$ref": "#/definitions/SpacecraftsProperties" - } - ] + "description": "Spacecraft Properties" } }, "allOf": [ From 8a28143c7271d4496296ed47f70c3cb5a9981e57 Mon Sep 17 00:00:00 2001 From: giladsu <43436811+giladsu@users.noreply.github.com> Date: Thu, 6 Apr 2023 06:08:38 +0300 Subject: [PATCH 17/28] Fixed PrometheusRuleGroups examples (#23390) * Fixed PrometheusRuleGroups examples * One more fix --- .../createOrUpdatePrometheusRuleGroup.json | 20 ++++++++-------- .../examples/deletePrometheusRuleGroup.json | 4 ++-- .../examples/getPrometheusRuleGroup.json | 10 ++++---- .../examples/listPrometheusRuleGroups.json | 10 ++++---- .../listSubscriptionPrometheusRuleGroups.json | 14 +++++------ .../examples/patchPrometheusRuleGroup.json | 10 ++++---- .../createOrUpdatePrometheusRuleGroup.json | 24 +++++++++---------- .../examples/deletePrometheusRuleGroup.json | 2 +- .../examples/getPrometheusRuleGroup.json | 10 ++++---- .../examples/listPrometheusRuleGroups.json | 18 +++++++------- .../listSubscriptionPrometheusRuleGroups.json | 18 +++++++------- .../examples/patchPrometheusRuleGroup.json | 10 ++++---- 12 files changed, 75 insertions(+), 75 deletions(-) diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/createOrUpdatePrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/createOrUpdatePrometheusRuleGroup.json index c01c1c08fcfa..4e034ed41c22 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/createOrUpdatePrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/createOrUpdatePrometheusRuleGroup.json @@ -1,7 +1,7 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", - "resourceGroupName": "giladstest", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2021-07-22-preview", "parameters": { @@ -9,7 +9,7 @@ "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/myMonitoringAccount" ], "rules": [ { @@ -36,7 +36,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/giladstest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" @@ -52,13 +52,13 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/myMonitoringAccount" ], "interval": "PT5M", "rules": [ @@ -86,7 +86,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/giladstest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" @@ -109,13 +109,13 @@ "201": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/myMonitoringAccount" ], "interval": "PT5M", "rules": [ @@ -143,7 +143,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/giladstest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/deletePrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/deletePrometheusRuleGroup.json index 5c08be786219..455da317299a 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/deletePrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/deletePrometheusRuleGroup.json @@ -1,7 +1,7 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", - "resourceGroupName": "giladsteset", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2021-07-22-preview" }, diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/getPrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/getPrometheusRuleGroup.json index 08a28bf9a863..12c04787bc5d 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/getPrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/getPrometheusRuleGroup.json @@ -1,7 +1,7 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", - "resourceGroupName": "giladstest", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2021-07-22-preview" }, @@ -9,13 +9,13 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "global", "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/myMonitoringAccount" ], "rules": [ { @@ -36,7 +36,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/giladstest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listPrometheusRuleGroups.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listPrometheusRuleGroups.json index 11a7b3037abf..51a8a3bcc8b8 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listPrometheusRuleGroups.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listPrometheusRuleGroups.json @@ -1,7 +1,7 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", - "resourceGroupName": "giladstest", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "promResourceGroup", "api-version": "2021-07-22-preview" }, "responses": { @@ -10,13 +10,13 @@ "body": { "value": [ { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/myMonitoringAccount" ], "rules": [ { @@ -37,7 +37,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/gigtest/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listSubscriptionPrometheusRuleGroups.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listSubscriptionPrometheusRuleGroups.json index ac58f7c16626..3283124f0fac 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listSubscriptionPrometheusRuleGroups.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/listSubscriptionPrometheusRuleGroups.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "api-version": "2021-07-22-preview" }, "responses": { @@ -9,13 +9,13 @@ "body": { "value": [ { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/monitoringAcount/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/monitoringAcount/myMonitoringAccount" ], "rules": [ { @@ -36,7 +36,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" @@ -56,13 +56,13 @@ } }, { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/rg-2/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup2", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup2", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/rg-2/providers/microsoft.monitor/accounts/monitoringAcount/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/monitoringAcount/myMonitoringAccount" ], "rules": [ { @@ -83,7 +83,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/gigtest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/patchPrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/patchPrometheusRuleGroup.json index 01aa83cb3439..1d614fbdc038 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/patchPrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/preview/2021-07-22-preview/examples/patchPrometheusRuleGroup.json @@ -1,7 +1,7 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", - "resourceGroupName": "giladstest", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2021-07-22-preview", "parameters": { @@ -17,7 +17,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/gigtest/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "tags": { @@ -26,7 +26,7 @@ "properties": { "description": "This is the description of the first rule group", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/giladstest/providers/microsoft.monitor/accounts/monitoringAcount/myMonitoringAccount" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/microsoft.monitor/accounts/monitoringAcount/myMonitoringAccount" ], "enabled": false, "rules": [ @@ -48,7 +48,7 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/giladstest/providers/microsoft.insights/notificationgroups/group2", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/promResourceGroup/providers/microsoft.insights/actiongroups/group2", "actionProperties": { "key11": "value11", "key12": "value12" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/createOrUpdatePrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/createOrUpdatePrometheusRuleGroup.json index c590ca51d7b9..d22c09687c81 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/createOrUpdatePrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/createOrUpdatePrometheusRuleGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2023-03-01", @@ -12,7 +12,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -40,14 +40,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" @@ -63,7 +63,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -72,7 +72,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -100,14 +100,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" @@ -122,7 +122,7 @@ "201": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -131,7 +131,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -159,14 +159,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/deletePrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/deletePrometheusRuleGroup.json index 53fd889f677f..628faa44efbb 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/deletePrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/deletePrometheusRuleGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2023-03-01" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/getPrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/getPrometheusRuleGroup.json index 0c70fb15b7c2..8ea5d6e15b28 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/getPrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/getPrometheusRuleGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2023-03-01" @@ -9,7 +9,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -18,7 +18,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -46,14 +46,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listPrometheusRuleGroups.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listPrometheusRuleGroups.json index 0db60181773a..4900872d3056 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listPrometheusRuleGroups.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listPrometheusRuleGroups.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "promResourceGroup", "api-version": "2023-03-01" }, @@ -10,7 +10,7 @@ "body": { "value": [ { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/ruleGroupName1", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/ruleGroupName1", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -19,7 +19,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -47,14 +47,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" @@ -66,7 +66,7 @@ } }, { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/ruleGroupName2", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/ruleGroupName2", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -75,7 +75,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -103,14 +103,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listSubscriptionPrometheusRuleGroups.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listSubscriptionPrometheusRuleGroups.json index 4642625c364c..bd6296d090a3 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listSubscriptionPrometheusRuleGroups.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/listSubscriptionPrometheusRuleGroups.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "promResourceGroup", "api-version": "2023-03-01" }, @@ -10,7 +10,7 @@ "body": { "value": [ { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/resourceGroupName1/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/resourceGroupName1/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -19,7 +19,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -47,14 +47,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" @@ -66,7 +66,7 @@ } }, { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/resourceGroupName2/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/resourceGroupName2/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -75,7 +75,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -103,14 +103,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" diff --git a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/patchPrometheusRuleGroup.json b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/patchPrometheusRuleGroup.json index 4fe7a73ef948..55ab04017068 100644 --- a/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/patchPrometheusRuleGroup.json +++ b/specification/alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/examples/patchPrometheusRuleGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "subscriptionId": "14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7", + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", "resourceGroupName": "promResourceGroup", "ruleGroupName": "myPrometheusRuleGroup", "api-version": "2023-03-01", @@ -17,7 +17,7 @@ "200": { "headers": {}, "body": { - "id": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/promResourceGroup/providers/providers/Microsoft.AlertsManagement/prometheusRuleGroups/myPrometheusRuleGroup", "type": "Microsoft.AlertsManagement/prometheusRuleGroups", "location": "East US", "properties": { @@ -26,7 +26,7 @@ "interval": "PT10M", "clusterName": "myClusterName", "scopes": [ - "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/myResourceGroup/providers/microsoft.monitor/accounts/myAzureMonitorWorkspace" ], "rules": [ { @@ -54,14 +54,14 @@ }, "actions": [ { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myactiongroup", "actionProperties": { "key11": "value11", "key12": "value12" } }, { - "actionGroupId": "/subscriptions/14ddf0c5-77c5-4b53-84f6-e1fa43ad68f7/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", + "actionGroupId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/myrg/providers/microsoft.insights/actiongroups/myotheractiongroup", "actionProperties": { "key21": "value21", "key22": "value22" From 3a8a03746104623f69c3dccab27ad1ac842a7130 Mon Sep 17 00:00:00 2001 From: will Date: Thu, 6 Apr 2023 22:40:50 +0800 Subject: [PATCH 18/28] Remvoe flattern (#23460) Co-authored-by: Will Huang --- .../maps/data-plane/Route/preview/2023-08-01-preview/route.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/maps/data-plane/Route/preview/2023-08-01-preview/route.json b/specification/maps/data-plane/Route/preview/2023-08-01-preview/route.json index 8dddfb523873..5aa68d2828a1 100644 --- a/specification/maps/data-plane/Route/preview/2023-08-01-preview/route.json +++ b/specification/maps/data-plane/Route/preview/2023-08-01-preview/route.json @@ -514,7 +514,6 @@ "$ref": "#/definitions/Geometry" }, "properties": { - "x-ms-client-flatten": true, "$ref": "#/definitions/FeatureProperties" }, "bbox": { From 665a816837d1bba8c641877d7c84125e0d961cbd Mon Sep 17 00:00:00 2001 From: Mike Kistler Date: Thu, 6 Apr 2023 12:54:23 -0500 Subject: [PATCH 19/28] Mvad update (#23434) * Add default value 10 for topContributorCount * Update AnomalyDetector typespec to latest typespec and Azure.Core versions and fix all warnings * Update TypeSpec config * Add back language emitter options * Fix cspell and model validation errors --------- Co-authored-by: Chunlei Wang --- .../examples/v1.1/ChangePointDetect.json | 2 +- .../examples/v1.1/DetectAnomaly.json | 2 +- .../examples/v1.1/EntireDetect.json | 2 +- .../examples/v1.1/LastDetect.json | 2 +- .../examples/v1.1/LastDetectAnomaly.json | 2 +- .../examples/v1.1/TrainModel.json | 2 +- .../AnomalyDetector/main.tsp | 5 +- .../AnomalyDetector/multivariate/models.tsp | 19 ++-- .../AnomalyDetector/multivariate/routes.tsp | 86 +++++++++++------ .../AnomalyDetector/tspconfig.yaml | 10 +- .../AnomalyDetector/univariate/models.tsp | 9 +- .../AnomalyDetector/univariate/routes.tsp | 53 +++++++---- .../v1.1/examples/ChangePointDetect.json | 2 +- .../stable/v1.1/examples/DetectAnomaly.json | 2 +- .../stable/v1.1/examples/EntireDetect.json | 2 +- .../stable/v1.1/examples/LastDetect.json | 2 +- .../v1.1/examples/LastDetectAnomaly.json | 2 +- .../stable/v1.1/examples/TrainModel.json | 2 +- .../AnomalyDetector/stable/v1.1/openapi.json | 93 +++++++++---------- 19 files changed, 174 insertions(+), 125 deletions(-) diff --git a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/ChangePointDetect.json b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/ChangePointDetect.json index 961b008f896a..a045c22e1947 100644 --- a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/ChangePointDetect.json +++ b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/ChangePointDetect.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "options": { "series": [ { "timestamp": "2017-01-01T06:45:00Z", diff --git a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/DetectAnomaly.json b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/DetectAnomaly.json index 429c24f8b9d2..afeb27183a3e 100644 --- a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/DetectAnomaly.json +++ b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/DetectAnomaly.json @@ -7,7 +7,7 @@ "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", "modelId": "45aad126-aafd-11ea-b8fb-d89ef3400c5f", - "body": { + "options": { "dataSource": "https://multiadsample.blob.core.windows.net/data/sample_data_2_1000.csv", "topContributorCount": 10, "startTime": "2019-04-01T00:15:00Z", diff --git a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/EntireDetect.json b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/EntireDetect.json index 1869ce4b95ba..dad2fbe78e7c 100644 --- a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/EntireDetect.json +++ b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/EntireDetect.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "options": { "series": [ { "timestamp": "1972-01-01T00:00:00Z", diff --git a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetect.json b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetect.json index ebc05dca98fa..db24b8b570df 100644 --- a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetect.json +++ b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetect.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "options": { "series": [ { "timestamp": "1972-01-01T00:00:00Z", diff --git a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetectAnomaly.json b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetectAnomaly.json index 09c4992dd22b..f5bb920b59e9 100644 --- a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetectAnomaly.json +++ b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/LastDetectAnomaly.json @@ -7,7 +7,7 @@ "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", "modelId": "45aad126-aafd-11ea-b8fb-d89ef3400c5f", - "body": { + "options": { "variables": [ { "variable": "Variable_1", diff --git a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/TrainModel.json b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/TrainModel.json index 234215b723cd..eecf82d71743 100644 --- a/specification/cognitiveservices/AnomalyDetector/examples/v1.1/TrainModel.json +++ b/specification/cognitiveservices/AnomalyDetector/examples/v1.1/TrainModel.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "modelInfo": { "slidingWindow": 20, "alignPolicy": { "alignMode": "Outer", diff --git a/specification/cognitiveservices/AnomalyDetector/main.tsp b/specification/cognitiveservices/AnomalyDetector/main.tsp index 8f394014c9f2..e8d78f67bd8e 100644 --- a/specification/cognitiveservices/AnomalyDetector/main.tsp +++ b/specification/cognitiveservices/AnomalyDetector/main.tsp @@ -10,7 +10,7 @@ using TypeSpec.Versioning; @versioned(APIVersion) @service({title: "Anomaly Detector"}) -@useAuth(ApiKeyAuth) +@useAuth(AnomalyDetectorApiKeyAuth) @server( "{Endpoint}/anomalydetector/{ApiVersion}", "The Anomaly Detector API detects anomalies automatically in time series data. It supports two kinds of mode, one is for stateless using, another is for stateful using. In stateless mode, there are three functionalities. Entire Detect is for detecting the whole series with model trained by the time series, Last Detect is detecting last point with model trained by points before. ChangePoint Detect is for detecting trend changes in time series. In stateful mode, user can store time series, the stored time series will be used for detection anomalies. Under this mode, user can still use the above three functionalities by only giving a time range without preparing time series in client side. Besides the above three functionalities, stateful model also provide group based detection and labeling service. By leveraging labeling service user can provide labels for each detection result, these labels will be used for retuning or regenerating detection models. Inconsistency detection is a kind of group based detection, this detection will find inconsistency ones in a set of time series. By using anomaly detector service, business customers can discover incidents and establish a logic flow for root cause analysis.", @@ -46,6 +46,9 @@ discover incidents and establish a logic flow for root cause analysis. """) namespace AnomalyDetector; +@doc("The secret key for your Azure Cognitive Services subscription.") +model AnomalyDetectorApiKeyAuth is ApiKeyAuth; + enum APIVersion { v1_1: "v1.1", } diff --git a/specification/cognitiveservices/AnomalyDetector/multivariate/models.tsp b/specification/cognitiveservices/AnomalyDetector/multivariate/models.tsp index fb0208950101..5a521d962747 100644 --- a/specification/cognitiveservices/AnomalyDetector/multivariate/models.tsp +++ b/specification/cognitiveservices/AnomalyDetector/multivariate/models.tsp @@ -17,7 +17,6 @@ enum FillNAMethod { "Fixed", } -@fixed enum MultivariateBatchDetectionStatus { Created: "CREATED", Running: "RUNNING", @@ -33,13 +32,11 @@ enum DataSchema { "MultiTable", } -@fixed enum AlignMode { "Inner", "Outer", } -@fixed enum ModelStatus { Created: "CREATED", Running: "RUNNING", @@ -50,8 +47,8 @@ enum ModelStatus { @doc("Detection results for the resultId value.") @resource("multivariate/detect-batch") model MultivariateDetectionResult { + #suppress "@azure-tools/typespec-azure-core/key-visibility-required" "Properties in response-only schemas should not be marked readOnly" @doc("Result identifier that's used to fetch the results of an inference call.") - @visibility("read") @key @format("uuid") resultId: string; @@ -96,6 +93,7 @@ model VariableState { @doc("Variable name in variable states.") variable?: string; + #suppress "@azure-tools/typespec-azure-core/casing-style" "Service uppercases common acronyms like NA." @doc("Proportion of missing values that need to be filled by fillNAMethod.") @minValue(0.0) @maxValue(1.0) @@ -245,13 +243,15 @@ detect whether the time stamp is an anomaly or not. alignPolicy?: AlignPolicy; @doc("Model status.") + @visibility("read") status?: ModelStatus; - @visibility("read") @doc("Error messages after failure to create a model.") + @visibility("read") errors?: ErrorResponse[]; @doc("Diagnostics information to help inspect the states of a model or variable.") + @visibility("read") diagnosticsInfo?: DiagnosticsInfo; } @@ -263,6 +263,7 @@ time range. """) alignMode?: AlignMode; + #suppress "@azure-tools/typespec-azure-core/casing-style" "Service uppercases common acronyms like NA." @doc(""" Field that indicates how missing values will be filled. """) @@ -307,8 +308,8 @@ epoch. @doc("Response of getting a model.") @resource("multivariate/models") model AnomalyDetectionModel { + #suppress "@azure-tools/typespec-azure-core/key-visibility-required" "Properties in response-only schemas should not be marked readOnly" @doc("Model identifier.") - @visibility("read") @key @format("uuid") modelId: string; @@ -357,7 +358,7 @@ Number of top contributed variables for one anomalous time stamp in the response. The default is 10. """) - topContributorCount: int32; + topContributorCount?: int32 = 10; } @doc("Variable values.") @@ -384,8 +385,8 @@ model MultivariateLastDetectionResult { @doc("Error response.") @error model ResponseError { - @header + @header("x-ms-error-code") @doc("Error code.") - "x-ms-error-code"?: string, + msErrorCode?: string, ...ErrorResponse } diff --git a/specification/cognitiveservices/AnomalyDetector/multivariate/routes.tsp b/specification/cognitiveservices/AnomalyDetector/multivariate/routes.tsp index 14b2e6c799b1..44cdd074d500 100644 --- a/specification/cognitiveservices/AnomalyDetector/multivariate/routes.tsp +++ b/specification/cognitiveservices/AnomalyDetector/multivariate/routes.tsp @@ -9,6 +9,21 @@ using Azure.Core; namespace AnomalyDetector.Multivariate; +// Operation templates + +@post +@doc("Operation template for multivariate anomaly detection service action.") +op MultivariateServiceAction( + ...TParams +): TResponse | ResponseError; + +// Operations + +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern" +// This operation does not fit any standard operation pattern. +// The closest match is probably GetResourceOperationStatus, but that can't be used because +// it does not support an api-version in the path defined in the @server decorator. +// https://github.com/Azure/typespec-azure/issues/2798 @get @route("/multivariate/detect-batch/{resultId}") @summary("Get Multivariate Anomaly Detection Result") @@ -16,15 +31,14 @@ namespace AnomalyDetector.Multivariate; For asynchronous inference, get a multivariate anomaly detection result based on the resultId value that the BatchDetectAnomaly API returns. """) -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 op GetMultivariateBatchDetectionResult( @format("uuid") @doc("ID of a batch detection result.") @path resultId: string, ): MultivariateDetectionResult | ResponseError; - -@post +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Azure core RpcOperation does not support custom error response" +// https://github.com/Azure/typespec-azure/issues/2795 @route("/multivariate/models") @summary("Train a Multivariate Anomaly Detection Model") @doc(""" @@ -35,38 +49,44 @@ Storage folder that contains multiple CSV files, where each CSV file has two columns, time stamp and variable. Or the Blob Storage URI can point to a single blob that contains a CSV file that has all the variables and a time stamp column. """) -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 -op TrainMultivariateModel( - @doc("Model information.") - @body modelInfo: ModelInfo, -): { - @statusCode statusCode: 201, - @doc("Location and ID of the model.") - @header Location: string, - @body result: AnomalyDetectionModel - } | ResponseError; +op TrainMultivariateModel is MultivariateServiceAction< + // TParams + { + @doc("Model information.") + @body modelInfo: ModelInfo, + }, + // TResponse + { + @statusCode statusCode: 201, + @doc("Location and ID of the model.") + @header location: string, + @body result: AnomalyDetectionModel + }>; +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern" +// This operation does not fit any standard operation pattern. +// The closest match is probably ResourceList, but that can't be used because +// it does not support an api-version in the path defined in the @server decorator. +// https://github.com/Azure/typespec-azure/issues/2798 +// and because the response uses "models" instead of "value" as the array property name. @get @route("/multivariate/models") @summary("List Multivariate Models") @doc("List models of a resource.") -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 op ListMultivariateModels( - @doc("Skip indicates how many models will be skipped.") - @query - skip?: int32 = 0; - - @doc("Top indicates how many models will be fetched.") - @query - top?: int32; + ...SkipQueryParameter, + ...TopQueryParameter, ): ModelList | ResponseError; +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern" +// This operation does not fit any standard operation pattern. +// The closest match is probably ResourceDelete, but that can't be used because +// it does not support an api-version in the path defined in the @server decorator. @summary("Delete Multivariate Model") @doc("Delete an existing multivariate model according to the modelId value.") @delete @route("/multivariate/models/{modelId}") -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 op DeleteMultivariateModel( @doc("Model identifier.") @path @@ -77,6 +97,11 @@ op DeleteMultivariateModel( statusCode: 204 } | ResponseError; + +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern" +// This operation does not fit any standard operation pattern. +// The closest match is probably ResourceGet, but that can't be used because +// it does not support an api-version in the path defined in the @server decorator. @summary("Get Multivariate Model") @doc(""" Get detailed information about the multivariate model, including the training status @@ -84,13 +109,17 @@ and variables used in the model. """) @get @route("/multivariate/models/{modelId}") -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 op GetMultivariateModel( @doc("Model identifier.") @path modelId: string, ): AnomalyDetectionModel | ResponseError; +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern" +// This operation does not fit any standard operation pattern. +// The closest match is probably LongRunningResourceAction, but that can't be used because +// it does not support an api-version in the path defined in the @server decorator. +@post @route("/multivariate/models/{modelId}:detect-batch") @summary("Detect Multivariate Anomaly") @doc(""" @@ -101,7 +130,6 @@ query the detection result. The request should be a source link to indicate an externally accessible Azure Storage URI that either points to an Azure Blob Storage folder or points to a CSV file in Azure Blob Storage. """) -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 op DetectMultivariateBatchAnomaly( @doc("Model identifier.") @path @@ -111,12 +139,17 @@ op DetectMultivariateBatchAnomaly( ): { @statusCode statusCode: 202, @doc("ID of the detection result.") - @header "Operation-Id": string, + @header("Operation-Id") operationId: string, @doc("Location of the detection result.") - @header "Operation-Location": string, + @header("Operation-Location") operationLocation: string, @body result: MultivariateDetectionResult, } | ResponseError; + +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Does not fit any standard operation pattern" +// This operation does not fit any standard operation pattern. +// The closest match is probably ResourceAction, but that can't be used because +// it does not support an api-version in the path defined in the @server decorator. @route("/multivariate/models/{modelId}:detect-last") @summary("Detect anomalies in the last point of the request body") @doc(""" @@ -125,7 +158,6 @@ and inference data. The inference data should be put into the request body in JSON format. The request will finish synchronously and return the detection immediately in the response body. """) -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 op DetectMultivariateLastAnomaly( @doc("Model identifier.") @path diff --git a/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml b/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml index 56c01abe2685..945c6f8be04d 100644 --- a/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml +++ b/specification/cognitiveservices/AnomalyDetector/tspconfig.yaml @@ -1,12 +1,12 @@ emit: [ "@azure-tools/typespec-autorest", - "@azure-tools/typespec-python", - "@azure-tools/typespec-csharp", ] options: "@azure-tools/typespec-autorest": - "output-file": "openapi.json" - "examples-directory": ./examples + examples-directory: ./examples + omit-unreachable-types: true + output-file: openapi.json + emitter-output-dir: "{project-root}/../data-plane/AnomalyDetector/stable" "@azure-tools/typespec-python": "basic-setup-py": true "package-version": 3.0.0b6 @@ -22,5 +22,3 @@ options: clear-output-folder: true namespace: Azure.AI.AnomalyDetector model-namespace: false - # Uncomment this line and add "@azure-tools/typespec-typescript" to your package.json to generate Typescript code - # "@azure-tools/cadl-typescript": true diff --git a/specification/cognitiveservices/AnomalyDetector/univariate/models.tsp b/specification/cognitiveservices/AnomalyDetector/univariate/models.tsp index a0af816fe0f5..d8483fc6b9f9 100644 --- a/specification/cognitiveservices/AnomalyDetector/univariate/models.tsp +++ b/specification/cognitiveservices/AnomalyDetector/univariate/models.tsp @@ -31,7 +31,6 @@ enum AnomalyDetectorErrorCodes { "InvalidImputeFixedValue", } -@fixed enum TimeGranularity { Yearly: "yearly", Monthly: "monthly", @@ -172,15 +171,15 @@ severe the anomaly is. For normal points, the severity is always 0. @doc("Error information that the API returned.") @error model AnomalyDetectorError { - @header + @header("x-ms-error-code") @doc("Error code.") - "x-ms-error-code"?: string, + msErrorCode: string, @doc("Error code.") - code?: AnomalyDetectorErrorCodes; + code: AnomalyDetectorErrorCodes; @doc("Message that explains the error that the service reported.") - message?: string; + message: string; } @doc("Response of the last anomaly detection.") diff --git a/specification/cognitiveservices/AnomalyDetector/univariate/routes.tsp b/specification/cognitiveservices/AnomalyDetector/univariate/routes.tsp index d0ca6909a997..3e33c2acd4ff 100644 --- a/specification/cognitiveservices/AnomalyDetector/univariate/routes.tsp +++ b/specification/cognitiveservices/AnomalyDetector/univariate/routes.tsp @@ -5,10 +5,18 @@ import "./models.tsp"; using TypeSpec.Rest; using TypeSpec.Http; +using Azure.Core; namespace AnomalyDetector.Univariate; @post +@doc("Operation template for univariate anomaly detection service action.") +op UnivariateServiceAction( + ...TParams +): TResponse | AnomalyDetectorError; + +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Azure core RpcOperation does not support custom error response" +// https://github.com/Azure/typespec-azure/issues/2795 @route("timeseries/entire/detect") @summary("Detect anomalies for the entire series in batch.") @doc(""" @@ -17,31 +25,42 @@ with the same model. With this method, points before and after a certain point are used to determine whether it's an anomaly. The entire detection can give the user an overall status of the time series. """) -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 -op DetectUnivariateEntireSeries( - @doc("Method of univariate anomaly detection.") - @body options: UnivariateDetectionOptions, -): UnivariateEntireDetectionResult | AnomalyDetectorError; +op DetectUnivariateEntireSeries is UnivariateServiceAction< + // TParams + { + @doc("Method of univariate anomaly detection.") + @body options: UnivariateDetectionOptions, + }, + // TResponse + UnivariateEntireDetectionResult>; -@post +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Azure core RpcOperation does not support custom error response" +// https://github.com/Azure/typespec-azure/issues/2795 @route("timeseries/last/detect") @summary("Detect anomaly status of the latest point in time series.") @doc(""" This operation generates a model by using the points that you sent in to the API and based on all data to determine whether the last point is anomalous. """) -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 -op DetectUnivariateLastPoint( - @doc("Method of univariate anomaly detection.") - @body options: UnivariateDetectionOptions, -): UnivariateLastDetectionResult | AnomalyDetectorError; +op DetectUnivariateLastPoint is UnivariateServiceAction< + // TParams + { + @doc("Method of univariate anomaly detection.") + @body options: UnivariateDetectionOptions, + }, + // TResponse + UnivariateLastDetectionResult>; -@post +#suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Azure core RpcOperation does not support custom error response" +// https://github.com/Azure/typespec-azure/issues/2795 @route("timeseries/changepoint/detect") @summary("Detect change point for the entire series") @doc("Evaluate the change point score of every series point.") -// To improve CADL implementation apply: https://github.com/Azure/azure-rest-api-specs/issues/21527 -op DetectUnivariateChangePoint( - @doc("Method of univariate anomaly detection.") - @body options: UnivariateChangePointDetectionOptions, -): UnivariateChangePointDetectionResult | AnomalyDetectorError; +op DetectUnivariateChangePoint is UnivariateServiceAction< + // TParams + { + @doc("Method of univariate anomaly detection.") + @body options: UnivariateChangePointDetectionOptions, + }, + // TResponse + UnivariateChangePointDetectionResult>; diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/ChangePointDetect.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/ChangePointDetect.json index 961b008f896a..a045c22e1947 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/ChangePointDetect.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/ChangePointDetect.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "options": { "series": [ { "timestamp": "2017-01-01T06:45:00Z", diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/DetectAnomaly.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/DetectAnomaly.json index 429c24f8b9d2..afeb27183a3e 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/DetectAnomaly.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/DetectAnomaly.json @@ -7,7 +7,7 @@ "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", "modelId": "45aad126-aafd-11ea-b8fb-d89ef3400c5f", - "body": { + "options": { "dataSource": "https://multiadsample.blob.core.windows.net/data/sample_data_2_1000.csv", "topContributorCount": 10, "startTime": "2019-04-01T00:15:00Z", diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/EntireDetect.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/EntireDetect.json index 1869ce4b95ba..dad2fbe78e7c 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/EntireDetect.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/EntireDetect.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "options": { "series": [ { "timestamp": "1972-01-01T00:00:00Z", diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetect.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetect.json index ebc05dca98fa..db24b8b570df 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetect.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetect.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "options": { "series": [ { "timestamp": "1972-01-01T00:00:00Z", diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetectAnomaly.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetectAnomaly.json index 09c4992dd22b..f5bb920b59e9 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetectAnomaly.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/LastDetectAnomaly.json @@ -7,7 +7,7 @@ "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", "modelId": "45aad126-aafd-11ea-b8fb-d89ef3400c5f", - "body": { + "options": { "variables": [ { "variable": "Variable_1", diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/TrainModel.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/TrainModel.json index 234215b723cd..eecf82d71743 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/TrainModel.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/examples/TrainModel.json @@ -6,7 +6,7 @@ "ApiVersion": "v1.1", "Content-Type": "application/json", "Ocp-Apim-Subscription-Key": "{API key}", - "body": { + "modelInfo": { "slidingWindow": 20, "alignPolicy": { "alignMode": "Outer", diff --git a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json index 87973cfe1c42..9bd2358f9cc3 100644 --- a/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json +++ b/specification/cognitiveservices/data-plane/AnomalyDetector/stable/v1.1/openapi.json @@ -53,12 +53,13 @@ ], "security": [ { - "ApiKeyAuth": [] + "AnomalyDetectorApiKeyAuth": [] } ], "securityDefinitions": { - "ApiKeyAuth": { + "AnomalyDetectorApiKeyAuth": { "type": "apiKey", + "description": "The secret key for your Azure Cognitive Services subscription.", "in": "header", "name": "Ocp-Apim-Subscription-Key" } @@ -161,21 +162,10 @@ "description": "List models of a resource.", "parameters": [ { - "name": "skip", - "in": "query", - "required": false, - "description": "Skip indicates how many models will be skipped.", - "default": 0, - "type": "integer", - "format": "int32" + "$ref": "#/parameters/Azure.Core.SkipQueryParameter" }, { - "name": "top", - "in": "query", - "required": false, - "description": "Top indicates how many models will be fetched.", - "type": "integer", - "format": "int32" + "$ref": "#/parameters/Azure.Core.TopQueryParameter" } ], "responses": { @@ -312,11 +302,11 @@ "202": { "description": "The request has been accepted for processing, but processing has not yet completed.", "headers": { - "operation-id": { + "Operation-Id": { "description": "ID of the detection result.", "type": "string" }, - "operation-location": { + "Operation-Location": { "description": "Location of the detection result.", "type": "string" } @@ -526,22 +516,6 @@ } }, "definitions": { - "APIVersion": { - "type": "string", - "enum": [ - "v1.1" - ], - "x-ms-enum": { - "name": "APIVersion", - "modelAsString": true, - "values": [ - { - "name": "v1_1", - "value": "v1.1" - } - ] - } - }, "Multivariate.AlignMode": { "type": "string", "enum": [ @@ -550,7 +524,7 @@ ], "x-ms-enum": { "name": "AlignMode", - "modelAsString": false + "modelAsString": true } }, "Multivariate.AlignPolicy": { @@ -578,8 +552,7 @@ "modelId": { "type": "string", "description": "Model identifier.", - "format": "uuid", - "readOnly": true + "format": "uuid" }, "createdTime": { "type": "string", @@ -814,7 +787,8 @@ }, "status": { "$ref": "#/definitions/Multivariate.ModelStatus", - "description": "Model status." + "description": "Model status.", + "readOnly": true }, "errors": { "type": "array", @@ -828,7 +802,8 @@ }, "diagnosticsInfo": { "$ref": "#/definitions/Multivariate.DiagnosticsInfo", - "description": "Diagnostics information to help inspect the states of a model or variable." + "description": "Diagnostics information to help inspect the states of a model or variable.", + "readOnly": true } }, "description": "Training result of a model, including its status, errors, and diagnostics\ninformation.", @@ -924,7 +899,7 @@ ], "x-ms-enum": { "name": "ModelStatus", - "modelAsString": false, + "modelAsString": true, "values": [ { "name": "Created", @@ -1022,7 +997,7 @@ ], "x-ms-enum": { "name": "MultivariateBatchDetectionStatus", - "modelAsString": false, + "modelAsString": true, "values": [ { "name": "Created", @@ -1049,8 +1024,7 @@ "resultId": { "type": "string", "description": "Result identifier that's used to fetch the results of an inference call.", - "format": "uuid", - "readOnly": true + "format": "uuid" }, "summary": { "$ref": "#/definitions/Multivariate.MultivariateBatchDetectionResultSummary", @@ -1088,13 +1062,13 @@ "topContributorCount": { "type": "integer", "format": "int32", - "description": "Number of top contributed\nvariables for one anomalous time stamp in the response. The default is\n10." + "description": "Number of top contributed\nvariables for one anomalous time stamp in the response. The default is\n10.", + "default": 10 } }, "description": "Request of the last detection.", "required": [ - "variables", - "topContributorCount" + "variables" ] }, "Multivariate.MultivariateLastDetectionResult": { @@ -1215,7 +1189,11 @@ "description": "Message that explains the error that the service reported." } }, - "description": "Error information that the API returned." + "description": "Error information that the API returned.", + "required": [ + "code", + "message" + ] }, "Univariate.AnomalyDetectorErrorCodes": { "type": "string", @@ -1293,7 +1271,7 @@ ], "x-ms-enum": { "name": "TimeGranularity", - "modelAsString": false, + "modelAsString": true, "values": [ { "name": "Yearly", @@ -1615,5 +1593,24 @@ ] } }, - "parameters": {} + "parameters": { + "Azure.Core.SkipQueryParameter": { + "name": "skip", + "in": "query", + "required": false, + "description": "The number of result items to skip.", + "type": "integer", + "format": "int32", + "x-ms-parameter-location": "method" + }, + "Azure.Core.TopQueryParameter": { + "name": "top", + "in": "query", + "required": false, + "description": "The number of result items to return.", + "type": "integer", + "format": "int32", + "x-ms-parameter-location": "method" + } + } } From b532b6f9526d330b1a1f4d069df121c2d924957b Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Thu, 6 Apr 2023 16:52:42 -0700 Subject: [PATCH 20/28] revert Operations example api version --- .../stable/2023-05-01/examples/OperationsList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json index 7b53de49f9e2..57267e685a7c 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/examples/OperationsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2022-09-01" + "api-version": "2023-05-01" }, "responses": { "200": { From 3eaf771dc5323403a3144a8f731083b7d9ea4f97 Mon Sep 17 00:00:00 2001 From: Naman Agarwal Date: Fri, 7 Apr 2023 07:17:00 +0530 Subject: [PATCH 21/28] add codeowners for Compute Instance swagger (#23437) Co-authored-by: Naman Agarwal --- CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 4ca296f30bc1..5f33f67a1c7b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -252,6 +252,9 @@ # PRLabel: %Web Apps /specification/web/ @naveedaz @Azure/azure-app-service-control-plane +# PRLabel: %AzureML - Compute Instance +/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/**/machineLearningServices.json @Azure/aml-compute-instance + # PRLabel: %Profile /profile/ @shahabhijeet From 4eaa726249b3b1c58bd712a657b2b9a7898a0df6 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Thu, 6 Apr 2023 23:07:27 -0400 Subject: [PATCH 22/28] [Hub Generated] Review request for Microsoft.DevHub to add version preview/2022-10-11-preview (#22828) * Adds base for updating Microsoft.DevHub from version preview/2022-04-01-preview to version 2022-10-11-preview * Updates readme * Updates API version in new specs and examples * start 10-11 preview * add words * fix readme version * update swagger version * add second putworkflow example * fix generatepreviewartifactsresponse * align generate preview artifacts example * update param locations that got changed * add x-ms-client-flatten for artifact properties * Adding WorkflowRunStatus * Fixing enum name * add namespace to example --------- Co-authored-by: Brandon Foley --- custom-words.txt | 4 + .../examples/GeneratePreviewArtifacts.json | 30 + .../examples/GitHubOAuth.json | 18 + .../examples/GitHubOAuthCallback.json | 21 + .../examples/GitHubOAuth_List.json | 23 + .../examples/Operation_List.json | 23 + .../examples/Workflow_CreateOrUpdate.json | 146 ++ ...rkflow_CreateOrUpdate_WithArtifactGen.json | 159 +++ .../examples/Workflow_Delete.json | 16 + .../examples/Workflow_Get.json | 65 + .../examples/Workflow_List.json | 62 + .../Workflow_ListByResourceGroup.json | 71 + .../examples/Workflow_UpdateTags.json | 73 + .../preview/2022-10-11-preview/workflow.json | 1179 +++++++++++++++++ .../developerhub/resource-manager/readme.md | 11 +- 15 files changed, 1900 insertions(+), 1 deletion(-) create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GeneratePreviewArtifacts.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuthCallback.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth_List.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Operation_List.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate_WithArtifactGen.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Delete.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Get.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_List.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_ListByResourceGroup.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_UpdateTags.json create mode 100644 specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/workflow.json diff --git a/custom-words.txt b/custom-words.txt index b2518a90bca2..45303a2dc7b1 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -649,6 +649,8 @@ Dnat dnsname dnszones DOCM +Dockerfile +Dockerfiles docx Domainful domainname @@ -888,6 +890,7 @@ gluster gmsa Gmsa GOARCH +gomodule GPUMIG GPUP GPUs @@ -1133,6 +1136,7 @@ KubeVirt Kustomization kustomizations Kustomizations +kustomize kusto kustooperations kvset diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GeneratePreviewArtifacts.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GeneratePreviewArtifacts.json new file mode 100644 index 000000000000..f5a84f8aaa60 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GeneratePreviewArtifacts.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "location": "location1", + "parameters": { + "generationLanguage": "javascript", + "languageVersion": "14", + "port": "80", + "appName": "my-app", + "dockerfileOutputDirectory": "./", + "manifestOutputDirectory": "./", + "manifestGenerationMode": "enabled", + "dockerfileGenerationMode": "enabled", + "manifestType": "kube", + "imageName": "myimage", + "namespace": "my-namespace", + "imageTag": "latest" + } + }, + "responses": { + "200": { + "body": { + "dockerfiles/example-dockerfile": "dockerfile-content \n including newlines", + "manifests/example-manifest-file-1": "manifest file 1 content \n including newlines", + "manifests/example-manifest-file-2": "manifest file 2 content \n including newlines" + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth.json new file mode 100644 index 000000000000..96ff82bca84b --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "subscriptionId": "subscriptionId1", + "location": "eastus2euap", + "api-version": "2022-10-11-preview", + "parameters": { + "redirectUrl": "https://ms.portal.azure.com/aks" + } + }, + "responses": { + "200": { + "body": { + "authURL": "https://github.com/login/oauth/authorize?client_id=11111111&redirect_uri=https://management.azure.com/subscriptions/subscriptionId1/providers/Microsoft.DevHub/locations/eastus2euap/githuboauth&state=2345678-3456-7890-5678-012345678901&scope=repo,user:email,workflow", + "token": "" + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuthCallback.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuthCallback.json new file mode 100644 index 000000000000..76a1b7355f0c --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuthCallback.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "subscriptionId1", + "location": "eastus2euap", + "api-version": "2022-10-11-preview", + "code": "3584d83530557fdd1f46af8289938c8ef79f9dc5", + "state": "12345678-3456-7890-5678-012345678901" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subscriptionId1/providers/Microsoft.DevHub/locations/eastus2euap/githuboauth/default", + "type": "Microsoft.DevHub/locations/githuboauth", + "name": "default", + "properties": { + "username": "user" + } + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth_List.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth_List.json new file mode 100644 index 000000000000..a1b220819516 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/GitHubOAuth_List.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "subscriptionId1", + "location": "eastus2euap", + "api-version": "2022-10-11-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subscriptionId1/providers/Microsoft.DevHub/locations/eastus2euap/githuboauth/default", + "type": "Microsoft.DevHub/locations/githuboauth", + "name": "default", + "properties": { + "username": "user" + } + } + ] + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Operation_List.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Operation_List.json new file mode 100644 index 000000000000..ff1c2045c650 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Operation_List.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.DevHub/workflows/read", + "display": { + "provider": "Microsoft Developer Hub", + "resource": "Workflows", + "operation": "Get workflow", + "description": "Gets workflow" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate.json new file mode 100644 index 000000000000..9b91a10c5757 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate.json @@ -0,0 +1,146 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "resourceGroupName": "resourceGroup1", + "workflowName": "workflow1", + "parameters": { + "location": "location1", + "tags": { + "appname": "testApp" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "kubeManifestLocations": [ + "/src/manifests/" + ], + "overrides": { + "key1": "value1" + } + }, + "namespace": "namespace1", + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo2", + "branchName": "branch2", + "dockerfile": "repo2/images/Dockerfile", + "dockerBuildContext": "repo2/src/", + "deploymentProperties": { + "manifestType": "helm", + "helmChartPath": "/src/charts", + "helmValues": "/src/chars/values.yaml", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/User/repo2/pull/6567", + "pullNumber": 6567, + "prStatus": "submitted", + "authStatus": "Authorized" + } + } + } + }, + "201": { + "body": { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/owner1/repo1/pull/6567", + "pullNumber": 6567, + "prStatus": "submitted", + "authStatus": "Authorized" + } + } + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate_WithArtifactGen.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate_WithArtifactGen.json new file mode 100644 index 000000000000..fc67813d2086 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_CreateOrUpdate_WithArtifactGen.json @@ -0,0 +1,159 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "resourceGroupName": "resourceGroup1", + "workflowName": "workflow1", + "parameters": { + "location": "location1", + "tags": { + "appname": "testApp" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "kubeManifestLocations": [ + "/src/manifests/" + ], + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1" + }, + "artifactGenerationProperties": { + "generationLanguage": "javascript", + "languageVersion": "14", + "port": "80", + "appName": "my-app", + "dockerfileOutputDirectory": "./", + "manifestOutputDirectory": "./", + "manifestGenerationMode": "enabled", + "dockerfileGenerationMode": "enabled", + "manifestType": "kube", + "imageName": "myimage", + "namespace": "my-namespace", + "imageTag": "latest" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo2", + "branchName": "branch2", + "dockerfile": "repo2/images/Dockerfile", + "dockerBuildContext": "repo2/src/", + "deploymentProperties": { + "manifestType": "helm", + "helmChartPath": "/src/charts", + "helmValues": "/src/chars/values.yaml", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/User/repo2/pull/6567", + "pullNumber": 6567, + "prStatus": "submitted", + "authStatus": "Authorized" + } + } + } + }, + "201": { + "body": { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/owner1/repo1/pull/6567", + "pullNumber": 6567, + "prStatus": "submitted", + "authStatus": "Authorized" + } + } + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Delete.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Delete.json new file mode 100644 index 000000000000..4460cbb6aa86 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Delete.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "resourceGroupName": "resourceGroup1", + "workflowName": "workflow1" + }, + "responses": { + "200": { + "body": { + "status": "workflow deleted successfully" + } + }, + "204": {} + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Get.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Get.json new file mode 100644 index 000000000000..fe5bab659768 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_Get.json @@ -0,0 +1,65 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "resourceGroupName": "resourceGroup1", + "workflowName": "workflow1" + }, + "responses": { + "200": { + "body": { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/User/repo1/pull/6567", + "pullNumber": 6567, + "prStatus": "merged", + "lastWorkflowRun": { + "succeeded": true, + "workflowRunURL": "https://github.com/User/repo1/actions/runs/1820640230", + "lastRunAt": "2019-01-01T12:34:56.000Z", + "workflowRunStatus": "completed" + }, + "authStatus": "Authorized" + } + } + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_List.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_List.json new file mode 100644 index 000000000000..588fd7a85df6 --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_List.json @@ -0,0 +1,62 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/User/repo1/pull/6567", + "pullNumber": 6567, + "prStatus": "submitted", + "authStatus": "Authorized" + } + } + } + ], + "nextLink": "https://management.azure.com:443/subscriptions/subscriptionId1/providers/Microsoft.DevHub/workflows?api-version=2018-05-05-preview&timeRange=1&$skipToken=" + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_ListByResourceGroup.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_ListByResourceGroup.json new file mode 100644 index 000000000000..b87b50fca9ff --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_ListByResourceGroup.json @@ -0,0 +1,71 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "resourceGroupName": "resourceGroup1", + "location": "location1", + "managedClusterResource": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "appname": "testapp" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/User/repo1/pull/6567", + "pullNumber": 6567, + "prStatus": "merged", + "lastWorkflowRun": { + "succeeded": true, + "workflowRunURL": "https://github.com/User/repo1/actions/runs/1820640230", + "lastRunAt": "2019-01-01T12:34:56.000Z", + "workflowRunStatus": "completed" + }, + "authStatus": "Authorized" + } + } + } + ], + "nextLink": "https://management.azure.com:443/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevHub/workflows?api-version=2018-05-05-preview&timeRange=1&$skipToken=1" + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_UpdateTags.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_UpdateTags.json new file mode 100644 index 000000000000..0a9227e31fde --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/examples/Workflow_UpdateTags.json @@ -0,0 +1,73 @@ +{ + "parameters": { + "api-version": "2022-10-11-preview", + "subscriptionId": "subscriptionId1", + "resourceGroupName": "resourceGroup1", + "workflowName": "workflow1", + "parameters": { + "tags": { + "resourceEnv": "testing", + "promote": "false" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscription/subscriptionId1/resourceGroups/resourceGroup1/providers/Microsoft.DevHub/workflow/workflow1", + "location": "location1", + "name": "workflow1", + "type": "Micfosoft.DevHub/Workflow", + "tags": { + "previousValue": "stillExists", + "resourceEnv": "testing", + "promote": "false" + }, + "systemData": { + "createdBy": "foo@contoso.com", + "createdByType": "User", + "createdAt": "2018-04-24T16:30:55+00:00", + "lastModifiedBy": "foo@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2018-04-24T16:30:55+00:00" + }, + "properties": { + "githubWorkflowProfile": { + "repositoryOwner": "owner1", + "repositoryName": "repo1", + "branchName": "branch1", + "dockerfile": "repo1/images/Dockerfile", + "dockerBuildContext": "repo1/src/", + "deploymentProperties": { + "manifestType": "kube", + "overrides": { + "key1": "value1" + } + }, + "acr": { + "acrSubscriptionId": "subscriptionId1", + "acrResourceGroup": "resourceGroup1", + "acrRegistryName": "registry1", + "acrRepositoryName": "repo1" + }, + "oidcCredentials": { + "azureClientId": "12345678-3456-7890-5678-012345678901", + "azureTenantId": "66666666-3456-7890-5678-012345678901" + }, + "aksResourceId": "/subscriptions/subscriptionId1/resourcegroups/resourceGroup1/providers/Microsoft.ContainerService/managedClusters/cluster1", + "prURL": "https://github.com/owner1/repo1/pull/6567", + "pullNumber": 6567, + "prStatus": "merged", + "lastWorkflowRun": { + "succeeded": true, + "workflowRunURL": "https://github.com/User/repo1/actions/runs/1820640230", + "lastRunAt": "2019-01-01T12:34:56.000Z", + "workflowRunStatus": "completed" + }, + "authStatus": "Authorized" + } + } + } + } + } +} diff --git a/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/workflow.json b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/workflow.json new file mode 100644 index 000000000000..f06d4dfb46ea --- /dev/null +++ b/specification/developerhub/resource-manager/Microsoft.DevHub/preview/2022-10-11-preview/workflow.json @@ -0,0 +1,1179 @@ +{ + "swagger": "2.0", + "info": { + "version": "2022-10-11-preview", + "title": "DeveloperHubServiceClient", + "description": "The AKS Developer Hub Service Client" + }, + "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": { + "/providers/Microsoft.DevHub/operations": { + "get": { + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "description": "Returns list of operations.", + "summary": "Gets a list of operations.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation details.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false, + "x-ms-examples": { + "List available operations for the container service resource provider": { + "$ref": "./examples/Operation_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DevHub/locations/{location}/githuboauth/default/getGitHubOAuthInfo": { + "post": { + "tags": [ + "GitHubOAuth" + ], + "operationId": "GitHubOAuth", + "summary": "Gets GitHubOAuth info used to authenticate users with the Developer Hub GitHub App.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter" + }, + { + "name": "parameters", + "required": false, + "in": "body", + "schema": { + "$ref": "#/definitions/GitHubOAuthCallRequest" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/GitHubOAuthInfoResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "GitHub OAuth": { + "$ref": "./examples/GitHubOAuth.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DevHub/locations/{location}/githuboauth/default": { + "get": { + "tags": [ + "GitHubOAuth" + ], + "operationId": "GitHubOAuthCallback", + "summary": "Callback URL to hit once authenticated with GitHub App to have the service store the OAuth token.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/GitHubOAuthCodeParameter" + }, + { + "$ref": "#/parameters/GitHubOAuthStateParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/GitHubOAuthResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "GitHub OAuth Callback": { + "$ref": "./examples/GitHubOAuthCallback.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DevHub/locations/{location}/githuboauth": { + "get": { + "tags": [ + "GitHubOAuth" + ], + "operationId": "ListGitHubOAuth", + "summary": "Callback URL to hit once authenticated with GitHub App to have the service store the OAuth token.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/GitHubOAuthListResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "List GitHub OAuth": { + "$ref": "./examples/GitHubOAuth_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DevHub/workflows": { + "get": { + "tags": [ + "Workflow" + ], + "operationId": "Workflow_List", + "summary": "Gets a list of workflows associated with the specified subscription.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Describe the result of a successful operation.", + "schema": { + "$ref": "#/definitions/WorkflowListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Workflows": { + "$ref": "./examples/Workflow_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevHub/workflows": { + "get": { + "tags": [ + "Workflow" + ], + "operationId": "Workflow_ListByResourceGroup", + "summary": "Gets a list of workflows within a resource group.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ManagedClusterParameter" + } + ], + "responses": { + "200": { + "description": "Describe the result of a successful operation.", + "schema": { + "$ref": "#/definitions/WorkflowListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Workflows": { + "$ref": "./examples/Workflow_ListByResourceGroup.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevHub/workflows/{workflowName}": { + "get": { + "tags": [ + "Workflow" + ], + "operationId": "Workflow_Get", + "summary": "Gets a workflow.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkflowNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Workflow" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Workflow": { + "$ref": "./examples/Workflow_Get.json" + } + } + }, + "put": { + "tags": [ + "Workflow" + ], + "operationId": "Workflow_CreateOrUpdate", + "summary": "Creates or updates a workflow", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkflowNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Workflow" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Workflow" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/Workflow" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Create Workflow": { + "$ref": "./examples/Workflow_CreateOrUpdate.json" + }, + "Create Workflow With Artifact Generation": { + "$ref": "./examples/Workflow_CreateOrUpdate_WithArtifactGen.json" + } + } + }, + "delete": { + "tags": [ + "Workflow" + ], + "operationId": "Workflow_Delete", + "summary": "Deletes a workflow", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkflowNameParameter" + } + ], + "responses": { + "200": { + "description": "successful delete with response", + "schema": { + "$ref": "#/definitions/DeleteWorkflowResponse" + } + }, + "204": { + "description": "Successfully deleted the resource" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Delete Workflow": { + "$ref": "./examples/Workflow_Delete.json" + } + } + }, + "patch": { + "tags": [ + "Workflow" + ], + "operationId": "Workflow_UpdateTags", + "summary": "Updates tags on a workflow.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkflowNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/TagsObject" + }, + "description": "Parameters supplied to the Update Workflow Tags operation." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Workflow" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Update Managed Cluster Tags": { + "$ref": "./examples/Workflow_UpdateTags.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.DevHub/locations/{location}/generatePreviewArtifacts": { + "post": { + "tags": [ + "Artifacts" + ], + "operationId": "GeneratePreviewArtifacts", + "summary": "Generate preview dockerfile and manifests.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter" + }, + { + "name": "parameters", + "required": true, + "in": "body", + "schema": { + "$ref": "#/definitions/ArtifactGenerationProperties" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/GeneratePreviewArtifactsResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Artifact Generation Properties": { + "$ref": "./examples/GeneratePreviewArtifacts.json" + } + } + } + } + }, + "definitions": { + "Workflow": { + "title": "Workflow", + "description": "Resource representation of a workflow", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" + } + ], + "properties": { + "properties": { + "description": "Properties of a workflow.", + "$ref": "#/definitions/WorkflowProperties", + "x-ms-client-flatten": true + } + } + }, + "WorkflowProperties": { + "type": "object", + "description": "Workflow properties", + "properties": { + "githubWorkflowProfile": { + "description": "Profile of a github workflow.", + "$ref": "#/definitions/GitHubWorkflowProfile", + "x-ms-client-flatten": true + }, + "artifactGenerationProperties": { + "description": "Properties for generating artifacts like dockerfile and manifests.", + "$ref": "#/definitions/ArtifactGenerationProperties", + "x-ms-client-flatten": true + } + } + }, + "GitHubWorkflowProfile": { + "type": "object", + "description": "GitHub Workflow Profile", + "properties": { + "repositoryOwner": { + "type": "string", + "title": "The owner of the repository the workflow is associated with.", + "description": "Repository Owner" + }, + "repositoryName": { + "type": "string", + "title": "The name of the repository the workflow is associated with.", + "description": "Repository Name" + }, + "branchName": { + "type": "string", + "title": "The name of the branch the workflow is associated with.", + "description": "Repository Branch Name" + }, + "dockerfile": { + "type": "string", + "title": "Path to Dockerfile within the repository.", + "description": "Path to the Dockerfile within the repository." + }, + "dockerBuildContext": { + "type": "string", + "title": "Path to Dockerfile Build Context within the repository.", + "description": "Path to Dockerfile Build Context within the repository." + }, + "deploymentProperties": { + "$ref": "#/definitions/DeploymentProperties" + }, + "namespace": { + "type": "string", + "description": "Kubernetes namespace the application is deployed to.", + "title": "The Kubernetes namespace the application is deployed to" + }, + "acr": { + "$ref": "#/definitions/ACR" + }, + "oidcCredentials": { + "type": "object", + "description": "The fields needed for OIDC with GitHub.", + "properties": { + "azureClientId": { + "type": "string", + "description": "Azure Application Client ID" + }, + "azureTenantId": { + "type": "string", + "description": "Azure Directory (tenant) ID" + } + } + }, + "aksResourceId": { + "type": "string", + "description": "The Azure Kubernetes Cluster Resource the application will be deployed to.", + "title": "The Azure Kubernetes Managed Cluster resource." + }, + "prURL": { + "type": "string", + "description": "The URL to the Pull Request submitted against the users repository.", + "readOnly": true + }, + "pullNumber": { + "type": "integer", + "format": "int32", + "readOnly": true, + "description": "The number associated with the submitted pull request." + }, + "prStatus": { + "$ref": "#/definitions/PullRequestStatus" + }, + "lastWorkflowRun": { + "$ref": "#/definitions/WorkflowRun" + }, + "authStatus": { + "$ref": "#/definitions/AuthorizationStatus" + } + } + }, + "WorkflowListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Workflow" + }, + "description": "The list of workflows." + }, + "nextLink": { + "type": "string", + "description": "The URL to the next set of workflow results.", + "readOnly": true + } + }, + "description": "The response from List Workflows operation." + }, + "PullRequestStatus": { + "type": "string", + "readOnly": true, + "enum": [ + "unknown", + "submitted", + "merged", + "removed" + ], + "x-ms-enum": { + "name": "PullRequestStatus", + "modelAsString": true, + "values": [ + { + "value": "unknown", + "description": "Pull Request state unknown." + }, + { + "value": "submitted", + "description": "Pull Request submitted to repository." + }, + { + "value": "merged", + "description": "Pull Request merged into repository." + }, + { + "value": "removed", + "description": "Workflow no longer found within repository." + } + ] + }, + "description": "The status of the Pull Request submitted against the users repository." + }, + "DeploymentProperties": { + "type": "object", + "properties": { + "manifestType": { + "$ref": "#/definitions/ManifestType" + }, + "kubeManifestLocations": { + "type": "array", + "items": { + "type": "string" + } + }, + "helmChartPath": { + "type": "string", + "description": "Helm chart directory path in repository." + }, + "helmValues": { + "type": "string", + "description": "Helm Values.yaml file location in repository." + }, + "overrides": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "Manifest override values.", + "description": "Manifest override values." + } + } + }, + "ArtifactGenerationProperties": { + "description": "Properties used for generating artifacts such as Dockerfiles and manifests.", + "title": "Artifact Generation Properties", + "type": "object", + "properties": { + "generationLanguage": { + "$ref": "#/definitions/GenerationLanguage" + }, + "languageVersion": { + "type": "string", + "description": "The version of the language image used for execution in the generated dockerfile." + }, + "builderVersion": { + "type": "string", + "description": "The version of the language image used for building the code in the generated dockerfile." + }, + "port": { + "type": "string", + "description": "The port the application is exposed on." + }, + "appName": { + "type": "string", + "description": "The name of the app." + }, + "dockerfileOutputDirectory": { + "type": "string", + "description": "The directory to output the generated Dockerfile to." + }, + "manifestOutputDirectory": { + "type": "string", + "description": "The directory to output the generated manifests to." + }, + "dockerfileGenerationMode": { + "$ref": "#/definitions/DockerfileGenerationMode" + }, + "manifestGenerationMode": { + "$ref": "#/definitions/ManifestGenerationMode" + }, + "manifestType": { + "$ref": "#/definitions/GenerationManifestType" + }, + "imageName": { + "type": "string", + "description": "The name of the image to be generated." + }, + "namespace": { + "type": "string", + "description": "The namespace to deploy the application to." + }, + "imageTag": { + "type": "string", + "description": "The tag to apply to the generated image." + } + } + }, + "ManifestType": { + "type": "string", + "enum": [ + "helm", + "kube", + "kustomize" + ], + "x-ms-enum": { + "name": "ManifestType", + "modelAsString": true, + "values": [ + { + "value": "helm", + "description": "Repositories using helm" + }, + { + "value": "kube", + "description": "Repositories using kubernetes manifests" + } + ] + }, + "description": "Determines the type of manifests within the repository." + }, + "AuthorizationStatus": { + "type": "string", + "enum": [ + "Authorized", + "NotFound", + "Error" + ], + "readOnly": true, + "x-ms-enum": { + "name": "AuthorizationStatus", + "modelAsString": true, + "values": [ + { + "value": "Authorized", + "description": "Requests authorized successfully" + }, + { + "value": "NotFound", + "description": "Requests returned NotFound response" + }, + { + "value": "Error", + "description": "Requests returned other error response" + } + ] + }, + "description": "Determines the authorization status of requests." + }, + "GenerationLanguage": { + "type": "string", + "enum": [ + "clojure", + "csharp", + "erlang", + "go", + "gomodule", + "gradle", + "java", + "javascript", + "php", + "python", + "ruby", + "rust", + "swift" + ], + "x-ms-enum": { + "name": "GenerationLanguage", + "modelAsString": true, + "values": [ + { + "value": "clojure", + "description": "clojure language" + }, + { + "value": "csharp", + "description": "csharp language" + }, + { + "value": "erlang", + "description": "erlang language" + }, + { + "value": "go", + "description": "go language" + }, + { + "value": "gomodule", + "description": "gomodule language" + }, + { + "value": "gradle", + "description": "gradle language" + }, + { + "value": "java", + "description": "java language" + }, + { + "value": "javascript", + "description": "javascript language" + }, + { + "value": "php", + "description": "php language" + }, + { + "value": "python", + "description": "python language" + }, + { + "value": "ruby", + "description": "ruby language" + }, + { + "value": "rust", + "description": "rust language" + }, + { + "value": "swift", + "description": "swift language" + } + ] + }, + "description": "The programming language used." + }, + "ManifestGenerationMode": { + "type": "string", + "enum": [ + "enabled", + "disabled" + ], + "x-ms-enum": { + "name": "ManifestGenerationMode", + "modelAsString": true, + "values": [ + { + "value": "enabled", + "description": "Manifests will be generated" + }, + { + "value": "disabled", + "description": "Manifests will not be generated" + } + ] + }, + "description": "The mode of generation to be used for generating Manifest." + }, + "DockerfileGenerationMode": { + "type": "string", + "enum": [ + "enabled", + "disabled" + ], + "x-ms-enum": { + "name": "DockerfileGenerationMode", + "modelAsString": true, + "values": [ + { + "value": "enabled", + "description": "Dockerfiles will be generated" + }, + { + "value": "disabled", + "description": "Dockerfiles will not be generated" + } + ] + }, + "description": "The mode of generation to be used for generating Dockerfiles." + }, + "GenerationManifestType": { + "type": "string", + "enum": [ + "helm", + "kube" + ], + "x-ms-enum": { + "name": "GenerationManifestType", + "modelAsString": true, + "values": [ + { + "value": "helm", + "description": "Helm manifests" + }, + { + "value": "kube", + "description": "Kubernetes manifests" + } + ] + }, + "description": "Determines the type of manifests to be generated." + }, + "WorkflowRun": { + "type": "object", + "properties": { + "succeeded": { + "type": "boolean", + "readOnly": true, + "description": "Describes if the workflow run succeeded." + }, + "workflowRunURL": { + "type": "string", + "readOnly": true, + "description": "URL to the run of the workflow." + }, + "lastRunAt": { + "type": "string", + "readOnly": true, + "format": "date-time", + "description": "The timestamp of the last workflow run." + }, + "workflowRunStatus": { + "$ref": "#/definitions/WorkflowRunStatus" + } + } + }, + "WorkflowRunStatus": { + "type": "string", + "enum": [ + "queued", + "inprogress", + "completed" + ], + "x-ms-enum": { + "name": "WorkflowRunStatus", + "modelAsString": true, + "values": [ + { + "value": "queued", + "description": "Workflow run is queued" + }, + { + "value": "inprogress", + "description": "Workflow run is inprogress" + }, + { + "value": "completed", + "description": "Workflow run is completed" + } + ] + }, + "description": "Describes the status of the workflow run" + }, + "ACR": { + "type": "object", + "description": "Information on the azure container registry", + "properties": { + "acrSubscriptionId": { + "type": "string", + "description": "ACR subscription id" + }, + "acrResourceGroup": { + "type": "string", + "description": "ACR resource group" + }, + "acrRegistryName": { + "type": "string", + "description": "ACR registry" + }, + "acrRepositoryName": { + "type": "string", + "description": "ACR repository" + } + } + }, + "GeneratePreviewArtifactsResponse": { + "type": "object", + "description": "Dockerfile and manifest artifacts generated as a preview are returned as a map", + "additionalProperties": { + "type": "string" + } + }, + "GitHubOAuthInfoResponse": { + "type": "object", + "description": "URL used to authorize the Developer Hub GitHub App", + "properties": { + "authURL": { + "type": "string", + "description": "URL for authorizing the Developer Hub GitHub App" + }, + "token": { + "type": "string", + "description": "OAuth token used to make calls to GitHub" + } + } + }, + "TagsObject": { + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + }, + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "DeleteWorkflowResponse": { + "type": "object", + "properties": { + "status": { + "type": "string", + "description": "delete status message" + } + }, + "description": "delete response if content must be provided on delete operation" + }, + "GitHubOAuthCallRequest": { + "type": "object", + "properties": { + "redirectUrl": { + "type": "string", + "description": "The URL the client will redirect to on successful authentication. If empty, no redirect will occur." + } + }, + "description": "GitHubOAuth request object" + }, + "GitHubOAuthResponse": { + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "description": "Properties of a workflow.", + "$ref": "#/definitions/GitHubOAuthProperties", + "x-ms-client-flatten": true + } + }, + "description": "Singleton response of GitHubOAuth containing " + }, + "GitHubOAuthProperties": { + "type": "object", + "properties": { + "username": { + "type": "string", + "description": "user making request" + } + }, + "description": "The response from List GitHubOAuth operation." + }, + "GitHubOAuthListResponse": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/GitHubOAuthResponse" + }, + "description": "Singleton list response containing one GitHubOAuthResponse response" + } + }, + "description": "The response from List GitHubOAuth operation." + } + }, + "parameters": { + "ManagedClusterParameter": { + "name": "managedClusterResource", + "in": "query", + "required": false, + "type": "string", + "description": "The ManagedCluster resource associated with the workflows.", + "x-ms-parameter-location": "method" + }, + "WorkflowNameParameter": { + "name": "workflowName", + "in": "path", + "required": true, + "type": "string", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-zA-Z0-9]$|^[a-zA-Z0-9][-_a-zA-Z0-9]{0,61}[a-zA-Z0-9]$", + "description": "The name of the workflow resource.", + "x-ms-parameter-location": "method" + }, + "GitHubOAuthCodeParameter": { + "name": "code", + "in": "query", + "required": true, + "type": "string", + "description": "The code response from authenticating the GitHub App.", + "x-ms-parameter-location": "method" + }, + "GitHubOAuthStateParameter": { + "name": "state", + "in": "query", + "required": true, + "type": "string", + "description": "The state response from authenticating the GitHub App.", + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/developerhub/resource-manager/readme.md b/specification/developerhub/resource-manager/readme.md index 9e5198a55331..0d0db5e7ea51 100644 --- a/specification/developerhub/resource-manager/readme.md +++ b/specification/developerhub/resource-manager/readme.md @@ -26,7 +26,16 @@ These are the global settings for the DeveloperHub API. ```yaml openapi-type: arm -tag: package-preview-2022-04 +tag: package-preview-2022-10 +``` + +### Tag: package-preview-2022-10 + +These settings apply only when `--tag=package-preview-2022-10` is specified on the command line. + +```yaml $(tag) == 'package-preview-2022-10' +input-file: + - Microsoft.DevHub/preview/2022-10-11-preview/workflow.json ``` ### Tag: package-preview-2022-04 From 0de386a47454f277f89563c616992d6defa0bf98 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 7 Apr 2023 13:57:18 +0800 Subject: [PATCH 23/28] Update readme.python.md (#23208) --- .../resourceconnector/resource-manager/readme.python.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/resourceconnector/resource-manager/readme.python.md b/specification/resourceconnector/resource-manager/readme.python.md index 9fc171412315..5dbd787e4587 100644 --- a/specification/resourceconnector/resource-manager/readme.python.md +++ b/specification/resourceconnector/resource-manager/readme.python.md @@ -4,6 +4,7 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. ``` yaml $(python) +title: ResourceConnectorMgmtClient azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION package-name: azure-mgmt-resourceconnector From 4e5305a5734f8f458b45fe229f742e41800f0653 Mon Sep 17 00:00:00 2001 From: Karishma Daga Date: Fri, 7 Apr 2023 00:46:21 -0700 Subject: [PATCH 24/28] fixing async response type for machinelearningservices-2023-02-01-preview (#23105) * fixing regex pattern and async response type * remove update to regex --- .../preview/2023-02-01-preview/mfe.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-02-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-02-01-preview/mfe.json index 49e8fb2c2e34..ee56836dafe2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-02-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-02-01-preview/mfe.json @@ -1506,7 +1506,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "original-uri" } } }, @@ -1860,7 +1860,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "original-uri" } } }, @@ -6725,7 +6725,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "original-uri" } } }, @@ -7048,7 +7048,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "original-uri" } } }, @@ -7659,7 +7659,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "original-uri" } } }, @@ -7982,7 +7982,7 @@ }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" + "final-state-via": "original-uri" } } }, From 844b06b77ca841a151a6aa2a459f126e277f3c77 Mon Sep 17 00:00:00 2001 From: vikotha <81368129+vikotha@users.noreply.github.com> Date: Fri, 7 Apr 2023 14:23:17 +0530 Subject: [PATCH 25/28] Fix lint error for Datadog RP (#23477) * Fix link error for Datadog RP * Fix version --- .../stable/2021-03-01/examples/Monitors_Delete.json | 6 +++++- .../stable/2022-06-01/examples/Monitors_Delete.json | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/specification/datadog/resource-manager/Microsoft.Datadog/stable/2021-03-01/examples/Monitors_Delete.json b/specification/datadog/resource-manager/Microsoft.Datadog/stable/2021-03-01/examples/Monitors_Delete.json index dc0e9e0e9aee..f499577c6071 100644 --- a/specification/datadog/resource-manager/Microsoft.Datadog/stable/2021-03-01/examples/Monitors_Delete.json +++ b/specification/datadog/resource-manager/Microsoft.Datadog/stable/2021-03-01/examples/Monitors_Delete.json @@ -7,7 +7,11 @@ }, "responses": { "200": {}, - "202": {}, + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/subid/resourceGroups/peerTest/providers/Microsoft.Datadog/monitors/test?api-version=2021-03-01" + } + }, "204": {} } } diff --git a/specification/datadog/resource-manager/Microsoft.Datadog/stable/2022-06-01/examples/Monitors_Delete.json b/specification/datadog/resource-manager/Microsoft.Datadog/stable/2022-06-01/examples/Monitors_Delete.json index b8a774a7cd15..03d44f1d64ec 100644 --- a/specification/datadog/resource-manager/Microsoft.Datadog/stable/2022-06-01/examples/Monitors_Delete.json +++ b/specification/datadog/resource-manager/Microsoft.Datadog/stable/2022-06-01/examples/Monitors_Delete.json @@ -7,7 +7,11 @@ }, "responses": { "200": {}, - "202": {}, + "202": { + "headers": { + "Location": "https://management.azure.com/subscriptions/subid/resourceGroups/peerTest/providers/Microsoft.Datadog/monitors/test?api-version=2022-06-01" + } + }, "204": {} } } From 6b992c049ed7d6a95465d5c0a2234fc54c87b9bf Mon Sep 17 00:00:00 2001 From: Gaurav Date: Fri, 7 Apr 2023 14:31:12 +0530 Subject: [PATCH 26/28] merging billing fix to public repo (#23424) Co-authored-by: Gaurav Bang --- ...Monitors_SwitchBilling_MaximumSet_Gen.json | 74 +++++++++++++++++++ ...Monitors_SwitchBilling_MinimumSet_Gen.json | 74 +++++++++++++++++++ .../newrelic/NewRelic.Management/main.cadl | 2 +- .../preview/2022-07-01-preview/NewRelic.json | 16 ++++ ...Monitors_SwitchBilling_MaximumSet_Gen.json | 74 +++++++++++++++++++ ...Monitors_SwitchBilling_MinimumSet_Gen.json | 74 +++++++++++++++++++ .../stable/2022-07-01/NewRelic.json | 16 ++++ ...Monitors_SwitchBilling_MaximumSet_Gen.json | 74 +++++++++++++++++++ ...Monitors_SwitchBilling_MinimumSet_Gen.json | 74 +++++++++++++++++++ 9 files changed, 477 insertions(+), 1 deletion(-) diff --git a/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MaximumSet_Gen.json b/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MaximumSet_Gen.json index 63b8c6f81886..9d73a790743e 100644 --- a/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MaximumSet_Gen.json +++ b/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MaximumSet_Gen.json @@ -19,6 +19,80 @@ } }, "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Accepted", + "monitoringStatus": "Enabled", + "marketplaceSubscriptionStatus": "Active", + "marketplaceSubscriptionId": "jizcsbgrdjhrfqqvvruhgftqhra", + "newRelicAccountProperties": { + "userId": "vcscxlncofcuduadesd", + "accountInfo": { + "accountId": "xhqmg", + "region": "ljcf" + }, + "organizationInfo": { + "organizationId": "k" + }, + "singleSignOnProperties": { + "singleSignOnState": "Initial", + "enterpriseAppId": "kwiwfz", + "singleSignOnUrl": "kvseueuljsxmfwpqctz", + "provisioningState": "Accepted" + } + }, + "userInfo": { + "firstName": "vdftzcggirefejajwahhwhyibutramdaotvnuf", + "lastName": "bcsztgqovdlmzfkjdrngidwzqsevagexzzilnlc", + "emailAddress": "%6%@4-g.N1.3F-kI1.Ue-.lJso", + "phoneNumber": "krf", + "country": "hslqnwdanrconqyekwbnttaetv" + }, + "planData": { + "usageType": "PAYG", + "billingCycle": "YEARLY", + "planDetails": "tbbiaga", + "effectiveDate": "2022-12-05T14:11:37.786Z" + }, + "liftrResourceCategory": "Unknown", + "liftrResourcePreference": 12, + "orgCreationSource": "LIFTR", + "accountCreationSource": "LIFTR" + }, + "identity": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "tenantId": "cac47a92-2856-11ed-a261-0242ac120002", + "type": "None", + "userAssignedIdentities": { + "key8903": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "clientId": "cac47a92-2856-11ed-a261-0242ac120002" + } + } + }, + "tags": { + "key6976": "oaxfhf" + }, + "location": "k", + "id": "ilrwkvbuwu", + "name": "fteaqmtwspcfgyopqzrepiqu", + "type": "hdj", + "systemData": { + "createdBy": "pcdjzdldbwsdlfi", + "createdByType": "User", + "createdAt": "2022-12-05T14:11:37.787Z", + "lastModifiedBy": "xbsjrxmwwlmpnpvcica", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-12-05T14:11:37.787Z" + } + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://contoso.com/operationstatus" + } + }, "204": {} } } diff --git a/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MinimumSet_Gen.json b/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MinimumSet_Gen.json index be0dfbff8e2e..faea5e3503f8 100644 --- a/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MinimumSet_Gen.json +++ b/specification/newrelic/NewRelic.Management/examples/Monitors_SwitchBilling_MinimumSet_Gen.json @@ -11,6 +11,80 @@ } }, "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Accepted", + "monitoringStatus": "Enabled", + "marketplaceSubscriptionStatus": "Active", + "marketplaceSubscriptionId": "jizcsbgrdjhrfqqvvruhgftqhra", + "newRelicAccountProperties": { + "userId": "vcscxlncofcuduadesd", + "accountInfo": { + "accountId": "xhqmg", + "region": "ljcf" + }, + "organizationInfo": { + "organizationId": "k" + }, + "singleSignOnProperties": { + "singleSignOnState": "Initial", + "enterpriseAppId": "kwiwfz", + "singleSignOnUrl": "kvseueuljsxmfwpqctz", + "provisioningState": "Accepted" + } + }, + "userInfo": { + "firstName": "vdftzcggirefejajwahhwhyibutramdaotvnuf", + "lastName": "bcsztgqovdlmzfkjdrngidwzqsevagexzzilnlc", + "emailAddress": "%6%@4-g.N1.3F-kI1.Ue-.lJso", + "phoneNumber": "krf", + "country": "hslqnwdanrconqyekwbnttaetv" + }, + "planData": { + "usageType": "PAYG", + "billingCycle": "YEARLY", + "planDetails": "tbbiaga", + "effectiveDate": "2022-12-05T14:11:37.786Z" + }, + "liftrResourceCategory": "Unknown", + "liftrResourcePreference": 12, + "orgCreationSource": "LIFTR", + "accountCreationSource": "LIFTR" + }, + "identity": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "tenantId": "cac47a92-2856-11ed-a261-0242ac120002", + "type": "None", + "userAssignedIdentities": { + "key8903": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "clientId": "cac47a92-2856-11ed-a261-0242ac120002" + } + } + }, + "tags": { + "key6976": "oaxfhf" + }, + "location": "k", + "id": "ilrwkvbuwu", + "name": "fteaqmtwspcfgyopqzrepiqu", + "type": "hdj", + "systemData": { + "createdBy": "pcdjzdldbwsdlfi", + "createdByType": "User", + "createdAt": "2022-12-05T14:11:37.787Z", + "lastModifiedBy": "xbsjrxmwwlmpnpvcica", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-12-05T14:11:37.787Z" + } + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://contoso.com/operationstatus" + } + }, "204": {} } } diff --git a/specification/newrelic/NewRelic.Management/main.cadl b/specification/newrelic/NewRelic.Management/main.cadl index 5fcbde78e985..c2a458956bf3 100644 --- a/specification/newrelic/NewRelic.Management/main.cadl +++ b/specification/newrelic/NewRelic.Management/main.cadl @@ -100,7 +100,7 @@ interface Monitors { op SwitchBilling( ...ResourceInstanceParameters, ...SwitchBillingParameter - ): void | ErrorResponse; + ): ArmResponse | ArmAcceptedResponse | void | ErrorResponse; @post @doc("Get metric rules") diff --git a/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/NewRelic.json b/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/NewRelic.json index 9659fac150d9..d2cfe38e3fa8 100644 --- a/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/NewRelic.json +++ b/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/NewRelic.json @@ -743,6 +743,22 @@ } ], "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/NewRelicMonitorResource" + } + }, + "202": { + "description": "Resource operation accepted.", + "headers": { + "Retry-After": { + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status.", + "type": "integer", + "format": "int32" + } + } + }, "204": { "description": "There is no content to send for this request, but the headers may be useful. " }, diff --git a/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MaximumSet_Gen.json b/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MaximumSet_Gen.json index 63b8c6f81886..9d73a790743e 100644 --- a/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MaximumSet_Gen.json +++ b/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MaximumSet_Gen.json @@ -19,6 +19,80 @@ } }, "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Accepted", + "monitoringStatus": "Enabled", + "marketplaceSubscriptionStatus": "Active", + "marketplaceSubscriptionId": "jizcsbgrdjhrfqqvvruhgftqhra", + "newRelicAccountProperties": { + "userId": "vcscxlncofcuduadesd", + "accountInfo": { + "accountId": "xhqmg", + "region": "ljcf" + }, + "organizationInfo": { + "organizationId": "k" + }, + "singleSignOnProperties": { + "singleSignOnState": "Initial", + "enterpriseAppId": "kwiwfz", + "singleSignOnUrl": "kvseueuljsxmfwpqctz", + "provisioningState": "Accepted" + } + }, + "userInfo": { + "firstName": "vdftzcggirefejajwahhwhyibutramdaotvnuf", + "lastName": "bcsztgqovdlmzfkjdrngidwzqsevagexzzilnlc", + "emailAddress": "%6%@4-g.N1.3F-kI1.Ue-.lJso", + "phoneNumber": "krf", + "country": "hslqnwdanrconqyekwbnttaetv" + }, + "planData": { + "usageType": "PAYG", + "billingCycle": "YEARLY", + "planDetails": "tbbiaga", + "effectiveDate": "2022-12-05T14:11:37.786Z" + }, + "liftrResourceCategory": "Unknown", + "liftrResourcePreference": 12, + "orgCreationSource": "LIFTR", + "accountCreationSource": "LIFTR" + }, + "identity": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "tenantId": "cac47a92-2856-11ed-a261-0242ac120002", + "type": "None", + "userAssignedIdentities": { + "key8903": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "clientId": "cac47a92-2856-11ed-a261-0242ac120002" + } + } + }, + "tags": { + "key6976": "oaxfhf" + }, + "location": "k", + "id": "ilrwkvbuwu", + "name": "fteaqmtwspcfgyopqzrepiqu", + "type": "hdj", + "systemData": { + "createdBy": "pcdjzdldbwsdlfi", + "createdByType": "User", + "createdAt": "2022-12-05T14:11:37.787Z", + "lastModifiedBy": "xbsjrxmwwlmpnpvcica", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-12-05T14:11:37.787Z" + } + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://contoso.com/operationstatus" + } + }, "204": {} } } diff --git a/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MinimumSet_Gen.json b/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MinimumSet_Gen.json index be0dfbff8e2e..faea5e3503f8 100644 --- a/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MinimumSet_Gen.json +++ b/specification/newrelic/resource-manager/NewRelic.Observability/preview/2022-07-01-preview/examples/Monitors_SwitchBilling_MinimumSet_Gen.json @@ -11,6 +11,80 @@ } }, "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Accepted", + "monitoringStatus": "Enabled", + "marketplaceSubscriptionStatus": "Active", + "marketplaceSubscriptionId": "jizcsbgrdjhrfqqvvruhgftqhra", + "newRelicAccountProperties": { + "userId": "vcscxlncofcuduadesd", + "accountInfo": { + "accountId": "xhqmg", + "region": "ljcf" + }, + "organizationInfo": { + "organizationId": "k" + }, + "singleSignOnProperties": { + "singleSignOnState": "Initial", + "enterpriseAppId": "kwiwfz", + "singleSignOnUrl": "kvseueuljsxmfwpqctz", + "provisioningState": "Accepted" + } + }, + "userInfo": { + "firstName": "vdftzcggirefejajwahhwhyibutramdaotvnuf", + "lastName": "bcsztgqovdlmzfkjdrngidwzqsevagexzzilnlc", + "emailAddress": "%6%@4-g.N1.3F-kI1.Ue-.lJso", + "phoneNumber": "krf", + "country": "hslqnwdanrconqyekwbnttaetv" + }, + "planData": { + "usageType": "PAYG", + "billingCycle": "YEARLY", + "planDetails": "tbbiaga", + "effectiveDate": "2022-12-05T14:11:37.786Z" + }, + "liftrResourceCategory": "Unknown", + "liftrResourcePreference": 12, + "orgCreationSource": "LIFTR", + "accountCreationSource": "LIFTR" + }, + "identity": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "tenantId": "cac47a92-2856-11ed-a261-0242ac120002", + "type": "None", + "userAssignedIdentities": { + "key8903": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "clientId": "cac47a92-2856-11ed-a261-0242ac120002" + } + } + }, + "tags": { + "key6976": "oaxfhf" + }, + "location": "k", + "id": "ilrwkvbuwu", + "name": "fteaqmtwspcfgyopqzrepiqu", + "type": "hdj", + "systemData": { + "createdBy": "pcdjzdldbwsdlfi", + "createdByType": "User", + "createdAt": "2022-12-05T14:11:37.787Z", + "lastModifiedBy": "xbsjrxmwwlmpnpvcica", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-12-05T14:11:37.787Z" + } + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://contoso.com/operationstatus" + } + }, "204": {} } } diff --git a/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/NewRelic.json b/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/NewRelic.json index caab32423f1a..3ed6178503bd 100644 --- a/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/NewRelic.json +++ b/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/NewRelic.json @@ -743,6 +743,22 @@ } ], "responses": { + "200": { + "description": "ARM operation completed successfully.", + "schema": { + "$ref": "#/definitions/NewRelicMonitorResource" + } + }, + "202": { + "description": "Resource operation accepted.", + "headers": { + "Retry-After": { + "description": "The Retry-After header can indicate how long the client should wait before polling the operation status.", + "type": "integer", + "format": "int32" + } + } + }, "204": { "description": "There is no content to send for this request, but the headers may be useful. " }, diff --git a/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MaximumSet_Gen.json b/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MaximumSet_Gen.json index cdfdeee60abe..1b85702b56de 100644 --- a/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MaximumSet_Gen.json +++ b/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MaximumSet_Gen.json @@ -19,6 +19,80 @@ } }, "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Accepted", + "monitoringStatus": "Enabled", + "marketplaceSubscriptionStatus": "Active", + "marketplaceSubscriptionId": "jizcsbgrdjhrfqqvvruhgftqhra", + "newRelicAccountProperties": { + "userId": "vcscxlncofcuduadesd", + "accountInfo": { + "accountId": "xhqmg", + "region": "ljcf" + }, + "organizationInfo": { + "organizationId": "k" + }, + "singleSignOnProperties": { + "singleSignOnState": "Initial", + "enterpriseAppId": "kwiwfz", + "singleSignOnUrl": "kvseueuljsxmfwpqctz", + "provisioningState": "Accepted" + } + }, + "userInfo": { + "firstName": "vdftzcggirefejajwahhwhyibutramdaotvnuf", + "lastName": "bcsztgqovdlmzfkjdrngidwzqsevagexzzilnlc", + "emailAddress": "%6%@4-g.N1.3F-kI1.Ue-.lJso", + "phoneNumber": "krf", + "country": "hslqnwdanrconqyekwbnttaetv" + }, + "planData": { + "usageType": "PAYG", + "billingCycle": "YEARLY", + "planDetails": "tbbiaga", + "effectiveDate": "2022-12-05T14:11:37.786Z" + }, + "liftrResourceCategory": "Unknown", + "liftrResourcePreference": 12, + "orgCreationSource": "LIFTR", + "accountCreationSource": "LIFTR" + }, + "identity": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "tenantId": "cac47a92-2856-11ed-a261-0242ac120002", + "type": "None", + "userAssignedIdentities": { + "key8903": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "clientId": "cac47a92-2856-11ed-a261-0242ac120002" + } + } + }, + "tags": { + "key6976": "oaxfhf" + }, + "location": "k", + "id": "ilrwkvbuwu", + "name": "fteaqmtwspcfgyopqzrepiqu", + "type": "hdj", + "systemData": { + "createdBy": "pcdjzdldbwsdlfi", + "createdByType": "User", + "createdAt": "2022-12-05T14:11:37.787Z", + "lastModifiedBy": "xbsjrxmwwlmpnpvcica", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-12-05T14:11:37.787Z" + } + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://contoso.com/operationstatus" + } + }, "204": {} } } diff --git a/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MinimumSet_Gen.json b/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MinimumSet_Gen.json index 72bb99bfed17..e87aedc2bede 100644 --- a/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MinimumSet_Gen.json +++ b/specification/newrelic/resource-manager/NewRelic.Observability/stable/2022-07-01/examples/Monitors_SwitchBilling_MinimumSet_Gen.json @@ -11,6 +11,80 @@ } }, "responses": { + "200": { + "body": { + "properties": { + "provisioningState": "Accepted", + "monitoringStatus": "Enabled", + "marketplaceSubscriptionStatus": "Active", + "marketplaceSubscriptionId": "jizcsbgrdjhrfqqvvruhgftqhra", + "newRelicAccountProperties": { + "userId": "vcscxlncofcuduadesd", + "accountInfo": { + "accountId": "xhqmg", + "region": "ljcf" + }, + "organizationInfo": { + "organizationId": "k" + }, + "singleSignOnProperties": { + "singleSignOnState": "Initial", + "enterpriseAppId": "kwiwfz", + "singleSignOnUrl": "kvseueuljsxmfwpqctz", + "provisioningState": "Accepted" + } + }, + "userInfo": { + "firstName": "vdftzcggirefejajwahhwhyibutramdaotvnuf", + "lastName": "bcsztgqovdlmzfkjdrngidwzqsevagexzzilnlc", + "emailAddress": "%6%@4-g.N1.3F-kI1.Ue-.lJso", + "phoneNumber": "krf", + "country": "hslqnwdanrconqyekwbnttaetv" + }, + "planData": { + "usageType": "PAYG", + "billingCycle": "YEARLY", + "planDetails": "tbbiaga", + "effectiveDate": "2022-12-05T14:11:37.786Z" + }, + "liftrResourceCategory": "Unknown", + "liftrResourcePreference": 12, + "orgCreationSource": "LIFTR", + "accountCreationSource": "LIFTR" + }, + "identity": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "tenantId": "cac47a92-2856-11ed-a261-0242ac120002", + "type": "None", + "userAssignedIdentities": { + "key8903": { + "principalId": "cac47a92-2856-11ed-a261-0242ac120002", + "clientId": "cac47a92-2856-11ed-a261-0242ac120002" + } + } + }, + "tags": { + "key6976": "oaxfhf" + }, + "location": "k", + "id": "ilrwkvbuwu", + "name": "fteaqmtwspcfgyopqzrepiqu", + "type": "hdj", + "systemData": { + "createdBy": "pcdjzdldbwsdlfi", + "createdByType": "User", + "createdAt": "2022-12-05T14:11:37.787Z", + "lastModifiedBy": "xbsjrxmwwlmpnpvcica", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-12-05T14:11:37.787Z" + } + } + }, + "202": { + "headers": { + "Azure-AsyncOperation": "https://contoso.com/operationstatus" + } + }, "204": {} } } From 619a2e4f0df97f04f9099c10940ddab068223b41 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 7 Apr 2023 10:47:04 -0700 Subject: [PATCH 27/28] use management.auzre.com endpoint --- .../stable/2023-05-01/containerInstance.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json index 35ea97365c2d..6b4540674ca7 100644 --- a/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json +++ b/specification/containerinstance/resource-manager/Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json @@ -4,7 +4,7 @@ "version": "2023-05-01", "title": "ContainerInstanceManagementClient" }, - "host": "eastus2euap.management.azure.com", + "host": "management.azure.com", "schemes": [ "https" ], From 83cb125bc924f946439d6bae29550d293ab11d41 Mon Sep 17 00:00:00 2001 From: FNU Arnav Date: Fri, 7 Apr 2023 11:06:13 -0700 Subject: [PATCH 28/28] fix package version in readme --- specification/containerinstance/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md index 954bfe8cd6f4..269e41768add 100644 --- a/specification/containerinstance/resource-manager/readme.md +++ b/specification/containerinstance/resource-manager/readme.md @@ -36,7 +36,7 @@ These settings apply only when `--tag=package-2023-05` is specified on the comma ```yaml $(tag) == 'package-2023-05' input-file: - Microsoft.ContainerInstance/stable/2023-05-01/containerInstance.json -tag: package-preview-2023-02 +tag: package-2023-05 ``` ### Tag: package-2023-05