Skip to content

Making the scope property as fully qualified resource Id #18165

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Making the scope property as fully qualified resource Id #18165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
943f93b
making the scope property as fully qualified resource Id
Oct 3, 2025
a22ca09
reuse the same function and removing unwanted reference
Oct 6, 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
16 changes: 8 additions & 8 deletions ...egrationTests/Files/SymbolicNameTests/ResourceInfo/sql-database-with-management/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "4117458336638385923"
"templateHash": "9398539240056510995"
}
},
"parameters": {
Expand Down Expand Up @@ -67,7 +67,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "539045749339275659"
"templateHash": "7415740835907921061"
}
},
"parameters": {
Expand Down Expand Up @@ -184,7 +184,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "13365229039280932647"
"templateHash": "12444332133751382655"
}
},
"parameters": {
Expand Down Expand Up @@ -398,7 +398,7 @@
"condition": "[parameters('sqlLogicalServer').diagnosticLogsAndMetrics.auditLogs]",
"type": "microsoft.insights/diagnosticSettings",
"apiVersion": "2017-05-01-preview",
"scope": "[format('Microsoft.Sql/servers/{0}/databases/{1}', parameters('sqlLogicalServer').name, 'master')]",
"scope": "[resourceId('Microsoft.Sql/servers/databases', parameters('sqlLogicalServer').name, 'master')]",
"name": "SQLSecurityAuditEvents_3d229c42-c7e7-4c97-9a99-ec0d0d8b86c1",
"properties": {
"workspaceId": "[resourceInfo('logAnalyticsWorkspace').id]",
Expand All @@ -424,7 +424,7 @@
"condition": "[not(empty(parameters('sqlLogicalServer').diagnosticLogsAndMetrics.name))]",
"type": "microsoft.insights/diagnosticSettings",
"apiVersion": "2017-05-01-preview",
"scope": "[format('Microsoft.Sql/servers/{0}/databases/{1}', parameters('sqlLogicalServer').name, 'master')]",
"scope": "[resourceId('Microsoft.Sql/servers/databases', parameters('sqlLogicalServer').name, 'master')]",
"name": "sendLogsAndMetrics",
"properties": {
"copy": [
Expand Down Expand Up @@ -548,7 +548,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "11694828696500125168"
"templateHash": "18189861927363119486"
}
},
"parameters": {
Expand Down Expand Up @@ -660,7 +660,7 @@
"condition": "[parameters('sqlDatabase').diagnosticLogsAndMetrics.auditLogs]",
"type": "microsoft.insights/diagnosticSettings",
"apiVersion": "2017-05-01-preview",
"scope": "[format('Microsoft.Sql/servers/{0}/databases/{1}', split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[0], split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[1])]",
"scope": "[resourceId('Microsoft.Sql/servers/databases', split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[0], split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[1])]",
"name": "SQLSecurityAuditEvents_3d229c42-c7e7-4c97-9a99-ec0d0d8b86c1",
"properties": {
"workspaceId": "[resourceInfo('logAnalyticsWorkspace').id]",
Expand All @@ -681,7 +681,7 @@
"condition": "[not(empty(parameters('sqlDatabase').diagnosticLogsAndMetrics.name))]",
"type": "microsoft.insights/diagnosticSettings",
"apiVersion": "2017-05-01-preview",
"scope": "[format('Microsoft.Sql/servers/{0}/databases/{1}', split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[0], split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[1])]",
"scope": "[resourceId('Microsoft.Sql/servers/databases', split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[0], split(format('{0}/{1}', parameters('sqlServerName'), parameters('sqlDatabase').name), '/')[1])]",
"name": "sendLogsAndMetrics",
"properties": {
"copy": [
Expand Down
2 changes: 1 addition & 1 deletion src/Bicep.Core.IntegrationTests/Scenarios/ScopeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ param PSQL_DATABASES {
result.Should().NotHaveAnyDiagnostics();
using (new AssertionScope())
{
result.Template.Should().HaveValueAtPath("$.resources['dbLocks'].scope", "[format('Microsoft.DBforPostgreSQL/servers/{0}/databases/{1}', last(split(parameters('postgreSqlServerId'), '/')), parameters('PSQL_DATABASES')[copyIndex()].database.name)]");
result.Template.Should().HaveValueAtPath("$.resources['dbLocks'].scope", "[resourceId('Microsoft.DBforPostgreSQL/servers/databases', last(split(parameters('postgreSqlServerId'), '/')), parameters('PSQL_DATABASES')[copyIndex()].database.name)]");
result.Template.Should().HaveValueAtPath("$.resources['dbLocks'].dependsOn", new JArray
{
"[format('postgreSQL::database[{0}]', copyIndex())]"
Expand Down
57 changes: 50 additions & 7 deletions src/Bicep.Core.IntegrationTests/ScopeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,61 @@ public void Emitter_should_generate_correct_extension_scope_property_and_correct

using (new AssertionScope())
{
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].scope", "[format('My.Rp/myResource/{0}', 'resourceA')]");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].scope", "[resourceId('My.Rp/myResource', 'resourceA')]");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].dependsOn[0]", "[resourceId('My.Rp/myResource', 'resourceA')]");

template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceC')].scope", "[extensionResourceId(format('My.Rp/myResource/{0}', 'resourceA'), 'My.Rp/myResource', 'resourceB')]");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceC')].scope", "[extensionResourceId(resourceId('My.Rp/myResource', 'resourceA'), 'My.Rp/myResource', 'resourceB')]");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceC')].dependsOn[0]", "[extensionResourceId(resourceId('My.Rp/myResource', 'resourceA'), 'My.Rp/myResource', 'resourceB')]");
}
}

[DataRow("tenant", "[format('My.Rp/myResource/{0}', 'resourceA')]", "[reference(tenantResourceId('My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataRow("managementGroup", "[format('My.Rp/myResource/{0}', 'resourceA')]", "[reference(extensionResourceId(managementGroup().id, 'My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataRow("subscription", "[format('My.Rp/myResource/{0}', 'resourceA')]", "[reference(subscriptionResourceId('My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataRow("resourceGroup", "[format('My.Rp/myResource/{0}', 'resourceA')]", "[reference(resourceId('My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
//https://github.com/Azure/bicep/issues/18097
[TestMethod]
public void Emitter_should_generate_fullyQualifiedResourceId_in_extension_scope_property_and_correct_dependsOn()
{
//tenant scope resource and its extension resource can be deployed from anywhere
var (template, _, _) = CompilationHelper.Compile(@"
resource resourceA 'My.Rp/myResource@2020-01-01' = {
name: 'resourceA'
scope: tenant()
}

resource resourceB 'My.Rp/myResource@2020-01-01' = {
scope: resourceA
name: 'resourceB'
}");

using (new AssertionScope())
{
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceA')].scope", "/");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].scope", "[tenantResourceId('My.Rp/myResource', 'resourceA')]");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].dependsOn[0]", "[tenantResourceId('My.Rp/myResource', 'resourceA')]");
}

// existing tenant resource and its extension resource can be deployed from anywhere
var (template1, _, _) = CompilationHelper.Compile(@"
resource resourceA 'My.Rp/myResource@2020-01-01' existing = {
name: 'resourceA'
scope: tenant()
}

resource resourceB 'My.Rp/myResource@2020-01-01' = {
scope: resourceA
name: 'resourceB'
}");

using (new AssertionScope())
{
template1.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].scope", "[tenantResourceId('My.Rp/myResource', 'resourceA')]");
}


}

[DataRow("tenant", "[tenantResourceId('My.Rp/myResource', 'resourceA')]", "[reference(tenantResourceId('My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataRow("managementGroup", "[extensionResourceId(managementGroup().id, 'My.Rp/myResource', 'resourceA')]", "[reference(extensionResourceId(managementGroup().id, 'My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataRow("subscription", "[subscriptionResourceId('My.Rp/myResource', 'resourceA')]", "[reference(subscriptionResourceId('My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataRow("resourceGroup", "[resourceId('My.Rp/myResource', 'resourceA')]", "[reference(resourceId('My.Rp/myResource', 'resourceA'), '2020-01-01').myProp]")]
[DataTestMethod]
public void Emitter_should_generate_correct_references_for_existing_resources(string targetScope, string expectedScopeExpression, string expectedReferenceExpression)
{
Expand Down Expand Up @@ -314,7 +357,7 @@ public void Extensions_of_existing_resources_are_permitted()
{
diags.Should().BeEmpty();

template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].scope", "[format('My.Rp/myResource/{0}', 'resourceA')]");
template.Should().HaveValueAtPath("$.resources[?(@.name == 'resourceB')].scope", "[resourceId('My.Rp/myResource', 'resourceA')]");
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/Bicep.Core.Samples/Files/baselines/LoopsIndexed_LF/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "dev",
"templateHash": "17760091364916659741"
"templateHash": "13486310390719974679"
}
},
"parameters": {
Expand Down Expand Up @@ -54,7 +54,7 @@
{
"type": "Microsoft.Authorization/locks",
"apiVersion": "2016-09-01",
"scope": "[format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name')))]",
"scope": "[resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name')))]",
"name": "single-resource-lock",
"properties": {
"level": "CanNotDelete"
Expand All @@ -66,7 +66,7 @@
{
"type": "Microsoft.Authorization/locks",
"apiVersion": "2016-09-01",
"scope": "[extensionResourceId(format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', 'single-resource-lock')]",
"scope": "[extensionResourceId(resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', 'single-resource-lock')]",
"name": "single-resource-cascade-extension",
"properties": {
"level": "CanNotDelete"
Expand Down Expand Up @@ -97,7 +97,7 @@
{
"type": "Microsoft.Authorization/locks",
"apiVersion": "2016-09-01",
"scope": "[format('Microsoft.Storage/storageAccounts/{0}', format('{0}-collection-{1}-{2}', parameters('name'), parameters('accounts')[mod(parameters('index'), 2)].name, mod(parameters('index'), 2)))]",
"scope": "[resourceId('Microsoft.Storage/storageAccounts', format('{0}-collection-{1}-{2}', parameters('name'), parameters('accounts')[mod(parameters('index'), 2)].name, mod(parameters('index'), 2)))]",
"name": "one-resource-collection-item-lock",
"properties": {
"level": "ReadOnly"
Expand All @@ -113,7 +113,7 @@
},
"type": "Microsoft.Authorization/locks",
"apiVersion": "2016-09-01",
"scope": "[format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name')))]",
"scope": "[resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name')))]",
"name": "[format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex())]",
"properties": {
"level": "[if(and(equals(range(0, 1)[copyIndex()], 0), equals(copyIndex(), 0)), 'CanNotDelete', 'ReadOnly')]"
Expand All @@ -131,7 +131,7 @@
},
"type": "Microsoft.Authorization/locks",
"apiVersion": "2016-09-01",
"scope": "[extensionResourceId(format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex()))]",
"scope": "[extensionResourceId(resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex()))]",
"name": "[format('lock-the-lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex())]",
"properties": {
"level": "[if(and(equals(range(0, 1)[copyIndex()], 0), equals(copyIndex(), 0)), 'CanNotDelete', 'ReadOnly')]"
Expand Down
10 changes: 5 additions & 5 deletions src/Bicep.Core.Samples/Files/baselines/LoopsIndexed_LF/main.sourcemap.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ resource singleResourceExtension 'Microsoft.Authorization/locks@2016-09-01' = {
//@ {
//@ "type": "Microsoft.Authorization/locks",
//@ "apiVersion": "2016-09-01",
//@ "scope": "[format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name')))]",
//@ "scope": "[resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name')))]",
//@ "name": "single-resource-lock",
//@ "dependsOn": [
//@ "[resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name')))]"
Expand All @@ -57,7 +57,7 @@ resource singleResourceCascadeExtension 'Microsoft.Authorization/locks@2016-09-0
//@ {
//@ "type": "Microsoft.Authorization/locks",
//@ "apiVersion": "2016-09-01",
//@ "scope": "[extensionResourceId(format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', 'single-resource-lock')]",
//@ "scope": "[extensionResourceId(resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', 'single-resource-lock')]",
//@ "name": "single-resource-cascade-extension",
//@ "dependsOn": [
//@ "[extensionResourceId(resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', 'single-resource-lock')]"
Expand Down Expand Up @@ -111,7 +111,7 @@ resource extendSingleResourceInCollection 'Microsoft.Authorization/locks@2016-09
//@ {
//@ "type": "Microsoft.Authorization/locks",
//@ "apiVersion": "2016-09-01",
//@ "scope": "[format('Microsoft.Storage/storageAccounts/{0}', format('{0}-collection-{1}-{2}', parameters('name'), parameters('accounts')[mod(parameters('index'), 2)].name, mod(parameters('index'), 2)))]",
//@ "scope": "[resourceId('Microsoft.Storage/storageAccounts', format('{0}-collection-{1}-{2}', parameters('name'), parameters('accounts')[mod(parameters('index'), 2)].name, mod(parameters('index'), 2)))]",
//@ "name": "one-resource-collection-item-lock",
//@ "dependsOn": [
//@ "[resourceId('Microsoft.Storage/storageAccounts', format('{0}-collection-{1}-{2}', parameters('name'), parameters('accounts')[mod(parameters('index'), 2)].name, mod(parameters('index'), 2)))]"
Expand All @@ -136,7 +136,7 @@ resource extensionCollection 'Microsoft.Authorization/locks@2016-09-01' = [for (
//@ },
//@ "type": "Microsoft.Authorization/locks",
//@ "apiVersion": "2016-09-01",
//@ "scope": "[format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name')))]",
//@ "scope": "[resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name')))]",
//@ "name": "[format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex())]",
//@ "dependsOn": [
//@ "[resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name')))]"
Expand Down Expand Up @@ -164,7 +164,7 @@ resource lockTheLocks 'Microsoft.Authorization/locks@2016-09-01' = [for (i, i2)
//@ },
//@ "type": "Microsoft.Authorization/locks",
//@ "apiVersion": "2016-09-01",
//@ "scope": "[extensionResourceId(format('Microsoft.Storage/storageAccounts/{0}', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex()))]",
//@ "scope": "[extensionResourceId(resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex()))]",
//@ "name": "[format('lock-the-lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex())]",
//@ "dependsOn": [
//@ "[extensionResourceId(resourceId('Microsoft.Storage/storageAccounts', format('{0}single-resource-name', parameters('name'))), 'Microsoft.Authorization/locks', format('lock-{0}-{1}', range(0, 1)[copyIndex()], copyIndex()))]"
Expand Down
Loading
Loading