Skip to content

Commit eaf557d

Browse files
charmainewkchanCharmaine Chan
authored andcommitted
Make failover group status type object to fix resource sync (Azure#23058)
* Make status object to fix resource sync * Remove trailing comma * Move changes to 2023-03-15-preview --------- Co-authored-by: Charmaine Chan <[email protected]>
1 parent 4f95983 commit eaf557d

File tree

2 files changed

+4
-194
lines changed

2 files changed

+4
-194
lines changed

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/failoverGroups.json

Lines changed: 2 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@
7474
"x-ms-client-flatten": false
7575
},
7676
"status": {
77-
"$ref": "#/definitions/FailoverGroupStatus",
78-
"description": "The status of the failover group custom resource.",
79-
"x-ms-client-flatten": false
77+
"type": "object",
78+
"description": "The status of the failover group custom resource."
8079
}
8180
},
8281
"additionalProperties": {},
@@ -142,100 +141,6 @@
142141
"required": [
143142
"role"
144143
]
145-
},
146-
"FailoverGroupStatus": {
147-
"type": "object",
148-
"description": "The status of the Kubernetes custom resource.",
149-
"properties": {
150-
"lastUpdateTime": {
151-
"type": "string",
152-
"format": "date-time",
153-
"description": "The time that the custom resource was last updated."
154-
},
155-
"observedGeneration": {
156-
"type": "integer",
157-
"format": "int64",
158-
"description": "The version of the replicaSet associated with the failover group custom resource."
159-
},
160-
"state": {
161-
"type": "string",
162-
"enum": [
163-
"Waiting",
164-
"Succeeded",
165-
"Failed"
166-
],
167-
"x-ms-enum": {
168-
"name": "state",
169-
"modelAsString": true
170-
},
171-
"description": "The state of the failover group custom resource."
172-
},
173-
"results": {
174-
"type": "string",
175-
"description": "The message in case of a failure in the failover group."
176-
},
177-
"role": {
178-
"type": "string",
179-
"enum": [
180-
"primary",
181-
"secondary",
182-
"force-primary-allow-data-loss",
183-
"force-secondary"
184-
],
185-
"x-ms-enum": {
186-
"name": "instanceFailoverGroupRole",
187-
"modelAsString": true
188-
},
189-
"description": "The role of the managed instance in the failover group."
190-
},
191-
"replicas": {
192-
"type": "array",
193-
"description": "A list of failover group replicas.",
194-
"items": {
195-
"$ref": "#/definitions/AGReplicas",
196-
"description": "The availability group replicas.",
197-
"x-ms-client-flatten": false
198-
},
199-
"x-ms-identifiers": [
200-
"replicaName"
201-
]
202-
}
203-
},
204-
"additionalProperties": {}
205-
},
206-
"AGReplicas": {
207-
"type": "object",
208-
"description": "The information about each failover group replica.",
209-
"properties": {
210-
"healthState": {
211-
"type": "string",
212-
"description": "The health state of the replica."
213-
},
214-
"replicaName": {
215-
"type": "string",
216-
"description": "The replica name."
217-
},
218-
"role": {
219-
"type": "string",
220-
"description": "The role of the replica."
221-
},
222-
"connectedState": {
223-
"type": "string",
224-
"description": "The connected state of the replica."
225-
},
226-
"synchronizationState": {
227-
"type": "string",
228-
"description": "The synchronization state of the availability group replicas."
229-
},
230-
"availabilityMode": {
231-
"type": "string",
232-
"description": "The availability mode of the replica."
233-
},
234-
"secondaryRoleAllowConnections": {
235-
"type": "string",
236-
"description": "The secondary role allowed connections."
237-
}
238-
}
239144
}
240145
},
241146
"securityDefinitions": {

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-03-15-preview/failoverGroups.json

Lines changed: 2 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@
7474
"x-ms-client-flatten": false
7575
},
7676
"status": {
77-
"$ref": "#/definitions/FailoverGroupStatus",
78-
"description": "The status of the failover group custom resource.",
79-
"x-ms-client-flatten": false
77+
"type": "object",
78+
"description": "The status of the failover group custom resource."
8079
}
8180
},
8281
"additionalProperties": {},
@@ -142,100 +141,6 @@
142141
"required": [
143142
"role"
144143
]
145-
},
146-
"FailoverGroupStatus": {
147-
"type": "object",
148-
"description": "The status of the Kubernetes custom resource.",
149-
"properties": {
150-
"lastUpdateTime": {
151-
"type": "string",
152-
"format": "date-time",
153-
"description": "The time that the custom resource was last updated."
154-
},
155-
"observedGeneration": {
156-
"type": "integer",
157-
"format": "int64",
158-
"description": "The version of the replicaSet associated with the failover group custom resource."
159-
},
160-
"state": {
161-
"type": "string",
162-
"enum": [
163-
"Waiting",
164-
"Succeeded",
165-
"Failed"
166-
],
167-
"x-ms-enum": {
168-
"name": "state",
169-
"modelAsString": true
170-
},
171-
"description": "The state of the failover group custom resource."
172-
},
173-
"results": {
174-
"type": "string",
175-
"description": "The message in case of a failure in the failover group."
176-
},
177-
"role": {
178-
"type": "string",
179-
"enum": [
180-
"primary",
181-
"secondary",
182-
"force-primary-allow-data-loss",
183-
"force-secondary"
184-
],
185-
"x-ms-enum": {
186-
"name": "instanceFailoverGroupRole",
187-
"modelAsString": true
188-
},
189-
"description": "The role of the managed instance in the failover group."
190-
},
191-
"replicas": {
192-
"type": "array",
193-
"description": "A list of failover group replicas.",
194-
"items": {
195-
"$ref": "#/definitions/AGReplicas",
196-
"description": "The availability group replicas.",
197-
"x-ms-client-flatten": false
198-
},
199-
"x-ms-identifiers": [
200-
"replicaName"
201-
]
202-
}
203-
},
204-
"additionalProperties": {}
205-
},
206-
"AGReplicas": {
207-
"type": "object",
208-
"description": "The information about each failover group replica.",
209-
"properties": {
210-
"healthState": {
211-
"type": "string",
212-
"description": "The health state of the replica."
213-
},
214-
"replicaName": {
215-
"type": "string",
216-
"description": "The replica name."
217-
},
218-
"role": {
219-
"type": "string",
220-
"description": "The role of the replica."
221-
},
222-
"connectedState": {
223-
"type": "string",
224-
"description": "The connected state of the replica."
225-
},
226-
"synchronizationState": {
227-
"type": "string",
228-
"description": "The synchronization state of the availability group replicas."
229-
},
230-
"availabilityMode": {
231-
"type": "string",
232-
"description": "The availability mode of the replica."
233-
},
234-
"secondaryRoleAllowConnections": {
235-
"type": "string",
236-
"description": "The secondary role allowed connections."
237-
}
238-
}
239144
}
240145
},
241146
"securityDefinitions": {

0 commit comments

Comments
 (0)