Skip to content

add required fields for sku object #10623

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

Merged
akning-ms merged 15 commits into from
Sep 9, 2020
Merged

add required fields for sku object #10623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d917a29
add required fields for sku object
QingqingYuan2 Aug 27, 2020
f139d06
fix prettier
QingqingYuan2 Aug 27, 2020
cd38bb6
fix lint errors
QingqingYuan2 Aug 29, 2020
f4aa7d0
fix prettier
QingqingYuan2 Aug 29, 2020
b106811
fix lint errors
QingqingYuan2 Aug 29, 2020
25f8ee2
Fix lint errors
QingqingYuan2 Aug 29, 2020
9cd67d1
fix sdk eorror
QingqingYuan2 Aug 29, 2020
701a59c
add default response
QingqingYuan2 Aug 29, 2020
1f32a74
Fix checknameavailability response
QingqingYuan2 Aug 29, 2020
e7f80d4
fix prettier
QingqingYuan2 Aug 29, 2020
aad744b
add default result for operations
QingqingYuan2 Aug 29, 2020
ac8d1a8
Remove proxy resource definition
QingqingYuan2 Sep 1, 2020
09a3c4d
supress the provider name check
QingqingYuan2 Sep 1, 2020
a944d15
Remove duplicate Resource definition
QingqingYuan2 Sep 1, 2020
ff1e11c
removed duplicate tracked resource definition
QingqingYuan2 Sep 1, 2020
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
102 changes: 28 additions & 74 deletions ...n/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
},
"paths": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}": {
"put": {
"tags": [
"Servers"
Expand Down Expand Up @@ -217,7 +217,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers": {
"get": {
"tags": [
"Servers"
Expand Down Expand Up @@ -253,7 +253,7 @@
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.DBforMariaDB/servers": {
"/subscriptions/{subscriptionId}/providers/Microsoft.DBForMariaDB/servers": {
"get": {
"tags": [
"Servers"
Expand Down Expand Up @@ -286,7 +286,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/restart": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/restart": {
"post": {
"tags": [
"ServerRestart"
Expand Down Expand Up @@ -329,7 +329,7 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/replicas": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/replicas": {
"get": {
"tags": [
"Replicas"
Expand Down Expand Up @@ -368,7 +368,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/firewallRules/{firewallRuleName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/firewallRules/{firewallRuleName}": {
"put": {
"tags": [
"FirewallRules"
Expand Down Expand Up @@ -504,7 +504,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/firewallRules": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/firewallRules": {
"get": {
"tags": [
"FirewallRules"
Expand Down Expand Up @@ -543,7 +543,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/virtualNetworkRules/{virtualNetworkRuleName}": {
"get": {
"tags": [
"VirtualNetworkRules"
Expand Down Expand Up @@ -688,7 +688,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/virtualNetworkRules": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/virtualNetworkRules": {
"get": {
"tags": [
"VirtualNetworkRules"
Expand Down Expand Up @@ -730,7 +730,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/databases/{databaseName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/databases/{databaseName}": {
"put": {
"tags": [
"Databases"
Expand Down Expand Up @@ -866,7 +866,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/databases": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/databases": {
"get": {
"tags": [
"Databases"
Expand Down Expand Up @@ -905,7 +905,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/configurations/{configurationName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/configurations/{configurationName}": {
"put": {
"tags": [
"Configurations"
Expand Down Expand Up @@ -994,7 +994,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/configurations": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/configurations": {
"get": {
"tags": [
"Configurations"
Expand Down Expand Up @@ -1033,7 +1033,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/logFiles": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/logFiles": {
"get": {
"tags": [
"LogFiles"
Expand Down Expand Up @@ -1072,7 +1072,7 @@
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.DBforMariaDB/locations/{locationName}/performanceTiers": {
"/subscriptions/{subscriptionId}/providers/Microsoft.DBForMariaDB/locations/{locationName}/performanceTiers": {
"get": {
"tags": [
"LocationBasedPerformanceTier"
Expand Down Expand Up @@ -1108,7 +1108,7 @@
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.DBforMariaDB/checkNameAvailability": {
"/subscriptions/{subscriptionId}/providers/Microsoft.DBForMariaDB/checkNameAvailability": {
"post": {
"tags": [
"CheckNameAvailability"
Expand Down Expand Up @@ -1147,7 +1147,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBforMariaDB/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DBForMariaDB/servers/{serverName}/securityAlertPolicies/{securityAlertPolicyName}": {
"get": {
"tags": [
"ServerSecurityAlertPolicies"
Expand Down Expand Up @@ -1267,7 +1267,7 @@
}
}
},
"/providers/Microsoft.DBforMariaDB/operations": {
"/providers/Microsoft.DBForMariaDB/operations": {
"get": {
"tags": [
"Operations"
Expand Down Expand Up @@ -1320,55 +1320,6 @@
"modelAsString": false
}
},
"ProxyResource": {
"description": "Resource properties.",
"properties": {
"id": {
"readOnly": true,
"type": "string",
"description": "Resource ID"
},
"name": {
"readOnly": true,
"type": "string",
"description": "Resource name."
},
"type": {
"readOnly": true,
"type": "string",
"description": "Resource type."
}
},
"x-ms-azure-resource": true
},
"TrackedResource": {
"description": "Resource properties including location and tags for track resources.",
"properties": {
"location": {
"type": "string",
"x-ms-mutability": [
"read",
"create"
],
"description": "The location the resource resides in."
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Application-specific metadata in the form of key-value pairs."
}
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
}
],
"required": [
"location"
]
},
"ServerProperties": {
"properties": {
"administratorLogin": {
Expand Down Expand Up @@ -1617,6 +1568,9 @@
"description": "The family of hardware."
}
},
"required": [
"name"
],
"description": "Billing information related properties of a server."
},
"ResourceIdentity": {
Expand Down Expand Up @@ -1666,7 +1620,7 @@
},
"allOf": [
{
"$ref": "#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
}
],
"description": "Represents a server."
Expand Down Expand Up @@ -1784,7 +1738,7 @@
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"required": [
Expand Down Expand Up @@ -1842,7 +1796,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -1895,7 +1849,7 @@
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"description": "Represents a Database."
Expand Down Expand Up @@ -1955,7 +1909,7 @@
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"description": "Represents a Configuration."
Expand Down Expand Up @@ -2093,7 +2047,7 @@
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"description": "Represents a log file."
Expand Down Expand Up @@ -2267,7 +2221,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 .../Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/PrivateEndpointConnections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,44 +346,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": {}
},
"PrivateEndpointConnection": {
"description": "A private endpoint connection",
"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 ...anager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/PrivateLinkResources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,44 +168,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": {}
},
"PrivateLinkResource": {
"description": "A private link resource",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
Loading