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

Jump to bottom

Use common Resource & Sku definitions in all Sql specs #3134

Merged
merged 7 commits into from
May 25, 2018
Merged

Use common Resource & Sku definitions in all Sql specs #3134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c63b51a
Use common Resource & Sku definitions
jaredmoo May 24, 2018
74554df
Don't use common Sku definition
jaredmoo May 24, 2018
06f47bb
Just use common SQL definitions
jaredmoo May 24, 2018
8e5212f
Fixed syntax error
jaredmoo May 24, 2018
7207a43
Fixed another syntax error
jaredmoo May 24, 2018
6b4950b
Fixed sku ref error
jaredmoo May 24, 2018
3892c33
Fixed syntax error in example
jaredmoo May 24, 2018
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
Next Next commit
Use common Resource & Sku definitions
  • Loading branch information
@jaredmoo
jaredmoo committed May 24, 2018
commit c63b51a5611cce9ad3075d90f8f791af75064f54
36 changes: 2 additions & 34 deletions specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/advisors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,38 +486,6 @@
}
},
"definitions": {
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ProxyResource": {
"description": "ARM proxy resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {}
},
"AdvisorProperties": {
"description": "Properties for a Database, Server or Elastic Pool Advisor.",
"required": [
Expand Down Expand Up @@ -923,7 +891,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand All @@ -949,7 +917,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
34 changes: 1 addition & 33 deletions ...n/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditingPolicies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,44 +208,12 @@
}
}
},
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ProxyResource": {
"description": "ARM proxy resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {}
},
"DatabaseBlobAuditingPolicy": {
"description": "A database blob auditing policy.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
34 changes: 1 addition & 33 deletions ...ql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,44 +210,12 @@
}
}
},
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ProxyResource": {
"description": "ARM proxy resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {}
},
"DatabaseAutomaticTuning": {
"description": "Database-level Automatic Tuning.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
34 changes: 1 addition & 33 deletions ...n/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,44 +239,12 @@
}
}
},
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ProxyResource": {
"description": "ARM proxy resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {}
},
"EncryptionProtector": {
"description": "The server encryption protector.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
34 changes: 1 addition & 33 deletions ...ication/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,44 +531,12 @@
}
}
},
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ProxyResource": {
"description": "ARM proxy resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {}
},
"FailoverGroup": {
"description": "A failover group.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
87 changes: 3 additions & 84 deletions ...ation/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,36 +333,6 @@
}
}
},
"Sku": {
"description": "An ARM Resource SKU.",
"required": [
"name"
],
"type": "object",
"properties": {
"name": {
"description": "The name of the SKU, typically, a letter + Number code, e.g. P3.",
"type": "string"
},
"tier": {
"description": "The tier of the particular SKU, e.g. Basic, Premium.",
"type": "string"
},
"size": {
"description": "Size of the particular SKU",
"type": "string"
},
"family": {
"description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.",
"type": "string"
},
"capacity": {
"format": "int32",
"description": "Capacity of the particular SKU.",
"type": "integer"
}
}
},
"ManagedInstanceProperties": {
"description": "The properties of a managed instance.",
"type": "object",
Expand Down Expand Up @@ -413,57 +383,6 @@
}
}
},
"Resource": {
"description": "ARM resource.",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"TrackedResource": {
"description": "ARM tracked top level resource.",
"required": [
"location"
],
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {
"location": {
"description": "Resource location.",
"type": "string",
"x-ms-mutability": [
"read",
"create"
]
},
"tags": {
"description": "Resource tags.",
"type": "object",
"additionalProperties": {
"type": "string"
}
}
}
},
"ManagedInstance": {
"description": "An Azure SQL managed instance.",
"required": [
Expand All @@ -472,7 +391,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand All @@ -485,7 +404,7 @@
]
},
"sku": {
"$ref": "#/definitions/Sku",
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"description": "Managed instance sku"
},
"properties": {
Expand All @@ -500,7 +419,7 @@
"type": "object",
"properties": {
"sku": {
"$ref": "#/definitions/Sku",
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"description": "Managed instance sku"
},
"properties": {
Expand Down
Loading