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

Adding SubscriptionId and ResourceGroup for Azure Datastore #25289

Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9390,6 +9390,9 @@
"description": "Azure Blob datastore configuration.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AzureDatastore"
},
{
"$ref": "#/definitions/Datastore"
}
Expand Down Expand Up @@ -9453,6 +9456,9 @@
],
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AzureDatastore"
},
{
"$ref": "#/definitions/Datastore"
}
Expand Down Expand Up @@ -9489,6 +9495,9 @@
],
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AzureDatastore"
},
{
"$ref": "#/definitions/Datastore"
}
Expand Down Expand Up @@ -9547,6 +9556,23 @@
"x-ms-discriminator-value": "AzureDataLakeGen2",
"additionalProperties": false
},
"AzureDatastore": {
"description": "Base definition for Azure datastore contents configuration.",
"type": "object",
"properties": {
"resourceGroup": {
"description": "Azure Resource Group name",
"type": "string",
"x-nullable": true
Copy link
Member

@TimLovellSmith TimLovellSmith Aug 19, 2023

Choose a reason for hiding this comment

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

"x-nullable": true

I think its preferred api behavior not to use x-nullable, but just to allow omitting the fields completely when there are no values to serialize

Copy link
Contributor Author

@ChunyuMSFT ChunyuMSFT Aug 20, 2023

Choose a reason for hiding this comment

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

I thought "x-nullable" just makes the "null" as acceptable value? How to mark omit null value in swagger? I think it's implementation behavior instead of something in swagger?

Copy link
Member

Choose a reason for hiding this comment

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

We prefer implementations to not rely on the value null if they don't have to.

},
"subscriptionId": {
"description": "Azure Subscription Id",
"type": "string",
"x-nullable": true
}
},
"additionalProperties": false
ChunyuMSFT marked this conversation as resolved.
Show resolved Hide resolved
},
"AzureFileDatastore": {
"description": "Azure File datastore configuration.",
"required": [
Expand All @@ -9555,6 +9581,9 @@
],
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AzureDatastore"
},
{
"$ref": "#/definitions/Datastore"
}
Expand Down