ci update logging

MIchaelMainer · MIchaelMainer · commit 24a0a8ec9dcd · 2025-10-20T12:34:00.000-07:00
diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml
@@ -76,17 +76,17 @@ jobs:
     displayName: install hidi
 
   - pwsh: |
-      git fetch origin master | Write-Host -ForegroundColor Yellow
-      git switch master | Write-Host -ForegroundColor Yellow
+      git fetch origin master
+      git switch master
     displayName: ensure the generation happens from master latest
     workingDirectory: $(Build.SourcesDirectory)/msgraph-metadata
 
   - pwsh: |
-      Write-Host "`nGet status before generation:" -ForegroundColor Green
-      git status | Write-Host -ForegroundColor Yellow
+      Write-Host "`ngit status before generation:"
+      git status
       $(scriptsDirectory)/generate-open-api.ps1 -endpointVersion ${{ parameters.endpoint }} -settings "$(conversionSettingsDirectory)/$(File)" -platformName "$(Name)"
-      Write-Host "`nGet status after generation:" -ForegroundColor Green
-      git status | Write-Host -ForegroundColor Yellow
+      Write-Host "`ngit status after generation:"
+      git status
     displayName: 'generate ${{ parameters.endpoint }} open API description'
     workingDirectory: $(Build.SourcesDirectory)/msgraph-metadata
 
@@ -153,6 +153,8 @@ jobs:
       contents: '**/*.yaml'
       targetFolder: '$(Build.SourcesDirectory)/msgraph-metadata/openapi/${{ parameters.endpoint }}'
     displayName: Copy OpenAPI files to local msgraph-metadata repo
+    overwrite: true
+
 
   # Push changes to msgraph-metadata repo and create PR
   - pwsh: '$(scriptsDirectory)/git-push-cleanmetadata.ps1'
@@ -163,6 +165,7 @@ jobs:
       PublishChanges: $(publishChanges)
     workingDirectory: '$(Build.SourcesDirectory)/msgraph-metadata'
     enabled: true
+    
 
   # Create PR - note that this PR is not used for gating. It's just for discovery purposes. 
   # Library generation PRs will still be created based on the OpenAPI files.
diff --git a/scripts/create-pull-request.ps1 b/scripts/create-pull-request.ps1
@@ -1,11 +1,11 @@
 if (($env:OverrideSkipCI -eq $False) -and ($env:BUILD_REASON -eq 'Manual')) # Skip CI if manually running this pipeline.
 {
-    Write-Host "Skipping pull request creation due Skip CI." -ForegroundColor Green
+    Write-Host "Skipping pull request creation due Skip CI."
     return;
 }
 
 if (($env:GeneratePullRequest -eq $False)) { # Skip CI if manually running this pipeline.
-    Write-Host "Skipping pull request creation due this repository being disabled" -ForegroundColor Green
+    Write-Host "Skipping pull request creation due this repository being disabled"
     return;
 }
 
@@ -33,10 +33,10 @@ if (![string]::IsNullOrEmpty($env:BaseBranch))
 # The installed application is required to have the following permissions: read/write on pull requests/
 $tokenGenerationScript = "$env:ScriptsDirectory\Generate-Github-Token.ps1"
 $env:GITHUB_TOKEN = & $tokenGenerationScript -AppClientId $env:GhAppId -AppPrivateKeyContents $env:GhAppKey -Repository $env:RepoName
-Write-Host "Fetched Github Token for PR generation and set as environment variable." -ForegroundColor Green
+Write-Host "Fetched Github Token for PR generation and set as environment variable."
 
 # No need to specify reviewers as code owners should be added automatically.
 Invoke-Expression "gh auth login" # login to GitHub
 Invoke-Expression "gh pr create -t ""$title"" -b ""$body"" $baseBranchParameter | Write-Host"
 
