[AutoPR netapp] [NetAppFiles] s360 fixes to 2021-01

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   build:
     runs-on: ubuntu-latest

azure-pipelines-autogen.yml

@@ -46,12 +46,12 @@ jobs:
       set -Eeuxo pipefail
       git checkout $(Build.SourceBranchName)
       git pull
-      git merge --no-commit --no-ff --strategy-option=theirs origin/master
+      git merge --no-commit --no-ff --strategy-option=theirs origin/main
       if ! git diff-index --quiet HEAD --; then
-        git commit -m "Merge remote-tracking branch 'origin/master' into $(Build.SourceBranchName)"
+        git commit -m "Merge remote-tracking branch 'origin/main' into $(Build.SourceBranchName)"
         git push origin $(Build.SourceBranchName)
       fi
-    displayName: Integrate master branch
+    displayName: Integrate main branch
 
   - script: |
       set -Eeuxo pipefail

generator/README.md

@@ -28,15 +28,19 @@ View the Pipeline Configuration [here](/azure-pipelines-autogen.yml).
 #### Merging Pipeline-generated schemas
 
 1. Review the status badge on this page to ensure the latest run was successful.
-2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`master`](https://github.com/Azure/azure-resource-manager-schemas/tree/master).
+2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`main`](https://github.com/Azure/azure-resource-manager-schemas/tree/main).
 3. If there are any modifications to [schemas/common/autogeneratedResources.json](/schemas/common/autogeneratedResources.json), push a commit to the autogenerate branch to make any corresponding changes to [schemas/2014-04-01-preview/deploymentTemplate.json](/schemas/2014-04-01-preview/deploymentTemplate.json) and [schemas/2015-01-01/deploymentTemplate.json](/schemas/2015-01-01/deploymentTemplate.json).
 
 #### Onboarding to the autogeneration pipeline
-
-1. Follow the steps listed under [Getting Started](#getting-started). The following commands assume you are running in the `generator` directory.
-3. Run `npm run list-basepaths` to discover the specs repo path containing the swagger definitions.
-4. Run `npm run generate-single {basePath}` to generate schemas for them. Save the console output to file.
-5. Manually remove any existing references to your provider namespace (if any) from [schemas/2019-04-01/deploymentTemplate.json](/schemas/2019-04-01/deploymentTemplate.json).
-6. Add the {basePath} to the autogenlist array in [autogenlist.ts](./autogenlist.ts).
-7. Commit all the changed files, and submit a PR to this repo with title "Onboarding {provider} for autogeneration". Include the full output saved in step 2 as a comment.
-8. Ensure all CI tests pass, and ask the team to review the PR (including tool output) to ensure that all expected resources have been detected and generated as expected.
+New resource providers are onboarded for autogeneration by default, so the only providers which have been opted out are listed in [autogenlist.ts](./autogenlist.ts) with `disabledForAutogen` set.
+
+If your team has been opted out, and you would like to opt in, please raise an issue in this repo, and we will assist.
+
+> The following steps are no longer necessary for onboarding, but listed here for reference:
+> 1. Follow the steps listed under [Getting Started](#getting-started). The following commands assume you are running in the > `generator` directory.
+> 3. Run `npm run list-basepaths` to discover the specs repo path containing the swagger definitions.
+> 4. Run `npm run generate-single {basePath}` to generate schemas for them. Save the console output to file.
+> 5. Manually remove any existing references to your provider namespace (if any) from [schemas/2019-04-01/deploymentTemplate.> json](/schemas/2019-04-01/deploymentTemplate.json).
+> 6. Add the {basePath} to the autogenlist array in [autogenlist.ts](./autogenlist.ts).
+> 7. Commit all the changed files, and submit a PR to this repo with title "Onboarding {provider} for autogeneration". Include > the full output saved in step 2 as a comment.
+> 8. Ensure all CI tests pass, and ask the team to review the PR (including tool output) to ensure that all expected resources > have been detected and generated as expected.

generator/autogenlist.ts

@@ -8,8 +8,224 @@ import { postProcessor as policyProcessor } from './processors/Microsoft.Authori
 import { postProcessor as securityInsightsPostProcessor } from './processors/Microsoft.SecurityInsights';
 import { lowerCaseEquals } from './utils';
 
+// New providers are onboarded by default. The providers listed here are the only ones **not** onboarded.
+const disabledProviders: AutoGenConfig[] = [
+    {
+        basePath: 'advisor/resource-manager',
+        namespace: 'Microsoft.Advisor',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'agrifood/resource-manager',
+        namespace: 'Microsoft.AgFoodPlatform',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'azure-kusto/resource-manager',
+        namespace: 'Microsoft.Kusto',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'azurestackhci/resource-manager',
+        namespace: 'Microsoft.AzureStackHCI',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'baremetalinfrastructure/resource-manager',
+        namespace: 'Microsoft.BareMetalInfrastructure',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'cloudshell/resource-manager',
+        namespace: 'Microsoft.Portal',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'compute/resource-manager',
+        namespace: 'Microsoft.Compute',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'compute/resource-manager',
+        namespace: 'Microsoft.ContainerService',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'confidentialledger/resource-manager',
+        namespace: 'Microsoft.ConfidentialLedger',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'cost-management/resource-manager',
+        namespace: 'Microsoft.CostManagement',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'cpim/resource-manager',
+        namespace: 'Microsoft.AzureActiveDirectory',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'dataprotection/resource-manager',
+        namespace: 'Microsoft.DataProtection',
+        disabledForAutogen: true,
+    },
+    {
+        // Disabled as the swagger spec contains a type ("DateTimeRfc1123") which autorest is unable to parse: https://github.com/Azure/autorest.azureresourceschema/issues/71
+        basePath: 'domainservices/resource-manager',
+        namespace: 'Microsoft.AAD',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'dfp/resource-manager',
+        namespace: 'Microsoft.Dynamics365Fraudprotection',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'dnc/resource-manager',
+        namespace: 'Microsoft.DelegatedNetwork',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'dns/resource-manager',
+        namespace: 'Microsoft.Network',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'edgeorder/resource-manager',
+        namespace: 'Microsoft.EdgeOrder',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'edgeorderpartner/resource-manager',
+        namespace: 'Microsoft.EdgeOrderPartner',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'extendedlocation/resource-manager',
+        namespace: 'Microsoft.ExtendedLocation',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'fluidrelay/resource-manager',
+        namespace: 'Microsoft.FluidRelay',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'iotsecurity/resource-manager',
+        namespace: 'Microsoft.IoTSecurity',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'logic/resource-manager',
+        namespace: 'Microsoft.Logic',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'm365securityandcompliance/resource-manager',
+        namespace: 'Microsoft.M365SecurityAndCompliance',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'managedservices/resource-manager',
+        namespace: 'Microsoft.ManagedServices',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'marketplacenotifications/resource-manager',
+        namespace: 'Microsoft.MarketplaceNotifications',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'marketplaceordering/resource-manager',
+        namespace: 'Microsoft.MarketplaceOrdering',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'mediaservices/resource-manager',
+        namespace: 'Microsoft.Media',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'msi/resource-manager',
+        namespace: 'Microsoft.ManagedIdentity',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'network/resource-manager',
+        namespace: 'Microsoft.Network',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'operationsmanagement/resource-manager',
+        namespace: 'Microsoft.OperationsManagement',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'privatedns/resource-manager',
+        namespace: 'Microsoft.Network',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'providerhub/resource-manager',
+        namespace: 'Microsoft.ProviderHub',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'quota/resource-manager',
+        namespace: 'Microsoft.Quota',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'resources/resource-manager',
+        namespace: 'Microsoft.Features',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'resources/resource-manager',
+        namespace: 'Microsoft.Solutions',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'securityandcompliance/resource-manager',
+        namespace: 'Microsoft.SecurityAndCompliance',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'service-map/resource-manager',
+        namespace: 'Microsoft.OperationalInsights',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'servicefabricmanagedclusters/resource-manager',
+        namespace: 'Microsoft.ServiceFabricManagedClusters',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'testbase/resource-manager',
+        namespace: 'Microsoft.TestBase',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'trafficmanager/resource-manager',
+        namespace: 'Microsoft.Network',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'videoanalyzer/resource-manager',
+        namespace: 'Microsoft.Media',
+        disabledForAutogen: true,
+    },
+    {
+        basePath: 'webpubsub/resource-manager',
+        namespace: 'Microsoft.SignalRService',
+        disabledForAutogen: true,
+    },
+];
+
 // Run "npm run list-basepaths" to discover all the valid readme files to add to this list
 const autoGenList: AutoGenConfig[] = [
+    ...disabledProviders,
     {
         basePath: 'addons/resource-manager',
         namespace: 'Microsoft.Addons',
@@ -268,10 +484,6 @@ const autoGenList: AutoGenConfig[] = [
         basePath: 'EnterpriseKnowledgeGraph/resource-manager',
         namespace: 'Microsoft.EnterpriseKnowledgeGraph',
     },
-    /*{ NOTE(jcotillo): Temporally removing this RP - latest swagger contains an unsupported type by the schema generator tool
-        basePath: 'domainservices/resource-manager',
-        namespace: 'Microsoft.AAD',
-    },*/
     {
         basePath: 'eventhub/resource-manager',
         namespace: 'Microsoft.EventHub',
@@ -827,13 +1039,25 @@ const autoGenList: AutoGenConfig[] = [
     {
         basePath: 'deviceupdate/resource-manager',
         namespace: 'Microsoft.DeviceUpdate',
-    }
+    },
 ];
 
-export function getAutoGenList(): AutoGenConfig[] {
-    return autoGenList;
-}
-
 export function findAutogenEntries(basePath: string): AutoGenConfig[] {
     return autoGenList.filter(w => lowerCaseEquals(w.basePath, basePath));
 }
+
+export function findOrGenerateAutogenEntries(basePath: string, namespaces: string[]): AutoGenConfig[] {
+    const entries = findAutogenEntries(basePath).filter(e => namespaces.some(ns => lowerCaseEquals(e.namespace, ns)));
+
+    for (const namespace of namespaces) {
+        if (!entries.some(e => lowerCaseEquals(e.namespace, namespace))) {
+            // Generate configuration for any RPs not explicitly declared in the autogen list
+            entries.push({
+                basePath,
+                namespace,
+            });
+        }
+    }
+
+    return entries;
+}

generator/cmd/findbasepath.ts

@@ -17,7 +17,7 @@ executeSynchronous(async () => {
 
     const autoGenEntries = findAutogenEntries(basePath);
 
-    if (autoGenEntries.length === 0) {
+    if (autoGenEntries[0]?.disabledForAutogen === true) {
         // not onboarded in autogeneration
         console.log("false");
         return;