Add resource manager packages compatible with the 2020-09-01-hybrid profile API versions

.github/CODEOWNERS

@@ -141,6 +141,7 @@
 # Management Plane
 /sdk/resourcemanager/                               @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978
 /sdk/**/azure-resourcemanager-*                     @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978
+/sdk/resourcemanagerhybrid/                         @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @bbridges @bganapa
 
 # Quantum
 # PRLabel: %Azure Quantum

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

@@ -37,6 +37,9 @@ parameters:
   - name: SkipAggregateReports
     type: boolean
     default: false
+  - name: PreBuildSteps
+    type: object
+    default: []
 
 jobs:
   - job: 'Test'
@@ -68,6 +71,8 @@ jobs:
 
       - template: ../steps/install-reporting-tools.yml
 
+      - ${{ parameters.PreBuildSteps }}
+
       - ${{ parameters.PreTestSteps }}
 
       - task: PythonScript@0

eng/pipelines/templates/jobs/ci.yml

@@ -31,6 +31,9 @@ parameters:
   - name: SkipAggregateReports
     type: boolean
     default: false
+  - name: PreBuildSteps
+    type: object
+    default: []
 
 jobs:
   - job: 'Build'
@@ -72,6 +75,8 @@ jobs:
         inputs:
           versionSpec: '3.6'
 
+      - ${{ parameters.PreBuildSteps }}
+
       # This step needs to run before we update to using dev versions otherwise dependency
       # check in the script will not fully work because the versions will mismatch
       - task: PythonScript@0
@@ -322,3 +327,4 @@ jobs:
         AdditionalModules: ${{ parameters.AdditionalModules }}
         PreTestSteps: ${{ parameters.PreTestSteps }}
         SkipAggregateReports: ${{ parameters.SkipAggregateReports }}
+        PreBuildSteps: ${{ parameters.PreBuildSteps }}

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -47,6 +47,9 @@ parameters:
 - name: SkipAggregateReports
   type: boolean
   default: false
+- name: PreBuildSteps
+  type: object
+  default: []
 
 stages:
   - stage: Build
@@ -78,6 +81,7 @@ stages:
             - TestGoals=.*/verify
             - TestOptions=.*/-am
           - AZURE_TEST.*=.*/
+        PreBuildSteps: ${{ parameters.PreBuildSteps }}
 
 
   # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.

eng/scripts/generate_from_source_pom.py

@@ -134,6 +134,10 @@ def create_dependency_and_path_mappings(project_list_identifiers: list, artifact
     module_path_mapping = {}
 
     for root, _, files in os.walk(root_path):
+        # Ignore sdk/resourcemanagerhybrid
+        if 'resourcemanagerhybrid' in root:
+            continue
+
         for file_name in files:
             file_path = root + os.sep + file_name
 

eng/versioning/pom_file_version_scanner.ps1

@@ -408,6 +408,12 @@ 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
+    }
+
     if ($PomFilesIgnoreParent -contains $pomFile)
     {
         $xmlPomFile = New-Object xml

sdk/resourcemanager/api-specs.json

@@ -24,12 +24,25 @@
     "args": "--tag=package-2021-02 --add-inner=AppServiceCertificate --name-for-ungrouped-operations=ResourceProvider",
     "note": "Add status code '200' to 'syncFunctionTriggers'"
   },
+  "appservice-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-appservice",
+    "source": "specification/web/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.appservice",
+    "args": "--payload-flattening-threshold=1 --tag=profile-hybrid-2020-09-01 --add-inner=AppServiceCertificate --name-for-ungrouped-operations=ResourceProvider",
+    "note": "Add status code '200' to 'syncFunctionTriggers'"
+  },
   "authorization": {
     "dir": "azure-resourcemanager-authorization",
     "source": "specification/authorization/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.authorization",
     "args": "--tag=package-2018-01-01-preview"
   },