-Write-Host "Pull Request Created successfully." -ForegroundColor Green
+Write-Host "Pull Request Created successfully."
diff --git a/scripts/generate-open-api.ps1 b/scripts/generate-open-api.ps1
@@ -21,6 +21,8 @@ param(
     [parameter(Mandatory = $true)][String]$platformName
     )
 
+Write-Host "Starting $endpointVersion OpenAPI generation for $platformName using generate-open-api.ps1"
+
 $outputFile = Join-Path "./" "openapi" $endpointVersion "$platformName.yaml"
 $oldOutputFile = "$outputFile.old"
 $cleanVersion = $endpointVersion.Replace(".", "")
@@ -34,23 +36,24 @@ if($platformName -eq "openapi")
 $fileName = "$baseFileName$endpointVersion.xml";
 
 $inputFile = Join-Path "./" "clean_$($cleanVersion)_metadata" "$fileName"
-Write-Host "Settings: $settings"
-Write-Verbose "Generating OpenAPI description from $inputFile"
-Write-Verbose "Output file: $outputFile"
+Write-Host "`nSettings: $settings"
+Write-Host "Generating OpenAPI description from $inputFile"
+Write-Host "Output file: $outputFile"
 
 if(Test-Path $outputFile)
 {
-    Write-Verbose "Removing existing output file"
+    Write-Host "`nRemoving existing output file"
     if(Test-Path $oldOutputFile)
     {
-        Write-Verbose "Removing existing old output file"
+        Write-Host "Removing existing old output file: $oldOutputFile"
         Remove-Item $oldOutputFile -Force
     }
     $oldFileName = Split-Path $outputFile -leaf
     $oldFileName += ".old"
     Rename-Item $outputFile $oldFileName
 }
 
+Write-Host "`nGenerating OpenAPI description using hidi..."
 $command = "hidi transform --csdl ""$inputFile"" --output ""$outputFile"" --settings-path ""$settings"" --version ""3.0"" --metadata-version ""$endpointVersion"" --log-level Information --format yaml"
 Write-Host $command
 
@@ -62,16 +65,18 @@ try {
     Set-Content $outputFile $updatedContent -NoNewline
     if(Test-Path $oldOutputFile)
     {
-        Write-Verbose "Removing existing old output file"
+        Write-Host "`nRemoving existing old output file: $oldOutputFile"
         Remove-Item $oldOutputFile -Force
     }
+    Write-Host "Completed generating OpenAPI description using hidi"
 } catch {
     if(Test-Path $oldOutputFile)
     {
-        Write-Warning "Restoring old output file"
+        Write-Host "`nRestoring old output file: $oldOutputFile"
         $originalFileName = Split-Path $outputFile -leaf
         Rename-Item $oldOutputFile $originalFileName
     }
     Write-Error "Error generating OpenAPI description: $_"
     throw $_
 }
+
diff --git a/scripts/git-push-cleanmetadata.ps1 b/scripts/git-push-cleanmetadata.ps1
@@ -11,71 +11,71 @@
 
 if ($env:PublishChanges -eq $False)
 {
-    Write-Host "Not publishing changes per the run parameter!" -ForegroundColor Yellow
+    Write-Host "Not publishing changes per the run parameter!"
     return;
 }
 
-Write-Host "`nGet status:" -ForegroundColor Green
-git status | Write-Host -ForegroundColor Yellow
+Write-Host "`ngit status:"
+git status | Write-Host
 
-Write-Host "`nStash the update metadata files.....`nRunning: git stash" -ForegroundColor Green
-git stash | Write-Host -ForegroundColor Yellow
+Write-Host "`nStash the update metadata files.....`nRunning: git stash"
+git stash | Write-Host
 
-Write-Host "`nFetching latest master branch to ensure we are up to date..." -ForegroundColor Green
-git fetch origin master | Write-Host -ForegroundColor Yellow
+Write-Host "`nFetching latest master branch to ensure we are up to date..."
+git fetch origin master | Write-Host
 # checkout master to move from detached HEAD mode
-git switch master | Write-Host -ForegroundColor Yellow
+git switch master | Write-Host
 
