nibhati - 5191 - add ClientContext.cs

common/ManagementCoreShared/ClientContext.cs

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using Azure.Core;
+
+namespace Azure.ResourceManager.Core
+{
+    /// <summary>
+    /// helper class
+    /// </summary>
+    internal class ClientContext
+    {
+        /// <summary>
+        /// client options
+        /// </summary>
+        public ArmClientOptions ClientOptions { get; set; }
+
+        /// <summary>
+        /// credential
+        /// </summary>
+        public TokenCredential Credential { get; set; }
+
+        /// <summary>
+        /// baseuri
+        /// </summary>
+        public Uri BaseUri { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ClientContext"/> class.
+        /// </summary>
+        /// <param name="clientOptions"></param>
+        /// <param name="credential"></param>
+        /// <param name="uri"></param>
+        internal ClientContext(ArmClientOptions clientOptions, TokenCredential credential, Uri uri)
+        {
+            ClientOptions = clientOptions;
+            Credential = credential;
+            BaseUri = uri;
+        }
+    }
+}

common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs

@@ -107,7 +107,7 @@ protected void StopSessionRecording()
             {
                 throw new InvalidOperationException("The test didn't instrument any clients but had recordings. Please call InstrumentClient for the client being recorded.");
             }
-            
+
             SessionRecording?.Dispose(true);
             GlobalClient = null;
         }

eng/Directory.Build.Common.targets

@@ -138,11 +138,23 @@
     <!-- Add ProjectReferences -->
     <ProjectReference Include="@(ProjectsToConvert -> '%(ProjectPath)')" />
   </ItemGroup>
+
+  <!--TODO: update build targets - ADO 5668-->
+  <PropertyGroup>
+    <MgmtCoreShared>$(MSBuildThisFileDirectory)/../common/ManagementCoreShared</MgmtCoreShared>
+    <ExcludeMgmtCoreShared Condition="'$(ExcludeMgmtCoreShared)' == ''">false</ExcludeMgmtCoreShared>
+  </PropertyGroup>
 
+  <ItemGroup Condition="'$(IsMgmtLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(ExcludeMgmtCoreShared)' == 'false'">
+    <Compile Include="$(MgmtCoreShared)/**/*.cs"
+                 Link="Shared/Management/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <!--TODO: end-->
   <!-- *********** Management Client Library Override section ************* -->
   <ItemGroup Condition="'$(IsMgmtLibrary)' == 'true' and '$(IsTestProject)' != 'true'">
     <PackageReference Include="System.Text.Json" />
-
+    
     <!-- TODO: Review these file references-->
     <Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />

sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Azure.ResourceManager.AppConfiguration.csproj

@@ -8,6 +8,7 @@
     </Description>
     <PackageTags>azure;management;appconfiguration</PackageTags>
     <NoWarn>$(NoWarn);AZC0001;AZC0008;</NoWarn>
+    <ExcludeMgmtCoreShared>true</ExcludeMgmtCoreShared>
   </PropertyGroup>
 
   <ItemGroup>

sdk/communication/Azure.ResourceManager.Communication/src/Azure.ResourceManager.Communication.csproj

@@ -11,6 +11,7 @@
     AZC0001 - Azure.ResourceManager.Communication namespace needs to be registered in the analyzer
     -->
     <NoWarn>$(NoWarn);AZC0001</NoWarn>
+    <ExcludeMgmtCoreShared>true</ExcludeMgmtCoreShared>
   </PropertyGroup>
 
   <ItemGroup>

sdk/compute/Azure.ResourceManager.Compute/src/Azure.ResourceManager.Compute.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>1.0.0-preview.3</Version>
     <PackageId>Azure.ResourceManager.Compute</PackageId>
@@ -7,6 +7,7 @@
       This is a beta preview vesion. This version uses a next-generation code generator that introduces important breaking changes, but also new features (such as intuitive authentication, custom HTTP pipeline, distributed tracing and much more).
     </Description>
     <PackageTags>azure;management;compute</PackageTags>
+    <ExcludeMgmtCoreShared>true</ExcludeMgmtCoreShared>
   </PropertyGroup>
 
   <PropertyGroup>

sdk/core/Azure.Core.TestFramework/src/DiagnosticScopeValidatingInterceptor.cs

@@ -173,6 +173,11 @@ internal class DiagnosticScopeValidatingAsyncEnumerable<T> : AsyncPageable<T>
             private readonly bool _strict;
             private readonly bool _overridesGetAsyncEnumerator;
 
