Remove /sdk/resourcemanagerhybrid

.github/CODEOWNERS

@@ -964,9 +964,6 @@
 # ServiceLabel: %Mgmt
 # AzureSdkOwners:                                                  @weidongxu-microsoft
 
-# PRLabel: %Mgmt
-/sdk/resourcemanagerhybrid/                                        @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @bganapa @Azure/azure-java-sdk
-
 # ######## Eng Sys ########
 
 /eng/                                                              @raych1 @weshaggard @benbp

eng/CredScanSuppression.json

@@ -28,13 +28,6 @@
             ],
             "_justification": "Javadoc in azure-resourcemanager"
         },
-        {
-            "placeholder": [
-                "h2AllowImplicitFlow",
-                "h2Permissions"
-            ],
-            "_justification": "Javadoc in azure resourcemanagerhybrid"
-        },
         {
             "file": [
                 "test-proxy.log"
@@ -64,7 +57,6 @@
             "file": [
                 "sdk/communication/azure-communication-common-perf/src/main/java/com.azure.communication.common.perf/FakeCredentialInTest.java",
                 "sdk/keyvault/azure-security-keyvault-certificates/src/test/java/com/azure/security/keyvault/certificates/FakeCredentialInTest.java",
-                "sdk/resourcemanagerhybrid/azure-resourcemanager/src/test/resources/session-records/AzureResourceManagerTests.testContainerRegistry.json",
                 "sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/FakeCredentialInTest.java",
                 "sdk/spring/spring-cloud-azure-service/src/test/java/com/azure/spring/cloud/service/implementation/storage/FakeCredentialInTest.java",
                 "sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/FakeCredentialInTest.java",

eng/scripts/Generate-ServiceDirectories-From-Project-List.ps1

@@ -60,21 +60,17 @@ foreach($file in Get-ChildItem -Path $SourcesDirectory -Filter pom*.xml -Recurse
     $xmlPomFile.Load($file.FullName)
     $library = $xmlPomFile.project.groupId + ":" + $xmlPomFile.project.artifactId
     $serviceDirectory = (Get-Item $file).Directory.Parent
-    # This if check is only necessary because resourcemanager and resourcemanagerhybrid contain the
-    # exact same group/artifact ids
-    if ($file.FullName.Split([IO.Path]::DirectorySeparatorChar) -notcontains "resourcemanagerhybrid") {
-        # The directories for sparse checkout and ServiceDirectories need the $SourcesDirectory
-        # stripped off
-        $tempDir = $serviceDirectory.FullName.Replace("$SourcesDirectory", "")
-        $tempDir = $tempDir.Replace([IO.Path]::DirectorySeparatorChar, '/')
-        $sparseCheckoutDirHash.Add($library, $tempDir)
-        if ($tempDir.StartsWith("/sdk/")) {
-            # Strip off the "/sdk/" to get the service directory. A ServiceDirectory will always have
-            # the format of /SDK/<ServiceDirectory>. Whereas sparse checkout can have other directories
-            # outside of /SDK, eg. /common
-            $tempDir = $tempDir.Replace("/sdk/", "")
-            $serviceDirHash.Add($library, $tempDir)
-        }
+    # The directories for sparse checkout and ServiceDirectories need the $SourcesDirectory
+    # stripped off
+    $tempDir = $serviceDirectory.FullName.Replace("$SourcesDirectory", "")
+    $tempDir = $tempDir.Replace([IO.Path]::DirectorySeparatorChar, '/')
+    $sparseCheckoutDirHash.Add($library, $tempDir)
+    if ($tempDir.StartsWith("/sdk/")) {
+        # Strip off the "/sdk/" to get the service directory. A ServiceDirectory will always have
+        # the format of /SDK/<ServiceDirectory>. Whereas sparse checkout can have other directories
+        # outside of /SDK, eg. /common
+        $tempDir = $tempDir.Replace("/sdk/", "")
+        $serviceDirHash.Add($library, $tempDir)
     }
 }
 
@@ -91,13 +87,7 @@ foreach ($project in $ProjectList) {
     }
 }
 
-# This is sad. Because resourcemanager and resourcemanagerhybrid contain the some of the same
-# artifacts and we don't know which one is actually needed, if resourcemanager is in the list
-# then add resourcemanagerhybrid.
 Write-Host "sparseCheckoutDirectories=$sparseCheckoutDirectories"
-if ($sparseCheckoutDirectories.Contains("/sdk/resourcemanager")) {
-    $sparseCheckoutDirectories += "/sdk/resourcemanagerhybrid"
-}
 
 # Unreleased_ libraries are special. They're the only case, outside of FromSource runs where
 # libraries from other service directories, outside of the one we're building, need to get built.

eng/scripts/Language-Settings.ps1

@@ -36,9 +36,7 @@ function Get-AllPackageInfoFromRepo([string]$serviceDirectory = $null) {
     # the service directory sits outside of the engineering system
     # 1. boms - BOMs are POM only releases. Also, their versions aren't version controlled.
     # 2. parents - parents are POM only releases which are version controlled
-    # 3. resourcemanagerhybrid - intermediate version of resourcemanager that was
-    #    a one time release which sits outside of the engineering system
-    $excludeFolders = "boms", "resourcemanagerhybrid", "parents"
+    $excludeFolders = "boms", "parents"
     [array]$ymlFiles = Get-ChildItem -Path $sdkRoot -Include "ci*.yml" -Recurse -Depth 3 | Where-Object { $_.PSIsContainer -eq $false -and $_.DirectoryName -notmatch ($excludeFolders -join "|") }
   }
 

eng/scripts/Update-Artifacts-List-For-Patch-Release.ps1

@@ -29,8 +29,7 @@ $artifactsDict = [ordered]@{}
 $addModulesDict  = [ordered]@{}
 $ymlFiles = Get-ChildItem -Path $SourcesDirectory -Recurse -Depth 3 -File -Filter "ci.yml"
 foreach ($ymlFile in $ymlFiles) {
-    if ($ymlFile.FullName.Split([IO.Path]::DirectorySeparatorChar) -contains "resourcemanagerhybrid" -or
-        $ymlFile.FullName -eq $YmlToUpdate) {
+    if ($ymlFile.FullName -eq $YmlToUpdate) {
         continue
     }
     $ymlContent = Get-Content $ymlFile.FullName -Raw

eng/scripts/generate_aggregate_pom.py

@@ -239,11 +239,8 @@ def create_projects(project_list_identifiers: list, artifact_identifier_to_versi
     projects: Dict[str, Project] = {}
 
     for root, _, files in os.walk(root_path):
-        # Ignore sdk/resourcemanagerhybrid, sdk/e2e, sdk/template and azure-security-test-keyvault-jca
-        if 'resourcemanagerhybrid' in root \
-            or 'e2e' in root \
-            or 'azure-security-test-keyvault-jca' in root \
-            or 'template' in root:
+        # Ignore sdk/e2e, sdk/template and azure-security-test-keyvault-jca
+        if 'e2e' in root or 'azure-security-test-keyvault-jca' in root or 'template' in root:
             continue
 
         for file_name in files:

eng/scripts/generate_from_source_pom.py

@@ -222,10 +222,6 @@ def create_projects(artifacts_list_identifiers: list, artifact_identifier_to_ver
     projects: Dict[str, Project] = {}
 
     for root, _, files in os.walk(root_path):
-        # Ignore sdk/resourcemanagerhybrid
-        if 'resourcemanagerhybrid' in root:
-            continue
-
         # Also ignore sdk/e2e as this only creates noise during checkout as it uses many current dependencies but isn't an actual project we want to build.
         if 'e2e' in root:
             continue

eng/versioning/pom_file_version_scanner.ps1

@@ -164,8 +164,7 @@ function Get-ArtifactsList-Per-Service-Directory {
         }
         # The ci.cosmos.yml lives in spring and is used to test the cosmos spring library. Its exception
         # will be moved once things are corrected.
-        if ($ymlFile.FullName.Split([IO.Path]::DirectorySeparatorChar) -contains "resourcemanagerhybrid" -or
-            $ymlFile.Name -eq "ci.cosmos.yml") {
+        if ($ymlFile.Name -eq "ci.cosmos.yml") {
             continue
         }
         # The path is going to be the key. Since there can be multiple yml files for a single path,
@@ -569,12 +568,6 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
         return
     }
 
-    # Packages under sdk/resourcemanagerhybrid has duplicate artifactId with that under sdk/resourcemanager
-    if ($_.FullName -like "*resourcemanagerhybrid*")
-    {
-        return
-    }
-
     # Code customization packages should be excluded.
     if ($_.FullName -like "*swagger*")
     {
@@ -728,7 +721,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
         {
             # skip version checks when they have been intentionally applied via variables
         }
-        else 
+        else
         {
             if ($versionNode.NextSibling -and $versionNode.NextSibling.NodeType -eq "Comment")
             {
@@ -738,7 +731,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
                 {
                     # skip version checks when they have been intentionally applied via variables
                 }
-                else 
+                else
                 {
                     if ($versionNode.NextSibling.Value.Trim() -notmatch "{x-version-update;(.+)?$($groupId):$($artifactId);\w+}")
                     {
@@ -762,7 +755,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
                 $hasError = $true
                 $potentialLogMessage = Join-With-NewLine $potentialLogMessage "Error: Missing dependency version update tag for groupId=$($groupId), artifactId=$($artifactId). The tag should be <!-- {x-version-update;$($groupId):$($artifactId);current|dependency|external_dependency<select one>} -->"
             }
-        }    
+        }
     }
     # Verify every plugin has a group, artifact and version
     # Verify every dependency has a group, artifact and version
@@ -897,7 +890,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
                 $groupId = $split[0]
                 $artifactId = $split[1]
                 $version = $split[2]
-                
+
                 if ($version.StartsWith('[${')) {
                     # skip version checks when they have been intentionally applied via variables
                 }