-Write-Host "`nGet status:" -ForegroundColor Green
-git status | Write-Host -ForegroundColor Yellow
+Write-Host "`ngit status:"
+git status | Write-Host
 
-Write-Host "`nApply stashed metadata files...`nRunning: git stash pop" -ForegroundColor Green
-git stash pop | Write-Host -ForegroundColor Yellow
+Write-Host "`nApply stashed metadata files...`nRunning: git stash pop"
+git stash pop | Write-Host
 
-Write-Host "`nGet status:" -ForegroundColor Green
-git status | Write-Host -ForegroundColor Yellow
+Write-Host "`ngit status:"
+git status | Write-Host
 
 if ($env:CreatePR -eq $True)
 {
-    Write-Host "`nCreate branch: $env:BUILD_BUILDID/updateOpenAPI" -ForegroundColor Green
-    git checkout -B $env:BUILD_BUILDID/updateOpenAPI | Write-Host -ForegroundColor Yellow
+    Write-Host "`nCreate branch: $env:BUILD_BUILDID/updateOpenAPI"
+    git checkout -B $env:BUILD_BUILDID/updateOpenAPI | Write-Host
 }
 
-Write-Host "`nStaging clean $env:EndpointVersion metadata files....." -ForegroundColor Green
-git add . | Write-Host -ForegroundColor Yellow
+Write-Host "`nStaging clean $env:EndpointVersion metadata files.....`nRunning: git add ."
+git add . | Write-Host
 
-Write-Host "`nGet status:" -ForegroundColor Green
-git status | Write-Host -ForegroundColor Yellow
+Write-Host "`ngit status:"
+git status | Write-Host
 
-Write-Host "`nAttempting to commit clean $env:EndpointVersion metadata files....." -ForegroundColor Green
+Write-Host "`nAttempting to commit clean $env:EndpointVersion metadata files....."
 
 if ($env:BUILD_REASON -eq 'Manual') # Skip CI if manually running this pipeline.
 {
-    git commit -m "Update clean metadata file with $env:BUILD_BUILDID [skip ci]" | Write-Host -ForegroundColor Yellow
+    git commit -m "Update clean metadata file with $env:BUILD_BUILDID [skip ci]" | Write-Host
 }
 else
 {
-    git commit -m "Update clean metadata file with $env:BUILD_BUILDID" | Write-Host -ForegroundColor Yellow
+    git commit -m "Update clean metadata file with $env:BUILD_BUILDID" | Write-Host
 }
 
