Skip to content

Commit 99b5b0c

Browse files
brandong-msbrandong-ms
authored
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
1 parent 909b2c3 commit 99b5b0c

File tree

9 files changed

+937
-2
lines changed

9 files changed

+937
-2
lines changed

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
/specification/service-map/ @daveirwin1
6666
/specification/servicebus/ @sazeesha @v-ajnava
6767
/specification/servicefabric/ @juhacket @samedder
68-
/specification/sql/ @jaredmoo @jamestao
68+
/specification/sql/ @jamestao @bcham
6969
/specification/storage/ @blueww @jasonyang-msft @xiaonlimsft
7070
/specification/storage/data-plane/ @kasobol-msft @seanmcc-msft
7171
/specification/storageimportexport/ @leoz-ms

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ExportDatabase.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "Default-SQL-SouthEastAsia",
5+
"serverName": "testsvr",
6+
"databaseName": "testdb",
7+
"api-version": "2020-02-02-preview",
8+
"parameters": {
9+
"storageKeyType": "StorageAccessKey",
10+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==",
11+
"storageUri": "https://test.blob.core.windows.net/test.bacpac",
12+
"administratorLogin": "login",
13+
"administratorLoginPassword": "password",
14+
"authenticationType": "Sql"
15+
}
16+
},
17+
"responses": {
18+
"200": {
19+
"body": {
20+
"properties": {
21+
"requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4",
22+
"requestType": "Export",
23+
"queuedTime": "2/2/2020 8:33:27 PM",
24+
"lastModifiedTime": "2/2/2020 8:34:47 PM",
25+
"blobUri": "https://test.blob.core.windows.net/test.bacpac",
26+
"serverName": "testsvr.database.windows.net",
27+
"databaseName": "testdb",
28+
"status": "Completed"
29+
},
30+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4",
31+
"name": "9d9a794a-5cec-4f23-af70-d29511b522a4",
32+
"type": "Microsoft.Sql/servers/databases/importExportOperationResults"
33+
}
34+
},
35+
"202": {}
36+
}
37+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ExportDatabaseWithNetworkIsolation.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "Default-SQL-SouthEastAsia",
5+
"serverName": "testsvr",
6+
"databaseName": "testdb",
7+
"api-version": "2020-02-02-preview",
8+
"parameters": {
9+
"storageKeyType": "StorageAccessKey",
10+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==",
11+
"storageUri": "https://test.blob.core.windows.net/test.bacpac",
12+
"administratorLogin": "login",
13+
"administratorLoginPassword": "password",
14+
"authenticationType": "Sql",
15+
"networkIsolation": {
16+
"sqlServerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr",
17+
"storageAccountResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Storage/storageAccounts/test-privatelink"
18+
}
19+
}
20+
},
21+
"responses": {
22+
"200": {
23+
"body": {
24+
"properties": {
25+
"requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4",
26+
"requestType": "Export",
27+
"queuedTime": "2/2/2020 8:33:27 PM",
28+
"lastModifiedTime": "2/2/2020 8:34:47 PM",
29+
"blobUri": "https://test.blob.core.windows.net/test.bacpac",
30+
"serverName": "testsvr.database.windows.net",
31+
"databaseName": "testdb",
32+
"status": "Completed"
33+
},
34+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4",
35+
"name": "9d9a794a-5cec-4f23-af70-d29511b522a4",
36+
"type": "Microsoft.Sql/servers/databases/importExportOperationResults"
37+
}
38+
},
39+
"202": {}
40+
}
41+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ImportDatabase.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "Default-SQL-SouthEastAsia",
5+
"serverName": "testsvr",
6+
"databaseName": "testdb",
7+
"api-version": "2020-02-02-preview",
8+
"parameters": {
9+
"storageKeyType": "StorageAccessKey",
10+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==",
11+
"storageUri": "https://test.blob.core.windows.net/test.bacpac",
12+
"administratorLogin": "login",
13+
"administratorLoginPassword": "password",
14+
"authenticationType": "Sql"
15+
}
16+
},
17+
"responses": {
18+
"200": {
19+
"body": {
20+
"properties": {
21+
"requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4",
22+
"requestType": "Import",
23+
"queuedTime": "2/2/2020 8:33:27 PM",
24+
"lastModifiedTime": "2/2/2020 8:34:47 PM",
25+
"blobUri": "https://test.blob.core.windows.net/test.bacpac",
26+
"serverName": "testsvr.database.windows.net",
27+
"databaseName": "testdb",
28+
"status": "Completed"
29+
},
30+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4",
31+
"name": "9d9a794a-5cec-4f23-af70-d29511b522a4",
32+
"type": "Microsoft.Sql/servers/databases/importExportOperationResults"
33+
}
34+
},
35+
"202": {}
36+
}
37+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ImportDatabaseWithNetworkIsolation.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "Default-SQL-SouthEastAsia",
5+
"serverName": "testsvr",
6+
"databaseName": "testdb",
7+
"api-version": "2020-02-02-preview",
8+
"parameters": {
9+
"storageKeyType": "StorageAccessKey",
10+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==",
11+
"storageUri": "https://test.blob.core.windows.net/test.bacpac",
12+
"administratorLogin": "login",
13+
"administratorLoginPassword": "password",
14+
"authenticationType": "Sql",
15+
"networkIsolation": {
16+
"sqlServerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr",
17+
"storageAccountResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Storage/storageAccounts/test-privatelink"
18+
}
19+
}
20+
},
21+
"responses": {
22+
"200": {
23+
"body": {
24+
"properties": {
25+
"requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4",
26+
"requestType": "Import",
27+
"queuedTime": "2/2/2020 8:33:27 PM",
28+
"lastModifiedTime": "2/2/2020 8:34:47 PM",
29+
"blobUri": "https://test.blob.core.windows.net/test.bacpac",
30+
"serverName": "testsvr.database.windows.net",
31+
"databaseName": "testdb",
32+
"status": "Completed"
33+
},
34+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4",
35+
"name": "9d9a794a-5cec-4f23-af70-d29511b522a4",
36+
"type": "Microsoft.Sql/servers/databases/importExportOperationResults"
37+
}
38+
},
39+
"202": {}
40+
}
41+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ImportNewDatabase.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "Default-SQL-SouthEastAsia",
5+
"serverName": "testsvr",
6+
"api-version": "2020-02-02-preview",
7+
"parameters": {
8+
"databaseName": "testdb",
9+
"storageKeyType": "StorageAccessKey",
10+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==",
11+
"storageUri": "https://test.blob.core.windows.net/test.bacpac",
12+
"administratorLogin": "login",
13+
"administratorLoginPassword": "password",
14+
"authenticationType": "Sql"
15+
}
16+
},
17+
"responses": {
18+
"200": {
19+
"body": {
20+
"properties": {
21+
"requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4",
22+
"requestType": "Import",
23+
"queuedTime": "2/2/2020 8:33:27 PM",
24+
"lastModifiedTime": "2/2/2020 8:34:47 PM",
25+
"blobUri": "https://test.blob.core.windows.net/test.bacpac",
26+
"serverName": "testsvr.database.windows.net",
27+
"databaseName": "testdb",
28+
"status": "Completed"
29+
},
30+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4",
31+
"name": "9d9a794a-5cec-4f23-af70-d29511b522a4",
32+
"type": "Microsoft.Sql/servers/databases/importExportOperationResults"
33+
}
34+
},
35+
"202": {}
36+
}
37+
}

