Skip to content

Commit

Permalink
CodeGen from PR 18629 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history 
[Hub Generated] Publish private branch 'stuartko/Jan22_TSBuiltInsWithApiVersionBump' (#18629)

* Copy previous version to 2022-02-01 directory

* Adding changed spec files from PR 4200. Without api-version bump

* Changing version string 2021-06-01 to 2022-02-01 in specs

* Updating SDK generation tags/settings to use 2022-02

* Fixing some LintDiff issues (new rules)

* Fixing "prettier" issue

* Fixing bad conflict resolution
  • Loading branch information
SDKAuto committed Apr 18, 2022
1 parent 3cf49b0 commit 5c6ded1
Show file tree
Hide file tree
Showing 3 changed files with 373 additions and 0 deletions.
3 changes: 3 additions & 0 deletions schemas/2018-05-01/subscriptionDeploymentTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,9 @@
{
"$ref": "https://schema.management.azure.com/schemas/2021-05-01/Microsoft.Resources.json#/subscription_resourceDefinitions/resourceGroups"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-02-01/Microsoft.Resources.json#/subscription_resourceDefinitions/resourceGroups"
},
{
"$ref": "https://schema.management.azure.com/schemas/2015-06-01-preview/Microsoft.Security.json#/subscription_resourceDefinitions/locations_applicationWhitelistings"
},
Expand Down
364 changes: 364 additions & 0 deletions schemas/2022-02-01/Microsoft.Resources.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,364 @@
{
"id": "https://schema.management.azure.com/schemas/2022-02-01/Microsoft.Resources.json#",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Microsoft.Resources",
"description": "Microsoft Resources Resource Types",
"resourceDefinitions": {
"templateSpecs": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2022-02-01"
]
},
"location": {
"type": "string",
"description": "The location of the Template Spec. It cannot be changed after Template Spec creation. It must be one of the supported Azure locations."
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Name of the Template Spec."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/TemplateSpecProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Template Spec properties."
},
"resources": {
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/definitions/templateSpecs_versions_childResource"
}
]
}
},
"tags": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "string"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Resource tags."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Resources/templateSpecs"
]
}
},
"required": [
"apiVersion",
"location",
"name",
"properties",
"type"
],
"description": "Microsoft.Resources/templateSpecs"
},
"templateSpecs_versions": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2022-02-01"
]
},
"location": {
"type": "string",
"description": "The location of the Template Spec Version. It must match the location of the parent Template Spec."
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The version of the Template Spec."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/TemplateSpecVersionProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Template Spec Version properties."
},
"tags": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "string"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Resource tags."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Resources/templateSpecs/versions"
]
}
},
"required": [
"apiVersion",
"location",
"name",
"properties",
"type"
],
"description": "Microsoft.Resources/templateSpecs/versions"
}
},
"definitions": {
"LinkedTemplateArtifact": {
"type": "object",
"properties": {
"path": {
"type": "string",
"description": "A filesystem safe relative path of the artifact."
},
"template": {
"type": "object",
"properties": {},
"description": "The Azure Resource Manager template."
}
},
"required": [
"path",
"template"
],
"description": "Represents a Template Spec artifact containing an embedded Azure Resource Manager template for use as a linked template."
},
"TemplateSpecProperties": {
"type": "object",
"properties": {
"description": {
"type": "string",
"maxLength": 4096,
"description": "Template Spec description."
},
"displayName": {
"type": "string",
"maxLength": 64,
"description": "Template Spec display name."
},
"metadata": {
"type": "object",
"properties": {},
"description": "The Template Spec metadata. Metadata is an open-ended object and is typically a collection of key-value pairs."
}
},
"description": "Template Spec properties."
},
"templateSpecs_versions_childResource": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2022-02-01"
]
},
"location": {
"type": "string",
"description": "The location of the Template Spec Version. It must match the location of the parent Template Spec."
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The version of the Template Spec."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/TemplateSpecVersionProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Template Spec Version properties."
},
"tags": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "string"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Resource tags."
},
"type": {
"type": "string",
"enum": [
"versions"
]
}
},
"required": [
"apiVersion",
"location",
"name",
"properties",
"type"
],
"description": "Microsoft.Resources/templateSpecs/versions"
},
"TemplateSpecVersionProperties": {
"type": "object",
"properties": {
"description": {
"type": "string",
"maxLength": 4096,
"description": "Template Spec version description."
},
"linkedTemplates": {
"oneOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/LinkedTemplateArtifact"
}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "An array of linked template artifacts."
},
"mainTemplate": {
"type": "object",
"properties": {},
"description": "The main Azure Resource Manager template content."
},
"metadata": {
"type": "object",
"properties": {},
"description": "The version metadata. Metadata is an open-ended object and is typically a collection of key-value pairs."
},
"uiFormDefinition": {
"type": "object",
"properties": {},
"description": "The Azure Resource Manager template UI definition content."
}
},
"description": "Template Spec Version properties."
}
},
"subscription_resourceDefinitions": {
"resourceGroups": {
"type": "object",
"properties": {
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^[-\\w\\._\\(\\)]+$",
"maxLength": 90,
"description": "the resource group name"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
},
"type": {
"type": "string",
"enum": [
"Microsoft.Resources/resourceGroups"
]
},
"apiVersion": {
"type": "string",
"enum": [
"2022-02-01"
]
},
"location": {
"type": "string",
"description": "the resource group location"
},
"tags": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "string"
}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The resource group tags."
}
},
"required": [
"name",
"type",
"apiVersion",
"location"
],
"description": "Microsoft.Resources/resourceGroups"
}
}
}
6 changes: 6 additions & 0 deletions schemas/common/autogeneratedResources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12571,6 +12571,12 @@
{
"$ref": "https://schema.management.azure.com/schemas/2021-05-01/Microsoft.Resources.json#/resourceDefinitions/templateSpecs_versions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-02-01/Microsoft.Resources.json#/resourceDefinitions/templateSpecs"
},
{
"$ref": "https://schema.management.azure.com/schemas/2022-02-01/Microsoft.Resources.json#/resourceDefinitions/templateSpecs_versions"
},
{
"$ref": "https://schema.management.azure.com/schemas/2014-08-01-preview/Microsoft.Scheduler.json#/resourceDefinitions/jobCollections"
},
Expand Down

0 comments on commit 5c6ded1

Please sign in to comment.