Write bicep into modules based on scope hierarchy rather than user constructs

sdk/provisioning/Azure.Provisioning/src/Construct.cs

@@ -139,7 +139,7 @@ public IEnumerable<Parameter> GetParameters(bool recursive = true)
             IEnumerable<Parameter> result = _parameters;
             if (recursive)
             {
-                result = result.Concat(GetConstructs(false).SelectMany(c => c.GetParameters(true)));
+                result = result.Concat(GetResources(true).SelectMany(c => c.Parameters));
             }
             return result;
         }

sdk/provisioning/Azure.Provisioning/tests/ConstructTests.cs

@@ -3,6 +3,7 @@
 
 using System.Linq;
 using Azure.Provisioning.ResourceManager;
+using Azure.Provisioning.Storage;
 using NUnit.Framework;
 
 namespace Azure.Provisioning.Tests
@@ -80,5 +81,73 @@ public void GetResourcesChildConstructs(bool recursive)
 
             Assert.AreEqual(expected, resources.Count());
         }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetParametersNoChildConstructs(bool recursive)
+        {
+            var infra = new TestInfrastructure();
+            var rg1 = new ResourceGroup(infra, "rg1");
+
+            rg1.AssignParameter(r => r.Location, new Parameter("location"));
+
+            var parameters = infra.GetParameters(recursive);
+            var expected = recursive ? 1 : 0;
+            Assert.AreEqual(expected, parameters.Count());
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetParametersChildConstructs(bool recursive)
+        {
+            var infra = new TestInfrastructure();
+            var rg1 = new ResourceGroup(infra, "rg1");
+            rg1.AssignParameter(r => r.Location, new Parameter("location"));
+
+            var childScope = infra.AddFrontEndWebSite();
+            var rg2 = new ResourceGroup(childScope, "rg2");
+            rg2.AssignParameter(r => r.Location, new Parameter("location"));
+
+            var expected = recursive ? 2 : 0;
+            var parameters = infra.GetParameters(recursive);
+
+            Assert.AreEqual(expected, parameters.Count());
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetOutputsNoChildConstructs(bool recursive)
+        {
+            var infra = new TestInfrastructure();
+            var rg1 = new ResourceGroup(infra, "rg1");
+
+            rg1.AddOutput(r => r.Location, "location");
+
+            var outputs = infra.GetOutputs(recursive);
+            Assert.AreEqual(1, outputs.Count());
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void GetOutputsChildConstructs(bool recursive)
+        {
+            var infra = new TestInfrastructure();
+            var rg1 = new ResourceGroup(infra, "rg1");
+            rg1.AddOutput(r => r.Location, "location");
+
+            var childScope = infra.AddFrontEndWebSite();
+            var rg2 = new ResourceGroup(childScope, "rg2");
+            rg2.AddOutput(r => r.Location, "location");
+
+            // front end website has an output
+            var expected = recursive ? 3 : 1;
+            var outputs = infra.GetOutputs(recursive);
+
+            Assert.AreEqual(expected, outputs.Count());
+        }
     }
 }

sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep

@@ -1,6 +1,6 @@
 
-resource storageAccount_KexecArjZ 'Microsoft.Storage/storageAccounts@2022-09-01' = {
-  name: 'photoAcct-ffa0e09008ef43'
+resource storageAccount_ndlcNKBxw 'Microsoft.Storage/storageAccounts@2022-09-01' = {
+  name: 'photoAcct-7a12b0a522d940'
   location: 'westus'
   sku: {
     name: 'Premium_LRS'
@@ -10,8 +10,8 @@ resource storageAccount_KexecArjZ 'Microsoft.Storage/storageAccounts@2022-09-01'
   }
 }
 
-resource blobService_tgFa0LTtj 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
-  parent: storageAccount_KexecArjZ
+resource blobService_LdjAyjFPX 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
+  parent: storageAccount_ndlcNKBxw
   name: 'default'
   properties: {
     cors: {

sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep

@@ -1,6 +1,6 @@
 
-resource storageAccount_GZYFQDrQ7 'Microsoft.Storage/storageAccounts@2022-09-01' = {
-  name: 'photoAcct-93297634c2184e'
+resource storageAccount_ueMvHVxRn 'Microsoft.Storage/storageAccounts@2022-09-01' = {
+  name: 'photoAcct-745e82f87b8643'
   location: 'westus'
   sku: {
     name: 'Premium_LRS'
@@ -10,8 +10,8 @@ resource storageAccount_GZYFQDrQ7 'Microsoft.Storage/storageAccounts@2022-09-01'
   }
 }
 
-resource blobService_zYYZUU0bM 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
-  parent: storageAccount_GZYFQDrQ7
+resource blobService_LNZp3bela 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
+  parent: storageAccount_ueMvHVxRn
   name: 'default'
   properties: {
     cors: {