Skip to content

Commit b0bf11b

Browse files
author
msftbot[bot]
authored
[ReleasePR confluent] Making Offer details and User Details required properties (#1593)
Create to sync Azure/azure-rest-api-specs#13985 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/master...AzureSDKAutomation:sdkAuto/confluent?expand=1)
2 parents a09c839 + 1c3dbce commit b0bf11b

File tree

4 files changed

+289
-23
lines changed

4 files changed

+289
-23
lines changed

‎schemas/2018-05-01/subscriptionDeploymentTemplate.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@
156156
{
157157
"$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Confluent.json#/subscription_resourceDefinitions/agreements"
158158
},
159+
{
160+
"$ref": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#/subscription_resourceDefinitions/agreements"
161+
},
159162
{
160163
"$ref": "https://schema.management.azure.com/schemas/2017-12-30-preview/Microsoft.Consumption.json#/subscription_resourceDefinitions/budgets"
161164
},

‎schemas/2020-03-01/Microsoft.Confluent.json‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -204,29 +204,6 @@
204204
"maxLength": 50,
205205
"description": "Publisher Id"
206206
},
207-
"status": {
208-
"oneOf": [
209-
{
210-
"type": "string",
211-
"enum": [
212-
"Started",
213-
"PendingFulfillmentStart",
214-
"InProgress",
215-
"Subscribed",
216-
"Suspended",
217-
"Reinstated",
218-
"Succeeded",
219-
"Failed",
220-
"Unsubscribed",
221-
"Updating"
222-
]
223-
},
224-
{
225-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
226-
}
227-
],
228-
"description": "SaaS Offer Status."
229-
},
230207
"termUnit": {
231208
"type": "string",
232209
"maxLength": 25,

‎schemas/2021-03-01-preview/Microsoft.Confluent.json‎

Lines changed: 283 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,283 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.Confluent",
5+
"description": "Microsoft Confluent Resource Types",
6+
"resourceDefinitions": {
7+
"organizations": {
8+
"type": "object",
9+
"properties": {
10+
"apiVersion": {
11+
"type": "string",
12+
"enum": [
13+
"2021-03-01-preview"
14+
]
15+
},
16+
"location": {
17+
"type": "string",
18+
"description": "Location of Organization resource"
19+
},
20+
"name": {
21+
"type": "string",
22+
"description": "Organization resource name"
23+
},
24+
"properties": {
25+
"oneOf": [
26+
{
27+
"$ref": "#/definitions/OrganizationResourceProperties"
28+
},
29+
{
30+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
31+
}
32+
],
33+
"description": "Organization resource property"
34+
},
35+
"tags": {
36+
"oneOf": [
37+
{
38+
"type": "object",
39+
"additionalProperties": {
40+
"type": "string"
41+
},
42+
"properties": {}
43+
},
44+
{
45+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
46+
}
47+
],
48+
"description": "Organization resource tags"
49+
},
50+
"type": {
51+
"type": "string",
52+
"enum": [
53+
"Microsoft.Confluent/organizations"
54+
]
55+
}
56+
},
57+
"required": [
58+
"apiVersion",
59+
"name",
60+
"properties",
61+
"type"
62+
],
63+
"description": "Microsoft.Confluent/organizations"
64+
}
65+
},
66+
"subscription_resourceDefinitions": {
67+
"agreements": {
68+
"type": "object",
69+
"properties": {
70+
"apiVersion": {
71+
"type": "string",
72+
"enum": [
73+
"2021-03-01-preview"
74+
]
75+
},
76+
"name": {
77+
"type": "string",
78+
"enum": [
79+
"default"
80+
]
81+
},
82+
"properties": {
83+
"oneOf": [
84+
{
85+
"$ref": "#/definitions/ConfluentAgreementProperties"
86+
},
87+
{
88+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
89+
}
90+
],
91+
"description": "Terms properties for Marketplace and Confluent."
92+
},
93+
"type": {
94+
"type": "string",
95+
"enum": [
96+
"Microsoft.Confluent/agreements"
97+
]
98+
}
99+
},
100+
"required": [
101+
"apiVersion",
102+
"name",
103+
"properties",
104+
"type"
105+
],
106+
"description": "Microsoft.Confluent/agreements"
107+
}
108+
},
109+
"definitions": {
110+
"ConfluentAgreementProperties": {
111+
"type": "object",
112+
"properties": {
113+
"accepted": {
114+
"oneOf": [
115+
{
116+
"type": "boolean"
117+
},
118+
{
119+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
120+
}
121+
],
122+
"description": "If any version of the terms have been accepted, otherwise false."
123+
},
124+
"licenseTextLink": {
125+
"type": "string",
126+
"description": "Link to HTML with Microsoft and Publisher terms."
127+
},
128+
"plan": {
129+
"type": "string",
130+
"description": "Plan identifier string."
131+
},
132+
"privacyPolicyLink": {
133+
"type": "string",
134+
"description": "Link to the privacy policy of the publisher."
135+
},
136+
"product": {
137+
"type": "string",
138+
"description": "Product identifier string."
139+
},
140+
"publisher": {
141+
"type": "string",
142+
"description": "Publisher identifier string."
143+
},
144+
"retrieveDatetime": {
145+
"type": "string",
146+
"format": "date-time",
147+
"description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false."
148+
},
149+
"signature": {
150+
"type": "string",
151+
"description": "Terms signature."
152+
}
153+
},
154+
"description": "Terms properties for Marketplace and Confluent."
155+
},
156+
"OfferDetail": {
157+
"type": "object",
158+
"properties": {
159+
"id": {
160+
"type": "string",
161+
"maxLength": 50,
162+
"description": "Offer Id"
163+
},
164+
"planId": {
165+
"type": "string",
166+
"maxLength": 50,
167+
"description": "Offer Plan Id"
168+
},
169+
"planName": {
170+
"type": "string",
171+
"maxLength": 50,
172+
"description": "Offer Plan Name"
173+
},
174+
"publisherId": {
175+
"type": "string",
176+
"maxLength": 50,
177+
"description": "Publisher Id"
178+
},
179+
"status": {
180+
"oneOf": [
181+
{
182+
"type": "string",
183+
"enum": [
184+
"Started",
185+
"PendingFulfillmentStart",
186+
"InProgress",
187+
"Subscribed",
188+
"Suspended",
189+
"Reinstated",
190+
"Succeeded",
191+
"Failed",
192+
"Unsubscribed",
193+
"Updating"
194+
]
195+
},
196+
{
197+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
198+
}
199+
],
200+
"description": "SaaS Offer Status."
201+
},
202+
"termUnit": {
203+
"type": "string",
204+
"maxLength": 25,
205+
"description": "Offer Plan Term unit"
206+
}
207+
},
208+
"required": [
209+
"id",
210+
"planId",
211+
"planName",
212+
"publisherId",
213+
"termUnit"
214+
],
215+
"description": "Confluent Offer detail"
216+
},
217+
"OrganizationResourceProperties": {
218+
"type": "object",
219+
"properties": {
220+
"offerDetail": {
221+
"oneOf": [
222+
{
223+
"$ref": "#/definitions/OfferDetail"
224+
},
225+
{
226+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
227+
}
228+
],
229+
"description": "Confluent Offer detail"
230+
},
231+
"userDetail": {
232+
"oneOf": [
233+
{
234+
"$ref": "#/definitions/UserDetail"
235+
},
236+
{
237+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
238+
}
239+
],
240+
"description": "Subscriber detail"
241+
}
242+
},
243+
"required": [
244+
"offerDetail",
245+
"userDetail"
246+
],
247+
"description": "Organization resource property"
248+
},
249+
"UserDetail": {
250+
"type": "object",
251+
"properties": {
252+
"emailAddress": {
253+
"oneOf": [
254+
{
255+
"type": "string",
256+
"pattern": "^\\S+@\\S+\\.\\S+$"
257+
},
258+
{
259+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
260+
}
261+
],
262+
"description": "Email address"
263+
},
264+
"firstName": {
265+
"type": "string",
266+
"maxLength": 50,
267+
"description": "First name"
268+
},
269+
"lastName": {
270+
"type": "string",
271+
"maxLength": 50,
272+
"description": "Last name"
273+
}
274+
},
275+
"required": [
276+
"emailAddress",
277+
"firstName",
278+
"lastName"
279+
],
280+
"description": "Subscriber detail"
281+
}
282+
}
283+
}

‎schemas/common/autogeneratedResources.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,6 +2263,9 @@
22632263
{
22642264
"$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Confluent.json#/resourceDefinitions/organizations"
22652265
},
2266+
{
2267+
"$ref": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#/resourceDefinitions/organizations"
2268+
},
22662269
{
22672270
"$ref": "https://schema.management.azure.com/schemas/2018-01-31/Microsoft.Consumption.json#/resourceDefinitions/budgets"
22682271
},

0 commit comments

Comments
 (0)