From 46de85810a3f6c3c9c8950dc3622fc419058d923 Mon Sep 17 00:00:00 2001 From: Samir Solanki Date: Mon, 12 Apr 2021 18:00:54 -0700 Subject: [PATCH 1/2] fix operation results contract --- .../2021-01-01-preview/definitions.json | 15 ++ ...piManagementTenantConfigurationDeploy.json | 18 +- .../ApiManagementTenantConfigurationSave.json | 17 +- ...ManagementTenantConfigurationValidate.json | 157 ++---------------- .../stable/2020-12-01/definitions.json | 15 ++ ...piManagementTenantConfigurationDeploy.json | 20 ++- .../ApiManagementTenantConfigurationSave.json | 19 ++- ...ManagementTenantConfigurationValidate.json | 157 ++---------------- 8 files changed, 94 insertions(+), 324 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json index 216fe4a2983a..08738b82c00f 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json @@ -3511,6 +3511,21 @@ "description": "Api Operation Entity Base Contract details." }, "OperationResultContract": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/OperationResultContractProperties", + "description": "Properties of the Operation Contract." + } + }, + "allOf": [ + { + "$ref": "./apimanagement.json#/definitions/Resource" + } + ], + "description": "Long Running Git Operation Results." + }, + "OperationResultContractProperties": { "properties": { "id": { "type": "string", diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationDeploy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationDeploy.json index bd2f272fc167..5b24da95aed7 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationDeploy.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationDeploy.json @@ -19,13 +19,17 @@ }, "200": { "body": { - "id": "5a1af4ae2a6d2e0b688d7517", - "status": "Failed", - "started": "2017-11-26T17:06:54.303Z", - "updated": "2017-11-26T17:07:21.777Z", - "error": { - "code": "ValidationError", - "message": "File not found: 'api-management/configuration.json'" + "id": "6074e652093a9d0dac3d733c", + "type": "Microsoft.ApiManagement/service/tenant/operationResults", + "name": "6074e652093a9d0dac3d733c", + "properties": { + "status": "Failed", + "started": "2017-11-26T17:06:54.303Z", + "updated": "2017-11-26T17:07:21.777Z", + "error": { + "code": "ValidationError", + "message": "File not found: 'api-management/configuration.json'" + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationSave.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationSave.json index 6c83c545ef74..e4e3a73dcfa1 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationSave.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationSave.json @@ -19,13 +19,16 @@ }, "200": { "body": { - "id": "5cae98acb597440f487b0d78", - "status": "Succeeded", - "started": "2019-04-11T01:30:20.883Z", - "updated": "2019-04-11T01:30:41.623Z", - "resultInfo": "The configuration was successfully saved to master as commit 709678560f72e689e469cf98ba9ba6d1b7736893.", - "error": null, - "actionLog": [] + "id": "6074e652093a9d0dac3d733c", + "type": "Microsoft.ApiManagement/service/tenant/operationResults", + "name": "6074e652093a9d0dac3d733c", + "properties": { + "status": "Succeeded", + "started": "2021-04-13T00:31:14.94Z", + "updated": "2021-04-13T00:31:27.59Z", + "resultInfo": "The configuration was successfully saved to master as commit c0ae274f6046912107bad734834cbf65918668b6.", + "actionLog": [] + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationValidate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationValidate.json index 267a94abd4b5..ba05071933a3 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationValidate.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantConfigurationValidate.json @@ -19,153 +19,16 @@ }, "200": { "body": { - "id": "5a1af64e2a6d2e0b688d751e", - "status": "Succeeded", - "started": "2019-04-11T01:30:51.767Z", - "updated": "2019-04-11T01:30:57.653Z", - "resultInfo": "Validation is successfull", - "actionLog": [ - { - "objectType": "ApiSpecificationContract", - "action": "Updated", - "objectKey": "57914cb351f68a16889be190;rev=1" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5768181ea40f7eb6c49f6ac7" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "576819c9a40f7e86289fb3e3" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "576819f1a40f7e86289fb6de" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681a67a40f7e72b4132522" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681a73a40f7e72b413281d" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681a7ea40f7e72b4132b18" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681b88a40f7ea0f017f099" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681b9fa40f7ea0f017f682" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bb5a40f7ea0f017fc6b" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bcaa40f7ea0f0180254" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bdfa40f7ea0f018083d" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bf5a40f7ea0f0180e26" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681c0ea40f7ea0f018140f" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681c26a40f7ea0f01819f8" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681c83a40f7e85f44db237" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681cb2a40f7e85f44dbcd0" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681ce3a40f7e85f44dc769" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681d1fa40f7e85f44dd202" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681d60a40f7e85f44ddc9b" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681db4a40f7e85f44de735" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681e11a40f7e85f44df1ce" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681e73a40f7e85f44dfc67" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681f06a40f7e74ec07785c" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5768211fa40f7e74ec07a74a" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "576823cfa40f7e74ec07d63a" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5600b57e7e8880006a060001" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5600b57e7e8880006a060002" - } - ] + "id": "6074ec02093a9d0dac3d7345", + "type": "Microsoft.ApiManagement/service/tenant/operationResults", + "name": "6074ec02093a9d0dac3d7345", + "properties": { + "status": "Succeeded", + "started": "2021-04-13T00:55:30.62Z", + "updated": "2021-04-13T00:55:39.857Z", + "resultInfo": "Validation is successfull", + "actionLog": [] + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json index 98cdbc97d91b..a8686728ddc5 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json @@ -3454,6 +3454,21 @@ "description": "Api Operation Entity Base Contract details." }, "OperationResultContract": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/OperationResultContractProperties", + "description": "Properties of the Operation Contract." + } + }, + "allOf": [ + { + "$ref": "./apimanagement.json#/definitions/Resource" + } + ], + "description": "Long Running Git Operation Results." + }, + "OperationResultContractProperties": { "properties": { "id": { "type": "string", diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationDeploy.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationDeploy.json index 235d9be39638..3f8ede6f3909 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationDeploy.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationDeploy.json @@ -14,18 +14,22 @@ "responses": { "202": { "headers": { - "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af4ae2a6d2e0b688d7517?api-version=2020-12-01" + "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/6074e652093a9d0dac3d733c?api-version=2020-12-01" } }, "200": { "body": { - "id": "5a1af4ae2a6d2e0b688d7517", - "status": "Failed", - "started": "2017-11-26T17:06:54.303Z", - "updated": "2017-11-26T17:07:21.777Z", - "error": { - "code": "ValidationError", - "message": "File not found: 'api-management/configuration.json'" + "id": "6074e652093a9d0dac3d733c", + "type": "Microsoft.ApiManagement/service/tenant/operationResults", + "name": "6074e652093a9d0dac3d733c", + "properties": { + "status": "Failed", + "started": "2017-11-26T17:06:54.303Z", + "updated": "2017-11-26T17:07:21.777Z", + "error": { + "code": "ValidationError", + "message": "File not found: 'api-management/configuration.json'" + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationSave.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationSave.json index e1e5fbf5a24c..cc4af56c5e44 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationSave.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationSave.json @@ -14,18 +14,21 @@ "responses": { "202": { "headers": { - "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/5a1af57d2a6d2e0b688d751b?api-version=2020-12-01" + "location": "https://management.azure.com/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/operationResults/6074e652093a9d0dac3d733c?api-version=2020-12-01" } }, "200": { "body": { - "id": "5cae98acb597440f487b0d78", - "status": "Succeeded", - "started": "2019-04-11T01:30:20.883Z", - "updated": "2019-04-11T01:30:41.623Z", - "resultInfo": "The configuration was successfully saved to master as commit 709678560f72e689e469cf98ba9ba6d1b7736893.", - "error": null, - "actionLog": [] + "id": "6074e652093a9d0dac3d733c", + "type": "Microsoft.ApiManagement/service/tenant/operationResults", + "name": "6074e652093a9d0dac3d733c", + "properties": { + "status": "Succeeded", + "started": "2021-04-13T00:31:14.94Z", + "updated": "2021-04-13T00:31:27.59Z", + "resultInfo": "The configuration was successfully saved to master as commit c0ae274f6046912107bad734834cbf65918668b6.", + "actionLog": [] + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationValidate.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationValidate.json index ed20536c5a1c..7a0752cf8378 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationValidate.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantConfigurationValidate.json @@ -19,153 +19,16 @@ }, "200": { "body": { - "id": "5a1af64e2a6d2e0b688d751e", - "status": "Succeeded", - "started": "2019-04-11T01:30:51.767Z", - "updated": "2019-04-11T01:30:57.653Z", - "resultInfo": "Validation is successfull", - "actionLog": [ - { - "objectType": "ApiSpecificationContract", - "action": "Updated", - "objectKey": "57914cb351f68a16889be190;rev=1" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5768181ea40f7eb6c49f6ac7" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "576819c9a40f7e86289fb3e3" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "576819f1a40f7e86289fb6de" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681a67a40f7e72b4132522" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681a73a40f7e72b413281d" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681a7ea40f7e72b4132b18" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681b88a40f7ea0f017f099" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681b9fa40f7ea0f017f682" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bb5a40f7ea0f017fc6b" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bcaa40f7ea0f0180254" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bdfa40f7ea0f018083d" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681bf5a40f7ea0f0180e26" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681c0ea40f7ea0f018140f" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681c26a40f7ea0f01819f8" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681c83a40f7e85f44db237" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681cb2a40f7e85f44dbcd0" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681ce3a40f7e85f44dc769" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681d1fa40f7e85f44dd202" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681d60a40f7e85f44ddc9b" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681db4a40f7e85f44de735" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681e11a40f7e85f44df1ce" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681e73a40f7e85f44dfc67" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "57681f06a40f7e74ec07785c" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5768211fa40f7e74ec07a74a" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "576823cfa40f7e74ec07d63a" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5600b57e7e8880006a060001" - }, - { - "objectType": "ProductSpecificationContract", - "action": "Updated", - "objectKey": "5600b57e7e8880006a060002" - } - ] + "id": "6074ec02093a9d0dac3d7345", + "type": "Microsoft.ApiManagement/service/tenant/operationResults", + "name": "6074ec02093a9d0dac3d7345", + "properties": { + "status": "Succeeded", + "started": "2021-04-13T00:55:30.62Z", + "updated": "2021-04-13T00:55:39.857Z", + "resultInfo": "Validation is successfull", + "actionLog": [] + } } } } From 9edbf28c6dc9ccd5dd3d134d8448a325e908519d Mon Sep 17 00:00:00 2001 From: Samir Solanki Date: Mon, 12 Apr 2021 18:32:10 -0700 Subject: [PATCH 2/2] fix sync state contract --- .../2021-01-01-preview/definitions.json | 14 +++++++++++++ .../ApiManagementTenantAccessSyncState.json | 20 ++++++++++++------- .../stable/2020-12-01/definitions.json | 14 +++++++++++++ .../ApiManagementTenantAccessSyncState.json | 20 ++++++++++++------- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json index 08738b82c00f..6107ce35d097 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json @@ -5488,6 +5488,16 @@ "description": "Contract defining the Tag property in the Tag Resource Contract" }, "TenantConfigurationSyncStateContract": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/TenantConfigurationSyncStateContractProperties", + "description": "Properties returned Tenant Configuration Sync State check." + } + }, + "description": "Result of Tenant Configuration Sync State." + }, + "TenantConfigurationSyncStateContractProperties": { "properties": { "branch": { "type": "string", @@ -5518,6 +5528,10 @@ "type": "string", "format": "date-time", "description": "The date of the latest configuration change. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n" + }, + "lastOperationId": { + "type": "string", + "description": "Most recent tenant configuration operation identifier" } }, "description": "Tenant Configuration Synchronization State." diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantAccessSyncState.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantAccessSyncState.json index 53bd156c5d93..6f8c9ac6c604 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantAccessSyncState.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementTenantAccessSyncState.json @@ -9,13 +9,19 @@ "responses": { "200": { "body": { - "branch": "master", - "commitId": "44c29c27a876372e2ea18d9c381cc493a6a89fc5", - "isExport": true, - "isSynced": false, - "isGitEnabled": true, - "syncDate": "2016-10-24T19:17:14.3641403Z", - "configurationChangeDate": "2017-06-03T00:41:30.9670873Z" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/configuration/syncState", + "type": "Microsoft.ApiManagement/service/tenant/syncState", + "name": "syncState", + "properties": { + "branch": "master", + "commitId": "de891c2342c7058dde45e5e624eae7e558c94683", + "isExport": true, + "isSynced": true, + "isGitEnabled": true, + "syncDate": "2021-04-13T01:15:53.9824995Z", + "configurationChangeDate": "2021-04-13T00:11:43.862781Z", + "lastOperationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/configuration/operationResults/6074f0bd093a9d0dac3d7347" + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json index a8686728ddc5..283ef09f07d1 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/definitions.json @@ -5423,6 +5423,16 @@ "description": "Contract defining the Tag property in the Tag Resource Contract" }, "TenantConfigurationSyncStateContract": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/TenantConfigurationSyncStateContractProperties", + "description": "Properties returned Tenant Configuration Sync State check." + } + }, + "description": "Result of Tenant Configuration Sync State." + }, + "TenantConfigurationSyncStateContractProperties": { "properties": { "branch": { "type": "string", @@ -5453,6 +5463,10 @@ "type": "string", "format": "date-time", "description": "The date of the latest configuration change. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n" + }, + "lastOperationId": { + "type": "string", + "description": "Most recent tenant configuration operation identifier" } }, "description": "Tenant Configuration Synchronization State." diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantAccessSyncState.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantAccessSyncState.json index d3c3d0ce2f4b..6c9ca32cfe67 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantAccessSyncState.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2020-12-01/examples/ApiManagementTenantAccessSyncState.json @@ -9,13 +9,19 @@ "responses": { "200": { "body": { - "branch": "master", - "commitId": "44c29c27a876372e2ea18d9c381cc493a6a89fc5", - "isExport": true, - "isSynced": false, - "isGitEnabled": true, - "syncDate": "2016-10-24T19:17:14.3641403Z", - "configurationChangeDate": "2017-06-03T00:41:30.9670873Z" + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/configuration/syncState", + "type": "Microsoft.ApiManagement/service/tenant/syncState", + "name": "syncState", + "properties": { + "branch": "master", + "commitId": "de891c2342c7058dde45e5e624eae7e558c94683", + "isExport": true, + "isSynced": true, + "isGitEnabled": true, + "syncDate": "2021-04-13T01:15:53.9824995Z", + "configurationChangeDate": "2021-04-13T00:11:43.862781Z", + "lastOperationId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/tenant/configuration/operationResults/6074f0bd093a9d0dac3d7347" + } } } }