Merge pull request #2 from Azure/main

Update 6/21

Author: BigCat20196

.github/CODEOWNERS

@@ -49,6 +49,9 @@
 # PRLabel: %Monitor - Exporter
 /sdk/monitor/azure-monitor-opentelemetry-exporter                    @rakshith91 @lmazuel @lzchen
 
+# PRLabel: %Monitor - Log
+/sdk/monitor/azure-monitor-query                                     @rakshith91
+
 # PRLabel: %Consumption
 /sdk/consumption/                                                    @sandeepnl
 

doc/dev/mgmt/generation.md

@@ -33,7 +33,7 @@ autorest readme.md --python --use="@microsoft.azure/autorest.python@~4.0.71" --p
 
 Which means "Generate the Python code for the Swagger mentioned in this readme, using autorest for Pyton v4.0.71 or above (but not v5), do not generate async files, generate multiapi if supported (if not ignore), and assume the package was already generated and it's an update"
 
-In pratical terms, this is not necessary since the Python SDK has the necessary tooling to simplify to just specify the readme.md:
+In practical terms, this is not necessary since the Python SDK has the necessary tooling to simplify to just specify the readme.md:
 
 - Checkout the branch
 - Checkout the RestAPI specs repo

eng/.docsettings.yml

@@ -70,6 +70,7 @@ known_content_issues:
   - ['sdk/core/azure-servicemanagement-legacy/README.md', '#4554']
   - ['sdk/eventgrid/azure-eventgrid/README.md', '#4554']
   - ['sdk/monitor/azure-monitor-query/README.md', '#4554']
+  - ['sdk/monitor/azure-monitor-query/samples/README.md', '#4554']
   - ['sdk/graphrbac/azure-graphrbac/README.md', '#4554']
   - ['sdk/loganalytics/azure-loganalytics/README.md', '#4554']
   - ['sdk/servicebus/azure-servicebus/README.md', '#4554']

eng/common/pipelines/templates/steps/set-default-branch.yml

@@ -5,8 +5,8 @@ steps:
 - pwsh: |
     $setDefaultBranch = (git remote show ${{ parameters.RemoteRepo }} | Out-String) -replace "(?ms).*HEAD branch: (\w+).*", '$1'
     if ($LASTEXITCODE -ne 0) {
-      Write-Host "Not able to fetch the default branch from git command. Set to master."
-      $setDefaultBranch = 'master'
+      Write-Host "Not able to fetch the default branch from git command. Set to main."
+      $setDefaultBranch = 'main'
     }
     Write-Host "Setting DefaultBranch=$setDefaultBranch"
     Write-Host "##vso[task.setvariable variable=DefaultBranch]$setDefaultBranch"

eng/common/scripts/ChangeLog-Operations.ps1

@@ -37,30 +37,45 @@ function Get-ChangeLogEntriesFromContent {
     return $null
   }
 
+  $changelogEntry = $null
+  $sectionName = $null
   $changeLogEntries = [Ordered]@{}
   try {
     # walk the document, finding where the version specifiers are and creating lists
-    $changeLogEntry = $null
     foreach ($line in $changeLogContent) {
       if ($line -match $RELEASE_TITLE_REGEX) {
-        $changeLogEntry = [pscustomobject]@{ 
+        $changeLogEntry = [pscustomobject]@{
           ReleaseVersion = $matches["version"]
           ReleaseStatus  =  $matches["releaseStatus"]
           ReleaseTitle   = "## {0} {1}" -f $matches["version"], $matches["releaseStatus"]
           ReleaseContent = @()
+          Sections = @{}
         }
         $changeLogEntries[$changeLogEntry.ReleaseVersion] = $changeLogEntry
       }
       else {
         if ($changeLogEntry) {
+          if ($line.Trim() -match "^###\s(?<sectionName>.*)")
+          {
+            $sectionName = $matches["sectionName"].Trim()
+            $changeLogEntry.Sections[$sectionName] = @()
+            $changeLogEntry.ReleaseContent += $line
+            continue
+          }
+
+          if ($sectionName)
+          {
+            $changeLogEntry.Sections[$sectionName] += $line
+          }
+
           $changeLogEntry.ReleaseContent += $line
         }
       }
     }
   }
   catch {
-    Write-Host "Error parsing Changelog."
-    Write-Host $_.Exception.Message
+    Write-Error "Error parsing Changelog."
+    Write-Error $_
   }
   return $changeLogEntries
 }
@@ -160,6 +175,21 @@ function Confirm-ChangeLogEntry {
       LogError "Entry has no content. Please ensure to provide some content of what changed in this version."
       return $false
     }
