Skip to content

[botservice] Modify the optionality of 'location' #36130

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

Merged
pshao25 merged 4 commits into from
Jul 23, 2025
Merged

[botservice] Modify the optionality of 'location' #36130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2facbc0
Modify the optionality of 'location'
melina5656 Jul 23, 2025
9a1cbc1
Merge branch 'main' into fix/botservice
melina5656 Jul 23, 2025
d793c34
resolve breaking change
v-jiaodi Jul 23, 2025
b454507
Merge branch 'main' into fix/botservice
v-jiaodi Jul 23, 2025
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
15 changes: 14 additions & 1 deletion specification/botservice/BotService.Management/Bot.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,27 @@ namespace Microsoft.BotService;
/**
* Bot resource definition
*/
model Bot is Azure.ResourceManager.TrackedResource<BotProperties> {
model Bot is Azure.ResourceManager.ProxyResource<BotProperties> {
...ResourceNameParameter<
Resource = Bot,
KeyName = "resourceName",
SegmentName = "botServices",
NamePattern = "^[a-zA-Z0-9][a-zA-Z0-9_.-]*$"
>;

/**
* Specifies the location of the resource.
*/
#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
location?: string;

/**
* Contains resource tags defined as key/value pairs.
*/
#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
#suppress "@azure-tools/typespec-azure-resource-manager/arm-no-record" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
tags?: Record<string>;

/**
* Gets or sets the SKU of the resource.
*/
Expand Down
15 changes: 14 additions & 1 deletion specification/botservice/BotService.Management/BotChannel.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,27 @@ namespace Microsoft.BotService;
* Bot channel resource definition
*/
@parentResource(Bot)
model BotChannel is Azure.ResourceManager.TrackedResource<Channel> {
model BotChannel is Azure.ResourceManager.ProxyResource<Channel> {
...ResourceNameParameter<
Resource = BotChannel,
KeyName = "channelName",
SegmentName = "channels",
NamePattern = "^[a-zA-Z0-9][a-zA-Z0-9_.-]*$"
>;

/**
* Specifies the location of the resource.
*/
#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
location?: string;

/**
* Contains resource tags defined as key/value pairs.
*/
#suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
#suppress "@azure-tools/typespec-azure-resource-manager/arm-no-record" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
tags?: Record<string>;

/**
* Gets or sets the SKU of the resource.
*/
Expand Down
3 changes: 2 additions & 1 deletion specification/botservice/BotService.Management/tspconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ options:
flavor: azure
"@azure-tools/typespec-ts":
package-dir: "arm-botservice"
is-modular-library: true
typespec-title-map:
BotServiceClient: "AzureBotService"
flavor: "azure"
experimental-extensible-enums: true
package-details:
Expand Down
26 changes: 24 additions & 2 deletions ...tservice/resource-manager/Microsoft.BotService/preview/2023-09-15-preview/botservice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2112,6 +2112,17 @@
"$ref": "#/definitions/BotProperties",
"description": "The set of properties specific to bot resource"
},
"location": {
"type": "string",
"description": "Specifies the location of the resource."
},
"tags": {
"type": "object",
"description": "Contains resource tags defined as key/value pairs.",
"additionalProperties": {
"type": "string"
}
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "Gets or sets the SKU of the resource."
Expand All @@ -2135,7 +2146,7 @@
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
}
]
},
Expand All @@ -2147,6 +2158,17 @@
"$ref": "#/definitions/Channel",
"description": "The set of properties specific to bot channel resource"
},
"location": {
"type": "string",
"description": "Specifies the location of the resource."
},
"tags": {
"type": "object",
"description": "Contains resource tags defined as key/value pairs.",
"additionalProperties": {
"type": "string"
}
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "Gets or sets the SKU of the resource."
Expand All @@ -2170,7 +2192,7 @@
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
}
]
},
Expand Down
Loading