Adds Find-MgGraphCommand

.azure-pipelines/common-templates/checkout.yml

@@ -1,6 +1,11 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+parameters:
+  - name: TargetBranch
+    type: string
+    default: ''
+
 steps:
   - checkout: self
     clean: true
@@ -15,6 +20,18 @@ steps:
         git config --global user.email "[email protected]"
         git config --global user.name "Microsoft Graph DevX Tooling"
 
+  - task: Bash@3
+    displayName: "Switch branch to target branch: $(TargetBranch)"
+    condition: and(succeeded(), eq('${{ parameters.TargetBranch }}', ''))
+    inputs:
+      targetType: inline
+      script: |
+        git status
+        git fetch --all
+        git checkout $(TargetBranch)
+        git pull
+        git status
+
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
     displayName: "Run CredScan"
     inputs:

.azure-pipelines/common-templates/download-openapi-docs.yml

@@ -18,6 +18,8 @@ jobs:
     pool: $(BuildAgent)
     steps:
       - template: ./checkout.yml
+        parameters:
+          TargetBranch: $(BaseBranch)
 
       - template: ./install-tools-template.yml
 
@@ -36,8 +38,6 @@ jobs:
           targetType: inline
           script: |
             git status
-            git fetch --all
-            git checkout $(BaseBranch)
             git branch $(ComputeBranch.WeeklyBranch)
             git checkout $(ComputeBranch.WeeklyBranch)
             git status
@@ -110,7 +110,7 @@ jobs:
                 . "$(System.DefaultWorkingDirectory)\tools\SetServiceModuleVersion.ps1" -VersionNumber $NewModuleVersion -Modules $_
               } catch {
                 if ($_.Exception.Message -like "No match*") {
-                  Write-Warning "$_. Version will be set to $NewMetaModuleVersion."      
+                  Write-Warning "$_. Version will be set to $NewMetaModuleVersion."
                 }
               }
             }

.azure-pipelines/generation-templates/generate-command-metadata-template.yml

@@ -0,0 +1,24 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+- task: PowerShell@2
+  displayName: Generate command metadata
+  inputs:
+    targetType: inline
+    pwsh: true
+    script: |
+      . $(System.DefaultWorkingDirectory)/tools/PostGeneration/NewCommandMetadata.ps1 -SourcePath "$(System.DefaultWorkingDirectory)/src/" -IncludePermissions -Debug
+
+- task: Bash@3
+  displayName: Push command metadata
+  enabled: true
+  env:
+    GITHUB_TOKEN: $(GITHUB_TOKEN)
+  inputs:
+    targetType: inline
+    script: |
+      git status
+      git add "$(System.DefaultWorkingDirectory)/src/Authentication/Authentication/custom/common/MgCommandMetadata.json"
+      git commit -m 'Add generated MgCommandMetadata.json. [run ci]'
+      git push
+      git status

.azure-pipelines/generation-templates/generate-service-modules.yml

@@ -18,6 +18,12 @@ parameters:
   - name: PublishToFeed
     type: boolean
     default: false
+  - name: GenerateCommandMetadata
+    type: boolean
+    default: false
+  - name: GenerateHelpDocs
+    type: boolean
+    default: false
   - name: DOCSBRANCH
     type: string
     default: "DocsGeneration"
@@ -35,20 +41,16 @@ jobs:
       ModulePrefix: ${{ parameters.ModulePrefix }}
       EnableSigning: ${{ parameters.EnableSigning }}
       PublishToFeed: ${{ parameters.PublishToFeed }}
+      GenerateCommandMetadata: ${{ parameters.GenerateCommandMetadata }}
+      GenerateHelpDocs: ${{ parameters.GenerateHelpDocs }}
       DocsBranch: ${{ parameters.DocsBranch }}
     steps:
