Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR confluent] Making Offer details and User Details required properties #1593

Merged
1 commit merged into from
Apr 20, 2021
Merged

[ReleasePR confluent] Making Offer details and User Details required properties #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions schemas/2018-05-01/subscriptionDeploymentTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Confluent.json#/subscription_resourceDefinitions/agreements"
},
{
"$ref": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#/subscription_resourceDefinitions/agreements"
},
{
"$ref": "https://schema.management.azure.com/schemas/2017-12-30-preview/Microsoft.Consumption.json#/subscription_resourceDefinitions/budgets"
},
Expand Down
23 changes: 0 additions & 23 deletions schemas/2020-03-01/Microsoft.Confluent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,29 +204,6 @@
"maxLength": 50,
"description": "Publisher Id"
},
"status": {
"oneOf": [
{
"type": "string",
"enum": [
"Started",
"PendingFulfillmentStart",
"InProgress",
"Subscribed",
"Suspended",
"Reinstated",
"Succeeded",
"Failed",
"Unsubscribed",
"Updating"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "SaaS Offer Status."
},
"termUnit": {
"type": "string",
"maxLength": 25,
Expand Down
283 changes: 283 additions & 0 deletions schemas/2021-03-01-preview/Microsoft.Confluent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,283 @@
{
"id": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Microsoft.Confluent",
"description": "Microsoft Confluent Resource Types",
"resourceDefinitions": {
"organizations": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2021-03-01-preview"
]
},
"location": {
"type": "string",
"description": "Location of Organization resource"
},
"name": {
"type": "string",
"description": "Organization resource name"
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/OrganizationResourceProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Organization resource property"
},
"tags": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "string"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Organization resource tags"
},
"type": {
"type": "string",
"enum": [
"Microsoft.Confluent/organizations"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Confluent/organizations"
}
},
"subscription_resourceDefinitions": {
"agreements": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2021-03-01-preview"
]
},
"name": {
"type": "string",
"enum": [
"default"
]
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ConfluentAgreementProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Terms properties for Marketplace and Confluent."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Confluent/agreements"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Confluent/agreements"
}
},
"definitions": {
"ConfluentAgreementProperties": {
"type": "object",
"properties": {
"accepted": {
"oneOf": [
{
"type": "boolean"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "If any version of the terms have been accepted, otherwise false."
},
"licenseTextLink": {
"type": "string",
"description": "Link to HTML with Microsoft and Publisher terms."
},
"plan": {
"type": "string",
"description": "Plan identifier string."
},
"privacyPolicyLink": {
"type": "string",
"description": "Link to the privacy policy of the publisher."
},
"product": {
"type": "string",
"description": "Product identifier string."
},
"publisher": {
"type": "string",
"description": "Publisher identifier string."
},
"retrieveDatetime": {
"type": "string",
"format": "date-time",
"description": "Date and time in UTC of when the terms were accepted. This is empty if Accepted is false."
},
"signature": {
"type": "string",
"description": "Terms signature."
}
},
"description": "Terms properties for Marketplace and Confluent."
},
"OfferDetail": {
"type": "object",
"properties": {
"id": {
"type": "string",
"maxLength": 50,
"description": "Offer Id"
},
"planId": {
"type": "string",
"maxLength": 50,
"description": "Offer Plan Id"
},
"planName": {
"type": "string",
"maxLength": 50,
"description": "Offer Plan Name"
},
"publisherId": {
"type": "string",
"maxLength": 50,
"description": "Publisher Id"
},
"status": {
"oneOf": [
{
"type": "string",
"enum": [
"Started",
"PendingFulfillmentStart",
"InProgress",
"Subscribed",
"Suspended",
"Reinstated",
"Succeeded",
"Failed",
"Unsubscribed",
"Updating"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "SaaS Offer Status."
},
"termUnit": {
"type": "string",
"maxLength": 25,
"description": "Offer Plan Term unit"
}
},
"required": [
"id",
"planId",
"planName",
"publisherId",
"termUnit"
],
"description": "Confluent Offer detail"
},
"OrganizationResourceProperties": {
"type": "object",
"properties": {
"offerDetail": {
"oneOf": [
{
"$ref": "#/definitions/OfferDetail"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Confluent Offer detail"
},
"userDetail": {
"oneOf": [
{
"$ref": "#/definitions/UserDetail"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Subscriber detail"
}
},
"required": [
"offerDetail",
"userDetail"
],
"description": "Organization resource property"
},
"UserDetail": {
"type": "object",
"properties": {
"emailAddress": {
"oneOf": [
{
"type": "string",
"pattern": "^\\S+@\\S+\\.\\S+$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Email address"
},
"firstName": {
"type": "string",
"maxLength": 50,
"description": "First name"
},
"lastName": {
"type": "string",
"maxLength": 50,
"description": "Last name"
}
},
"required": [
"emailAddress",
"firstName",
"lastName"
],
"description": "Subscriber detail"
}
}
}
3 changes: 3 additions & 0 deletions schemas/common/autogeneratedResources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,6 +2263,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Confluent.json#/resourceDefinitions/organizations"
},
{
"$ref": "https://schema.management.azure.com/schemas/2021-03-01-preview/Microsoft.Confluent.json#/resourceDefinitions/organizations"
},
{
"$ref": "https://schema.management.azure.com/schemas/2018-01-31/Microsoft.Consumption.json#/resourceDefinitions/budgets"
},
Expand Down