From 3c72bb9751a158bb84b579fcb366ad18e95e2fdb Mon Sep 17 00:00:00 2001 From: Charmaine Chan Date: Mon, 13 Mar 2023 14:32:55 -0700 Subject: [PATCH 1/3] Make status object to fix resource sync --- .../2023-01-15-preview/failoverGroups.json | 97 +------------------ 1 file changed, 1 insertion(+), 96 deletions(-) diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json index a1261eebf07b..a5fed680c82f 100644 --- a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json +++ b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json @@ -74,9 +74,8 @@ "x-ms-client-flatten": false }, "status": { - "$ref": "#/definitions/FailoverGroupStatus", + "type": "object", "description": "The status of the failover group custom resource.", - "x-ms-client-flatten": false } }, "additionalProperties": {}, @@ -142,100 +141,6 @@ "required": [ "role" ] - }, - "FailoverGroupStatus": { - "type": "object", - "description": "The status of the Kubernetes custom resource.", - "properties": { - "lastUpdateTime": { - "type": "string", - "format": "date-time", - "description": "The time that the custom resource was last updated." - }, - "observedGeneration": { - "type": "integer", - "format": "int64", - "description": "The version of the replicaSet associated with the failover group custom resource." - }, - "state": { - "type": "string", - "enum": [ - "Waiting", - "Succeeded", - "Failed" - ], - "x-ms-enum": { - "name": "state", - "modelAsString": true - }, - "description": "The state of the failover group custom resource." - }, - "results": { - "type": "string", - "description": "The message in case of a failure in the failover group." - }, - "role": { - "type": "string", - "enum": [ - "primary", - "secondary", - "force-primary-allow-data-loss", - "force-secondary" - ], - "x-ms-enum": { - "name": "instanceFailoverGroupRole", - "modelAsString": true - }, - "description": "The role of the managed instance in the failover group." - }, - "replicas": { - "type": "array", - "description": "A list of failover group replicas.", - "items": { - "$ref": "#/definitions/AGReplicas", - "description": "The availability group replicas.", - "x-ms-client-flatten": false - }, - "x-ms-identifiers": [ - "replicaName" - ] - } - }, - "additionalProperties": {} - }, - "AGReplicas": { - "type": "object", - "description": "The information about each failover group replica.", - "properties": { - "healthState": { - "type": "string", - "description": "The health state of the replica." - }, - "replicaName": { - "type": "string", - "description": "The replica name." - }, - "role": { - "type": "string", - "description": "The role of the replica." - }, - "connectedState": { - "type": "string", - "description": "The connected state of the replica." - }, - "synchronizationState": { - "type": "string", - "description": "The synchronization state of the availability group replicas." - }, - "availabilityMode": { - "type": "string", - "description": "The availability mode of the replica." - }, - "secondaryRoleAllowConnections": { - "type": "string", - "description": "The secondary role allowed connections." - } - } } }, "securityDefinitions": { From 4965e0d49ffcbdd7aed00a6ab52d2694452b4993 Mon Sep 17 00:00:00 2001 From: Charmaine Chan Date: Tue, 14 Mar 2023 10:58:41 -0700 Subject: [PATCH 2/3] Remove trailing comma --- .../preview/2023-01-15-preview/failoverGroups.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json index a5fed680c82f..fee0b9e3d3cf 100644 --- a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json +++ b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json @@ -75,7 +75,7 @@ }, "status": { "type": "object", - "description": "The status of the failover group custom resource.", + "description": "The status of the failover group custom resource." } }, "additionalProperties": {}, From 543e7c7f6f79004adcb1c2da2838c6ce8d563fb1 Mon Sep 17 00:00:00 2001 From: Charmaine Chan Date: Fri, 17 Mar 2023 12:27:05 -0700 Subject: [PATCH 3/3] Move changes to 2023-03-15-preview --- .../2023-03-15-preview/failoverGroups.json | 99 +------------------ 1 file changed, 2 insertions(+), 97 deletions(-) diff --git a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-03-15-preview/failoverGroups.json b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-03-15-preview/failoverGroups.json index db8fe9c7e348..75accbf36a4b 100644 --- a/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-03-15-preview/failoverGroups.json +++ b/specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-03-15-preview/failoverGroups.json @@ -74,9 +74,8 @@ "x-ms-client-flatten": false }, "status": { - "$ref": "#/definitions/FailoverGroupStatus", - "description": "The status of the failover group custom resource.", - "x-ms-client-flatten": false + "type": "object", + "description": "The status of the failover group custom resource." } }, "additionalProperties": {}, @@ -142,100 +141,6 @@ "required": [ "role" ] - }, - "FailoverGroupStatus": { - "type": "object", - "description": "The status of the Kubernetes custom resource.", - "properties": { - "lastUpdateTime": { - "type": "string", - "format": "date-time", - "description": "The time that the custom resource was last updated." - }, - "observedGeneration": { - "type": "integer", - "format": "int64", - "description": "The version of the replicaSet associated with the failover group custom resource." - }, - "state": { - "type": "string", - "enum": [ - "Waiting", - "Succeeded", - "Failed" - ], - "x-ms-enum": { - "name": "state", - "modelAsString": true - }, - "description": "The state of the failover group custom resource." - }, - "results": { - "type": "string", - "description": "The message in case of a failure in the failover group." - }, - "role": { - "type": "string", - "enum": [ - "primary", - "secondary", - "force-primary-allow-data-loss", - "force-secondary" - ], - "x-ms-enum": { - "name": "instanceFailoverGroupRole", - "modelAsString": true - }, - "description": "The role of the managed instance in the failover group." - }, - "replicas": { - "type": "array", - "description": "A list of failover group replicas.", - "items": { - "$ref": "#/definitions/AGReplicas", - "description": "The availability group replicas.", - "x-ms-client-flatten": false - }, - "x-ms-identifiers": [ - "replicaName" - ] - } - }, - "additionalProperties": {} - }, - "AGReplicas": { - "type": "object", - "description": "The information about each failover group replica.", - "properties": { - "healthState": { - "type": "string", - "description": "The health state of the replica." - }, - "replicaName": { - "type": "string", - "description": "The replica name." - }, - "role": { - "type": "string", - "description": "The role of the replica." - }, - "connectedState": { - "type": "string", - "description": "The connected state of the replica." - }, - "synchronizationState": { - "type": "string", - "description": "The synchronization state of the availability group replicas." - }, - "availabilityMode": { - "type": "string", - "description": "The availability mode of the replica." - }, - "secondaryRoleAllowConnections": { - "type": "string", - "description": "The secondary role allowed connections." - } - } } }, "securityDefinitions": {