Added ResourceGroup and SubscriptionId fields

src/Bicep.Core.IntegrationTests/ScenarioTests.cs

@@ -474,5 +474,29 @@ public void Test_Issue1402()
                 template.SelectToken("$.resources[?(@.name == 'subDeploy')].location")!.Should().BeNull();
             }
         }
+
+        [TestMethod]
+        public void Test_Issue1391()
+        {
+            var (template, diags, _) = CompilationHelper.Compile(
+                ("main.bicep", @"
+resource dep 'Microsoft.Resources/deployments@2020-06-01' = {
+  name: 'nestedDeployment'
+  resourceGroup: 'bicep-rg'
+  subscriptionId: 'abcd-efgh'
+  location: 'westus'
+  properties: {
+    mode: 'Incremental'
+  }
+}
+"));
+            template!.Should().NotBeNull();
+            diags.Should().BeEmpty();
+            using (new AssertionScope())
+            {
+                template!.SelectToken("$.resources[?(@.name == 'nestedDeployment')].subscriptionId")!.Should().DeepEqual("abcd-efgh");
+                template.SelectToken("$.resources[?(@.name == 'nestedDeployment')].resourceGroup")!.Should().DeepEqual("bicep-rg");
+            }
+        }
     }
 }

src/Bicep.Core/TypeSystem/Az/AzResourceTypeFactory.cs

@@ -97,7 +97,6 @@ private TypeSymbol ToTypeSymbol(Azure.Bicep.Types.Concrete.TypeBase typeBase, bo
                 {
                     var resourceTypeReference = ResourceTypeReference.Parse(resourceType.Name);
                     var bodyType = GetTypeSymbol(resourceType.Body.Type, true);
-
                     return new ResourceType(resourceTypeReference, ToResourceScope(resourceType.ScopeType), bodyType);
                 }
                 case Azure.Bicep.Types.Concrete.UnionType unionType:

src/Bicep.Core/TypeSystem/Az/AzResourceTypeProvider.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using Azure.Bicep.Types.Az;
 using Bicep.Core.Resources;
+using Bicep.Core.Emit;
 
 namespace Bicep.Core.TypeSystem.Az
 {
@@ -114,33 +115,31 @@ private static ObjectType SetBicepResourceProperties(ObjectType objectType, Reso
                 // we can refer to a resource at any scope if it is an existing resource not being deployed by this file
                 var scopeReference = LanguageConstants.CreateResourceScopeReference(validParentScopes);
                 properties = properties.SetItem(LanguageConstants.ResourceScopePropertyName, new TypeProperty(LanguageConstants.ResourceScopePropertyName, scopeReference, scopeRequiredFlag));
-
-                return new NamedObjectType(
-                    objectType.Name,
-                    objectType.ValidationFlags,
-                    ConvertToReadOnly(properties.Values),
-                    objectType.AdditionalPropertiesType,
-                    ConvertToReadOnly(objectType.AdditionalPropertiesFlags));
             }
             else
             {
+                // TODO: remove 'dependsOn' from the type library
+                properties = properties.SetItem(LanguageConstants.ResourceDependsOnPropertyName, new TypeProperty(LanguageConstants.ResourceDependsOnPropertyName, LanguageConstants.ResourceRefArray, TypePropertyFlags.WriteOnly));
+
                 // we only support scope for extension resources (or resources where the scope is unknown and thus may be an extension resource)
                 if (validParentScopes.HasFlag(ResourceScope.Resource))
                 {
                     var scopeReference = LanguageConstants.CreateResourceScopeReference(ResourceScope.Resource);
                     properties = properties.SetItem(LanguageConstants.ResourceScopePropertyName, new TypeProperty(LanguageConstants.ResourceScopePropertyName, scopeReference, scopeRequiredFlag));
                 }
-
-                // TODO: remove 'dependsOn' from the type library
-                properties = properties.SetItem(LanguageConstants.ResourceDependsOnPropertyName, new TypeProperty(LanguageConstants.ResourceDependsOnPropertyName, LanguageConstants.ResourceRefArray, TypePropertyFlags.WriteOnly));
-
-                return new NamedObjectType(
-                    objectType.Name,
-                    objectType.ValidationFlags,
-                    properties.Values,
-                    objectType.AdditionalPropertiesType,
-                    objectType.AdditionalPropertiesFlags);
             }
+            // Deployments RP
+            if (StringComparer.OrdinalIgnoreCase.Equals(objectType.Name, TemplateWriter.NestedDeploymentResourceType))
+            {
+                properties = properties.SetItem("resourceGroup", new TypeProperty("resourceGroup", LanguageConstants.String));
+                properties = properties.SetItem("subscriptionId", new TypeProperty("subscriptionId", LanguageConstants.String));
+            }
+            return new NamedObjectType(
+                objectType.Name,
+                objectType.ValidationFlags,
+                isExistingResource ? ConvertToReadOnly(properties.Values) : properties.Values,
+                objectType.AdditionalPropertiesType,
+                isExistingResource ? ConvertToReadOnly(objectType.AdditionalPropertiesFlags) : objectType.AdditionalPropertiesFlags);
         }
 
         private static IEnumerable<TypeProperty> ConvertToReadOnly(IEnumerable<TypeProperty> properties)