fix the scope issue

src/AutoRest.CSharp/Mgmt/AutoRest/MgmtConfiguration.cs

@@ -350,6 +350,7 @@ internal void SaveConfiguration(Utf8JsonWriter writer)
             WriteNonEmptySettings(writer, nameof(PrivilegedOperations), PrivilegedOperations);
             WriteNonEmptySettings(writer, nameof(OverrideOperationName), OverrideOperationName);
             WriteNonEmptySettings(writer, nameof(PartialResources), PartialResources);
+            WriteNonEmptySettings(writer, nameof(RawParameterizedScopes), RawParameterizedScopes);
             MgmtDebug.Write(writer, nameof(MgmtDebug));
             if (IsArmCore)
                 writer.WriteBoolean("ArmCore", IsArmCore);

src/AutoRest.CSharp/Mgmt/Output/Samples/NewMgmtSampleProvider.cs

@@ -371,10 +371,9 @@ private MethodBodyStatement BuildGetCollectionStatement(ResourceCollection colle
             if (parent is MgmtExtension extension && extension.ArmCoreType == typeof(ArmResource))
             {
                 statements.Add(
-                    // TODO -- find out the scope parameter
-                    BuildCreateResourceIdentifierForScopePath(example, collection.RequestPath.GetScopePath(), parent.Type, out var scope)
+                    BuildCreateScopeResourceIdentifier(example, example.RequestPath.GetScopePath(), out var scopeId)
                     );
-                arguments.Add(scope);
+                arguments.Add(New.Instance(typeof(ResourceIdentifier), scopeId));
             }
 
             foreach (var extraParameter in collection.ExtraConstructorParameters)
@@ -518,6 +517,35 @@ private MethodBodyStatement BuildCreateResourceIdentifierForUsualPath(OperationE
             return statements;
         }
 
+        private MethodBodyStatement BuildCreateScopeResourceIdentifier(OperationExample example, RequestPath operationScopePath, out TypedValueExpression scopeId)
+        {
+            var statements = new List<MethodBodyStatement>();
+            var scopeValues = new List<TypedValueExpression>();
+            foreach (var reference in operationScopePath.Where(segment => segment.IsReference))
+            {
+                var exampleValue = example.FindInputExampleValueFromReference(reference.Reference);
+                var scopeRefStatement = Declare(reference.Type, reference.ReferenceName, ExampleValueSnippets.GetExpression(reference.Type, exampleValue), out var scopeRefVar);
+                statements.Add(scopeRefStatement);
+                scopeValues.Add(scopeRefVar);
+            }
+
+            if (operationScopePath.Count == 1)
+            {
+                // the scope in the id is an explicit scope, such as a request path defined like: `/{scope}/providers/Microsoft.Something/roleDefinitions/{name}` therefore we do not have do anything special for it
+                //idArguments.AddRange(scopeValues);
+                scopeId = scopeValues[0];
+            }
+            else
+            {
+                // this scope is an implicit scope, such as a request path defined like: `/subscriptions/{subsId}/providers/Microsoft.Something/roleDefinitions/{name}` but we changed this in our generator to make it a scope resource
+                var scopeDeclarationStatement = Declare(typeof(string), "scope", new FormattableStringExpression(operationScopePath, scopeValues), out var scope);
+                statements.Add(scopeDeclarationStatement);
+                scopeId = scope;
+            }
+
+            return statements;
+        }
+
         private MethodBodyStatement BuildCreateResourceIdentifierForScopePath(OperationExample example, RequestPath resourcePath, CSharpType typeOfResource, out TypedValueExpression id)
         {
             var statements = new List<MethodBodyStatement>();
@@ -544,8 +572,7 @@ private MethodBodyStatement BuildCreateResourceIdentifierForScopePath(OperationE
             else
             {
                 // this scope is an implicit scope, such as a request path defined like: `/subscriptions/{subsId}/providers/Microsoft.Something/roleDefinitions/{name}` but we changed this in our generator to make it a scope resource
-                var scopeSegment = resourceScopePath[0];
-                var scopeDeclarationStatement = Declare(scopeSegment.Reference.Type, scopeSegment.ReferenceName, new FormattableStringExpression(operationScopePath, scopeValues), out var scope);
+                var scopeDeclarationStatement = Declare(typeof(string), "scope", new FormattableStringExpression(operationScopePath, scopeValues), out var scope);
                 statements.Add(scopeDeclarationStatement);
                 idArguments.Add(scope);
             }

src/AutoRest.CSharp/MgmtTest/AutoRest/MgmtTestConfiguration.cs

@@ -24,7 +24,6 @@ internal class MgmtTestConfiguration
         public MgmtTestConfiguration(
             IReadOnlyList<string> skippedOperations,
             JsonElement? sourceCodePath = default,
-            JsonElement? mock = default,
             JsonElement? sample = default,
             JsonElement? outputFolder = default,
             JsonElement? clearOutputFolder = default)
@@ -43,11 +42,11 @@ public MgmtTestConfiguration(
             if (testGenRoot.ValueKind != JsonValueKind.Object)
                 return null;
 
-            testGenRoot.TryGetProperty(nameof(SkippedOperations), out var skippedOperationsElement);
-            testGenRoot.TryGetProperty(nameof(SourceCodePath), out var sourceCodePath);
-            testGenRoot.TryGetProperty(nameof(Sample), out var sample);
-            testGenRoot.TryGetProperty(nameof(OutputFolder), out var testGenOutputFolder);
-            testGenRoot.TryGetProperty(nameof(ClearOutputFolder), out var testGenClearOutputFolder);
+            testGenRoot.TryGetProperty(Options.SkippedOperations, out var skippedOperationsElement);
+            testGenRoot.TryGetProperty(Options.SourcePath, out var sourceCodePath);
+            testGenRoot.TryGetProperty(Options.Sample, out var sample);
+            testGenRoot.TryGetProperty(Options.OutputFolder, out var testGenOutputFolder);
+            testGenRoot.TryGetProperty(Options.ClearOutputFolder, out var testGenClearOutputFolder);
 
             var skippedOperations = Configuration.DeserializeArray(skippedOperationsElement);
 
@@ -67,23 +66,41 @@ public MgmtTestConfiguration(
             return new MgmtTestConfiguration(
                 skippedOperations: autoRest.GetValue<string[]?>(string.Format(TestGenOptionsFormat, "skipped-operations")).GetAwaiter().GetResult() ?? Array.Empty<string>(),
                 sourceCodePath: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "source-path")).GetAwaiter().GetResult(),
-                mock: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "mock")).GetAwaiter().GetResult(),
                 sample: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "sample")).GetAwaiter().GetResult(),
                 outputFolder: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "output-folder")).GetAwaiter().GetResult(),
                 clearOutputFolder: autoRest.GetValue<JsonElement?>(string.Format(TestGenOptionsFormat, "clear-output-folder")).GetAwaiter().GetResult());
         }
 