+  "authorization-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-authorization",
+    "source": "specification/authorization/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.authorization",
+    "args": "--tag=profile-hybrid-2020-09-01 --payload-flattening-threshold=1"
+  },
   "automation": {
     "dir": "azure-resourcemanager-automation",
     "source": "specification/automation/resource-manager/readme.md",
@@ -79,6 +92,12 @@
     "package": "com.azure.resourcemanager.compute",
     "args": "--tag=package-2021-07-01 --rename-model=UserAssignedIdentitiesValue:VirtualMachineIdentityUserAssignedIdentities,VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue:VirtualMachineScaleSetIdentityUserAssignedIdentities --preserve-model=AvailabilitySetSkuTypes"
   },
+  "compute-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-compute",
+    "source": "specification/compute/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.compute",
+    "args": "--payload-flattening-threshold=1 --tag=profile-hybrid-2020-09-01 --rename-model=UserAssignedIdentitiesValue:VirtualMachineIdentityUserAssignedIdentities,VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue:VirtualMachineScaleSetIdentityUserAssignedIdentities --preserve-model=AvailabilitySetSkuTypes"
+  },
   "consumption": {
     "dir": "azure-resourcemanager-consumption",
     "source": "specification/consumption/resource-manager/readme.md",
@@ -97,12 +116,24 @@
     "package": "com.azure.resourcemanager.containerregistry",
     "args": "--tag=package-2019-12-preview"
   },
+  "containerregistry-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-containerregistry",
+    "source": "specification/containerregistry/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.containerregistry",
+    "args": "--payload-flattening-threshold=1 --tag=package-2019-05"
+  },
   "containerservice": {
     "dir": "azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
     "args": "--tag=package-2021-09 --preserve-model=ContainerServiceVMSizeTypes"
   },
+  "containerservice-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-containerservice",
+    "source": "specification/containerservice/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.containerservice",
+    "args": "--payload-flattening-threshold=1 --tag=profile-hybrid-2020-09-01 --preserve-model=ContainerServiceVMSizeTypes"
+  },
   "cosmos": {
     "dir": "azure-resourcemanager-cosmos",
     "source": "specification/cosmos-db/resource-manager/readme.md",
@@ -155,25 +186,49 @@
     "package": "com.azure.resourcemanager.dns",
     "args": "--tag=package-2018-03-preview"
   },
+  "dns-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-dns",
+    "source": "specification/dns/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.dns",
+    "args": "--payload-flattening-threshold=1 --tag=package-2016-04"
+  },
   "eventhubs": {
     "dir": "azure-resourcemanager-eventhubs",
     "source": "specification/eventhub/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.eventhubs",
     "args": "--tag=package-2021-11"
   },
+  "eventhubs-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-eventhubs",
+    "source": "specification/eventhub/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.eventhubs",
+    "args": "--payload-flattening-threshold=1 --tag=profile-hybrid-2020-09-01"
+  },
   "features": {
     "dir": "azure-resourcemanager-resources",
     "source": "specification/resources/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.resources",
     "args": "--tag=package-features-2021-07"
   },
+  "features-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-resources",
+    "source": "specification/resources/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.resources",
+    "args": "--tag=package-features-2015-12"
+  },
   "graphrbac": {
     "spec": "https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/resourcemanager",
     "dir": "azure-resourcemanager-authorization",
     "source": "azure-resourcemanager-authorization/swagger/swagger.md",
     "package": "com.azure.resourcemanager.authorization",
     "args": "--tag=v1.0 --title=MicrosoftGraphClient --models-subpackage=fluent.models"
   },
+  "graphrbac-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-authorization",
+    "source": "specification/graphrbac/data-plane/readme.md",
+    "package": "com.azure.resourcemanager.authorization",
+    "args": "--payload-flattening-threshold=1 --tag=1.6"
+  },
   "iothub": {
     "dir": "azure-resourcemanager-devices",
     "source": "specification/iothub/resource-manager/readme.md",
@@ -186,12 +241,24 @@
     "package": "com.azure.resourcemanager.keyvault",
     "args": "--tag=package-2019-09"
   },
