From 679e2314c286dec9366a8fd68aa96c27cfba8084 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 2 Jan 2025 16:18:15 -0800 Subject: [PATCH 1/2] Fix incorrect variable name --- eng/common/pipelines/templates/jobs/prepare-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml index 2192c1ebfbf..799b1078530 100644 --- a/eng/common/pipelines/templates/jobs/prepare-pipelines.yml +++ b/eng/common/pipelines/templates/jobs/prepare-pipelines.yml @@ -130,7 +130,7 @@ jobs: Write-Host "##vso[task.setvariable variable=InternalVariableGroups]$internalVariableGroups" Write-Host "##vso[task.setvariable variable=TestVariableGroups]$testVariableGroups" Write-Host "##vso[task.setvariable variable=TestServiceConnections]$testServiceConnections" - Write-Host "##vso[task.setvariable variable=InternalServiceConnections]$internalServviceConnections" + Write-Host "##vso[task.setvariable variable=InternalServiceConnections]$internalServiceConnections" Write-host "##vso[task.setvariable variable=GeneratePublicCIPipeline]$generatePublicCIPipeline" Write-Host "##vso[task.setvariable variable=GenerateUnifiedWeekly]$generateUnifiedWeekly" displayName: Setup pipeline generation variables From 8774bbe7d213e2975b36870dbb11904d7fd7e7b7 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 2 Jan 2025 16:25:51 -0800 Subject: [PATCH 2/2] Add logging to service connection permission updates --- .../Azure.Sdk.Tools.PipelineGenerator/Program.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Program.cs b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Program.cs index c0b367da749..3f4ce12dfb4 100644 --- a/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Program.cs +++ b/tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Program.cs @@ -185,7 +185,7 @@ public async Task RunAsync( return ExitCondition.DuplicateComponentsFound; } - var updatedDefinitions = new List(); + var definitions = new List(); foreach (var component in components) { logger.LogInformation("Processing component '{0}' in '{1}'.", component.Name, component.Path); @@ -202,7 +202,7 @@ public async Task RunAsync( OpenBrowser(definition.GetWebUrl()); } - updatedDefinitions.Add(definition); + definitions.Add(definition); } } @@ -216,8 +216,8 @@ public async Task RunAsync( var pipelines = pipelinePermissions["pipelines"].AsArray(); var pipelineIdsWithPermissions = new HashSet(pipelines.Select(p => p["id"].GetValue())); - bool needsUpdate = false; - foreach (var definition in updatedDefinitions) + int definitionsToAdd = 0; + foreach (var definition in definitions) { // Check this pipeline has permissions if (!pipelineIdsWithPermissions.Contains(definition.Id)) @@ -232,12 +232,15 @@ public async Task RunAsync( } ); - needsUpdate = true; + definitionsToAdd++; } } - if (needsUpdate) + logger.LogInformation("'{0}' pipelines already have permissions to service connection '{1}'. Need to grant permission to '{2}' more.", pipelineIdsWithPermissions.Count, serviceConnection.Id, definitionsToAdd); + + if (definitionsToAdd > 0) { + logger.LogInformation("Granting permissions for '{0}' definitions to service connection '{1}'.", definitionsToAdd, serviceConnection.Id); // Update the permissions if we added anything await context.UpdatePipelinePermissionsAsync(serviceConnection.Id, pipelinePermissions, cancellationToken); }