From 2ae215c97690491035d8a08b73a68f752462eba5 Mon Sep 17 00:00:00 2001 From: Sai Sankar Gochhayat Date: Wed, 22 Jun 2022 12:24:25 -0700 Subject: [PATCH 1/5] Fixed example on v2021-10-31-preview API --- .../2021-10-31-preview/examples/AppliancesCreate_Update.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2021-10-31-preview/examples/AppliancesCreate_Update.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2021-10-31-preview/examples/AppliancesCreate_Update.json index 157a71d5d617..03f9da30edb5 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2021-10-31-preview/examples/AppliancesCreate_Update.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2021-10-31-preview/examples/AppliancesCreate_Update.json @@ -4,6 +4,9 @@ "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", "resourceName": "appliance01", + "identity": { + "type": "SystemAssigned" + }, "parameters": { "location": "West US", "properties": { From 8485b3ae38e069ac4714725e8eddac48260864d2 Mon Sep 17 00:00:00 2001 From: Sai Sankar Gochhayat Date: Wed, 22 Jun 2022 12:28:57 -0700 Subject: [PATCH 2/5] Copied v2021-10-31-preview as new API --- .../2022-04-15-preview/appliances.json | 709 ++++++++++++++++++ .../examples/AppliancesCreate_Update.json | 82 ++ .../examples/AppliancesDelete.json | 12 + .../examples/AppliancesGet.json | 40 + .../AppliancesListByResourceGroup.json | 61 ++ .../AppliancesListBySubscription.json | 60 ++ .../AppliancesListClusterUserCredential.json | 26 + .../examples/AppliancesListOperations.json | 101 +++ .../examples/AppliancesPatch.json | 43 ++ 9 files changed, 1134 insertions(+) create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json new file mode 100644 index 000000000000..c3844954ed9c --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json @@ -0,0 +1,709 @@ +{ + "swagger": "2.0", + "info": { + "version": "2021-10-31-preview", + "title": "appliances", + "description": "The appliances Rest API spec." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/providers/Microsoft.ResourceConnector/operations": { + "get": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_ListOperations", + "description": "Lists all available Appliances operations.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Operation details.", + "schema": { + "$ref": "#/definitions/applianceOperationsList" + } + }, + "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" + }, + "x-ms-examples": { + "List Appliances operations": { + "$ref": "./examples/AppliancesListOperations.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.ResourceConnector/appliances": { + "get": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_ListBySubscription", + "summary": "Gets a list of Appliances in a subscription.", + "description": "Gets a list of Appliances in the specified subscription. The operation returns properties of each Appliance", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/applianceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Appliances by subscription": { + "$ref": "./examples/AppliancesListBySubscription.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances": { + "get": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_ListByResourceGroup", + "summary": "Gets a list of Appliances in the specified subscription and resource group.", + "description": "Gets a list of Appliances in the specified subscription and resource group. The operation returns properties of each Appliance.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/applianceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Appliances by resource group": { + "$ref": "./examples/AppliancesListByResourceGroup.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}": { + "get": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_Get", + "summary": "Gets an Appliance.", + "description": "Gets the details of an Appliance with a specified resource group and name.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/appliance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Appliance": { + "$ref": "./examples/AppliancesGet.json" + } + } + }, + "put": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_CreateOrUpdate", + "summary": "Creates or updates an Appliance.", + "description": "Creates or updates an Appliance in the specified Subscription and Resource Group.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/appliance" + }, + "description": "Parameters supplied to create or update an Appliance." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/appliance" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/appliance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Create/Update Appliance": { + "$ref": "./examples/AppliancesCreate_Update.json" + } + } + }, + "delete": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_Delete", + "summary": "Deletes an Appliance.", + "description": "Deletes an Appliance with the specified Resource Name, Resource Group, and Subscription Id.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + } + ], + "responses": { + "202": { + "description": "Accepted. The response indicates the delete operation is performed in the background." + }, + "204": { + "description": "NoContent. The response indicates the appliance resource is already deleted." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, + "x-ms-examples": { + "Delete Appliance": { + "$ref": "./examples/AppliancesDelete.json" + } + } + }, + "patch": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_Update", + "summary": "Updates an Appliance.", + "description": "Updates an Appliance with the specified Resource Name in the specified Resource Group and Subscription.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "x-ms-client-flatten": true, + "schema": { + "$ref": "#/definitions/patchableAppliance" + }, + "description": "The updatable fields of an existing Appliance." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/appliance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Update Appliance": { + "$ref": "./examples/AppliancesPatch.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}/listClusterUserCredential": { + "post": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_ListClusterUserCredential", + "summary": "Returns the cluster user credential.", + "description": "Returns the cluster user credentials for the dedicated appliance.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/applianceListCredentialResults" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ListClusterUserCredentialAppliance": { + "$ref": "./examples/AppliancesListClusterUserCredential.json" + } + } + } + } + }, + "parameters": { + "ResourceNameParameter": { + "name": "resourceName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method", + "minLength": 1, + "maxLength": 63, + "pattern": "^[a-zA-Z0-9]$|^[a-zA-Z0-9][-_a-zA-Z0-9]{0,61}[a-zA-Z0-9]$", + "description": "Appliances name." + } + }, + "definitions": { + "HybridConnectionConfig": { + "description": "Contains the REP (rendezvous endpoint) and “Listener” access token from notification service (NS).", + "type": "object", + "properties": { + "expirationTime": { + "description": "Timestamp when this token will be expired.", + "type": "integer", + "readOnly": true, + "format": "int64" + }, + "hybridConnectionName": { + "description": "Name of the connection", + "type": "string", + "readOnly": true + }, + "relay": { + "description": "Name of the notification service.", + "type": "string", + "readOnly": true + }, + "token": { + "description": "Listener access token", + "type": "string", + "readOnly": true + } + } + }, + "Identity": { + "description": "Identity for the resource.", + "type": "object", + "properties": { + "principalId": { + "description": "The principal ID of resource identity.", + "type": "string", + "readOnly": true + }, + "tenantId": { + "description": "The tenant ID of resource.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "The identity type.", + "type": "string", + "enum": [ + "SystemAssigned", + "None" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": true + } + } + } + }, + "appliance": { + "description": "Appliances definition.", + "type": "object", + "properties": { + "identity": { + "$ref": "#/definitions/Identity", + "description": "Identity for the resource." + }, + "properties": { + "$ref": "#/definitions/applianceProperties", + "description": "The set of properties specific to an Appliance", + "x-ms-client-flatten": true + }, + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "Metadata pertaining to creation and last modification of the resource", + "readOnly": true + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + } + ] + }, + "applianceCredentialKubeconfig": { + "description": "Cluster User Credential appliance.", + "type": "object", + "properties": { + "name": { + "description": "Name which contains the role of the kubeconfig.", + "type": "string", + "readOnly": true, + "enum": [ + "clusterUser" + ], + "x-ms-enum": { + "name": "AccessProfileType", + "modelAsString": true + } + }, + "value": { + "description": "Contains the kubeconfig value.", + "type": "string", + "readOnly": true + } + } + }, + "applianceListCredentialResults": { + "description": "The List Cluster User Credential appliance.", + "type": "object", + "properties": { + "hybridConnectionConfig": { + "$ref": "#/definitions/HybridConnectionConfig", + "description": "Contains the REP (rendezvous endpoint) and “Listener” access token from notification service (NS).", + "readOnly": true + }, + "kubeconfigs": { + "description": "The list of appliance kubeconfigs.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/applianceCredentialKubeconfig" + } + } + } + }, + "applianceListResult": { + "description": "The List Appliances operation response.", + "type": "object", + "properties": { + "nextLink": { + "description": "The URL to use for getting the next set of results.", + "type": "string", + "readOnly": true + }, + "value": { + "description": "The list of Appliances.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/appliance" + } + } + } + }, + "applianceOperation": { + "description": "Appliances operation.", + "type": "object", + "properties": { + "display": { + "$ref": "#/definitions/applianceOperationValueDisplay", + "description": "Describes the properties of an Appliances Operation Value Display.", + "x-ms-client-flatten": true + }, + "isDataAction": { + "description": "Is this Operation a data plane operation", + "type": "boolean", + "readOnly": true + }, + "name": { + "description": "The name of the compute operation.", + "type": "string", + "readOnly": true + }, + "origin": { + "description": "The origin of the compute operation.", + "type": "string", + "readOnly": true + } + } + }, + "applianceOperationValueDisplay": { + "description": "Describes the properties of an Appliances Operation Value Display.", + "type": "object", + "properties": { + "description": { + "description": "The description of the operation.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "The display name of the compute operation.", + "type": "string", + "readOnly": true + }, + "provider": { + "description": "The resource provider for the operation.", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "The display name of the resource the operation applies to.", + "type": "string", + "readOnly": true + } + } + }, + "applianceOperationsList": { + "description": "Lists of Appliances operations.", + "required": [ + "value" + ], + "type": "object", + "properties": { + "nextLink": { + "description": "Next page of operations.", + "type": "string" + }, + "value": { + "description": "Array of applianceOperation", + "type": "array", + "items": { + "$ref": "#/definitions/applianceOperation" + } + } + } + }, + "applianceProperties": { + "description": "Properties for an appliance.", + "type": "object", + "properties": { + "distro": { + "description": "Represents a supported Fabric/Infra. (AKSEdge etc...).", + "type": "string", + "default": "AKSEdge", + "enum": [ + "AKSEdge" + ], + "x-ms-enum": { + "name": "distro", + "modelAsString": true + } + }, + "infrastructureConfig": { + "description": "Contains infrastructure information about the Appliance", + "type": "object", + "properties": { + "provider": { + "description": "Information about the connected appliance.", + "type": "string", + "enum": [ + "VMWare", + "HCI", + "SCVMM" + ], + "x-ms-enum": { + "name": "provider", + "modelAsString": true + } + } + } + }, + "provisioningState": { + "description": "The current deployment or provisioning state, which only appears in the response.", + "type": "string", + "readOnly": true + }, + "publicKey": { + "description": "Certificates pair used to download MSI certificate from HIS", + "type": "string" + }, + "status": { + "description": "Appliance’s health and state of connection to on-prem", + "type": "string", + "readOnly": true, + "enum": [ + "WaitingForHeartbeat", + "Validating", + "Connected", + "Running" + ], + "x-ms-enum": { + "name": "status", + "modelAsString": true + } + }, + "version": { + "description": "Version of the Appliance", + "type": "string", + "readOnly": true + } + } + }, + "patchableAppliance": { + "description": "The Appliances patchable resource definition.", + "type": "object", + "x-ms-azure-resource": true, + "x-ms-client-flatten": true, + "properties": { + "tags": { + "description": "Resource tags", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json new file mode 100644 index 000000000000..03f9da30edb5 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json @@ -0,0 +1,82 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "appliance01", + "identity": { + "type": "SystemAssigned" + }, + "parameters": { + "location": "West US", + "properties": { + "distro": "AKSEdge", + "infrastructureConfig": { + "provider": "VMWare" + } + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testrg/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "appliance01", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Succeeded", + "status": "Connected", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "identity": { + "type": "SystemAssigned", + "principalId": "11111111-1111-1111-1111-111111111111", + "tenantId": "111111-1111-1111-1111-111111111111" + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testrg/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "appliance01", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Creating", + "status": "WaitingForHeartbeat", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "identity": { + "type": "SystemAssigned", + "principalId": "11111111-1111-1111-1111-111111111111", + "tenantId": "111111-1111-1111-1111-111111111111" + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json new file mode 100644 index 000000000000..766417638455 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "appliance01" + }, + "responses": { + "202": {}, + "204": {} + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json new file mode 100644 index 000000000000..15595687429a --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "appliance01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "appliance01", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Succeeded", + "status": "Connected", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "identity": { + "type": "SystemAssigned", + "principalId": "11111111-1111-1111-1111-111111111111", + "tenantId": "111111-1111-1111-1111-111111111111" + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json new file mode 100644 index 000000000000..36291169c56e --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json @@ -0,0 +1,61 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "appliance01", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Succeeded", + "status": "Connected", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + }, + { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance02", + "name": "appliance02", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Succeeded", + "status": "Connected", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + } + ] + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json new file mode 100644 index 000000000000..d68eae15d283 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "appliance01", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Succeeded", + "status": "Connected", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + }, + { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance02", + "name": "appliance02", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "properties": { + "distro": "AKSEdge", + "version": "1.0.1", + "provisioningState": "Succeeded", + "status": "Connected", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "systemData": { + "createdBy": "string", + "createdByType": "Application", + "createdAt": "2020-04-24T18:53:29.0928001Z", + "lastModifiedBy": "string", + "lastModifiedByType": "Application", + "lastModifiedAt": "2020-04-24T18:53:29.0928001Z" + } + } + ] + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json new file mode 100644 index 000000000000..2bc2ea8afaf8 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "testresourcename" + }, + "responses": { + "200": { + "body": { + "hybridConnectionConfig": { + "expirationTime": 123456789, + "hybridConnectionName": "provider/type/bc36ffcf318d5bedfc05ba8b0628dba", + "token": "mockSecretOtherprovider/type/bc36ffcf318d5bedfc05ba91c157ReceiverToken", + "relay": "relayName" + }, + "kubeconfigs": [ + { + "name": "kubeconfigName1", + "value": "xxxxxxxxxxxxx" + } + ] + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json new file mode 100644 index 000000000000..33dd29fdc6a2 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json @@ -0,0 +1,101 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.ResourceConnector/operations/read", + "display": { + "description": "Gets list of Available Operations for Appliances", + "operation": "List Available Operations for Appliances", + "provider": "Microsoft ResourceConnector", + "resource": "Operations" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/register/action", + "display": { + "description": "Registers the subscription for Appliance resource provider and enables the creation of Appliance.", + "operation": "Registers the Appliance Resource Provider", + "provider": "Microsoft ResourceConnector", + "resource": "Appliances Resource Provider" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/appliances/read", + "display": { + "description": "Gets an Appliance resource", + "operation": "Get Appliance", + "provider": "Microsoft ResourceConnector", + "resource": "Appliances" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/appliances/write", + "display": { + "description": "Creates or Updates Appliance resource", + "operation": "Create or Update Appliance", + "provider": "Microsoft ResourceConnector", + "resource": "Appliances" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/appliances/delete", + "display": { + "description": "Deletes Appliance resource", + "operation": "Delete Appliance", + "provider": "Microsoft ResourceConnector", + "resource": "Appliances" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/appliances/listClusterUserCredential", + "display": { + "description": "Get an appliance cluster user credential", + "operation": "List User Cluster Credential", + "provider": "Microsoft ResourceConnector", + "resource": "Appliances" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/locations/operationsstatus/read", + "display": { + "description": "Get result of Appliance operation", + "operation": "Get status of Appliance operation", + "provider": "Microsoft ResourceConnector", + "resource": "Appliance Operation Status" + }, + "origin": "user,system", + "isDataAction": false + }, + { + "name": "Microsoft.ResourceConnector/locations/operationresults/read", + "display": { + "description": "Get result of Appliance operation", + "operation": "Get the status of Appliance operation", + "provider": "Microsoft ResourceConnector", + "resource": "Appliance Operation Result" + }, + "origin": "user,system", + "isDataAction": false + } + ] + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json new file mode 100644 index 000000000000..462dc417a2f6 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2021-10-31-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "appliance01", + "parameters": { + "tags": { + "key": "value" + } + }, + "identity": { + "type": "SystemAssigned" + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "appliance01", + "type": "Microsoft.ResourceConnector/appliances", + "location": "West US", + "tags": { + "key": "value" + }, + "properties": { + "provisioningState": "Succeeded", + "status": "Validating", + "distro": "AKSEdge", + "version": "1.0.1", + "infrastructureConfig": { + "provider": "VMWare" + } + }, + "identity": { + "type": "SystemAssigned", + "principalId": "11111111-1111-1111-1111-111111111111", + "tenantId": "111111-1111-1111-1111-111111111111" + } + } + } + } +} From 55df9893c8ccddbea7a1dc1fd05620ef9e89fc64 Mon Sep 17 00:00:00 2001 From: Sai Sankar Gochhayat Date: Wed, 22 Jun 2022 12:30:35 -0700 Subject: [PATCH 3/5] Add actual v2022-04-15-preview api --- .../2022-04-15-preview/appliances.json | 297 +++++++++++++++++- .../examples/AppliancesCreate_Update.json | 2 +- .../examples/AppliancesDelete.json | 2 +- .../examples/AppliancesGet.json | 2 +- .../AppliancesListByResourceGroup.json | 2 +- .../AppliancesListBySubscription.json | 2 +- ...ncesListClusterCustomerUserCredential.json | 26 ++ .../AppliancesListClusterUserCredential.json | 4 +- .../examples/AppliancesListOperations.json | 2 +- .../examples/AppliancesPatch.json | 2 +- .../examples/UpgradeGraph.json | 37 +++ .../resource-manager/readme.go.md | 12 +- .../resource-manager/readme.md | 11 +- .../resource-manager/readme.python.md | 64 +++- .../resource-manager/readme.ruby.md | 12 +- .../resource-manager/readme.typescript.md | 2 + 16 files changed, 453 insertions(+), 26 deletions(-) create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterCustomerUserCredential.json create mode 100644 specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json index c3844954ed9c..0cf4500b2b64 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2021-10-31-preview", + "version": "2022-04-15-preview", "title": "appliances", "description": "The appliances Rest API spec." }, @@ -353,6 +353,49 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}/listClusterCustomerUserCredential": { + "post": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_ListClusterCustomerUserCredential", + "summary": "Returns the cluster customer user credential.", + "description": "Returns the cluster customer user credentials for the dedicated appliance.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/applianceListClusterCustomerUserCredentialResults" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ListClusterCustomerUserCredentialAppliance": { + "$ref": "./examples/AppliancesListClusterCustomerUserCredential.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}/listClusterUserCredential": { "post": { "tags": [ @@ -395,6 +438,56 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}/upgradegraph/{releaseTrain}": { + "get": { + "tags": [ + "appliances" + ], + "operationId": "Appliances_GetUpgradeGraph", + "summary": "Gets an Appliance upgrade graph.", + "description": "Gets the upgrade graph of an Appliance with a specified resource group and name and specific release train.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/ResourceNameParameter" + }, + { + "name": "releaseTrain", + "in": "path", + "required": true, + "type": "string", + "description": "Release train version, ex - stable" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/UpgradeGraph" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Appliance Upgrade Graph": { + "$ref": "./examples/UpgradeGraph.json" + } + } + } } }, "parameters": { @@ -466,6 +559,149 @@ } } }, + "SSHKey": { + "description": "Appliance SSHKey definition.", + "type": "object", + "properties": { + "privateKey": { + "description": "User Private Key.", + "type": "string" + }, + "publicKey": { + "description": "User Public Key.", + "type": "string" + } + } + }, + "SSHKeyType": { + "description": "Appliance SSHKeyType definition.", + "type": "string", + "enum": [ + "SSHCustomerUser" + ], + "x-ms-enum": { + "name": "SSHKeyType", + "modelAsString": true + } + }, + "SupportedVersion": { + "description": "The SupportedVersion object for appliance.", + "type": "object", + "properties": { + "metadata": { + "$ref": "#/definitions/SupportedVersionMetadata", + "description": "This is the metadata of the supported newer version.", + "type": "object", + "readOnly": true + }, + "version": { + "description": "The newer version available for upgrade.", + "type": "string", + "readOnly": true + } + } + }, + "SupportedVersionCatalogVersion": { + "description": "The SupportedVersionCatalogVersion object for appliance.", + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/SupportedVersionCatalogVersionData", + "description": "The newer supported version catalog version data.", + "type": "object", + "readOnly": true + }, + "name": { + "description": "The catalog version name for the version available for upgrade.", + "type": "string", + "readOnly": true + }, + "namespace": { + "description": "The catalog version namespace for the version available for upgrade.", + "type": "string", + "readOnly": true + } + } + }, + "SupportedVersionCatalogVersionData": { + "description": "The SupportedVersionCatalogVersionData object for appliance.", + "type": "object", + "properties": { + "audience": { + "description": "The image audience name for the version available for upgrade.", + "type": "string", + "readOnly": true + }, + "catalog": { + "description": "The image catalog name for the version available for upgrade.", + "type": "string", + "readOnly": true + }, + "offer": { + "description": "The image offer name for the version available for upgrade.", + "type": "string", + "readOnly": true + }, + "version": { + "description": "The image version for the version available for upgrade.", + "type": "string", + "readOnly": true + } + } + }, + "SupportedVersionMetadata": { + "description": "The SupportedVersionMetadata object for appliance.", + "type": "object", + "properties": { + "catalogVersion": { + "$ref": "#/definitions/SupportedVersionCatalogVersion", + "description": "The newer supported version catalog version.", + "type": "object", + "readOnly": true + } + } + }, + "UpgradeGraph": { + "description": "The Upgrade Graph for appliance.", + "type": "object", + "properties": { + "id": { + "description": "The appliance resource path", + "type": "string", + "readOnly": true + }, + "name": { + "description": "The release train name.", + "type": "string", + "readOnly": true + }, + "properties": { + "$ref": "#/definitions/UpgradeGraphProperties", + "description": "The properties of supported version", + "type": "object" + } + } + }, + "UpgradeGraphProperties": { + "description": "The Upgrade Graph Properties for appliance.", + "type": "object", + "properties": { + "applianceVersion": { + "description": "The current appliance version", + "type": "string", + "readOnly": true + }, + "supportedVersions": { + "description": "This contains the current version and supported upgrade versions.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/SupportedVersion" + }, + "x-ms-identifiers": [] + } + } + }, "appliance": { "description": "Appliances definition.", "type": "object", @@ -500,7 +736,8 @@ "type": "string", "readOnly": true, "enum": [ - "clusterUser" + "clusterUser", + "clusterCustomerUser" ], "x-ms-enum": { "name": "AccessProfileType", @@ -514,6 +751,29 @@ } } }, + "applianceListClusterCustomerUserCredentialResults": { + "description": "The List Cluster Customer User Credential Results appliance.", + "type": "object", + "properties": { + "kubeconfigs": { + "description": "The list of appliance kubeconfigs.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/applianceCredentialKubeconfig" + }, + "x-ms-identifiers": [] + }, + "sshKeys": { + "description": "Map of Customer User Public and Private SSH Keys", + "type": "object", + "readOnly": true, + "additionalProperties": { + "$ref": "#/definitions/SSHKey" + } + } + } + }, "applianceListCredentialResults": { "description": "The List Cluster User Credential appliance.", "type": "object", @@ -529,7 +789,8 @@ "readOnly": true, "items": { "$ref": "#/definitions/applianceCredentialKubeconfig" - } + }, + "x-ms-identifiers": [] } } }, @@ -620,7 +881,8 @@ "type": "array", "items": { "$ref": "#/definitions/applianceOperation" - } + }, + "x-ms-identifiers": [] } } }, @@ -631,14 +893,14 @@ "distro": { "description": "Represents a supported Fabric/Infra. (AKSEdge etc...).", "type": "string", - "default": "AKSEdge", "enum": [ "AKSEdge" ], "x-ms-enum": { "name": "distro", "modelAsString": true - } + }, + "default": "AKSEdge" }, "infrastructureConfig": { "description": "Contains infrastructure information about the Appliance", @@ -650,7 +912,9 @@ "enum": [ "VMWare", "HCI", - "SCVMM" + "SCVMM", + "KubeVirt", + "OpenStack" ], "x-ms-enum": { "name": "provider", @@ -675,8 +939,22 @@ "enum": [ "WaitingForHeartbeat", "Validating", + "Connecting", "Connected", - "Running" + "Running", + "PreparingForUpgrade", + "UpgradePrerequisitesCompleted", + "PreUpgrade", + "UpdatingCloudOperator", + "WaitingForCloudOperator", + "UpdatingCAPI", + "UpdatingCluster", + "PostUpgrade", + "UpgradeComplete", + "UpgradeClusterExtensionFailedToDelete", + "UpgradeFailed", + "Offline", + "None" ], "x-ms-enum": { "name": "status", @@ -685,8 +963,7 @@ }, "version": { "description": "Version of the Appliance", - "type": "string", - "readOnly": true + "type": "string" } } }, diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json index 03f9da30edb5..362b7664492f 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesCreate_Update.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", "resourceName": "appliance01", diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json index 766417638455..6bfd9e4381c8 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesDelete.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", "resourceName": "appliance01" diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json index 15595687429a..7b1b0215db81 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesGet.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", "resourceName": "appliance01" diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json index 36291169c56e..ffc5a4bfeebc 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListByResourceGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup" }, diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json index d68eae15d283..03931b0b5522 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListBySubscription.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555" }, "responses": { diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterCustomerUserCredential.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterCustomerUserCredential.json new file mode 100644 index 000000000000..86b264ff8899 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterCustomerUserCredential.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2022-04-15-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "appliance01" + }, + "responses": { + "200": { + "body": { + "kubeconfigs": [ + { + "name": "kubeconfigName1", + "value": "xxxxxxxxxxxxx" + } + ], + "sshKeys": { + "SSHCustomerUser": { + "privateKey": "xxxxxxxx", + "publicKey": "xxxxxxxx" + } + } + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json index 2bc2ea8afaf8..5a60cb53b57b 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListClusterUserCredential.json @@ -1,9 +1,9 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", - "resourceName": "testresourcename" + "resourceName": "appliance01" }, "responses": { "200": { diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json index 33dd29fdc6a2..b0069003e824 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesListOperations.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview" + "api-version": "2022-04-15-preview" }, "responses": { "200": { diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json index 462dc417a2f6..27d3d5cc43c3 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/AppliancesPatch.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-10-31-preview", + "api-version": "2022-04-15-preview", "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", "resourceName": "appliance01", diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json new file mode 100644 index 000000000000..0cd1e02436e9 --- /dev/null +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "api-version": "2022-04-15-preview", + "subscriptionId": "11111111-2222-3333-4444-555555555555", + "resourceGroupName": "testresourcegroup", + "resourceName": "appliance01", + "releaseTrain": "stable" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/11111111-2222-3333-4444-555555555555/resourceGroups/testresourcegroup/providers/Microsoft.ResourceConnector/appliances/appliance01", + "name": "stable", + "properties": { + "applianceVersion": "1.0.0", + "supportedVersions": [ + { + "version": "1.0.1", + "metadata": { + "catalogVersion": { + "name": "cloudop-product-information", + "namespace": "cloudop-system", + "data": { + "offer": "arcappliance", + "version": "0.1.5.11115", + "catalog": "arc-appliance-stable-catalogs-ext", + "audience": "stable" + } + } + } + } + ] + } + } + } + } +} diff --git a/specification/resourceconnector/resource-manager/readme.go.md b/specification/resourceconnector/resource-manager/readme.go.md index 5148e00c1c63..9ace75702969 100644 --- a/specification/resourceconnector/resource-manager/readme.go.md +++ b/specification/resourceconnector/resource-manager/readme.go.md @@ -20,7 +20,7 @@ azure-arm: true ```yaml $(go) && $(multiapi) batch: - - tag: package-2021-10-31-preview + - tag: package-2022-04-15-preview ``` ### Tag: package-2021-10-31-preview and go @@ -32,3 +32,13 @@ Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-2022-04-15-preview' && $(go) +namespace: resourceconnector +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2022-04-15-preview/$(namespace) +``` \ No newline at end of file diff --git a/specification/resourceconnector/resource-manager/readme.md b/specification/resourceconnector/resource-manager/readme.md index feff445f4cce..9df6dc3b0d0f 100644 --- a/specification/resourceconnector/resource-manager/readme.md +++ b/specification/resourceconnector/resource-manager/readme.md @@ -27,7 +27,7 @@ These are the global settings for the appliance. ```yaml name: appliances openapi-type: arm -tag: package-2021-10-31-preview +tag: package-2022-04-15-preview ``` ### Tag: package-2021-10-31-preview @@ -39,6 +39,15 @@ input-file: - Microsoft.ResourceConnector/preview/2021-10-31-preview/appliances.json ``` +### Tag: package-2022-04-15-preview + +These settings apply only when `--tag=package-2022-04-15-preview` is specified on the command line. + +```yaml $(tag) == 'package-2022-04-15-preview' +input-file: + - Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json +``` + --- # Code Generation diff --git a/specification/resourceconnector/resource-manager/readme.python.md b/specification/resourceconnector/resource-manager/readme.python.md index 25dbed6bfd65..e69b7693bb48 100644 --- a/specification/resourceconnector/resource-manager/readme.python.md +++ b/specification/resourceconnector/resource-manager/readme.python.md @@ -3,17 +3,73 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. + +These settings apply only when `--python` is specified on the command line. + +``` yaml !$(track2) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + package-name: azure-mgmt-resourceconnector + clear-output-folder: true + no-namespace-folders: true +``` + These settings apply only when `--track2` is specified on the command line. -``` yaml $(python) +``` yaml $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION -package-name: azure-mgmt-resourceconnector namespace: azure.mgmt.resourceconnector package-version: 1.0.0b1 +no-namespace-folders: true +``` + +### Python multi-api + +Generate all API versions currently shipped for this package + +```yaml $(multiapi) && !$(track2) +batch: + - tag: package-2022-04-15-preview +``` + +```yaml $(multiapi) && $(track2) clear-output-folder: true +batch: + - tag: package-2022-04-15-preview + - multiapiscript: true ``` -``` yaml $(python) -no-namespace-folders: true + +``` yaml $(multiapiscript) output-folder: $(python-sdks-folder)/resourceconnector/azure-mgmt-resourceconnector/azure/mgmt/resourceconnector/ +clear-output-folder: false +perform-load: false ``` + +### Tag: package-2021-10-31-preview and python + +These settings apply only when `--tag=package-2021-10-31-preview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2021-10-31-preview' +namespace: azure.mgmt.resourceconnector.v2021-10-31-preview +output-folder: $(python-sdks-folder)/resourceconnector/azure-mgmt-resourceconnector/azure/mgmt/resourceconnector/v2021-10-31-preview +python: + namespace: azure.mgmt.resourceconnector.v2021-10-31-preview + output-folder: $(python-sdks-folder)/resourceconnector/azure-mgmt-resourceconnector/azure/mgmt/resourceconnector/v2021-10-31-preview +``` + +### Tag: package-2022-04-15-preview and python + +These settings apply only when `--tag=package-2022-04-15-preview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2022-04-15-preview' +namespace: azure.mgmt.resourceconnector.2022-04-15-preview +output-folder: $(python-sdks-folder)/resourceconnector/azure-mgmt-resourceconnector/azure/mgmt/resourceconnector/2022-04-15-preview +python: + namespace: azure.mgmt.resourceconnector.2022-04-15-preview + output-folder: $(python-sdks-folder)/resourceconnector/azure-mgmt-resourceconnector/azure/mgmt/resourceconnector/2022-04-15-preview +``` \ No newline at end of file diff --git a/specification/resourceconnector/resource-manager/readme.ruby.md b/specification/resourceconnector/resource-manager/readme.ruby.md index 4b11b224da95..87d86410200e 100644 --- a/specification/resourceconnector/resource-manager/readme.ruby.md +++ b/specification/resourceconnector/resource-manager/readme.ruby.md @@ -4,7 +4,7 @@ These settings apply only when `--ruby` is specified on the command line. ```yaml package-name: azure_mgmt_resource_connector -package-version: 2021-10-31-preview +package-version: 2022-04-15-preview azure-arm: true ``` @@ -16,4 +16,14 @@ Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2022-04-15-preview' && $(ruby) +namespace: Azure::ExtendedLocation::Mgmt::2022-04-15-preview +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_resource_connector/lib ``` \ No newline at end of file diff --git a/specification/resourceconnector/resource-manager/readme.typescript.md b/specification/resourceconnector/resource-manager/readme.typescript.md index 2d2bf4c0d0de..3eae1b5c5b18 100644 --- a/specification/resourceconnector/resource-manager/readme.typescript.md +++ b/specification/resourceconnector/resource-manager/readme.typescript.md @@ -4,10 +4,12 @@ These settings apply only when `--typescript` is specified on the command line. Please also specify `--typescript-sdks-folder=`. ``` yaml $(typescript) +title: ResourceConnectorManagementClient typescript: azure-arm: true package-name: "@azure/arm-resourceconnector" output-folder: "$(typescript-sdks-folder)/sdk/resourceconnector/arm-resourceconnector" + clear-output-folder: true payload-flattening-threshold: 1 generate-metadata: true ``` From e5d481a9b7e64f9786787983194e6a8f57541cf5 Mon Sep 17 00:00:00 2001 From: Sai Sankar Gochhayat Date: Wed, 22 Jun 2022 12:38:32 -0700 Subject: [PATCH 4/5] Added custom words --- custom-words.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index 93f3f0a774f0..826587015484 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -328,6 +328,7 @@ canadaeast canceldelete cancelpipelinerun canonicalized +capi Carbonite carretera catalogapi @@ -1091,6 +1092,7 @@ Kubelet kubelogin kubenet kubernetes +KubeVirt Kustomization kustomizations Kustomizations @@ -2275,6 +2277,7 @@ updatepolicy updateprivateendpointconnection updateproperties updation +upgradegraph upgradeos uploadbatchservicelogs uploadcertificate From c3b630be17bd65bc75e17d878ec1f9e2efcece26 Mon Sep 17 00:00:00 2001 From: Sai Sankar Gochhayat Date: Fri, 24 Jun 2022 11:43:32 -0700 Subject: [PATCH 5/5] Updated URL based on ARM suggestion --- .../preview/2022-04-15-preview/appliances.json | 6 +++--- .../preview/2022-04-15-preview/examples/UpgradeGraph.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json index 0cf4500b2b64..147a67bcc3a9 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/appliances.json @@ -439,7 +439,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}/upgradegraph/{releaseTrain}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ResourceConnector/appliances/{resourceName}/upgradeGraphs/{upgradeGraph}": { "get": { "tags": [ "appliances" @@ -461,11 +461,11 @@ "$ref": "#/parameters/ResourceNameParameter" }, { - "name": "releaseTrain", + "name": "upgradeGraph", "in": "path", "required": true, "type": "string", - "description": "Release train version, ex - stable" + "description": "Upgrade graph version, ex - stable" } ], "responses": { diff --git a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json index 0cd1e02436e9..d72e15a52f5e 100644 --- a/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json +++ b/specification/resourceconnector/resource-manager/Microsoft.ResourceConnector/preview/2022-04-15-preview/examples/UpgradeGraph.json @@ -4,7 +4,7 @@ "subscriptionId": "11111111-2222-3333-4444-555555555555", "resourceGroupName": "testresourcegroup", "resourceName": "appliance01", - "releaseTrain": "stable" + "upgradeGraph": "stable" }, "responses": { "200": {