-Write-Host "`nGet status:" -ForegroundColor Green
-git status | Write-Host -ForegroundColor Yellow
+Write-Host "`ngit status:"
+git status | Write-Host
 
 if ($env:CreatePR -eq $True)
 {
-    Write-Host "`nPushing branch for PR creation" -ForegroundColor Green
+    Write-Host "`nPushing branch for PR creation"
 
-    Write-Host "`ngit push --set-upstream origin $env:BUILD_BUILDID/updateOpenAPI:" -ForegroundColor Green
-    git push --set-upstream origin $env:BUILD_BUILDID/updateOpenAPI | Write-Host -ForegroundColor Yellow
+    Write-Host "`ngit push --set-upstream origin $env:BUILD_BUILDID/updateOpenAPI:"
+    git push --set-upstream origin $env:BUILD_BUILDID/updateOpenAPI | Write-Host
 }
 else # original behavior: push to master
 {
-    Write-Host "`nRunning: git pull origin master --rebase..." -ForegroundColor Green
+    Write-Host "`nRunning: git pull origin master --rebase..."
     # sync branch before pushing
     # this is especially important while running v1 and beta in parallel
     # and one process goes out of sync because of the other's check-in
-    git pull origin master --rebase | Write-Host -ForegroundColor Yellow
+    git pull origin master --rebase | Write-Host
 
-    Write-Host "`nRunning: git push --set-upstream origin master ..." -ForegroundColor Green
-    git push --set-upstream origin master | Write-Host -ForegroundColor Yellow
+    Write-Host "`nRunning: git push --set-upstream origin master ..."
+    git push --set-upstream origin master | Write-Host
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ param(`
`21`	`21`	`[parameter(Mandatory = $true)][String]$platformName`
`22`	`22`	`)`
`23`	`23`
	`24`	`+Write-Host "Starting $endpointVersion OpenAPI generation for $platformName using generate-open-api.ps1"`
	`25`	`+`
`24`	`26`	`$outputFile = Join-Path "./" "openapi" $endpointVersion "$platformName.yaml"`
`25`	`27`	`$oldOutputFile = "$outputFile.old"`
`26`	`28`	`$cleanVersion = $endpointVersion.Replace(".", "")`
`@@ -34,23 +36,24 @@ if($platformName -eq "openapi")`
`34`	`36`	`$fileName = "$baseFileName$endpointVersion.xml";`
`35`	`37`
`36`	`38`	`$inputFile = Join-Path "./" "clean_$($cleanVersion)_metadata" "$fileName"`
`37`		`-Write-Host "Settings: $settings"`
`38`		`-Write-Verbose "Generating OpenAPI description from $inputFile"`
`39`		`-Write-Verbose "Output file: $outputFile"`
	`39`	+Write-Host "`nSettings: $settings"
	`40`	`+Write-Host "Generating OpenAPI description from $inputFile"`
	`41`	`+Write-Host "Output file: $outputFile"`
`40`	`42`
`41`	`43`	`if(Test-Path $outputFile)`
`42`	`44`	`{`
`43`		`- Write-Verbose "Removing existing output file"`
	`45`	+ Write-Host "`nRemoving existing output file"
`44`	`46`	`if(Test-Path $oldOutputFile)`
`45`	`47`	`{`
`46`		`- Write-Verbose "Removing existing old output file"`
	`48`	`+ Write-Host "Removing existing old output file: $oldOutputFile"`
`47`	`49`	`Remove-Item $oldOutputFile -Force`
`48`	`50`	`}`
`49`	`51`	`$oldFileName = Split-Path $outputFile -leaf`
`50`	`52`	`$oldFileName += ".old"`
`51`	`53`	`Rename-Item $outputFile $oldFileName`
`52`	`54`	`}`
`53`	`55`
	`56`	+Write-Host "`nGenerating OpenAPI description using hidi..."
`54`	`57`	`$command = "hidi transform --csdl ""$inputFile"" --output ""$outputFile"" --settings-path ""$settings"" --version ""3.0"" --metadata-version ""$endpointVersion"" --log-level Information --format yaml"`
`55`	`58`	`Write-Host $command`
`56`	`59`
`@@ -62,16 +65,18 @@ try {`
`62`	`65`	`Set-Content $outputFile $updatedContent -NoNewline`
`63`	`66`	`if(Test-Path $oldOutputFile)`
`64`	`67`	`{`
`65`		`- Write-Verbose "Removing existing old output file"`
	`68`	+ Write-Host "`nRemoving existing old output file: $oldOutputFile"
`66`	`69`	`Remove-Item $oldOutputFile -Force`
`67`	`70`	`}`
	`71`	`+ Write-Host "Completed generating OpenAPI description using hidi"`
`68`	`72`	`} catch {`
`69`	`73`	`if(Test-Path $oldOutputFile)`
`70`	`74`	`{`
`71`		`- Write-Warning "Restoring old output file"`
	`75`	+ Write-Host "`nRestoring old output file: $oldOutputFile"
`72`	`76`	`$originalFileName = Split-Path $outputFile -leaf`
`73`	`77`	`Rename-Item $oldOutputFile $originalFileName`
`74`	`78`	`}`
`75`	`79`	`Write-Error "Error generating OpenAPI description: $_"`
`76`	`80`	`throw $_`
`77`	`81`	`}`
	`82`	`+`