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.

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

Add 2020-02-02-preview related to new ImportExport API #10428

Merged
merged 44 commits into from
Aug 28, 2020
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7cc3ba1
Add 2020-02-02-preview related to new ImportExport API
brandong-ms Aug 11, 2020
d80bf7a
Add missing example json
brandong-ms Aug 11, 2020
7779bb7
Update after merge DsMainDev
brandong-ms Aug 14, 2020
5f4320f
Update with missed change from after merge
brandong-ms Aug 14, 2020
6a2e3e1
Run prettier
brandong-ms Aug 14, 2020
a961bfb
Update with tweak to IE parameters to split by API
brandong-ms Aug 17, 2020
d8c2637
Run prettier
brandong-ms Aug 17, 2020
4a1825b
Update readme.md
brandong-ms Aug 17, 2020
82015b0
Change to use ImportExport tag to prevent task failure for lint
brandong-ms Aug 17, 2020
3b953b8
Run prettier
brandong-ms Aug 17, 2020
f80ddf3
Add importexport.json
brandong-ms Aug 17, 2020
72c9e1f
Update readme.md for importexport.json
brandong-ms Aug 18, 2020
cc536f2
Fix ApiVersion description
brandong-ms Aug 18, 2020
9249959
Update CODEOWNERS for sql
brandong-ms Aug 18, 2020
9d3de8a
Manually update API version parameter
brandong-ms Aug 18, 2020
82c551c
Update 2014 importexport to use the new api version parameter descrip…
brandong-ms Aug 18, 2020
88e3408
Make operation name consistent between 2014 and 2020
brandong-ms Aug 18, 2020
909c606
Make descriptions consistent in the 2014 version
brandong-ms Aug 18, 2020
d887394
Move more common parameters to reference; make some parameter descrip…
brandong-ms Aug 19, 2020
7ff4cf9
Fix copy-paste error
brandong-ms Aug 19, 2020
3f4d08a
Fix resource group parameter reference
brandong-ms Aug 19, 2020
ed905c7
try to add back 2014 parameters
brandong-ms Aug 19, 2020
a2121d0
Remove 2014 from composite v3
brandong-ms Aug 19, 2020
3a14f88
checkout 2014 version after removing from composite
brandong-ms Aug 19, 2020
8ccf968
Change to use different common reference for ApiVersion
brandong-ms Aug 19, 2020
af88971
Make ApiVersionParameter consistent across all of 2020
brandong-ms Aug 19, 2020
41c2ae2
Fix copy paste error
brandong-ms Aug 19, 2020
cc51227
Make importexport consistent with other 2020 APIs for SubscriptionId,…
brandong-ms Aug 19, 2020
99be0da
Fix UniqueXmsEnumName violation
brandong-ms Aug 19, 2020
e25befd
StorageKeyTypeParameter
brandong-ms Aug 19, 2020
4e5f35e
Backtrack to cc51227b2
brandong-ms Aug 19, 2020
e831d26
Try to move StorageKeyType to common definition ref
brandong-ms Aug 19, 2020
5f057f5
StorageKeType2Haha don't check in
brandong-ms Aug 19, 2020
9d969f0
Try to just make storage key type a string
brandong-ms Aug 19, 2020
1258228
Attempt to resolve ApiVersionParameter issue again - this time revert…
brandong-ms Aug 20, 2020
54c9e89
Revert the ResourceGroupNameParameter for managedDatabases.json
brandong-ms Aug 20, 2020
d5d6d4e
Fix two more files with different ApiVersionParameter
brandong-ms Aug 20, 2020
4ed14fc
Shotgun approach - change ALL ApiVersionParameter to reference types.…
brandong-ms Aug 20, 2020
a2c445a
Undo everything except importexport.json and new exaples
brandong-ms Aug 20, 2020
4e8c9bd
Change types.json under sql common to be consistent with common-types…
brandong-ms Aug 20, 2020
0801df0
Undo change to types.json
brandong-ms Aug 20, 2020
8e51be5
Update with changes to DS_Main_Dev
brandong-ms Aug 20, 2020
d49fb86
Run prettier, update examples with x'd out access key parameter
brandong-ms Aug 21, 2020
f81dd16
Merge branch 'master' into addNewIeApiSwagger
brandong-ms Aug 26, 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
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
/specification/service-map/ @daveirwin1
/specification/servicebus/ @sazeesha @v-ajnava
/specification/servicefabric/ @juhacket @samedder
/specification/sql/ @jaredmoo @jamestao
/specification/sql/ @jamestao @bcham
/specification/storage/ @blueww @jasonyang-msft @xiaonlimsft @kasobol-msft
/specification/storageimportexport/ @leoz-ms
/specification/storagesync/ @ankushbindlish2
Expand Down
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": {}
}
}
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": {}
}
}
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": {}
}
}
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": {}
}
}
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": {}
}
}
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": {}
}
}
Loading