From 72dfe7eb2747714d5d1c6bb3d4e96f0ddc135d28 Mon Sep 17 00:00:00 2001 From: rarayudu Date: Mon, 27 Sep 2021 00:06:44 -0700 Subject: [PATCH 1/3] Fixing bugs in Logic Apps swaggers --- .../stable/2019-05-01/logic.json | 144 +++++++++++++++++- 1 file changed, 138 insertions(+), 6 deletions(-) diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json index 604c3048b2a0..54308f41ccf4 100644 --- a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json +++ b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json @@ -6105,7 +6105,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ManagedApiListResult" + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApiListResult" } }, "default": { @@ -6165,7 +6165,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ManagedApi" + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi" } }, "default": { @@ -6215,19 +6215,28 @@ }, { "$ref": "#/parameters/api-version" + }, + { + "name": "integrationServiceEnvironmentManagedApi", + "description": "The integration service environment managed api.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi" + } } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ManagedApi" + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/ManagedApi" + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi" } }, "default": { @@ -6467,6 +6476,9 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/WorkflowProperties", "description": "The workflow properties." + }, + "identity": { + "$ref": "#/definitions/ManagedServiceIdentity" } }, "description": "The workflow type.", @@ -8810,6 +8822,9 @@ "sku": { "$ref": "#/definitions/IntegrationServiceEnvironmentSku", "description": "The sku." + }, + "identity": { + "$ref": "#/definitions/ManagedServiceIdentity" } }, "allOf": [ @@ -9018,7 +9033,6 @@ "properties": { "type": { "$ref": "#/definitions/OpenAuthenticationProviderType", - "readOnly": true, "description": "Type of provider for OAuth." }, "claims": { @@ -9102,6 +9116,63 @@ } } }, + "ManagedServiceIdentity": { + "description": "Managed service identity properties.", + "type": "object", + "properties": { + "type": { + "description": "Type of managed service identity. The type 'SystemAssigned' includes an implicitly created identity. The type 'None' will remove any identities from the resource.", + "enum": [ + "SystemAssigned", + "UserAssigned", + "None" + ], + "type": "string", + "x-ms-enum": { + "name": "ManagedServiceIdentityType", + "modelAsString": true + } + }, + "tenantId": { + "description": "Tenant of managed service identity.", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "principalId": { + "description": "Principal Id of managed service identity.", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "userAssignedIdentities": { + "description": "The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/userAssignedIdentity" + } + } + }, + "required": [ + "type" + ] + }, + "userAssignedIdentity": { + "description": "User Assigned identity properties.", + "type": "object", + "properties": { + "principalId": { + "description": "Principal Id of user assigned identity", + "type": "string", + "readOnly": true + }, + "clientId": { + "description": "Client Id of user assigned identity", + "type": "string", + "readOnly": true + } + } + }, "IntegrationServiceEnvironmentSkuList": { "type": "object", "properties": { @@ -9185,6 +9256,64 @@ "modelAsString": true } }, + "IntegrationServiceEnvironmentManagedApiListResult": { + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi" + }, + "description": "The integration service environment managed APIs." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of results." + } + }, + "description": "The list of integration service environment managed APIs." + }, + "IntegrationServiceEnvironmentManagedApi": { + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApiProperties", + "description": "The integration service environment managed api properties." + } + }, + "description": "The integration service environment managed api.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "IntegrationServiceEnvironmentManagedApiProperties": { + "type": "object", + "description": "The integration service environment managed api properties.", + "properties": { + "deploymentParameters": { + "$ref": "#/definitions/IntegrationServiceEnvironmentManagedApiDeploymentParameters", + "description": "The integration service environment managed api deployment parameters." + } + }, + "allOf": [ + { + "$ref": "#/definitions/ApiResourceProperties" + } + ] + }, + "IntegrationServiceEnvironmentManagedApiDeploymentParameters": { + "type": "object", + "description": "The integration service environment managed api deployment parameters.", + "properties": { + "contentLinkDefinition": { + "$ref": "#/definitions/ContentLink", + "description": "The integration service environment managed api content link for deployment." + } + } + }, "IntegrationAccountSkuName": { "type": "string", "description": "The integration account sku name.", @@ -9210,6 +9339,9 @@ "sku": { "$ref": "#/definitions/IntegrationAccountSku", "description": "The sku." + }, + "identity": { + "$ref": "#/definitions/ManagedServiceIdentity" } }, "description": "The integration account.", @@ -9224,7 +9356,7 @@ "description": "The integration account properties.", "properties": { "integrationServiceEnvironment": { - "$ref": "#/definitions/IntegrationServiceEnvironment", + "$ref": "#/definitions/ResourceReference", "description": "The integration service environment." }, "state": { From a5fabaadb28c47cbbd0a7a7980dbb9791ff81aef Mon Sep 17 00:00:00 2001 From: rarayudu Date: Mon, 27 Sep 2021 09:13:53 -0700 Subject: [PATCH 2/3] Updating example --- .../IntegrationServiceEnvironments_ManagedApis_Put.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ManagedApis_Put.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ManagedApis_Put.json index afa23a8b4540..3a7fdb7a95e5 100644 --- a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ManagedApis_Put.json +++ b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ManagedApis_Put.json @@ -4,7 +4,13 @@ "subscriptionId": "f34b22a3-2202-4fb1-b040-1332bd928c84", "resourceGroup": "testResourceGroup", "integrationServiceEnvironmentName": "testIntegrationServiceEnvironment", - "apiName": "servicebus" + "apiName": "servicebus", + "integrationServiceEnvironmentManagedApi": { + "location": "brazilsouth", + "properties": { + "deploymentParameters": null + } + } }, "responses": { "201": { From e22738da02c088fdd09316b15f8218f7c905b408 Mon Sep 17 00:00:00 2001 From: rarayudu Date: Tue, 5 Oct 2021 12:59:46 -0700 Subject: [PATCH 3/3] Addressed feedback --- .../stable/2019-05-01/logic.json | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json index 54308f41ccf4..71195d2d791f 100644 --- a/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json +++ b/specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json @@ -7330,20 +7330,24 @@ }, "contentVersion": { "type": "string", - "description": "The content version." + "description": "The content version.", + "readOnly": true }, "contentSize": { "type": "integer", "format": "int64", - "description": "The content size." + "description": "The content size.", + "readOnly": true }, "contentHash": { "$ref": "#/definitions/ContentHash", - "description": "The content hash." + "description": "The content hash.", + "readOnly": true }, "metadata": { "$ref": "#/definitions/Object", - "description": "The metadata." + "description": "The metadata.", + "readOnly": true } }, "description": "The content link." @@ -8309,52 +8313,62 @@ "properties": { "name": { "type": "string", - "description": "The name" + "description": "The name", + "readOnly": true }, "connectionParameters": { "type": "object", "additionalProperties": { "$ref": "#/definitions/Object" }, - "description": "The connection parameters." + "description": "The connection parameters.", + "readOnly": true }, "metadata": { "$ref": "#/definitions/ApiResourceMetadata", - "description": "The metadata." + "description": "The metadata.", + "readOnly": true }, "runtimeUrls": { "type": "array", "description": "The runtime urls.", "items": { "type": "string" - } + }, + "readOnly": true }, "generalInformation": { "$ref": "#/definitions/ApiResourceGeneralInformation", - "description": "The api general information." + "description": "The api general information.", + "readOnly": true }, "capabilities": { "type": "array", "description": "The capabilities.", "items": { "type": "string" - } + }, + "readOnly": true }, "backendService": { "$ref": "#/definitions/ApiResourceBackendService", - "description": "The backend service." + "description": "The backend service.", + "readOnly": true }, "policies": { "$ref": "#/definitions/ApiResourcePolicies", - "description": "The policies for the API." + "description": "The policies for the API.", + "readOnly": true }, "apiDefinitionUrl": { "type": "string", - "description": "The API definition." + "description": "The API definition.", + "readOnly": true }, "apiDefinitions": { "$ref": "#/definitions/ApiResourceDefinitions", - "description": "The api definitions." + "description": "The api definitions.", + "readOnly": true }, "integrationServiceEnvironment": { "$ref": "#/definitions/ResourceReference", @@ -8362,11 +8376,13 @@ }, "provisioningState": { "$ref": "#/definitions/WorkflowProvisioningState", - "description": "The provisioning state." + "description": "The provisioning state.", + "readOnly": true }, "category": { "$ref": "#/definitions/ApiTier", - "description": "The category." + "description": "The category.", + "readOnly": true } } }, @@ -9339,9 +9355,6 @@ "sku": { "$ref": "#/definitions/IntegrationAccountSku", "description": "The sku." - }, - "identity": { - "$ref": "#/definitions/ManagedServiceIdentity" } }, "description": "The integration account.",