+      - template: ../common-templates/checkout.yml
+        parameters:
+          TargetBranch: $(Branch)
+
       - template: ../common-templates/install-tools-template.yml
       - template: ../common-templates/security-prechecks-template.yml
-      - task: Bash@3
-        displayName: "Switch branch to $(Branch)"
-        inputs:
-          targetType: inline
-          script: |
-            git status
-            git fetch --all
-            git checkout $(Branch)
-            git pull
-            git status
 
       - task: PowerShell@2
         displayName: Build auth module
@@ -143,11 +145,9 @@ jobs:
             [bool]$EnableSigning = if ("$(EnableSigning)" -eq "true") { $true } else { $false }
             $Modules = "$(ModulesToGenerate)" -split " "
             . $(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1 -Build -Test -UpdateAutoRest -EnableSigning:$EnableSigning -ModulesToGenerate $Modules -ExcludeExampleTemplates -ExcludeNotesSection
-
-      - template: ./generate-helpdocs-template.yml
-        parameters:
-            DOCSBRANCH: $(DocsBranch)
-            ModulesToGenerate: $(ModulesToGenerate)
+
+      - ${{ if eq(parameters.GenerateCommandMetadata, true) }}:
+        - template: ./generate-command-metadata-template.yml
 
       - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
         displayName: ESRP DLL strong name (Service Modules)
@@ -281,4 +281,10 @@ jobs:
           publishVstsFeed: "0985d294-5762-4bc2-a565-161ef349ca3e/edc337b9-e5ea-49dd-a2cb-e8d66668ca57"
           allowPackageConflicts: true
 
+      - ${{ if eq(parameters.GenerateHelpDocs, true) }}:
+        - template: ./generate-helpdocs-template.yml
+          parameters:
+              DOCSBRANCH: $(DocsBranch)
+              ModulesToGenerate: $(ModulesToGenerate)
+
       - template: ../common-templates/security-postchecks-template.yml

.azure-pipelines/weekly-generation.yml

@@ -40,10 +40,11 @@ stages:
     jobs:
       - template: generation-templates/generate-service-modules.yml
         parameters:
-          ModulesToGenerate: $[ stageDependencies.DownloadOpenAPIDocs.GetLatestDocs.outputs['OpenAPIDocDiff.ModulesWithChanges'] ]
           Branch: $[ stageDependencies.DownloadOpenAPIDocs.GetLatestDocs.outputs['ComputeBranch.WeeklyBranch'] ]
           AuthModulePath: "src/Authentication/Authentication"
           ServiceModulePath: "src/"
           ModulePrefix: "Microsoft.Graph"
           EnableSigning: false
           PublishToFeed: false
+          GenerateCommandMetadata: true
+          GenerateHelpDocs: true

.github/workflows/create-openapidocs-pr-workflow.yml

@@ -7,13 +7,13 @@ name: "Create Weekly OpenAPIDocs Download PR"
 # events but only for the master branch
 on:
   push:
-    branches: 
+    branches:
       - 'WeeklyOpenApiDocsDownload/*'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   createOpenApiDocsPR:
-    if: github.event_name == 'push' && !contains(toJson(github.event.commits), 'NO_CI') && !contains(toJson(github.event.commits), '[ci skip]') && !contains(toJson(github.event.commits), '[skip ci]')
+    if: github.event_name == 'push' && contains(toJson(github.event.commits), '[run ci]') && !contains(toJson(github.event.commits), 'NO_CI') && !contains(toJson(github.event.commits), '[ci skip]') && !contains(toJson(github.event.commits), '[skip ci]')
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -22,17 +22,17 @@ jobs:
       run: |
          git config --global user.email "[email protected]"
          git config --global user.name "Microsoft Graph DevX Tooling"
-      
+
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout
       uses: actions/checkout@v2
-      
+
     - name: List Directory
-      run: | 
+      run: |
         echo $GITHUB_WORKSPACE
         ls -lsa $GITHUB_WORKSPACE
         ls -lsa $GITHUB_WORKSPACE/tools
-                
+
     # Create a pull request [1]
     - name: Create PR using the GitHub REST API via hub
       shell: bash

src/Authentication/Authentication.Core/Common/GraphSession.cs

@@ -8,6 +8,7 @@ namespace Microsoft.Graph.PowerShell.Authentication
     using Microsoft.Graph.PowerShell.Authentication.Interfaces;
 
     using System;
+    using System.Collections;
     using System.Security;
     using System.Threading;
 
@@ -62,6 +63,11 @@ public byte[] MSALToken
         /// </summary>
         public IGraphEnvironment Environment { get; set; }
 
+        /// <summary>
+        /// Represents a collection of Microsoft Graph PowerShell meta-info.
+        /// </summary>
+        public Hashtable[] MgCommandMetadata { get; set; }
+
         /// <summary>
         /// Gets an instance of <see cref="GraphSession"/>.
         /// </summary>

src/Authentication/Authentication/Extensions/PSCmdletExtensions.cs

@@ -10,6 +10,7 @@ namespace Microsoft.Graph.PowerShell
     using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
+    using System.Linq;
     using System.Linq.Expressions;
     using System.Management.Automation;
     public static class PSCmdletExtensions
@@ -119,5 +120,14 @@ internal static GraphSettings GetContextSettings(this PSCmdlet cmdlet)
         {
             return new GraphSettings(ProtectedFileProvider.CreateFileProvider(Constants.SettingFilePath, FileProtection.SharedRead));
         }
+
+        internal static IEnumerable<T> RunScript<T>(string script)
+            => PowerShell.Create().AddScript(script).Invoke<T>();
+
+        internal static IEnumerable<T> RunScript<T>(this PSCmdlet cmdlet, string script)
+          => cmdlet?.InvokeCommand.RunScript<T>(script) ?? RunScript<T>(script);
+
+        internal static IEnumerable<T> RunScript<T>(this CommandInvocationIntrinsics cii, string script)
+            => cii.InvokeScript(script).Select(o => o?.BaseObject).Where(o => o != null).OfType<T>();
     }
 }

