Skip to content

Commit

Permalink
Fix linter errors for Storage-ImportExport swagger (#1822)
Browse files Browse the repository at this point in the history
* Fix lint errors for Storage-ImportExport swagger

* Fix lint errors for missing descriptions and addmore job properties and update the GetBitLockerKeys response schema

1. Fix lint errors for missing descriptions
2. Add more job properties
3. Update the GetBitLockerKeys response schema

* Remove unused resourceGroupName and update the BitLockerKey response properties to follow camel-case

1. Remove unused resourceGroupName parameter from ListJobs API
2. update the BitLockerKey response properties to follow camel-case

* Fix not-required fields and add 201 response example for CreateJob

1. Fix not-required fields
2. Add 201 response example for CreateJob
3. Fix incorrect single quote character

* Update ShippingInformation properties and remove unnecessary enum values in swagger

1. Update ShippingInformation properties
2. remove unnecessary enum values in swagger

* Fix UpdateJob/CreateJob parameter name in swagger to pass validation

Fix UpdateJob/CreateJob parameter name in swagger to pass validation

* Fix CreateJob response in storage-importexport swagger file

Fix CreateJob response in storage-importexport swagger file

* Normalize operation IDs

Normalize operation IDs

* Fix case and add comments in EDS-related properties

Fix case in Locations_List,
Add comments in EDS-related properties

* Remove internal properties

Remove internal properties:
Job properties: userStorageAccountId and userTenantId
DriveStatus properties: currentLocation and returnLocation

* Remove internal properties from samples

Remove internal properties from samples

* update operation Ids to group them properly

update operation Ids to group them properly

* Use plural forms for method groups

* Resolved comments

1. Added x-ms-pageable
2. Restored required fields
3. Remove unnecessary x-ms-client-flatten
4. Add x-ms-parameter-location as appropriate
5. Add x-ms-client-name for client tenant id

* Fix incorrect required field names in ShippingInformation
  • Loading branch information
leoz-msft authored and olydis committed Oct 23, 2017
1 parent 54ffab4 commit 7c6c49a
Show file tree
Hide file tree
Showing 11 changed files with 1,766 additions and 1,167 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{
"parameters": {
"api-version": "2016-11-01",
"subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"resourceGroupName": "Default-Storage-WestUS",
"jobName": "test-by1-import",
"body": {
"location": "West US",
"properties": {
"storageAccountId": "/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/test",
"jobType": "Import",
"returnAddress": {
"recipientName": "Tets",
"streetAddress1": "Street1",
"streetAddress2": "street2",
"city": "Redmond",
"stateOrProvince": "wa",
"postalCode": "98007",
"countryOrRegion": "USA",
"phone": "4250000000",
"email": "[email protected]"
},
"diagnosticsPath": "waimportexport",
"logLevel": "Verbose",
"backupDriveManifest": true,
"driveList": [
{
"driveId": "9CA995BB",
"bitLockerKey": "238810-662376-448998-450120-652806-203390-606320-483076",
"manifestFile": "\\DriveManifest.xml",
"manifestHash": "109B21108597EF36D5785F08303F3638",
"driveHeaderHash": ""
}
]
}
}
},
"responses": {
"200": {
"body": {
"properties":{
"storageAccountId":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/test",
"jobType":"Import",
"returnAddress":{
"recipientName":"Tets",
"streetAddress1":"Street1",
"streetAddress2":"street2",
"city":"Redmond",
"stateOrProvince":"wa",
"postalCode":"98007",
"countryOrRegion":"USA",
"phone":"4250000000",
"email":"[email protected]"
},
"shippingInformation":{
"recipientName":"Microsoft Azure Import/Export Service",
"streetAddress1":"2045 Lafayette Street",
"streetAddress2":"",
"city":"Santa Clara",
"stateOrProvince":"CA",
"postalCode":"95050",
"countryOrRegion":"USA",
"phone":"408 0000 0000"
},
"diagnosticsPath":"waimportexport",
"logLevel":"Verbose",
"backupDriveManifest":true,
"cancelRequested":false,
"state":"Creating",
"driveList":[
{
"driveId":"9CA995BB",
"manifestFile":"\\DriveManifest.xml",
"manifestHash":"109B21108597EF36D5785F08303F3638",
"driveHeaderHash":"",
"state":"Specified"
}
],
"provisioningState":"Succeeded"
},
"id":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ImportExport/jobs/test",
"name":"test-by1-import",
"type":"Microsoft.ImportExport/jobs",
"location":"West US"
}
},
"201": {
"body": {
"properties":{
"storageAccountId":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/test",
"jobType":"Import",
"returnAddress":{
"recipientName":"Tets",
"streetAddress1":"Street1",
"streetAddress2":"street2",
"city":"Redmond",
"stateOrProvince":"wa",
"postalCode":"98007",
"countryOrRegion":"USA",
"phone":"4250000000",
"email":"[email protected]"
},
"shippingInformation":{
"recipientName":"Microsoft Azure Import/Export Service",
"streetAddress1":"2045 Lafayette Street",
"streetAddress2":"",
"city":"Santa Clara",
"stateOrProvince":"CA",
"postalCode":"95050",
"countryOrRegion":"USA",
"phone":"408 0000 0000"
},
"diagnosticsPath":"waimportexport",
"logLevel":"Verbose",
"backupDriveManifest":true,
"cancelRequested":false,
"state":"Creating",
"driveList":[
{
"driveId":"9CA995BB",
"manifestFile":"\\DriveManifest.xml",
"manifestHash":"109B21108597EF36D5785F08303F3638",
"driveHeaderHash":"",
"state":"Specified"
}
],
"provisioningState":"Succeeded"
},
"id":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ImportExport/jobs/test",
"name":"test-by1-import",
"type":"Microsoft.ImportExport/jobs",
"location":"West US"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parameters": {
"api-version": "2016-11-01",
"subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"resourceGroupName": "Default-Storage-WestUS",
"jobName": "test-by1-import"
},
"responses": {
"200": {
"properties":{
"storageAccountId":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/test",
"jobType":"Import",
"returnAddress":{
"recipientName":"Tets",
"streetAddress1":"Street1",
"streetAddress2":"street2",
"city":"Redmond",
"stateOrProvince":"wa",
"postalCode":"98007",
"countryOrRegion":"USA",
"phone":"4250000000",
"email":"[email protected]"
},
"shippingInformation":{
"recipientName":"Microsoft Azure Import/Export Service",
"streetAddress1":"2045 Lafayette Street",
"streetAddress2":"",
"city":"Santa Clara",
"stateOrProvince":"CA",
"postalCode":"95050",
"countryOrRegion":"USA",
"phone":"408 0000 0000"
},
"diagnosticsPath":"waimportexport",
"logLevel":"Verbose",
"backupDriveManifest":true,
"cancelRequested":false,
"state":"Creating",
"driveList":[
{
"driveId":"9CA995BB",
"manifestFile":"\\DriveManifest.xml",
"manifestHash":"109B21108597EF36D5785F08303F3638",
"driveHeaderHash":"",
"state":"Specified"
}
],
"provisioningState":"Succeeded"
},
"id":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ImportExport/jobs/test",
"name":"test-by1-import",
"type":"Microsoft.ImportExport/jobs",
"location":"West US"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"parameters": {
"api-version": "2016-11-01",
"subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"resourceGroupName": "Default-Storage-WestUS",
"jobName": "test-by1-import"
},
"responses": {
"200": {
"body": {
"properties":{
"storageAccountId":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/test",
"jobType":"Import",
"returnAddress":{
"recipientName":"Tets",
"streetAddress1":"Street1",
"streetAddress2":"street2",
"city":"Redmond",
"stateOrProvince":"wa",
"postalCode":"98007",
"countryOrRegion":"USA",
"phone":"4250000000",
"email":"[email protected]"
},
"shippingInformation":{
"recipientName":"Microsoft Azure Import/Export Service",
"streetAddress1":"2045 Lafayette Street",
"streetAddress2":"",
"city":"Santa Clara",
"stateOrProvince":"CA",
"postalCode":"95050",
"countryOrRegion":"USA",
"phone":"408 0000 0000"
},
"diagnosticsPath":"waimportexport",
"logLevel":"Verbose",
"backupDriveManifest":true,
"cancelRequested":false,
"state":"Creating",
"driveList":[
{
"driveId":"9CA995BB",
"manifestFile":"\\DriveManifest.xml",
"manifestHash":"109B21108597EF36D5785F08303F3638",
"driveHeaderHash":"",
"state":"Specified"
}
],
"provisioningState":"Succeeded"
},
"id":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ImportExport/jobs/test",
"name":"test-by1-import",
"type":"Microsoft.ImportExport/jobs",
"location":"West US"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"api-version": "2016-11-01",
"locationName": "West US"
},
"responses": {
"200": {
"body": {
"properties":{
"recipientName":"Microsoft Azure Import/Export Service",
"streetAddress1":"2045 Lafayette Street",
"streetAddress2":"",
"city":"Santa Clara",
"stateOrProvince":"CA",
"postalCode":"95050",
"countryOrRegion":"USA",
"phone":"408 352 7600",
"supportedCarriers":[
"FedEx"
],
"alternateLocations":[
"/providers/Microsoft.ImportExport/locations/westus"
]
},
"id":"/providers/Microsoft.ImportExport/locations/westus",
"name":"West US",
"type":"Microsoft.ImportExport/locations"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"api-version": "2016-11-01",
"subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"resourceGroupName": "Default-Storage-WestUS",
"jobName": "test-by1-import"
},
"responses": {
"200": {
"body": {
"value":[
{
"driveId":"9CA995BB",
"bitLockerKey":"000000-000000-111111-222222-333333-444444-555555-666666"
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"parameters": {
"api-version": "2016-11-01",
"subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"resourceGroupName": "Default-Storage-WestUS"
},
"responses": {
"200": {
"body": {
"value":[
{
"properties":{
"storageAccountId":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/xtprodtestwu",
"jobType":"Import",
"returnAddress":{
"recipientName":"La",
"streetAddress1":"Street1",
"streetAddress2":"street2",
"city":"Redmond",
"stateOrProvince":"wa",
"postalCode":"98007",
"countryOrRegion":"USA",
"phone":"4250000000",
"email":"[email protected]"
},
"shippingInformation":{
"recipientName":"Microsoft Azure Import/Export Service",
"streetAddress1":"2045 Lafayette Street",
"streetAddress2":"",
"city":"Santa Clara",
"stateOrProvince":"CA",
"postalCode":"95050",
"countryOrRegion":"USA",
"phone":"408 352 7600"
},
"deliveryPackage":{
"carrierName":"FedEx",
"trackingNumber":"787895108176",
"driveCount":1,
"shipDate":"9/29/2017 10:28:35 PM"
},
"diagnosticsPath":"waimportexport",
"logLevel":"Verbose",
"backupDriveManifest":true,
"cancelRequested":false,
"state":"Received",
"provisioningState":"Succeeded"
},
"id":"/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ImportExport/jobs/test-by1-ssd-2",
"name":"test-by1-ssd-2",
"type":"Microsoft.ImportExport/jobs",
"location":"West US"
}
]
}
}
}
}
Loading

0 comments on commit 7c6c49a

Please sign in to comment.