Skip to content

Commit

Permalink
Update swagger file and examples with time zone parameter (#5224)
Browse files Browse the repository at this point in the history
* Update swagger documetation to mark Collation property as writable.

Change Managed Instance collation property from read only to read and create.
Add collation to properties section in ManagedInstanceCreateMax example.

VSTS task: 12336257

* Remove 'cosmetics' from swagger.

* Remove comma as redundant

* Return to the initial, generated state.

* Update swagger file and examples with time zone parameter
  • Loading branch information
NMijat1024 authored and jianghaolu committed Feb 22, 2019
1 parent 5df40b9 commit 1b8a97c
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Redirect"
"proxyOverride" : "Redirect",
"timezoneId" : "UTC"
}
}
},
Expand All @@ -52,7 +53,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Redirect"
"proxyOverride" : "Redirect",
"timezoneId" : "UTC"
}
}
},
Expand All @@ -76,7 +78,8 @@
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"timezoneId" : "UTC"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"administratorLogin": "dummylogin",
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"timezoneId" : "UTC"
}
}
},
Expand All @@ -49,7 +50,8 @@
"administratorLogin": "dummylogin",
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"timezoneId" : "UTC"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Default"
"proxyOverride" : "Default",
"timezoneId" : "UTC"
},
"location" : "onebox",
"id" : "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Proxy"
"proxyOverride" : "Proxy",
"timezoneId" : "UTC"
}
}, {
"location" : "onebox",
Expand All @@ -48,7 +49,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : ""
"proxyOverride" : "",
"timezoneId" : "UTC"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : "Redirect"
"proxyOverride" : "Redirect",
"timezoneId" : "UTC"
}
}, {
"location" : "onebox",
Expand All @@ -51,7 +52,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : false,
"proxyOverride" : ""
"proxyOverride" : "",
"timezoneId" : "UTC"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530",
"proxyOverride": "Redirect",
"publicDataEndpointEnabled": false
"publicDataEndpointEnabled": false,
"timezoneId" : "UTC"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"administratorLogin": "dummylogin",
"state": "Ready",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"timezoneId": "UTC"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,14 @@
"modelAsString": true
},
"type": "string"
},
"timezoneId": {
"description": "Id of the timezone. Allowed values are timezones supported by Windows.\r\nWinodws keeps details on supported timezones, including the id, in registry under\r\nKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones.\r\nYou can get those registry values via SQL Server by querying SELECT name AS timezone_id FROM sys.time_zone_info.\r\nList of Ids can also be obtained by executing [System.TimeZoneInfo]::GetSystemTimeZones() in PowerShell.\r\nAn example of valid timezone id is \"Pacific Standard Time\" or \"W. Europe Standard Time\".",
"type": "string",
"x-ms-mutability": [
"read",
"create"
]
}
}
},
Expand Down

0 comments on commit 1b8a97c

Please sign in to comment.