Skip to content

Commit d3edcb1

Browse files
rarayuduLeiWang3
authored andcommitted
[Hub Generated] Review request for Microsoft.Logic to add version stable/2019-05-01 (Azure#16181)
* Fixing bugs in Logic Apps swaggers * Updating example * Addressed feedback
1 parent df39685 commit d3edcb1

File tree

2 files changed

+174
-23
lines changed

2 files changed

+174
-23
lines changed

specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/examples/IntegrationServiceEnvironments_ManagedApis_Put.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
"subscriptionId": "f34b22a3-2202-4fb1-b040-1332bd928c84",
55
"resourceGroup": "testResourceGroup",
66
"integrationServiceEnvironmentName": "testIntegrationServiceEnvironment",
7-
"apiName": "servicebus"
7+
"apiName": "servicebus",
8+
"integrationServiceEnvironmentManagedApi": {
9+
"location": "brazilsouth",
10+
"properties": {
11+
"deploymentParameters": null
12+
}
13+
}
814
},
915
"responses": {
1016
"201": {

specification/logic/resource-manager/Microsoft.Logic/stable/2019-05-01/logic.json

Lines changed: 167 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6105,7 +6105,7 @@
61056105
"200": {
61066106
"description": "OK",
61076107
"schema": {
6108-
"$ref": "#/definitions/ManagedApiListResult"
6108+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApiListResult"
61096109
}
61106110
},
61116111
"default": {
@@ -6165,7 +6165,7 @@
61656165
"200": {
61666166
"description": "OK",
61676167
"schema": {
6168-
"$ref": "#/definitions/ManagedApi"
6168+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi"
61696169
}
61706170
},
61716171
"default": {
@@ -6215,19 +6215,28 @@
62156215
},
62166216
{
62176217
"$ref": "#/parameters/api-version"
6218+
},
6219+
{
6220+
"name": "integrationServiceEnvironmentManagedApi",
6221+
"description": "The integration service environment managed api.",
6222+
"in": "body",
6223+
"required": true,
6224+
"schema": {
6225+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi"
6226+
}
62186227
}
62196228
],
62206229
"responses": {
62216230
"200": {
62226231
"description": "OK",
62236232
"schema": {
6224-
"$ref": "#/definitions/ManagedApi"
6233+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi"
62256234
}
62266235
},
62276236
"201": {
62286237
"description": "Created",
62296238
"schema": {
6230-
"$ref": "#/definitions/ManagedApi"
6239+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi"
62316240
}
62326241
},
62336242
"default": {
@@ -6467,6 +6476,9 @@
64676476
"x-ms-client-flatten": true,
64686477
"$ref": "#/definitions/WorkflowProperties",
64696478
"description": "The workflow properties."
6479+
},
6480+
"identity": {
6481+
"$ref": "#/definitions/ManagedServiceIdentity"
64706482
}
64716483
},
64726484
"description": "The workflow type.",
@@ -7318,20 +7330,24 @@
73187330
},
73197331
"contentVersion": {
73207332
"type": "string",
7321-
"description": "The content version."
7333+
"description": "The content version.",
7334+
"readOnly": true
73227335
},
73237336
"contentSize": {
73247337
"type": "integer",
73257338
"format": "int64",
7326-
"description": "The content size."
7339+
"description": "The content size.",
7340+
"readOnly": true
73277341
},
73287342
"contentHash": {
73297343
"$ref": "#/definitions/ContentHash",
7330-
"description": "The content hash."
7344+
"description": "The content hash.",
7345+
"readOnly": true
73317346
},
73327347
"metadata": {
73337348
"$ref": "#/definitions/Object",
7334-
"description": "The metadata."
7349+
"description": "The metadata.",
7350+
"readOnly": true
73357351
}
73367352
},
73377353
"description": "The content link."
@@ -8297,64 +8313,76 @@
82978313
"properties": {
82988314
"name": {
82998315
"type": "string",
8300-
"description": "The name"
8316+
"description": "The name",
8317+
"readOnly": true
83018318
},
83028319
"connectionParameters": {
83038320
"type": "object",
83048321
"additionalProperties": {
83058322
"$ref": "#/definitions/Object"
83068323
},
8307-
"description": "The connection parameters."
8324+
"description": "The connection parameters.",
8325+
"readOnly": true
83088326
},
83098327
"metadata": {
83108328
"$ref": "#/definitions/ApiResourceMetadata",
8311-
"description": "The metadata."
8329+
"description": "The metadata.",
8330+
"readOnly": true
83128331
},
83138332
"runtimeUrls": {
83148333
"type": "array",
83158334
"description": "The runtime urls.",
83168335
"items": {
83178336
"type": "string"
8318-
}
8337+
},
8338+
"readOnly": true
83198339
},
83208340
"generalInformation": {
83218341
"$ref": "#/definitions/ApiResourceGeneralInformation",
8322-
"description": "The api general information."
8342+
"description": "The api general information.",
8343+
"readOnly": true
83238344
},
83248345
"capabilities": {
83258346
"type": "array",
83268347
"description": "The capabilities.",
83278348
"items": {
83288349
"type": "string"
8329-
}
8350+
},
8351+
"readOnly": true
83308352
},
83318353
"backendService": {
83328354
"$ref": "#/definitions/ApiResourceBackendService",
8333-
"description": "The backend service."
8355+
"description": "The backend service.",
8356+
"readOnly": true
83348357
},
83358358
"policies": {
83368359
"$ref": "#/definitions/ApiResourcePolicies",
8337-
"description": "The policies for the API."
8360+
"description": "The policies for the API.",
8361+
"readOnly": true
83388362
},
83398363
"apiDefinitionUrl": {
83408364
"type": "string",
8341-
"description": "The API definition."
8365+
"description": "The API definition.",
8366+
"readOnly": true
83428367
},
83438368
"apiDefinitions": {
83448369
"$ref": "#/definitions/ApiResourceDefinitions",
8345-
"description": "The api definitions."
8370+
"description": "The api definitions.",
8371+
"readOnly": true
83468372
},
83478373
"integrationServiceEnvironment": {
83488374
"$ref": "#/definitions/ResourceReference",
83498375
"description": "The integration service environment reference."
83508376
},
83518377
"provisioningState": {
83528378
"$ref": "#/definitions/WorkflowProvisioningState",
8353-
"description": "The provisioning state."
8379+
"description": "The provisioning state.",
8380+
"readOnly": true
83548381
},
83558382
"category": {
83568383
"$ref": "#/definitions/ApiTier",
8357-
"description": "The category."
8384+
"description": "The category.",
8385+
"readOnly": true
83588386
}
83598387
}
83608388
},
@@ -8810,6 +8838,9 @@
88108838
"sku": {
88118839
"$ref": "#/definitions/IntegrationServiceEnvironmentSku",
88128840
"description": "The sku."
8841+
},
8842+
"identity": {
8843+
"$ref": "#/definitions/ManagedServiceIdentity"
88138844
}
88148845
},
88158846
"allOf": [
@@ -9018,7 +9049,6 @@
90189049
"properties": {
90199050
"type": {
90209051
"$ref": "#/definitions/OpenAuthenticationProviderType",
9021-
"readOnly": true,
90229052
"description": "Type of provider for OAuth."
90239053
},
90249054
"claims": {
@@ -9102,6 +9132,63 @@
91029132
}
91039133
}
91049134
},
9135+
"ManagedServiceIdentity": {
9136+
"description": "Managed service identity properties.",
9137+
"type": "object",
9138+
"properties": {
9139+
"type": {
9140+
"description": "Type of managed service identity. The type 'SystemAssigned' includes an implicitly created identity. The type 'None' will remove any identities from the resource.",
9141+
"enum": [
9142+
"SystemAssigned",
9143+
"UserAssigned",
9144+
"None"
9145+
],
9146+
"type": "string",
9147+
"x-ms-enum": {
9148+
"name": "ManagedServiceIdentityType",
9149+
"modelAsString": true
9150+
}
9151+
},
9152+
"tenantId": {
9153+
"description": "Tenant of managed service identity.",
9154+
"type": "string",
9155+
"format": "uuid",
9156+
"readOnly": true
9157+
},
9158+
"principalId": {
9159+
"description": "Principal Id of managed service identity.",
9160+
"type": "string",
9161+
"format": "uuid",
9162+
"readOnly": true
9163+
},
9164+
"userAssignedIdentities": {
9165+
"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}",
9166+
"type": "object",
9167+
"additionalProperties": {
9168+
"$ref": "#/definitions/userAssignedIdentity"
9169+
}
9170+
}
9171+
},
9172+
"required": [
9173+
"type"
9174+
]
9175+
},
9176+
"userAssignedIdentity": {
9177+
"description": "User Assigned identity properties.",
9178+
"type": "object",
9179+
"properties": {
9180+
"principalId": {
9181+
"description": "Principal Id of user assigned identity",
9182+
"type": "string",
9183+
"readOnly": true
9184+
},
9185+
"clientId": {
9186+
"description": "Client Id of user assigned identity",
9187+
"type": "string",
9188+
"readOnly": true
9189+
}
9190+
}
9191+
},
91059192
"IntegrationServiceEnvironmentSkuList": {
91069193
"type": "object",
91079194
"properties": {
@@ -9185,6 +9272,64 @@
91859272
"modelAsString": true
91869273
}
91879274
},
9275+
"IntegrationServiceEnvironmentManagedApiListResult": {
9276+
"type": "object",
9277+
"properties": {
9278+
"value": {
9279+
"type": "array",
9280+
"items": {
9281+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApi"
9282+
},
9283+
"description": "The integration service environment managed APIs."
9284+
},
9285+
"nextLink": {
9286+
"type": "string",
9287+
"description": "The URL to get the next set of results."
9288+
}
9289+
},
9290+
"description": "The list of integration service environment managed APIs."
9291+
},
9292+
"IntegrationServiceEnvironmentManagedApi": {
9293+
"type": "object",
9294+
"properties": {
9295+
"properties": {
9296+
"x-ms-client-flatten": true,
9297+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApiProperties",
9298+
"description": "The integration service environment managed api properties."
9299+
}
9300+
},
9301+
"description": "The integration service environment managed api.",
9302+
"allOf": [
9303+
{
9304+
"$ref": "#/definitions/Resource"
9305+
}
9306+
]
9307+
},
9308+
"IntegrationServiceEnvironmentManagedApiProperties": {
9309+
"type": "object",
9310+
"description": "The integration service environment managed api properties.",
9311+
"properties": {
9312+
"deploymentParameters": {
9313+
"$ref": "#/definitions/IntegrationServiceEnvironmentManagedApiDeploymentParameters",
9314+
"description": "The integration service environment managed api deployment parameters."
9315+
}
9316+
},
9317+
"allOf": [
9318+
{
9319+
"$ref": "#/definitions/ApiResourceProperties"
9320+
}
9321+
]
9322+
},
9323+
"IntegrationServiceEnvironmentManagedApiDeploymentParameters": {
9324+
"type": "object",
9325+
"description": "The integration service environment managed api deployment parameters.",
9326+
"properties": {
9327+
"contentLinkDefinition": {
9328+
"$ref": "#/definitions/ContentLink",
9329+
"description": "The integration service environment managed api content link for deployment."
9330+
}
9331+
}
9332+
},
91889333
"IntegrationAccountSkuName": {
91899334
"type": "string",
91909335
"description": "The integration account sku name.",
@@ -9224,7 +9369,7 @@
92249369
"description": "The integration account properties.",
92259370
"properties": {
92269371
"integrationServiceEnvironment": {
9227-
"$ref": "#/definitions/IntegrationServiceEnvironment",
9372+
"$ref": "#/definitions/ResourceReference",
92289373
"description": "The integration service environment."
92299374
},
92309375
"state": {

0 commit comments

Comments
 (0)