+            //for mocking
+            protected DiagnosticScopeValidatingAsyncEnumerable()
+            {
+            }
+
             public DiagnosticScopeValidatingAsyncEnumerable(AsyncPageable<T> pageable, string expectedName, string methodName, bool strict)
             {
                 if (pageable == null) throw new ArgumentNullException(nameof(pageable), "Operations returning [Async]Pageable should never return null.");

sdk/core/Azure.Core.TestFramework/src/InstrumentClientInterceptor.cs

@@ -37,7 +37,7 @@ public void Intercept(IInvocation invocation)
 
             if (
                 // Generated ARM clients will have a property containing the sub-client that ends with Operations.
-                (invocation.Method.Name.StartsWith("get_") && type.Name.EndsWith("Operations")) ||
+                (invocation.Method.Name.StartsWith("get_") && (type.Name.EndsWith("Operations") || type.BaseType.Name.EndsWith("Operations"))) ||
                 // Instrument the container construction methods inside Operations objects
                 (invocation.Method.Name.StartsWith("Get") && type.Name.EndsWith("Container")) ||
                 // Instrument the operations construction methods inside Operations objects

sdk/core/Azure.Core.TestFramework/src/ManagementInterceptor.cs

@@ -29,7 +29,6 @@ public void Intercept(IInvocation invocation)
             }
 
             var type = result.GetType();
-
             if (type.Name.StartsWith("Task"))
             {
                 var taskResultType = type.GetGenericArguments()[0];
@@ -43,6 +42,18 @@ public void Intercept(IInvocation invocation)
                     invocation.ReturnValue = genericMethod.Invoke(null, new object[] { instrumentedResult });
                 }
             }
+            else if (type.Name.StartsWith("ValueTask"))
+            {
+                var taskResultType = type.GetGenericArguments()[0];
+                if (taskResultType.Name.StartsWith("Response") || taskResultType.Name.StartsWith("ArmResponse"))
+                {
+                    var taskResult = result.GetType().GetProperty("Result").GetValue(result);
+                    var instrumentedResult = _testBase.InstrumentClient(taskResultType, taskResult, new IInterceptor[] { new ManagementInterceptor(_testBase) });
+                    var genericValueTask = typeof(ValueTask<>).MakeGenericType(taskResultType);
+                    var vtCtor = genericValueTask.GetConstructor(new Type[] { taskResultType });
+                    invocation.ReturnValue = vtCtor.Invoke(new object[] { instrumentedResult });
+                }
+            }
             else if (invocation.Method.Name.EndsWith("Value") && type.BaseType.Name.EndsWith("Operations"))
             {
                 invocation.ReturnValue = _testBase.InstrumentClient(type, result, new IInterceptor[] { new ManagementInterceptor(_testBase) });

sdk/core/Azure.Core.TestFramework/src/Properties/AssemblyInfo.cs

@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Runtime.CompilerServices;
+using Castle.Core.Internal;
+
+[assembly: InternalsVisibleTo(InternalsVisible.ToDynamicProxyGenAssembly2)]

sdk/core/Azure.Core/tests/ManagementRecordedTestBaseTests.cs

@@ -3,17 +3,20 @@
 
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
+using Azure.ResourceManager.Core;
+using Azure.ResourceManager.Resources.Models;
 using Azure.ResourceManager.TestFramework;
 using NUnit.Framework;
 
 namespace Azure.Core.Tests.Management
 {
+    [Parallelizable]
     internal class ManagementRecordedTestBaseTests : ManagementRecordedTestBase<TestEnvironmentTests.MockTestEnvironment>
     {
         public ManagementRecordedTestBaseTests(bool isAsync)
             : base(isAsync)
         {
-            TestDiagnostics = false;
+            TestDiagnostics = true;
         }
 
         [Test]
@@ -35,7 +38,7 @@ public void ValidateInstrumentDefaultSubscription()
             var sub = client.DefaultSubscription;
             var result = sub.Method();
 
-            Assert.AreEqual("TestResourceOperationsProxy", sub.GetType().Name);
+            Assert.AreEqual("TestResourceProxy", sub.GetType().Name);
             Assert.AreEqual("success", result);
         }
 
@@ -47,7 +50,7 @@ public async Task ValidateInstrumentArmOperation()
             var operation = (await sub.GetArmOperationAsync()).Value;
             var result = operation.Method();
 
-            Assert.AreEqual("TestResourceOperationsProxy", operation.GetType().Name);
+            Assert.AreEqual("TestResourceProxy", operation.GetType().Name);
             Assert.AreEqual("success", result);
         }
 
@@ -59,7 +62,7 @@ public async Task ValidateInstrumentArmResponse()
             var response = (await sub.GetArmOperationAsync()).Value;
             var result = response.Method();
 
-            Assert.AreEqual("TestResourceOperationsProxy", response.GetType().Name);
+            Assert.AreEqual("TestResourceProxy", response.GetType().Name);
             Assert.AreEqual("success", result);
         }
 