+        private static class Options
+        {
+            internal const string SkippedOperations = "skipped-operations";
+
+            internal const string SourcePath = "source-path";
+
+            internal const string Sample = "sample";
+
+            internal const string OutputFolder = "output-folder";
+
+            internal const string ClearOutputFolder = "clear-output-folder";
+        }
+
         internal void SaveConfiguration(Utf8JsonWriter writer)
         {
             writer.WriteStartObject(TestGenOptionsRoot);
 
-            WriteNonEmptySettings(writer, nameof(SkippedOperations), SkippedOperations);
+            WriteNonEmptySettings(writer, Options.SkippedOperations, SkippedOperations);
 
             if (SourceCodePath is not null)
-                writer.WriteString(nameof(SourceCodePath), SourceCodePath);
+                writer.WriteString(Options.SourcePath, SourceCodePath);
 
             if (Sample)
-                writer.WriteBoolean(nameof(Sample), Sample);
+                writer.WriteBoolean(Options.Sample, Sample);
+
+            if (OutputFolder is not null)
+                writer.WriteString(Options.OutputFolder, OutputFolder);
+
+            if (!ClearOutputFolder)
+                writer.WriteBoolean(Options.ClearOutputFolder, ClearOutputFolder);
 
             writer.WriteEndObject();
         }

test/TestProjects/MgmtMockAndSample/src/readme.md

@@ -25,7 +25,6 @@ modelerfour:
 
 include-x-ms-examples-original-file: false
 sample-gen:
-  mock: true
   sample: true
   output-folder: $(this-folder)../tests/Generated
   clear-output-folder: true

test/TestProjects/MgmtMockAndSample/tests/Generated/Samples/Sample_GuestConfigurationAssignmentCollection.cs

