Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove PATVAR from PipelineGenerator #8369

Merged
merged 12 commits into from
Jun 4, 2024
Merged

Remove PATVAR from PipelineGenerator #8369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3513b05
Remove PATVAR from PipelineGenerator
JimSuplizio Jun 3, 2024
71e831c
Add temporarily hacked up yml to test and add output before/after con…
JimSuplizio Jun 4, 2024
694e608
indent working directory
JimSuplizio Jun 4, 2024
f9ae858
add / to beginning of the working directory
JimSuplizio Jun 4, 2024
63dc621
change working directory again
JimSuplizio Jun 4, 2024
dc6bbaa
trying full path for working directory
JimSuplizio Jun 4, 2024
088e620
try packing/installing separately
JimSuplizio Jun 4, 2024
d589bc5
try packing/installing separately
JimSuplizio Jun 4, 2024
b7886f3
try packing/installing separately
JimSuplizio Jun 4, 2024
e58edef
Use Azure.Identity and setup a ChainedTokenCred using AzureCLI and Az…
JimSuplizio Jun 4, 2024
e437327
do the ConnectAsync in GetConnectionAsync because if there's a failur…
JimSuplizio Jun 4, 2024
c59711a
revert changes from pipeline-generation.yml
JimSuplizio Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...peline-generator/Azure.Sdk.Tools.PipelineGenerator/CommandParserOptions/DefaultOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ public string Organization
[Option('p', "project", Required = false, Default = "internal", HelpText = "Azure DevOps project name. Default: internal")]
public string Project { get; set; }

[Option('t', "patvar", Required = false, HelpText = "Environment variable name containing a Personal Access Token.")]
public string Patvar { get; set; }

[Option("whatif", Required = false, HelpText = "Dry Run changes")]
public bool WhatIf { get; set; }
}
}
}
20 changes: 4 additions & 16 deletions tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/PipelineGenerationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Microsoft.Azure.Services.AppAuthentication;
using Microsoft.Azure.Services.AppAuthentication;
using Microsoft.Extensions.Logging;
using Microsoft.TeamFoundation.Build.WebApi;
using Microsoft.TeamFoundation.Core.WebApi;
Expand All @@ -20,7 +20,6 @@ public class PipelineGenerationContext
{
private string organization;
private string project;
private string patvar;
private string endpoint;
private string agentPool;
private int[] variableGroups;
Expand All @@ -30,7 +29,6 @@ public PipelineGenerationContext(
ILogger logger,
string organization,
string project,
string patvar,
string endpoint,
string repository,
string branch,
Expand All @@ -46,7 +44,6 @@ public PipelineGenerationContext(
this.logger = logger;
this.organization = organization;
this.project = project;
this.patvar = patvar;
this.endpoint = endpoint;
this.Repository = repository;
this.Branch = branch;
Expand Down Expand Up @@ -77,18 +74,9 @@ private async Task<VssConnection> GetConnectionAsync()
if (cachedConnection == null)
{
VssCredentials credentials;
if (string.IsNullOrWhiteSpace(patvar))
{
var azureTokenProvider = new AzureServiceTokenProvider();
var authenticationResult = await azureTokenProvider.GetAuthenticationResultAsync("499b84ac-1321-427f-aa17-267ca6975798");
credentials = new VssAadCredential(new VssAadToken(authenticationResult.TokenType, authenticationResult.AccessToken));
}
else
{
var pat = Environment.GetEnvironmentVariable(patvar);
credentials = new VssBasicCredential("nobody", pat);
}

var azureTokenProvider = new AzureServiceTokenProvider();
JimSuplizio marked this conversation as resolved.
Show resolved Hide resolved
var authenticationResult = await azureTokenProvider.GetAuthenticationResultAsync("499b84ac-1321-427f-aa17-267ca6975798");
credentials = new VssAadCredential(new VssAadToken(authenticationResult.TokenType, authenticationResult.AccessToken));
cachedConnection = new VssConnection(new Uri(organization), credentials);
}

Expand Down
5 changes: 1 addition & 4 deletions tools/pipeline-generator/Azure.Sdk.Tools.PipelineGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand Down Expand Up @@ -43,7 +43,6 @@ public static async Task Run(object commandObj, CancellationTokenSource cancella
g.Project,
g.Prefix,
g.Path,
g.Patvar,
g.Endpoint,
g.Repository,
g.Branch,
Expand Down Expand Up @@ -127,7 +126,6 @@ public async Task<ExitCondition> RunAsync(
string project,
string prefix,
string path,
string patvar,
string endpoint,
string repository,
string branch,
Expand All @@ -154,7 +152,6 @@ public async Task<ExitCondition> RunAsync(
this.logger,
organization,
project,
patvar,
endpoint,
repository,
branch,
Expand Down