src/Authentication/Authentication/Helpers/StringUtil.cs

@@ -19,7 +19,7 @@
 
 namespace Microsoft.Graph.PowerShell.Authentication.Helpers
 {
-    internal static class StringUtil
+    public static class StringUtil
     {
         /// <summary>
         ///     Formats the specified string, using the current culture.
@@ -79,7 +79,7 @@ internal static string FormatDictionary(this IDictionary content)
         /// <param name="error">An error record if the conversion failed.</param>
         /// <returns>A <see cref="System.Management.Automation.PSObject"/> or a <see cref="System.Collections.Hashtable"/>
         /// if the <paramref name="returnHashtable"/> parameter is true.</returns>
-        internal static object ConvertFromJson(this string jsonString, bool returnHashtable, int? maxDepth, out ErrorRecord error)
+        public static object ConvertFromJson(this string jsonString, bool returnHashtable, int? maxDepth, out ErrorRecord error)
         {
             if (jsonString == null)
             {

src/Authentication/Authentication/Microsoft.Graph.Authentication.format.ps1xml

@@ -2,7 +2,7 @@
 <Configuration>
   <ViewDefinitions>
     <View>
-      <Name>AuthConfigView</Name>
+      <Name>Microsoft.Graph.PowerShell.Authentication.Models.AuthConfig</Name>
       <ViewSelectedBy>
         <TypeName>Microsoft.Graph.PowerShell.Authentication.Models.AuthConfig</TypeName>
       </ViewSelectedBy>
@@ -33,6 +33,77 @@
       </TableControl>
     </View>
 
+    <View>
+      <Name>Microsoft.Graph.PowerShell.Authentication.Models.GraphCommand</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Graph.PowerShell.Authentication.Models.GraphCommand</TypeName>
+      </ViewSelectedBy>
+      <GroupBy>
+        <PropertyName>APIVersion</PropertyName>
+        <Label>APIVersion</Label>
+      </GroupBy>
+      <TableControl>
+        <TableHeaders>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <PropertyName>Command</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>Module</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>Method</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>URI</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>OutputType</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>Permissions</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>Variants</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
+    </View>
+
+    <View>
+      <Name>Microsoft.Graph.PowerShell.Authentication.Models.GraphPermission</Name>
+      <ViewSelectedBy>
+        <TypeName>Microsoft.Graph.PowerShell.Authentication.Models.GraphPermission</TypeName>
+      </ViewSelectedBy>
+      <TableControl>
+        <TableHeaders>
+        </TableHeaders>
+        <TableRowEntries>
+          <TableRowEntry>
+            <TableColumnItems>
+              <TableColumnItem>
+                <PropertyName>Name</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>IsAdmin</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>Description</PropertyName>
+              </TableColumnItem>
+              <TableColumnItem>
+                <PropertyName>FullDescription</PropertyName>
+              </TableColumnItem>
+            </TableColumnItems>
+          </TableRowEntry>
+        </TableRowEntries>
+      </TableControl>
+    </View>
+
     <View>
       <Name>Permission</Name>
       <ViewSelectedBy>

src/Authentication/Authentication/Microsoft.Graph.Authentication.nuspec

@@ -23,7 +23,7 @@
     <file src="artifacts\Microsoft.Graph.Authentication.dll" />
     <file src="artifacts\Microsoft.Graph.Authentication.Core.dll" />
     <file src="artifacts\Microsoft.Graph.Core.dll" />
-    <file src="artifacts\StartupScripts\*" target="StartupScripts" />
+    <file src="artifacts\StartupScripts\" target="StartupScripts" />
     <file src="artifacts\custom\" target="custom" />
     <file src="artifacts\Dependencies\Newtonsoft.Json.dll" target="Dependencies" />
     <file src="artifacts\Dependencies\Microsoft.Graph.Auth.dll" target="Dependencies" />

src/Authentication/Authentication/Microsoft.Graph.Authentication.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft
 #
-# Generated on: 8/4/2021
+# Generated on: 8/3/2021
 #
 
 @{
@@ -69,7 +69,7 @@ FormatsToProcess = 'Microsoft.Graph.Authentication.format.ps1xml'
 # NestedModules = @()
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-FunctionsToExport = 'Find-MgGraphPermission'
+FunctionsToExport = 'Find-MgGraphCommand', 'Find-MgGraphPermission'
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = 'Connect-MgGraph', 'Disconnect-MgGraph', 'Get-MgContext',

src/Authentication/Authentication/Microsoft.Graph.Authentication.psm1

@@ -1,6 +1,10 @@
 
 # Load the module dll
-$null = Import-Module -Name (Join-Path $PSScriptRoot 'Microsoft.Graph.Authentication.dll')
+$ModulePath = (Join-Path $PSScriptRoot 'Microsoft.Graph.Authentication.dll')
+$null = Import-Module -Name $ModulePath
+
+# Export nothing to clear implicit exports.
+Export-ModuleMember
 
 if (Test-Path -Path "$PSScriptRoot\StartupScripts" -ErrorAction Ignore)
 {
@@ -9,6 +13,9 @@ if (Test-Path -Path "$PSScriptRoot\StartupScripts" -ErrorAction Ignore)
     }
 }
 
+# Export binary module cmdlets.
+Export-ModuleMember -Cmdlet (Get-ModuleCmdlet -ModulePath $ModulePath) -Alias (Get-ModuleCmdlet -ModulePath $ModulePath -AsAlias)
+
 $DependencyPath = (Join-Path $PSScriptRoot -ChildPath "Dependencies")
 if (Test-Path $DependencyPath -ErrorAction Ignore)
 {