Test proxy

cmake-modules/TestProxyPrep.cmake

@@ -0,0 +1,10 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# SPDX-License-Identifier: MIT
+#
+
+macro(CopyTestProxyScripts)
+    file(COPY ${CMAKE_SOURCE_DIR}/eng/Scripts/Start-TestProxy.ps1
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+    file(COPY ${CMAKE_SOURCE_DIR}/eng/Scripts/Stop-TestProxy.ps1
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+endmacro()

eng/pipelines/templates/jobs/ci.tests.yml

@@ -147,8 +147,21 @@ jobs:
           VcpkgArgs: "$(VcpkgArgs)"
           Env: "$(CmakeEnvArg)"
 
+      - template: /eng/common/testproxy/test-proxy-tool.yml
+        parameters:
+          runProxy: true
+          rootFolder: '$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}'
+          templateFolder: '$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}'
+          condition: and(succeeded(), contains(variables.CmakeArgs, 'BUILD_TESTING=ON'))
+
       - ${{ parameters.PreTestSteps }}
 
+      - pwsh: |
+          test-proxy restore -a $(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}
+        workingDirectory: '$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}'
+        displayName: Restore Recordings
+        condition: and(succeeded(), contains(variables.CmakeArgs, 'BUILD_TESTING=ON'), ne('${{parameters.ServiceDirectory}}', 'core'))
+
       - pwsh: |
           ctest `
             -C Debug `
@@ -161,6 +174,13 @@ jobs:
         displayName: Test
 
       - ${{ parameters.PostTestSteps }}
+
+      - pwsh: |
+          get-content test-proxy.log
+        displayName: TestProxy Log
+        condition: and(succeededOrFailed(), contains(variables.CmakeArgs, 'BUILD_TESTING=ON'))
+        workingDirectory: $(Build.SourcesDirectory)
+        continueOnError: true
 
       - task: PublishTestResults@2
         inputs:

eng/pipelines/templates/jobs/live.tests.yml

@@ -135,6 +135,10 @@ jobs:
       Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
       SubscriptionConfiguration: $(SubscriptionConfiguration)
 
+  - template: /eng/common/testproxy/test-proxy-tool.yml
+    parameters:
+      runProxy: false
+
   - ${{ parameters.PreTestSteps }}
 
     # For non multi-config generator use the same build configuration to run tests

eng/scripts/Start-TestProxy.ps1

@@ -0,0 +1,42 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# SPDX-License-Identifier: MIT
+
+param(
+[Parameter(Mandatory=$True)]
+[string] $AssetsPath
+)
+# check is there is another test-proxy running
+$running = Get-Process -Name test-proxy
+echo $AssetsPath
+if($running)
+{
+    echo "test-proxy running, no need for new instance"
+    exit 0
+}
+
+# make sure errors collection is empty
+$error.clear()
+
+#check if we have a test-proxy available
+$CurrentVersion = (Get-Command -Name "test-proxy" -ErrorAction SilentlyContinue).Version
+
+if($error){
+    echo "Will install testproxy"
+
+    dotnet tool update azure.sdk.tools.testproxy --global --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json --version "1.0.0-dev*"
+    # clear the errors again
+    $error.clear()
+
+    #check again for test proxy presence
+    $CurrentVersion = (Get-Command -Name "test-proxy" -ErrorAction SilentlyContinue).Version
+
+    # if we have errors this means we had issues installing it , needs to be done by hand
+    if($error){
+        echo "Unable to install testproxy. Try installing manually."
+        exit 1
+    }
+}
+
+echo "Start test proxy with argument list --storage-location $AssetsPath"
+#starts it in a separate process that will outlive pwsh in order to serve requests.
+Start-Process 'test-proxy' -ArgumentList "--storage-location $AssetsPath" 

eng/scripts/Stop-TestProxy.ps1

@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# SPDX-License-Identifier: MIT
+
+Stop-Process -Name "test-proxy"

sdk/attestation/assets.json

@@ -0,0 +1,6 @@
+{
+  "AssetsRepo": "Azure/azure-sdk-assets",
+  "AssetsRepoPrefixPath": "cpp",
+  "TagPrefix": "cpp/attestation",
+  "Tag": "cpp/attestation_b384d96f95"
+}

sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp

@@ -405,6 +405,7 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
     std::string GetTestName(testing::TestParamInfo<PolicyTests::ParamType> const& testInfo)
     {
       std::string testName;
+      int suffixVotes = 0;
       switch (testInfo.param.TestType)
       {
         case TestCaseType::GetPolicy:
@@ -415,6 +416,7 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
           break;
         case TestCaseType::ModifyPolicySecured:
           testName += "ModifyGeneratedKey";
+          suffixVotes++;
           break;
         case TestCaseType::ModifyPolicyUnsecured:
           testName += "ModifyUnsecured";
@@ -427,6 +429,7 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
       {
         case ServiceInstanceType::AAD:
           testName += "AAD";
+          suffixVotes++;
           break;
         case ServiceInstanceType::Isolated:
           testName += "Isolated";
@@ -440,6 +443,11 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
 
       testName += "_";
       testName += testInfo.param.TeeType.ToString();
+      if (suffixVotes == 2)
+      {
+        testName += "_LIVEONLY_";
+      };
+      //+"_LIVEONLY_";
       return testName;
     }
   } // namespace

sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp

@@ -29,6 +29,7 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
   protected:
     std::shared_ptr<Azure::Core::Credentials::TokenCredential> m_credential;
     std::unique_ptr<AttestationAdministrationClient> m_adminClient;
+
     // Create
     virtual void SetUp() override
     {

sdk/core/azure-core-test/CMakeLists.txt

@@ -10,21 +10,18 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 set(
   AZURE_CORE_TEST_HEADER
-  inc/azure/core/test/interceptor_manager.hpp
   inc/azure/core/test/network_models.hpp
-  inc/azure/core/test/playback_http_client.hpp
-  inc/azure/core/test/record_network_call_policy.hpp
   inc/azure/core/test/test_base.hpp
   inc/azure/core/test/test_context_manager.hpp
+  inc/azure/core/test/test_proxy_manager.hpp
 )
 
 set(
   AZURE_CORE_TEST_SOURCE
   src/private/package_version.hpp
-  src/interceptor_manager.cpp
-  src/playback_http_transport.cpp
-  src/record_policy.cpp
+  src/test_proxy_policy.cpp
   src/test_base.cpp
+  src/test_proxy_manager.cpp
 )
 
 add_library (
@@ -46,4 +43,4 @@ target_include_directories (azure-core-test-fw
 # make sure that users can consume the project as a library.
 add_library (Azure::Core::Test ALIAS azure-core-test-fw)
 target_link_libraries(azure-core-test-fw PRIVATE azure-core Azure::azure-identity gtest)
-create_map_file(azure-core-test-fw azure-core-test-fw.map)
+create_map_file(azure-core-test-fw azure-core-test-fw.map)

sdk/core/azure-core-test/README.md

@@ -51,3 +51,4 @@ Azure SDK for C++ is licensed under the [MIT](https://github.com/Azure/azure-sdk
 [c_compiler]: https://visualstudio.microsoft.com/vs/features/cplusplus/
 [cloud_shell]: https://docs.microsoft.com/azure/cloud-shell/overview
 [cloud_shell_bash]: https://shell.azure.com/bash
+