-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add 2020-02-02-preview related to new ImportExport API (#10428)
* Add 2020-02-02-preview related to new ImportExport API * Add missing example json * Update after merge DsMainDev * Update with missed change from after merge * Run prettier * Update with tweak to IE parameters to split by API * Run prettier * Update readme.md * Change to use ImportExport tag to prevent task failure for lint * Run prettier * Add importexport.json * Update readme.md for importexport.json * Fix ApiVersion description * Update CODEOWNERS for sql * Manually update API version parameter * Update 2014 importexport to use the new api version parameter description * Make operation name consistent between 2014 and 2020 * Make descriptions consistent in the 2014 version * Move more common parameters to reference; make some parameter descriptions consistent * Fix copy-paste error * Fix resource group parameter reference * try to add back 2014 parameters * Remove 2014 from composite v3 * checkout 2014 version after removing from composite * Change to use different common reference for ApiVersion * Make ApiVersionParameter consistent across all of 2020 * Fix copy paste error * Make importexport consistent with other 2020 APIs for SubscriptionId, ResourceGroup parameters * Fix UniqueXmsEnumName violation * StorageKeyTypeParameter * Backtrack to cc51227 * Try to move StorageKeyType to common definition ref * StorageKeType2Haha don't check in * Try to just make storage key type a string * Attempt to resolve ApiVersionParameter issue again - this time revert everything back except importexport.json, and update to use the reference in the types.json under sql common * Revert the ResourceGroupNameParameter for managedDatabases.json * Fix two more files with different ApiVersionParameter * Shotgun approach - change ALL ApiVersionParameter to reference types.json * Undo everything except importexport.json and new exaples * Change types.json under sql common to be consistent with common-types types.json * Undo change to types.json * Update with changes to DS_Main_Dev * Run prettier, update examples with x'd out access key parameter
- Loading branch information
1 parent
909b2c3
commit 99b5b0c
Showing
9 changed files
with
937 additions
and
2 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...ql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ExportDatabase.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "Default-SQL-SouthEastAsia", | ||
| "serverName": "testsvr", | ||
| "databaseName": "testdb", | ||
| "api-version": "2020-02-02-preview", | ||
| "parameters": { | ||
| "storageKeyType": "StorageAccessKey", | ||
| "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==", | ||
| "storageUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "administratorLogin": "login", | ||
| "administratorLoginPassword": "password", | ||
| "authenticationType": "Sql" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "requestType": "Export", | ||
| "queuedTime": "2/2/2020 8:33:27 PM", | ||
| "lastModifiedTime": "2/2/2020 8:34:47 PM", | ||
| "blobUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "serverName": "testsvr.database.windows.net", | ||
| "databaseName": "testdb", | ||
| "status": "Completed" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "name": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "type": "Microsoft.Sql/servers/databases/importExportOperationResults" | ||
| } | ||
| }, | ||
| "202": {} | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...Microsoft.Sql/preview/2020-02-02-preview/examples/ExportDatabaseWithNetworkIsolation.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "Default-SQL-SouthEastAsia", | ||
| "serverName": "testsvr", | ||
| "databaseName": "testdb", | ||
| "api-version": "2020-02-02-preview", | ||
| "parameters": { | ||
| "storageKeyType": "StorageAccessKey", | ||
| "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==", | ||
| "storageUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "administratorLogin": "login", | ||
| "administratorLoginPassword": "password", | ||
| "authenticationType": "Sql", | ||
| "networkIsolation": { | ||
| "sqlServerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr", | ||
| "storageAccountResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Storage/storageAccounts/test-privatelink" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "requestType": "Export", | ||
| "queuedTime": "2/2/2020 8:33:27 PM", | ||
| "lastModifiedTime": "2/2/2020 8:34:47 PM", | ||
| "blobUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "serverName": "testsvr.database.windows.net", | ||
| "databaseName": "testdb", | ||
| "status": "Completed" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "name": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "type": "Microsoft.Sql/servers/databases/importExportOperationResults" | ||
| } | ||
| }, | ||
| "202": {} | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...ql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ImportDatabase.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "Default-SQL-SouthEastAsia", | ||
| "serverName": "testsvr", | ||
| "databaseName": "testdb", | ||
| "api-version": "2020-02-02-preview", | ||
| "parameters": { | ||
| "storageKeyType": "StorageAccessKey", | ||
| "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==", | ||
| "storageUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "administratorLogin": "login", | ||
| "administratorLoginPassword": "password", | ||
| "authenticationType": "Sql" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "requestType": "Import", | ||
| "queuedTime": "2/2/2020 8:33:27 PM", | ||
| "lastModifiedTime": "2/2/2020 8:34:47 PM", | ||
| "blobUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "serverName": "testsvr.database.windows.net", | ||
| "databaseName": "testdb", | ||
| "status": "Completed" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "name": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "type": "Microsoft.Sql/servers/databases/importExportOperationResults" | ||
| } | ||
| }, | ||
| "202": {} | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...Microsoft.Sql/preview/2020-02-02-preview/examples/ImportDatabaseWithNetworkIsolation.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "Default-SQL-SouthEastAsia", | ||
| "serverName": "testsvr", | ||
| "databaseName": "testdb", | ||
| "api-version": "2020-02-02-preview", | ||
| "parameters": { | ||
| "storageKeyType": "StorageAccessKey", | ||
| "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==", | ||
| "storageUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "administratorLogin": "login", | ||
| "administratorLoginPassword": "password", | ||
| "authenticationType": "Sql", | ||
| "networkIsolation": { | ||
| "sqlServerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr", | ||
| "storageAccountResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Storage/storageAccounts/test-privatelink" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "requestType": "Import", | ||
| "queuedTime": "2/2/2020 8:33:27 PM", | ||
| "lastModifiedTime": "2/2/2020 8:34:47 PM", | ||
| "blobUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "serverName": "testsvr.database.windows.net", | ||
| "databaseName": "testdb", | ||
| "status": "Completed" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "name": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "type": "Microsoft.Sql/servers/databases/importExportOperationResults" | ||
| } | ||
| }, | ||
| "202": {} | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ImportNewDatabase.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "Default-SQL-SouthEastAsia", | ||
| "serverName": "testsvr", | ||
| "api-version": "2020-02-02-preview", | ||
| "parameters": { | ||
| "databaseName": "testdb", | ||
| "storageKeyType": "StorageAccessKey", | ||
| "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==", | ||
| "storageUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "administratorLogin": "login", | ||
| "administratorLoginPassword": "password", | ||
| "authenticationType": "Sql" | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "requestType": "Import", | ||
| "queuedTime": "2/2/2020 8:33:27 PM", | ||
| "lastModifiedTime": "2/2/2020 8:34:47 PM", | ||
| "blobUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "serverName": "testsvr.database.windows.net", | ||
| "databaseName": "testdb", | ||
| "status": "Completed" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "name": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "type": "Microsoft.Sql/servers/databases/importExportOperationResults" | ||
| } | ||
| }, | ||
| "202": {} | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...rosoft.Sql/preview/2020-02-02-preview/examples/ImportNewDatabaseWithNetworkIsolation.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "Default-SQL-SouthEastAsia", | ||
| "serverName": "testsvr", | ||
| "api-version": "2020-02-02-preview", | ||
| "parameters": { | ||
| "databaseName": "testdb", | ||
| "storageKeyType": "StorageAccessKey", | ||
| "storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==", | ||
| "storageUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "administratorLogin": "login", | ||
| "administratorLoginPassword": "password", | ||
| "authenticationType": "Sql", | ||
| "networkIsolation": { | ||
| "sqlServerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr", | ||
| "storageAccountResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Storage/storageAccounts/test-privatelink" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "requestType": "Import", | ||
| "queuedTime": "2/2/2020 8:33:27 PM", | ||
| "lastModifiedTime": "2/2/2020 8:34:47 PM", | ||
| "blobUri": "https://test.blob.core.windows.net/test.bacpac", | ||
| "serverName": "testsvr.database.windows.net", | ||
| "databaseName": "testdb", | ||
| "status": "Completed" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "name": "9d9a794a-5cec-4f23-af70-d29511b522a4", | ||
| "type": "Microsoft.Sql/servers/databases/importExportOperationResults" | ||
| } | ||
| }, | ||
| "202": {} | ||
| } | ||
| } |
Oops, something went wrong.