‎specification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/examples/ImportNewDatabaseWithNetworkIsolation.json‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "Default-SQL-SouthEastAsia",
5+
"serverName": "testsvr",
6+
"api-version": "2020-02-02-preview",
7+
"parameters": {
8+
"databaseName": "testdb",
9+
"storageKeyType": "StorageAccessKey",
10+
"storageKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==",
11+
"storageUri": "https://test.blob.core.windows.net/test.bacpac",
12+
"administratorLogin": "login",
13+
"administratorLoginPassword": "password",
14+
"authenticationType": "Sql",
15+
"networkIsolation": {
16+
"sqlServerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr",
17+
"storageAccountResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Storage/storageAccounts/test-privatelink"
18+
}
19+
}
20+
},
21+
"responses": {
22+
"200": {
23+
"body": {
24+
"properties": {
25+
"requestId": "9d9a794a-5cec-4f23-af70-d29511b522a4",
26+
"requestType": "Import",
27+
"queuedTime": "2/2/2020 8:33:27 PM",
28+
"lastModifiedTime": "2/2/2020 8:34:47 PM",
29+
"blobUri": "https://test.blob.core.windows.net/test.bacpac",
30+
"serverName": "testsvr.database.windows.net",
31+
"databaseName": "testdb",
32+
"status": "Completed"
33+
},
34+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/testsvr/databases/testdb/importExportOperationResults/9d9a794a-5cec-4f23-af70-d29511b522a4",
35+
"name": "9d9a794a-5cec-4f23-af70-d29511b522a4",
36+
"type": "Microsoft.Sql/servers/databases/importExportOperationResults"
37+
}
38+
},
39+
"202": {}
40+
}
41+
}

0 commit comments

Comments
 (0)