@@ -31,7 +31,11 @@ public async Task CreateOrUpdate_CreateOrUpdateGuestConfigurationAssignment()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this GuestConfigurationAssignmentResource
-            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments();
+            string subscriptionId = "mySubscriptionId";
+            string resourceGroupName = "myResourceGroupName";
+            string vmName = "myVMName";
+            string scope = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}";
+            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string guestConfigurationAssignmentName = "NotInstalledApplicationForWindows";
@@ -67,7 +71,11 @@ public async Task Get_GetAGuestConfigurationAssignment()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this GuestConfigurationAssignmentResource
-            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments();
+            string subscriptionId = "mySubscriptionId";
+            string resourceGroupName = "myResourceGroupName";
+            string vmName = "myVMName";
+            string scope = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}";
+            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string guestConfigurationAssignmentName = "SecureProtocol";
@@ -93,7 +101,11 @@ public async Task GetAll_ListAllGuestConfigurationAssignmentsForAVirtualMachine(
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this GuestConfigurationAssignmentResource
-            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments();
+            string subscriptionId = "mySubscriptionId";
+            string resourceGroupName = "myResourceGroupName";
+            string vmName = "myVMName";
+            string scope = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}";
+            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation and iterate over the result
             await foreach (GuestConfigurationAssignmentResource item in collection.GetAllAsync())
@@ -121,7 +133,11 @@ public async Task Exists_GetAGuestConfigurationAssignment()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this GuestConfigurationAssignmentResource
-            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments();
+            string subscriptionId = "mySubscriptionId";
+            string resourceGroupName = "myResourceGroupName";
+            string vmName = "myVMName";
+            string scope = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}";
+            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string guestConfigurationAssignmentName = "SecureProtocol";
@@ -143,7 +159,11 @@ public async Task GetIfExists_GetAGuestConfigurationAssignment()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this GuestConfigurationAssignmentResource
-            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments();
+            string subscriptionId = "mySubscriptionId";
+            string resourceGroupName = "myResourceGroupName";
+            string vmName = "myVMName";
+            string scope = $"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}";
+            GuestConfigurationAssignmentCollection collection = client.GetGuestConfigurationAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string guestConfigurationAssignmentName = "SecureProtocol";

test/TestProjects/MgmtMockAndSample/tests/Generated/Samples/Sample_RoleAssignmentCollection.cs

@@ -31,7 +31,8 @@ public async Task CreateOrUpdate_CreateRoleAssignment()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this RoleAssignmentResource
-            RoleAssignmentCollection collection = client.GetRoleAssignments();
+            string scope = "scope";
+            RoleAssignmentCollection collection = client.GetRoleAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string roleAssignmentName = "roleAssignmentName";
@@ -64,7 +65,8 @@ public async Task Get_GetRoleAssignmentByName()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this RoleAssignmentResource
-            RoleAssignmentCollection collection = client.GetRoleAssignments();
+            string scope = "scope";
+            RoleAssignmentCollection collection = client.GetRoleAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string roleAssignmentName = "roleAssignmentName";
@@ -90,7 +92,8 @@ public async Task GetAll_ListRoleAssignmentsForScope()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this RoleAssignmentResource
-            RoleAssignmentCollection collection = client.GetRoleAssignments();
+            string scope = "scope";
+            RoleAssignmentCollection collection = client.GetRoleAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation and iterate over the result
             await foreach (RoleAssignmentResource item in collection.GetAllAsync())
@@ -118,7 +121,8 @@ public async Task Exists_GetRoleAssignmentByName()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this RoleAssignmentResource
-            RoleAssignmentCollection collection = client.GetRoleAssignments();
+            string scope = "scope";
+            RoleAssignmentCollection collection = client.GetRoleAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string roleAssignmentName = "roleAssignmentName";
@@ -140,7 +144,8 @@ public async Task GetIfExists_GetRoleAssignmentByName()
             ArmClient client = new ArmClient(cred);
 
             // get the collection of this RoleAssignmentResource
-            RoleAssignmentCollection collection = client.GetRoleAssignments();
+            string scope = "scope";
+            RoleAssignmentCollection collection = client.GetRoleAssignments(new ResourceIdentifier(scope));
 
             // invoke the operation
             string roleAssignmentName = "roleAssignmentName";