From b4e9106b1e2f8da10cb501c4af3d12c44eb0e352 Mon Sep 17 00:00:00 2001 From: apmehrotra <117301390+apmehrotra@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:08:11 -0800 Subject: [PATCH 1/7] Adds base for updating Microsoft.HybridConnectivity from version preview/2022-05-01-preview to version 2023-03-15 --- .../examples/EndpointsDeleteDefault.json | 11 + .../examples/EndpointsGetCustom.json | 20 + .../examples/EndpointsGetDefault.json | 19 + .../2023-03-15/examples/EndpointsList.json | 31 + .../examples/EndpointsPatchDefault.json | 25 + .../EndpointsPostListCredentials.json | 21 + .../EndpointsPostListManagedProxyDetails.json | 19 + .../examples/EndpointsPutCustom.json | 27 + .../examples/EndpointsPutDefault.json | 25 + .../2023-03-15/examples/OperationsList.json | 93 +++ .../stable/2023-03-15/hybridconnectivity.json | 641 ++++++++++++++++++ 11 files changed, 932 insertions(+) create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json new file mode 100644 index 000000000000..6c83535b1983 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "default" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json new file mode 100644 index 000000000000..26076d841b7c --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "custom" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/custom", + "name": "custom", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "custom", + "resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace" + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json new file mode 100644 index 000000000000..19d534116770 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "default" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default", + "name": "default", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "default" + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json new file mode 100644 index 000000000000..194574a588eb --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default", + "name": "default", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "default" + } + }, + { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/custom", + "name": "custom", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "custom", + "resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace" + } + } + ] + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json new file mode 100644 index 000000000000..e2bb31a0b9af --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "default", + "EndpointResource": { + "properties": { + "type": "default" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default", + "name": "default", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "default", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json new file mode 100644 index 000000000000..fcb27369fd22 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "default", + "expiresin": 10800 + }, + "responses": { + "200": { + "body": { + "relay": { + "namespaceName": "azgnrelay-eastus-l1", + "namespaceNameSuffix": "servicebus.windows.net", + "hybridConnectionName": "microsoft.kubernetes/connectedclusters/a0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498/1619989456957411072", + "accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.kubernetes%2Fconnectedclusters%2Fa0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498%2F1619989456957411072%2F&sig=WxDwPF6AmmODaMHNnBGDSm773UG%2B%2Be", + "expiresOn": 1620000256 + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json new file mode 100644 index 000000000000..20189cecba97 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/arcGroup/providers/Microsoft.Compute/virtualMachines/vm00006", + "api-version": "2022-05-01-preview", + "endpointName": "default", + "ManagedProxyRequest": { + "service": "127.0.0.1:65035", + "hostname": "r.proxy.arc.com" + } + }, + "responses": { + "200": { + "body": { + "proxy": "uid.r.proxy.arc.com", + "expiresOn": 1620000256 + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json new file mode 100644 index 000000000000..a17aff44f5cd --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "custom", + "EndpointResource": { + "properties": { + "type": "custom", + "resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/custom", + "name": "custom", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "custom", + "resourceId": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.Relay/namespaces/custom-relay-namespace", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json new file mode 100644 index 000000000000..e2bb31a0b9af --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", + "api-version": "2022-05-01-preview", + "endpointName": "default", + "EndpointResource": { + "properties": { + "type": "default" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine/providers/Microsoft.HybridConnectivity/endpoints/default", + "name": "default", + "type": "Microsoft.HybridConnectivity/endpoints", + "properties": { + "type": "default", + "provisioningState": "Succeeded" + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json new file mode 100644 index 000000000000..a3bf99a08fb1 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json @@ -0,0 +1,93 @@ +{ + "parameters": { + "api-version": "2022-05-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.HybridConnectivity/operations/read", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "Operations", + "operation": "Get operations", + "description": "Get the list of Operations" + } + }, + { + "name": "Microsoft.HybridConnectivity/endpoints/read", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "endpoints", + "operation": "Get/List endpoints", + "description": "Get or list of endpoints to the target resource." + } + }, + { + "name": "Microsoft.HybridConnectivity/endpoints/write", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "endpoints", + "operation": "Create/Update endpoint", + "description": "Create or update the endpoint to the target resource." + } + }, + { + "name": "Microsoft.HybridConnectivity/endpoints/delete", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "endpoints", + "operation": "Delete endpoint", + "description": "Deletes the endpoint access to the target resource." + } + }, + { + "name": "Microsoft.HybridConnectivity/endpoints/listCredentials/action", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "endpoints", + "operation": "List credentials for endpoint access", + "description": "List the endpoint access credentials to the resource." + } + }, + { + "name": "Microsoft.HybridConnectivity/endpoints/listIngressGatewayCredentials/action", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "endpoints", + "operation": "List credentials for ingress gateway", + "description": "List the ingress gateway credentials to the resource." + } + }, + { + "name": "Microsoft.HybridConnectivity/register/action", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "Microsoft.HybridConnectivity", + "operation": "Register the Microsoft.HybridConnectivity", + "description": "Register the subscription for Microsoft.HybridConnectivity" + } + }, + { + "name": "Microsoft.HybridConnectivity/unregister/action", + "isDataAction": false, + "display": { + "provider": "Microsoft.HybridConnectivity", + "resource": "Microsoft.HybridConnectivity", + "operation": "Unregister the Microsoft.HybridConnectivity", + "description": "Unregister the subscription for Microsoft.HybridConnectivity" + } + } + ] + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json new file mode 100644 index 000000000000..7b86d61a7639 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json @@ -0,0 +1,641 @@ +{ + "swagger": "2.0", + "info": { + "title": "Hybrid Connectivity Management API", + "description": "REST API for Hybrid Connectivity", + "version": "2022-05-01-preview" + }, + "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.HybridConnectivity/operations": { + "get": { + "tags": [ + "Operations" + ], + "description": "Lists the available Hybrid Connectivity REST API operations.", + "operationId": "Operations_List", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityOperationsList": { + "$ref": "./examples/OperationsList.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation details.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints": { + "get": { + "tags": [ + "Endpoints" + ], + "description": "List of endpoints to the target resource.", + "operationId": "Endpoints_List", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsGet": { + "$ref": "./examples/EndpointsList.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + } + ], + "responses": { + "200": { + "description": "List of endpoints.", + "schema": { + "$ref": "#/definitions/EndpointsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}": { + "get": { + "tags": [ + "Endpoints" + ], + "description": "Gets the endpoint to the resource.", + "operationId": "Endpoints_Get", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsGetDefault": { + "$ref": "./examples/EndpointsGetDefault.json" + }, + "HybridConnectivityEndpointsGetCustom": { + "$ref": "./examples/EndpointsGetCustom.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "200": { + "description": "Endpoint details", + "schema": { + "$ref": "#/definitions/EndpointResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false + }, + "put": { + "tags": [ + "Endpoints" + ], + "description": "Create or update the endpoint to the target resource.", + "operationId": "Endpoints_CreateOrUpdate", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsPutDefault": { + "$ref": "./examples/EndpointsPutDefault.json" + }, + "HybridConnectivityEndpointsPutCustom": { + "$ref": "./examples/EndpointsPutCustom.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "name": "EndpointResource", + "description": "Endpoint details", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/EndpointResource" + } + } + ], + "responses": { + "200": { + "description": "Endpoint details.", + "schema": { + "$ref": "#/definitions/EndpointResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "tags": [ + "Endpoints" + ], + "description": "Update the endpoint to the target resource.", + "operationId": "Endpoints_Update", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsPatchDefault": { + "$ref": "./examples/EndpointsPatchDefault.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "name": "EndpointResource", + "description": "Endpoint details", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/EndpointResource" + } + } + ], + "responses": { + "200": { + "description": "Endpoint resource.", + "schema": { + "$ref": "#/definitions/EndpointResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "Endpoints" + ], + "description": "Deletes the endpoint access to the target resource.", + "operationId": "Endpoints_Delete", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsDeleteDefault": { + "$ref": "./examples/EndpointsDeleteDefault.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + } + ], + "responses": { + "200": { + "description": "The endpoint is deleted successfully." + }, + "204": { + "description": "The endpoint has been deleted already." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + } + } + }, + "/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}/listCredentials": { + "post": { + "tags": [ + "Endpoints" + ], + "description": "Gets the endpoint access credentials to the resource.", + "operationId": "Endpoints_ListCredentials", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsPostListCredentials": { + "$ref": "./examples/EndpointsPostListCredentials.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/AccessTokenExpirationParameter" + } + ], + "responses": { + "200": { + "description": "Endpoint access credentials", + "schema": { + "$ref": "#/definitions/EndpointAccessResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false + } + }, + "/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}/listManagedProxyDetails": { + "post": { + "tags": [ + "Endpoints" + ], + "description": "Fetches the managed proxy details ", + "operationId": "Endpoints_ListManagedProxyDetails", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsPostListManagedProxyDetails": { + "$ref": "./examples/EndpointsPostListManagedProxyDetails.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "name": "ManagedProxyRequest", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ManagedProxyRequest" + }, + "description": "Object of type ManagedProxyRequest" + } + ], + "responses": { + "200": { + "description": "Managed Proxy", + "schema": { + "$ref": "#/definitions/ManagedProxyResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false + } + } + }, + "definitions": { + "RelayNamespaceAccessProperties": { + "type": "object", + "description": "Azure relay hybrid connection access properties", + "required": [ + "namespaceName", + "namespaceNameSuffix", + "hybridConnectionName" + ], + "properties": { + "namespaceName": { + "type": "string", + "description": "The namespace name.", + "minLength": 1, + "maxLength": 200 + }, + "namespaceNameSuffix": { + "type": "string", + "description": "The suffix domain name of relay namespace.", + "minLength": 1, + "maxLength": 100 + }, + "hybridConnectionName": { + "type": "string", + "description": "Azure Relay hybrid connection name for the resource." + }, + "accessKey": { + "type": "string", + "description": "Access key for hybrid connection.", + "readOnly": true + }, + "expiresOn": { + "type": "integer", + "format": "int64", + "description": "The expiration of access key in unix time." + } + } + }, + "IngressGatewayResource": { + "description": "The ingress gateway access credentials", + "type": "object", + "properties": { + "relay": { + "$ref": "#/definitions/RelayNamespaceAccessProperties", + "x-ms-client-flatten": true + }, + "ingress": { + "$ref": "#/definitions/IngressProfileProperties", + "x-ms-client-flatten": true + } + } + }, + "IngressProfileProperties": { + "type": "object", + "description": "Ingress gateway profile", + "required": [ + "hostname", + "aadProfile" + ], + "properties": { + "hostname": { + "type": "string", + "description": "The ingress hostname." + }, + "aadProfile": { + "$ref": "#/definitions/AADProfileProperties", + "x-ms-client-flatten": true + } + } + }, + "AADProfileProperties": { + "type": "object", + "description": "The AAD Profile", + "required": [ + "serverId", + "tenantId" + ], + "properties": { + "serverId": { + "type": "string", + "description": "The arc ingress gateway server app id." + }, + "tenantId": { + "type": "string", + "description": "The target resource home tenant id." + } + } + }, + "EndpointAccessResource": { + "description": "The endpoint access for the target resource.", + "type": "object", + "properties": { + "relay": { + "$ref": "#/definitions/RelayNamespaceAccessProperties", + "x-ms-client-flatten": true + } + } + }, + "EndpointProperties": { + "type": "object", + "description": "Endpoint details", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "description": "The type of endpoint.", + "enum": [ + "default", + "custom" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true + } + }, + "resourceId": { + "type": "string", + "description": "The resource Id of the connectivity endpoint (optional)." + }, + "provisioningState": { + "type": "string", + "readOnly": true, + "description": "The resource provisioning state." + } + } + }, + "EndpointResource": { + "description": "The endpoint for the target resource.", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" + } + ], + "properties": { + "systemData": { + "description": "System data of endpoint resource", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "x-ms-client-flatten": true + }, + "properties": { + "description": "The endpoint properties.", + "$ref": "#/definitions/EndpointProperties", + "x-ms-client-flatten": true + } + } + }, + "EndpointsList": { + "description": "The list of endpoints.", + "type": "object", + "properties": { + "nextLink": { + "description": "The link used to get the next page of endpoints list.", + "type": "string" + }, + "value": { + "description": "The list of endpoint.", + "type": "array", + "items": { + "$ref": "#/definitions/EndpointResource" + } + } + } + }, + "ManagedProxyResource": { + "type": "object", + "description": "Managed Proxy", + "required": [ + "proxy", + "expiresOn" + ], + "properties": { + "proxy": { + "type": "string", + "description": "The short lived proxy name." + }, + "expiresOn": { + "type": "integer", + "format": "int64", + "description": "The expiration time of short lived proxy name in unix epoch." + } + } + }, + "ManagedProxyRequest": { + "type": "object", + "description": "Represent ManageProxy Request object.", + "required": [ + "service" + ], + "properties": { + "service": { + "type": "string", + "description": "The name of the service." + }, + "hostname": { + "type": "string", + "description": "The target host name." + } + } + } + }, + "parameters": { + "ResourceUriParameter": { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The fully qualified Azure Resource manager identifier of the resource to be connected.", + "x-ms-skip-url-encoding": true, + "x-ms-parameter-location": "method" + }, + "EndpointNameParameter": { + "name": "endpointName", + "in": "path", + "required": true, + "type": "string", + "description": "The endpoint name.", + "x-ms-skip-url-encoding": true, + "x-ms-parameter-location": "method" + }, + "AccessTokenExpirationParameter": { + "name": "expiresin", + "in": "query", + "required": false, + "type": "integer", + "format": "int64", + "default": 10800, + "minimum": 600, + "maximum": 10800, + "description": "The is how long the endpoint access token is valid (in seconds).", + "x-ms-parameter-location": "method" + } + } +} From 48c039b20f27e59dc9c7494be0ae64dfaeef9c6d Mon Sep 17 00:00:00 2001 From: apmehrotra <117301390+apmehrotra@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:08:15 -0800 Subject: [PATCH 2/7] Updates readme --- .../resource-manager/readme.md | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/specification/hybridconnectivity/resource-manager/readme.md b/specification/hybridconnectivity/resource-manager/readme.md index a83f579d81f5..ed13b7da366b 100644 --- a/specification/hybridconnectivity/resource-manager/readme.md +++ b/specification/hybridconnectivity/resource-manager/readme.md @@ -24,23 +24,32 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor These are the global settings for the hybridconnectivity. -```yaml +``` yaml openapi-type: arm openapi-subtype: rpaas tag: package-2021-10-06-preview ``` -```yaml +``` yaml openapi-type: arm openapi-subtype: rpaas -tag: package-2022-05-01-preview +tag: package-2023-03 ``` + +### Tag: package-2023-03 + +These settings apply only when `--tag=package-2023-03` is specified on the command line. + +```yaml $(tag) == 'package-2023-03' +input-file: + - Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json +``` ### Tag: package-2021-10-06-preview These settings apply only when `--tag=package-2021-10-06-preview` is specified on the command line. -```yaml $(tag) == 'package-2021-10-06-preview' +``` yaml $(tag) == 'package-2021-10-06-preview' input-file: - Microsoft.HybridConnectivity/preview/2021-10-06-preview/hybridconnectivity.json ``` @@ -49,7 +58,7 @@ input-file: These settings apply only when `--tag=package-2022-05-01-preview` is specified on the command line. -```yaml $(tag) == 'package-2022-05-01-preview' +``` yaml $(tag) == 'package-2022-05-01-preview' input-file: - Microsoft.HybridConnectivity/preview/2022-05-01-preview/hybridconnectivity.json ``` @@ -63,7 +72,7 @@ input-file: This section describes what SDK should be generated by the automatic system. This is not used by Autorest itself. -```yaml $(swagger-to-sdk) +``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net-track2 - repo: azure-sdk-for-python-track2 @@ -74,6 +83,7 @@ swagger-to-sdk: - repo: azure-cli-extensions - repo: azure-powershell ``` + ## Az See configuration in [readme.az.md](./readme.az.md) From cd3e8f5b83e0e61b6de4f3cdd4457c909402c57b Mon Sep 17 00:00:00 2001 From: apmehrotra <117301390+apmehrotra@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:08:18 -0800 Subject: [PATCH 3/7] Updates API version in new specs and examples --- .../stable/2023-03-15/examples/EndpointsDeleteDefault.json | 2 +- .../stable/2023-03-15/examples/EndpointsGetCustom.json | 2 +- .../stable/2023-03-15/examples/EndpointsGetDefault.json | 2 +- .../stable/2023-03-15/examples/EndpointsList.json | 2 +- .../stable/2023-03-15/examples/EndpointsPatchDefault.json | 2 +- .../2023-03-15/examples/EndpointsPostListCredentials.json | 2 +- .../examples/EndpointsPostListManagedProxyDetails.json | 2 +- .../stable/2023-03-15/examples/EndpointsPutCustom.json | 2 +- .../stable/2023-03-15/examples/EndpointsPutDefault.json | 2 +- .../stable/2023-03-15/examples/OperationsList.json | 2 +- .../stable/2023-03-15/hybridconnectivity.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json index 6c83535b1983..6ecd9b45175b 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsDeleteDefault.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "default" }, "responses": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json index 26076d841b7c..e2a283ff0ea4 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetCustom.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "custom" }, "responses": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json index 19d534116770..32bd9c005462 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsGetDefault.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "default" }, "responses": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json index 194574a588eb..e5962a119dc5 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsList.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview" + "api-version": "2023-03-15" }, "responses": { "200": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json index e2bb31a0b9af..b80a973b8d97 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPatchDefault.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "default", "EndpointResource": { "properties": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json index fcb27369fd22..cf47e1c4a32b 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "default", "expiresin": 10800 }, diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json index 20189cecba97..1cd737e4b128 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/arcGroup/providers/Microsoft.Compute/virtualMachines/vm00006", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "default", "ManagedProxyRequest": { "service": "127.0.0.1:65035", diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json index a17aff44f5cd..f325b85c5522 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutCustom.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "custom", "EndpointResource": { "properties": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json index e2bb31a0b9af..b80a973b8d97 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json @@ -1,7 +1,7 @@ { "parameters": { "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", - "api-version": "2022-05-01-preview", + "api-version": "2023-03-15", "endpointName": "default", "EndpointResource": { "properties": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json index a3bf99a08fb1..69ae3aaa6ec9 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/OperationsList.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2022-05-01-preview" + "api-version": "2023-03-15" }, "responses": { "200": { diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json index 7b86d61a7639..9ab751a2ad8d 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json @@ -3,7 +3,7 @@ "info": { "title": "Hybrid Connectivity Management API", "description": "REST API for Hybrid Connectivity", - "version": "2022-05-01-preview" + "version": "2023-03-15" }, "host": "management.azure.com", "schemes": [ From 86a9256c350c68705ecf9fca746641462c9eb84e Mon Sep 17 00:00:00 2001 From: Apoorv Mehrotra Date: Wed, 16 Nov 2022 09:32:56 -0800 Subject: [PATCH 4/7] Adding upcoming changes for GA --- .../EndpointsPostListCredentials.json | 8 ++- .../EndpointsPostListManagedProxyDetails.json | 3 +- .../examples/EndpointsPutDefault.json | 14 ++++- .../stable/2023-03-15/hybridconnectivity.json | 55 +++++++++++++++++++ .../resource-manager/readme.md | 17 +++--- 5 files changed, 84 insertions(+), 13 deletions(-) diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json index cf47e1c4a32b..8be6d54d920d 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json @@ -3,7 +3,10 @@ "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/hybridRG/providers/Microsoft.HybridCompute/machines/testMachine", "api-version": "2023-03-15", "endpointName": "default", - "expiresin": 10800 + "expiresin": 10800, + "ListCredentialsRequest": { + "service": "127.0.0.1:65035" + } }, "responses": { "200": { @@ -13,7 +16,8 @@ "namespaceNameSuffix": "servicebus.windows.net", "hybridConnectionName": "microsoft.kubernetes/connectedclusters/a0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498/1619989456957411072", "accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.kubernetes%2Fconnectedclusters%2Fa0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498%2F1619989456957411072%2F&sig=WxDwPF6AmmODaMHNnBGDSm773UG%2B%2Be", - "expiresOn": 1620000256 + "expiresOn": 1620000256, + "serviceConfiguationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG" } } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json index 1cd737e4b128..908554ef9dff 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json @@ -12,7 +12,8 @@ "200": { "body": { "proxy": "uid.r.proxy.arc.com", - "expiresOn": 1620000256 + "expiresOn": 1620000256, + "serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG" } } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json index b80a973b8d97..8d29da0977dc 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json @@ -5,7 +5,13 @@ "endpointName": "default", "EndpointResource": { "properties": { - "type": "default" + "type": "default", + "serviceConfigurations": [ + { + "name": "SSH", + "port": "22" + } + ] } } }, @@ -17,6 +23,12 @@ "type": "Microsoft.HybridConnectivity/endpoints", "properties": { "type": "default", + "serviceConfigurations": [ + { + "name": "SSH", + "port": "22" + } + ], "provisioningState": "Succeeded" } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json index 9ab751a2ad8d..fb2e30040921 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json @@ -331,6 +331,15 @@ }, { "$ref": "#/parameters/AccessTokenExpirationParameter" + }, + { + "name": "ListCredentialsRequest", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ListCredentialsRequest" + }, + "description": "Object of type ListCredentialsRequest" } ], "responses": { @@ -438,6 +447,10 @@ "type": "integer", "format": "int64", "description": "The expiration of access key in unix time." + }, + "serviceConfigurationToken": { + "type": "string", + "description": "The token to access the enabled service." } } }, @@ -528,9 +541,38 @@ "type": "string", "readOnly": true, "description": "The resource provisioning state." + }, + "serviceConfigurations": { + "type": "array", + "readOnly": true, + "description": "The enabled service configurations.", + "items": { + "$ref": "#/definitions/ServiceConfigurations" + } } } }, + "ServiceConfigurations": { + "properties": { + "name": { + "type": "string", + "description": "The type of service enabled.", + "enum": [ + "SSH", + "WAC" + ], + "x-ms-enum": { + "name": "ServiceNameType", + "modelAsString": true + } + }, + "port": { + "type": "string", + "description": "The port on which service is enabled." + } + }, + "type": "object" + }, "EndpointResource": { "description": "The endpoint for the target resource.", "type": "object", @@ -604,6 +646,19 @@ "description": "The target host name." } } + }, + "ListCredentialsRequest": { + "type": "object", + "description": "Represent ListCredentials Request object.", + "required": [ + "service" + ], + "properties": { + "service": { + "type": "string", + "description": "The name of the service." + } + } } }, "parameters": { diff --git a/specification/hybridconnectivity/resource-manager/readme.md b/specification/hybridconnectivity/resource-manager/readme.md index ed13b7da366b..5d851301e467 100644 --- a/specification/hybridconnectivity/resource-manager/readme.md +++ b/specification/hybridconnectivity/resource-manager/readme.md @@ -36,15 +36,6 @@ openapi-subtype: rpaas tag: package-2023-03 ``` - -### Tag: package-2023-03 - -These settings apply only when `--tag=package-2023-03` is specified on the command line. - -```yaml $(tag) == 'package-2023-03' -input-file: - - Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json -``` ### Tag: package-2021-10-06-preview These settings apply only when `--tag=package-2021-10-06-preview` is specified on the command line. @@ -63,6 +54,14 @@ input-file: - Microsoft.HybridConnectivity/preview/2022-05-01-preview/hybridconnectivity.json ``` +### Tag: package-2023-03-15 + +These settings apply only when `--tag=package-2023-03-15` is specified on the command line. + +``` yaml $(tag) == 'package-2023-03-15' +input-file: + - Microsoft.HybridConnectivity/preview/2023-03-15/hybridconnectivity.json +``` --- # Code Generation From 45bdaea5afb47f7a754f5f67979f27752662f5fe Mon Sep 17 00:00:00 2001 From: Apoorv Mehrotra Date: Wed, 16 Nov 2022 10:35:22 -0800 Subject: [PATCH 5/7] Adding service configuration --- .../2023-03-15/examples/EndpointsPostListCredentials.json | 2 +- .../stable/2023-03-15/hybridconnectivity.json | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json index 8be6d54d920d..d1c443f1d594 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json @@ -17,7 +17,7 @@ "hybridConnectionName": "microsoft.kubernetes/connectedclusters/a0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498/1619989456957411072", "accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.kubernetes%2Fconnectedclusters%2Fa0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498%2F1619989456957411072%2F&sig=WxDwPF6AmmODaMHNnBGDSm773UG%2B%2Be", "expiresOn": 1620000256, - "serviceConfiguationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG" + "serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG" } } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json index fb2e30040921..4890fd45a439 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json @@ -544,7 +544,7 @@ }, "serviceConfigurations": { "type": "array", - "readOnly": true, + "readOnly": false, "description": "The enabled service configurations.", "items": { "$ref": "#/definitions/ServiceConfigurations" @@ -627,6 +627,11 @@ "type": "integer", "format": "int64", "description": "The expiration time of short lived proxy name in unix epoch." + }, + "serviceConfigurationToken": { + "type": "integer", + "format": "int64", + "description": "The expiration time of short lived proxy name in unix epoch." } } }, From 1e2703b59578aea444ea53f7bb11b5eb297d2cc1 Mon Sep 17 00:00:00 2001 From: Apoorv Mehrotra Date: Wed, 16 Nov 2022 10:40:00 -0800 Subject: [PATCH 6/7] Adding serviceConfigurationToken --- .../EndpointsPostListCredentials.json | 4 +- ...intsPostListIngressGatewayCredentials.json | 28 +++++ .../EndpointsPostListManagedProxyDetails.json | 6 +- .../examples/EndpointsPutDefault.json | 20 ++-- .../stable/2023-03-15/hybridconnectivity.json | 107 ++++++++++++++---- .../resource-manager/readme.md | 9 +- 6 files changed, 129 insertions(+), 45 deletions(-) create mode 100644 specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListIngressGatewayCredentials.json diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json index d1c443f1d594..e5dae0c0e5d9 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListCredentials.json @@ -5,7 +5,7 @@ "endpointName": "default", "expiresin": 10800, "ListCredentialsRequest": { - "service": "127.0.0.1:65035" + "serviceName": "SSH" } }, "responses": { @@ -17,7 +17,7 @@ "hybridConnectionName": "microsoft.kubernetes/connectedclusters/a0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498/1619989456957411072", "accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.kubernetes%2Fconnectedclusters%2Fa0e1fd7d1d974ddf6b11a952d67679c9f12c006eee16861857a8268da4eb1498%2F1619989456957411072%2F&sig=WxDwPF6AmmODaMHNnBGDSm773UG%2B%2Be", "expiresOn": 1620000256, - "serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG" + "serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsinCN2zkG" } } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListIngressGatewayCredentials.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListIngressGatewayCredentials.json new file mode 100644 index 000000000000..430bf536e449 --- /dev/null +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListIngressGatewayCredentials.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "resourceUri": "subscriptions/f5bcc1d9-23af-4ae9-aca1-041d0f593a63/resourceGroups/arcGroup/providers/Microsoft.ArcPlaceHolder/ProvisionedClusters/cluster0", + "api-version": "2023-03-15", + "endpointName": "default", + "expiresin": 10800 + }, + "responses": { + "200": { + "body": { + "relay": { + "namespaceName": "relaynamespace", + "namespaceNameSuffix": "servicebus.windows.net", + "hybridConnectionName": "microsoft.arcplaceholder/provisionedclusters/000/1619989456957411072", + "accessKey": "SharedAccessSignature sr=http%3A%2F%2Fazgnrelay-eastus-l1.servicebus.windows.net%2Fmicrosoft.provisionedcluster%hci", + "expiresOn": 1620000256 + }, + "ingress": { + "hostname": "clusterhostname", + "aadProfile": { + "serverId": "6256c85f-0aad-4d50-b960-e6e9b21efe35", + "tenantId": "hy657tgh-8d16-42db-81b7-1234hygt67hy5" + } + } + } + } + } +} diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json index 908554ef9dff..c46ed6d97e39 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPostListManagedProxyDetails.json @@ -5,15 +5,15 @@ "endpointName": "default", "ManagedProxyRequest": { "service": "127.0.0.1:65035", - "hostname": "r.proxy.arc.com" + "hostname": "r.proxy.arc.com", + "serviceName": "WAC" } }, "responses": { "200": { "body": { "proxy": "uid.r.proxy.arc.com", - "expiresOn": 1620000256, - "serviceConfigurationToken": "SSHvjqH=pTlKql=RtMGw/-k5VFBxSYHIiq5ZgbGFcLkNrDNz5fDsIjL?inCN2zkG" + "expiresOn": 1620000256 } } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json index 8d29da0977dc..ef9c608b23f8 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json @@ -6,12 +6,14 @@ "EndpointResource": { "properties": { "type": "default", - "serviceConfigurations": [ - { - "name": "SSH", + "serviceConfigurations": { + "ssh": { "port": "22" + }, + "wac": { + "port": "80" } - ] + } } } }, @@ -23,12 +25,14 @@ "type": "Microsoft.HybridConnectivity/endpoints", "properties": { "type": "default", - "serviceConfigurations": [ - { - "name": "SSH", + "serviceConfigurations": { + "ssh": { "port": "22" + }, + "wac": { + "port": "80" } - ], + }, "provisioningState": "Succeeded" } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json index 4890fd45a439..061da27a46b9 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json @@ -359,6 +359,52 @@ "deprecated": false } }, + "/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}/listIngressGatewayCredentials": { + "post": { + "tags": [ + "Endpoints" + ], + "description": "Gets the ingress gateway endpoint credentials ", + "operationId": "Endpoints_ListIngressGatewayCredentials", + "produces": [ + "application/json" + ], + "x-ms-examples": { + "HybridConnectivityEndpointsPostListIngressGatewayCredentials": { + "$ref": "./examples/EndpointsPostListIngressGatewayCredentials.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ResourceUriParameter" + }, + { + "$ref": "#/parameters/EndpointNameParameter" + }, + { + "$ref": "#/parameters/AccessTokenExpirationParameter" + } + ], + "responses": { + "200": { + "description": "Ingress gateway access", + "schema": { + "$ref": "#/definitions/IngressGatewayResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "deprecated": false + } + }, "/{resourceUri}/providers/Microsoft.HybridConnectivity/endpoints/{endpointName}/listManagedProxyDetails": { "post": { "tags": [ @@ -543,8 +589,7 @@ "description": "The resource provisioning state." }, "serviceConfigurations": { - "type": "array", - "readOnly": false, + "type": "object", "description": "The enabled service configurations.", "items": { "$ref": "#/definitions/ServiceConfigurations" @@ -553,25 +598,24 @@ } }, "ServiceConfigurations": { + "type": "object", + "description": "The service configuration object definition where each key's value is additional property dictionary.", "properties": { - "name": { - "type": "string", - "description": "The type of service enabled.", - "enum": [ - "SSH", - "WAC" - ], - "x-ms-enum": { - "name": "ServiceNameType", - "modelAsString": true + "ssh": { + "type": "object", + "description": "Details for SSH service configuration.", + "additionalProperties": { + "type": "string" } }, - "port": { - "type": "string", - "description": "The port on which service is enabled." + "wac": { + "type": "object", + "description": "Details for WAC service configuration.", + "additionalProperties": { + "type": "string" + } } - }, - "type": "object" + } }, "EndpointResource": { "description": "The endpoint for the target resource.", @@ -627,11 +671,6 @@ "type": "integer", "format": "int64", "description": "The expiration time of short lived proxy name in unix epoch." - }, - "serviceConfigurationToken": { - "type": "integer", - "format": "int64", - "description": "The expiration time of short lived proxy name in unix epoch." } } }, @@ -649,6 +688,17 @@ "hostname": { "type": "string", "description": "The target host name." + }, + "serviceName": { + "type": "string", + "description": "The name of the service.", + "enum": [ + "SSH", + "WAC" + ], + "x-ms-enum": { + "name": "ServiceName" + } } } }, @@ -656,12 +706,19 @@ "type": "object", "description": "Represent ListCredentials Request object.", "required": [ - "service" + "serviceName" ], "properties": { - "service": { + "serviceName": { "type": "string", - "description": "The name of the service." + "description": "The name of the service.", + "enum": [ + "SSH", + "WAC" + ], + "x-ms-enum": { + "name": "ServiceName" + } } } } diff --git a/specification/hybridconnectivity/resource-manager/readme.md b/specification/hybridconnectivity/resource-manager/readme.md index 5d851301e467..e4307914ac46 100644 --- a/specification/hybridconnectivity/resource-manager/readme.md +++ b/specification/hybridconnectivity/resource-manager/readme.md @@ -24,16 +24,11 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor These are the global settings for the hybridconnectivity. -``` yaml -openapi-type: arm -openapi-subtype: rpaas -tag: package-2021-10-06-preview -``` ``` yaml openapi-type: arm openapi-subtype: rpaas -tag: package-2023-03 +tag: package-2023-03-15 ``` ### Tag: package-2021-10-06-preview @@ -60,7 +55,7 @@ These settings apply only when `--tag=package-2023-03-15` is specified on the co ``` yaml $(tag) == 'package-2023-03-15' input-file: - - Microsoft.HybridConnectivity/preview/2023-03-15/hybridconnectivity.json + - Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json ``` --- From 8063592b962ca31bf5f55b19c0f80b4544346fc3 Mon Sep 17 00:00:00 2001 From: Apoorv Mehrotra Date: Wed, 23 Nov 2022 15:26:54 -0800 Subject: [PATCH 7/7] Changing service configuration type --- .../examples/EndpointsPutDefault.json | 20 ++++--- .../stable/2023-03-15/hybridconnectivity.json | 54 ++++++++++--------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json index ef9c608b23f8..aa5461c0ca6f 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json @@ -6,14 +6,16 @@ "EndpointResource": { "properties": { "type": "default", - "serviceConfigurations": { - "ssh": { + "serviceConfigurations": [ + { + "serviceName": "SSH", "port": "22" }, - "wac": { + { + "serviceName": "WAC", "port": "80" } - } + ] } } }, @@ -25,14 +27,16 @@ "type": "Microsoft.HybridConnectivity/endpoints", "properties": { "type": "default", - "serviceConfigurations": { - "ssh": { + "serviceConfigurations": [ + { + "serviceName": "SSH", "port": "22" }, - "wac": { + { + "serviceName": "WAC", "port": "80" } - }, + ], "provisioningState": "Succeeded" } } diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json index 061da27a46b9..5550e8b3085a 100644 --- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json +++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json @@ -335,7 +335,6 @@ { "name": "ListCredentialsRequest", "in": "body", - "required": true, "schema": { "$ref": "#/definitions/ListCredentialsRequest" }, @@ -496,7 +495,8 @@ }, "serviceConfigurationToken": { "type": "string", - "description": "The token to access the enabled service." + "description": "The token to access the enabled service.", + "x-ms-secret": true } } }, @@ -589,33 +589,38 @@ "description": "The resource provisioning state." }, "serviceConfigurations": { - "type": "object", + "type": "array", "description": "The enabled service configurations.", "items": { - "$ref": "#/definitions/ServiceConfigurations" - } + "$ref": "#/definitions/ServiceConfiguration" + }, + "x-ms-identifiers": [ + "serviceName" + ] } } }, - "ServiceConfigurations": { - "type": "object", - "description": "The service configuration object definition where each key's value is additional property dictionary.", + "ServiceConfiguration": { + "description": "The service configuration object definition", "properties": { - "ssh": { - "type": "object", - "description": "Details for SSH service configuration.", - "additionalProperties": { - "type": "string" + "serviceName": { + "type": "string", + "description": "The type of service enabled.", + "enum": [ + "SSH", + "WAC" + ], + "x-ms-enum": { + "name": "serviceName", + "modelAsString": true } }, - "wac": { - "type": "object", - "description": "Details for WAC service configuration.", - "additionalProperties": { - "type": "string" - } + "port": { + "type": "string", + "description": "The port on which service is enabled." } - } + }, + "type": "object" }, "EndpointResource": { "description": "The endpoint for the target resource.", @@ -697,7 +702,8 @@ "WAC" ], "x-ms-enum": { - "name": "ServiceName" + "name": "serviceName", + "modelAsString": true } } } @@ -705,9 +711,6 @@ "ListCredentialsRequest": { "type": "object", "description": "Represent ListCredentials Request object.", - "required": [ - "serviceName" - ], "properties": { "serviceName": { "type": "string", @@ -717,7 +720,8 @@ "WAC" ], "x-ms-enum": { - "name": "ServiceName" + "name": "serviceName", + "modelAsString": true } } }