+
+    $emptySections = @()
+    foreach ($key in $changeLogEntry.Sections.Keys)
+    {
+      $sectionContent = $changeLogEntry.Sections[$key]
+      if ([System.String]::IsNullOrWhiteSpace(($sectionContent | Out-String)))
+      {
+        $emptySections += $key
+      }
+    }
+    if ($emptySections.Count -gt 0)
+    {
+      LogError "The changelog entry has the following sections with no content ($($emptySections -join ', ')). Please ensure to either remove the empty sections or add content to the section."
+      return $false
+    }
   }
   return $true
 }
@@ -195,9 +225,21 @@ function New-ChangeLogEntry {
     return $null
   }
 
-  if (!$Content) { $Content = @() }
+  if (!$Content) {
+    $Content = @()
+    $Content += ""
+    $Content += "### Features Added"
+    $Content += ""
+    $Content += "### Breaking Changes"
+    $Content += ""
+    $Content += "### Key Bugs Fixed"
+    $Content += ""
+    $Content += "### Fixed"
+    $Content += ""
+    $Content += ""
+  }
 
-  $newChangeLogEntry = [pscustomobject]@{ 
+  $newChangeLogEntry = [pscustomobject]@{
     ReleaseVersion = $Version
     ReleaseStatus  = $Status
     ReleaseTitle   = "## $Version $Status"

eng/common/scripts/Update-ChangeLog.ps1

@@ -15,6 +15,7 @@ param (
   [String]$ChangelogPath,
   [String]$ReleaseDate
 )
+Set-StrictMode -Version 3
 
 . (Join-Path $PSScriptRoot common.ps1)
 
@@ -39,11 +40,11 @@ if ($ReleaseDate)
         exit 1
     }
 }
-elseif ($Unreleased) 
+elseif ($Unreleased)
 {
     $ReleaseStatus = $CHANGELOG_UNRELEASED_STATUS
 }
-else 
+else
 {
     $ReleaseStatus = "$(Get-Date -Format $CHANGELOG_DATE_FORMAT)"
     $ReleaseStatus = "($ReleaseStatus)"
@@ -61,7 +62,7 @@ if ([string]::IsNullOrEmpty($ChangelogPath))
     $ChangelogPath = $pkgProperties.ChangeLogPath
 }
 
-if (!(Test-Path $ChangelogPath)) 
+if (!(Test-Path $ChangelogPath))
 {
     LogError "Changelog path [$ChangelogPath] is invalid."
     exit 1
@@ -103,7 +104,7 @@ if ($LatestsSorted[0] -ne $Version) {
     LogWarning "Version [$Version] is older than the latestversion [$LatestVersion] in the changelog. Consider using a more recent version."
 }
 
-if ($ReplaceLatestEntryTitle) 
+if ($ReplaceLatestEntryTitle)
 {
     $newChangeLogEntry = New-ChangeLogEntry -Version $Version -Status $ReleaseStatus -Content $ChangeLogEntries[$LatestVersion].ReleaseContent
     LogDebug "Resetting latest entry title to [$($newChangeLogEntry.ReleaseTitle)]"

eng/common/scripts/Verify-ChangeLog.ps1

@@ -6,11 +6,12 @@ param (
   [string]$ServiceDirectory,
   [boolean]$ForRelease = $False
 )
+Set-StrictMode -Version 3
 
 . (Join-Path $PSScriptRoot common.ps1)
 
 $validChangeLog = $false
-if ($ChangeLogLocation -and $VersionString) 
+if ($ChangeLogLocation -and $VersionString)
 {
   $validChangeLog = Confirm-ChangeLogEntry -ChangeLogLocation $ChangeLogLocation -VersionString $VersionString -ForRelease $ForRelease
 }

eng/common/scripts/update-docs-metadata.ps1

@@ -24,7 +24,7 @@ param (
 
 . (Join-Path $PSScriptRoot common.ps1)
 
-$releaseReplaceRegex = "(https://github.com/$RepoId/(?:blob|tree)/)master"
+$releaseReplaceRegex = "(https://github.com/$RepoId/(?:blob|tree)/)main"
 
 function GetMetaData {
   if (Test-Path Variable:MetadataUri) {

eng/pipelines/autorest_checks.yml

@@ -27,7 +27,7 @@ jobs:
     displayName: 'Run AutoRest'
 
     pool:
-      vmImage: 'ubuntu-18.04'
+      vmImage: 'ubuntu-20.04'
 
     steps:
       - task: NodeTool@0

eng/pipelines/generate-all-docs.yml

@@ -12,7 +12,7 @@ jobs:
     timeoutInMinutes: 120
 
     pool:
-      vmImage: 'ubuntu-18.04'
+      vmImage: 'ubuntu-20.04'
 
     steps:
       - task: UsePythonVersion@0