+  "keyvault-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-keyvault",
+    "source": "specification/keyvault/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.keyvault",
+    "args": "--payload-flattening-threshold=1 --tag=package-2019-09"
+  },
   "locks": {
     "dir": "azure-resourcemanager-resources",
     "source": "specification/resources/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.resources",
     "args": "--tag=package-locks-2016-09"
   },
+  "locks-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-resources",
+    "source": "specification/resources/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.resources",
+    "args": "--payload-flattening-threshold=1 --tag=package-locks-2016-09"
+  },
   "logic": {
     "dir": "azure-resourcemanager-logic",
     "source": "specification/logic/resource-manager/readme.md",
@@ -210,12 +277,24 @@
     "package": "com.azure.resourcemanager.monitor",
     "args": "--tag=package-2021-04 --add-inner=AutoscaleProfile,ScaleRule,LocalizableString --rename-model=MetricUnit:Unit"
   },
+  "monitor-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-monitor",
+    "source": "specification/monitor/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.monitor",
+    "args": "--payload-flattening-threshold=1 --tag=package-2021-04 --add-inner=AutoscaleProfile,ScaleRule,LocalizableString --rename-model=MetricUnit:Unit"
+  },
   "network": {
     "dir": "azure-resourcemanager-network",
     "source": "specification/network/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.network",
     "args": "--tag=package-2021-05 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture"
   },
+  "network-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-network",
+    "source": "specification/network/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.network",
+    "args": "--payload-flattening-threshold=1 --tag=profile-hybrid-2020-09-01 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture --remove-inner=Ipv6ExpressRouteCircuitPeeringConfig"
+  },
   "notificationhubs": {
     "dir": "azure-resourcemanager-notificationhubs",
     "source": "specification/notificationhubs/resource-manager/readme.md",
@@ -228,6 +307,12 @@
     "package": "com.azure.resourcemanager.resources",
     "args": "--tag=package-policy-2021-06 --remove-model=UserAssignedIdentitiesValue"
   },
+  "policy-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-resources",
+    "source": "specification/resources/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.resources",
+    "args": "--payload-flattening-threshold=1 --tag=package-policy-2016-12"
+  },
   "powerbi": {
     "dir": "azure-resourcemanager-powerbi",
     "source": "specification/powerbiembedded/resource-manager/readme.md",
@@ -276,6 +361,12 @@
     "package": "com.azure.resourcemanager.resources",
     "args": "--tag=package-resources-2021-01 --add-inner=Deployment"
   },
+  "resources-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-resources",
+    "source": "specification/resources/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.resources",
+    "args": "--tag=package-resources-2019-10 --payload-flattening-threshold=1 --add-inner=Deployment"
+  },
   "scheduler": {
     "dir": "azure-resourcemanager-scheduler",
     "source": "specification/scheduler/resource-manager/readme.md",
@@ -319,6 +410,12 @@
     "package": "com.azure.resourcemanager.storage",
     "args": "--tag=package-2021-04"
   },
+  "storage-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-storage",
+    "source": "specification/storage/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.storage",
+    "args": "--payload-flattening-threshold=2 --tag=profile-hybrid-2020-09-01"
+  },
   "storsimple8000series": {
     "dir": "azure-resourcemanager-storsimple8000series",
     "source": "specification/storsimple8000series/resource-manager/readme.md",
@@ -337,6 +434,12 @@
     "package": "com.azure.resourcemanager.resources",
     "args": "--tag=package-subscriptions-2021-01 --name-for-ungrouped-operations=ResourceName"
   },
+  "subscriptions-hybrid": {
+    "dir": "../resourcemanagerhybrid/azure-resourcemanager-resources",
+    "source": "specification/resources/resource-manager/readme.md",
+    "package": "com.azure.resourcemanager.resources",
+    "args": "--tag=package-subscriptions-2016-06 --name-for-ungrouped-operations=ResourceName"
+  },
   "trafficmanager": {
     "dir": "azure-resourcemanager-trafficmanager",
     "source": "specification/trafficmanager/resource-manager/readme.md",