@@ -71,7 +74,7 @@ public async Task ValidateInstrumentPhArmOperation()
             var operation = (await sub.GetPhArmOperationAsync()).Value;
             var result = operation.Method();
 
-            Assert.AreEqual("TestResourceOperationsProxy", operation.GetType().Name);
+            Assert.AreEqual("TestResourceProxy", operation.GetType().Name);
             Assert.AreEqual("success", result);
         }
 
@@ -83,7 +86,7 @@ public async Task ValidateInstrumentPhArmResponse()
             var response = (await sub.GetPhArmOperationAsync()).Value;
             var result = response.Method();
 
-            Assert.AreEqual("TestResourceOperationsProxy", response.GetType().Name);
+            Assert.AreEqual("TestResourceProxy", response.GetType().Name);
             Assert.AreEqual("success", result);
         }
 
@@ -120,5 +123,16 @@ public async Task ValidateInstrumentPhPageable()
                 Assert.AreEqual("success", item.Method());
             }
         }
+
+        [Test]
+        public async Task ValidateWaitForCompletion()
+        {
+            ManagementTestClient client = InstrumentClient(new ManagementTestClient());
+            TestResourceOperations rgOp = client.GetTestResourceOperations();
+            var testResourceOp = await rgOp.GetArmOperationAsync();
+            TestResource testResource = await testResourceOp.WaitForCompletionAsync();
+            Assert.AreEqual("TestResourceProxy", testResource.GetType().Name);
+            Assert.AreEqual("success", testResource.Method());
+        }
     }
 }

sdk/core/Azure.Core/tests/TestClients/ArmOperationTest.cs

@@ -1,19 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.ResourceManager.Core;
+
 namespace Azure.Core.Tests
 {
-    public class ArmOperationTest<T>
+    public class ArmOperationTest<T> : ArmOperation<T>
+        where T : class
     {
+        private T _value;
         protected ArmOperationTest()
         {
         }
 
         public ArmOperationTest(T value)
         {
-            Value = value;
+            _value = value;
+        }
+
+        public override string Id => "testId";
+
+        public override T Value => _value;
+
+        public override bool HasCompleted => true;
+
+        public override bool HasValue => true;
+
+        public override Response GetRawResponse()
+        {
+            return Response.FromValue(_value, null) as Response;
         }
 
-        public virtual T Value { get; private set; }
+        public override ValueTask<Response<T>> WaitForCompletionAsync(CancellationToken cancellationToken = default)
+        {
+            return new ValueTask<Response<T>>(Response.FromValue(_value, null));
+        }
+
+        public override ValueTask<Response<T>> WaitForCompletionAsync(TimeSpan pollingInterval, CancellationToken cancellationToken)
+        {
+            return new ValueTask<Response<T>>(Response.FromValue(_value, null));
+        }
+
+        public override ValueTask<Response> UpdateStatusAsync(CancellationToken cancellationToken = default)
+        {
+            return new ValueTask<Response>(Response.FromValue(_value, null) as Response);
+        }
+
+        public override Response UpdateStatus(CancellationToken cancellationToken = default)
+        {
+            return Response.FromValue(_value, null) as Response;
+        }
     }
 }

sdk/core/Azure.Core/tests/TestClients/ManagementTestClient.cs

@@ -29,7 +29,7 @@ public virtual TestResourceContainer GetTestResourceContainer()
             return new TestResourceContainer();
         }
 
-        public virtual TestResourceOperations DefaultSubscription => new TestResourceOperations();
+        public virtual TestResource DefaultSubscription => new TestResource();
 
         public virtual string Method()
         {

sdk/core/Azure.Core/tests/TestClients/PhArmOperationTest.cs

@@ -4,6 +4,7 @@
 namespace Azure.Core.Tests
 {
     public class PhArmOperationTest<T> : ArmOperationTest<T>
+        where T : class
     {
         protected PhArmOperationTest()
         {