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.

Sign up for GitHub

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

Updated managed instance swagger and examples #5138

Merged
merged 18 commits into from
Feb 8, 2019
Merged

Updated managed instance swagger and examples #5138

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
45f508a
Update managedInstances.json
stefanb995 Jan 30, 2019
397e372
Swagger change for Managed Instance
stefanb995 Feb 1, 2019
ac5b71c
Update managedInstances.json
stefanb995 Feb 2, 2019
080eff4
Update ManagedInstanceListByResourceGroup.json
stefanb995 Feb 4, 2019
88c55ad
Updated bool values
stefanb995 Feb 4, 2019
fcaf617
Update ManagedInstanceCreateMax.json
stefanb995 Feb 4, 2019
9f61378
Update ManagedInstanceGet.json
stefanb995 Feb 4, 2019
72acebf
Update ManagedInstanceList.json
stefanb995 Feb 4, 2019
a2649b9
Update ManagedInstanceListByResourceGroup.json
stefanb995 Feb 4, 2019
320e26d
Update ManagedInstanceUpdateMax.json
stefanb995 Feb 4, 2019
743faf3
Merge branch 'Add-publicDataEndpointEnabled-and-proxyOverride-to-swag…
stefanb995 Feb 4, 2019
f77f93b
Update managedInstances.json
stefanb995 Feb 7, 2019
5f400db
Update managedInstances.json
stefanb995 Feb 7, 2019
00ccb04
Update managedInstances.json
stefanb995 Feb 7, 2019
c614033
Update managedInstances.json
stefanb995 Feb 7, 2019
b79620d
Update ManagedInstanceCreateMax.json
stefanb995 Feb 8, 2019
8b90edd
Merge branch 'master' into Add-publicDataEndpointEnabled-and-proxyOve…
stefanb995 Feb 8, 2019
b7c9ded
Update managedInstances.json
stefanb995 Feb 8, 2019
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
7 changes: 5 additions & 2 deletions ...e-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance"
"dnsZonePartner": "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testinstance",
"publicDataEndpointEnabled" : "false",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think the boolean value should be quoted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I fixed it.

"proxyOverride" : "Redirect"
}
}
},
Expand All @@ -48,7 +50,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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is publicDataEndpointEnabled intentionally not there in the response?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's by design.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I talked with Mladen who was implementing this feature. He actually forgot to include it here. It should be in response. I'll update it and he'll make sure to update his part.

"proxyOverride" : "Redirect"
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions ...esource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"

"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : "false",
"proxyOverride" : "Default"
},
"location" : "onebox",
"id" : "/subscriptions/20d7082a-0fc7-4468-82bd-542694d5042b/resourceGroups/testrg/providers/Microsoft.Sql/managedInstances/testcl",
Expand Down
8 changes: 6 additions & 2 deletions ...source-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : "false",
"proxyOverride" : "Proxy"
}
}, {
"location" : "onebox",
Expand All @@ -44,7 +46,9 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : "false",
"proxyOverride" : ""
}
}
]
Expand Down
7 changes: 5 additions & 2 deletions ...Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : "false",
"proxyOverride" : "Redirect"
}
}, {
"location" : "onebox",
Expand All @@ -47,7 +49,8 @@
"storageSizeInGB": 1024,
"licenseType": "Full",
"collation": "SQL_Latin1_General_CP1_CI_AS",
"dnsZone": "1b4e2caff2530"
"dnsZone": "1b4e2caff2530",
"publicDataEndpointEnabled" : "false"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is proxyOverride intentionally missing?

Copy link
Contributor Author

@stefanb995 stefanb995 Feb 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. It should be empty string because this instance is created before this property is introduced and the value for this property is null as I have already explained.

}
}
]
Expand Down
8 changes: 6 additions & 2 deletions ...e-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceUpdateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
"fullyQualifiedDomainName" : "testinstance.1b4e2caff2530.database.windows.net",
"administratorLogin" : "dummylogin",
"administratorLoginPassword" : "Un53cuRE!",
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"
"subnetId" : "/subscriptions/20D7082A-0FC7-4468-82BD-542694D5042B/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
"proxyOverride": "Redirect",
"publicDataEndpointEnabled": "false"
}
}
},
Expand All @@ -42,7 +44,9 @@
"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",
"proxyOverride": "Redirect",
"publicDataEndpointEnabled": "false"
}
}
},
Expand Down
13 changes: 13 additions & 0 deletions ...ation/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,19 @@
"x-ms-mutability": [
"create"
]
},
"publicDataEndpointEnabled": {
"description": "Whether or not the public data endpoint is enabled.",
"type": "boolean"
},
"proxyOverride": {
"description": "Connection type used for connecting to the instance.",
"enum": ["Proxy", "Redirect", "Default"],
"x-ms-enum":{
"name": "ManagedInstanceProxyOverride",
"modelAsString": true
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: please fix indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

"type": "string"
}
}
},
Expand Down