Skip to content

Commit

Permalink
Fixing issues with a few breaking changes (#23943)
Browse files Browse the repository at this point in the history
* Minor fixes for Turkey name change and missing x-ms-identifier

* Adding back missing arm-id and other missing property issues causing breaking changes incorrectly.

* Fixing prettier issue with ManagedDatabases.json

* Fixing arm-id format in 4 examples

* Adding missing location for 202 responses on sync examples
  • Loading branch information
jeremyfrosti authored May 18, 2023
1 parent ee86d4a commit 465891a
Show file tree
Hide file tree
Showing 17 changed files with 78 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,15 @@
"storageAccountResourceId": {
"description": "The resource id for the storage account used to store BACPAC file. If set, private endpoint connection will be created for the storage account. Must match storage account used for StorageUri parameter.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
},
"sqlServerResourceId": {
"description": "The resource id for the SQL server which is the target of this request. If set, private endpoint connection will be created for the SQL server. Must match server which is target of the operation.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,8 @@
"properties": {
"destinationManagedDatabaseId": {
"description": "The destination managed database ID",
"type": "string"
"type": "string",
"format": "arm-id"
}
}
},
Expand Down Expand Up @@ -706,27 +707,31 @@
"sourceDatabaseId": {
"description": "The resource identifier of the source database associated with create operation of this database.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
},
"crossSubscriptionSourceDatabaseId": {
"description": "The resource identifier of the cross-subscription source database associated with create operation of this database.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
},
"restorableDroppedDatabaseId": {
"description": "The restorable dropped database resource id to restore when creating this database.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
},
"crossSubscriptionRestorableDroppedDatabaseId": {
"description": "The restorable cross-subscription dropped database resource id to restore when creating this database.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
Expand All @@ -753,13 +758,15 @@
"recoverableDatabaseId": {
"description": "The resource identifier of the recoverable database associated with create operation of this database.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
},
"longTermRetentionBackupResourceId": {
"description": "The name of the Long Term Retention backup to be used for restore of this managed database.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
Expand Down Expand Up @@ -804,7 +811,8 @@
"properties": {
"destinationManagedDatabaseId": {
"description": "The destination managed database ID",
"type": "string"
"type": "string",
"format": "arm-id"
},
"operationMode": {
"description": "The move operation mode.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -697,13 +697,15 @@
"storageAccountResourceId": {
"description": "The resource id for the storage account used to store BACPAC file. If set, private endpoint connection will be created for the storage account. Must match storage account used for StorageUri parameter.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
},
"sqlServerResourceId": {
"description": "The resource id for the SQL server which is the target of this request. If set, private endpoint connection will be created for the SQL server. Must match server which is target of the operation.",
"type": "string",
"format": "arm-id",
"x-ms-mutability": [
"create"
]
Expand Down Expand Up @@ -1026,7 +1028,7 @@
"readOnly": true
},
"minimalTlsVersion": {
"description": "Minimal TLS version. Allowed values: '1.0', '1.1', '1.2'",
"description": "Minimal TLS version. Allowed values: 'None', '1.0', '1.1', '1.2'",
"type": "string"
},
"publicNetworkAccess": {
Expand Down Expand Up @@ -1057,7 +1059,15 @@
},
"primaryUserAssignedIdentityId": {
"description": "The resource id of a user assigned identity to be used by default.",
"type": "string"
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
}
]
}
},
"federatedClientId": {
"format": "uuid",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,8 @@
},
"syncDatabaseId": {
"description": "ARM resource id of the sync database in the sync agent.",
"type": "string"
"type": "string",
"format": "arm-id"
},
"lastAliveTime": {
"format": "date-time",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,8 @@
},
"syncDatabaseId": {
"description": "ARM resource id of the sync database in the sync group.",
"type": "string"
"type": "string",
"format": "arm-id"
},
"hubDatabaseUserName": {
"description": "User name for the sync group hub database credential.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,15 @@
},
"syncAgentId": {
"description": "ARM resource id of the sync agent in the sync member.",
"type": "string"
"type": "string",
"format": "arm-id",
"x-ms-arm-id-details": {
"allowedResources": [
{
"type": "Microsoft.Sql/servers/syncAgents"
}
]
}
},
"sqlServerDatabaseId": {
"format": "uuid",
Expand All @@ -647,7 +655,8 @@
},
"syncMemberAzureDatabaseResourceId": {
"description": "ARM resource id of the sync member logical database, for sync members in Azure.",
"type": "string"
"type": "string",
"format": "arm-id"
},
"usePrivateLinkConnection": {
"description": "Whether to use private link connection.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"databaseName": "testDatabase",
"api-version": "2022-11-01-preview",
"parameters": {
"destinationManagedDatabaseId": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase"
"destinationManagedDatabaseId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase"
}
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"databaseName": "testDatabase",
"api-version": "2022-11-01-preview",
"parameters": {
"destinationManagedDatabaseId": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase"
"destinationManagedDatabaseId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase"
}
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"databaseName": "testDatabase",
"api-version": "2022-11-01-preview",
"parameters": {
"destinationManagedDatabaseId": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase",
"destinationManagedDatabaseId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase",
"operationMode": "Copy"
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"databaseName": "testDatabase",
"api-version": "2022-11-01-preview",
"parameters": {
"destinationManagedDatabaseId": "subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase"
"destinationManagedDatabaseId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/group1/providers/Microsoft.Sql/managedInstances/testInstanceTgt/databases/testDatabase"
}
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
},
"responses": {
"200": {},
"202": {},
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
},
"responses": {
"200": {},
"202": {},
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
"type": "Microsoft.Sql/servers/databases/syncGroups"
}
},
"202": {}
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
},
"responses": {
"200": {},
"202": {}
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
},
"responses": {
"200": {},
"202": {},
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
"type": "Microsoft.Sql/servers/databases/syncGroups/syncMembers"
}
},
"202": {}
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
},
"responses": {
"200": {},
"202": {}
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/westus/operation/00000000-1111-2222-3333-444444444444?api-version=2022-11-01-preview"
}
}
}
}

0 comments on commit 465891a

Please sign in to comment.