Skip to content

Update Azure CLI Cred #36553

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

Merged
g2vinay merged 5 commits into from
Oct 16, 2023
Merged

Update Azure CLI Cred #36553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b71b9f
discard stdin
g2vinay Aug 28, 2023
391ed5b
redirect to dev null.
g2vinay Oct 5, 2023
5e169e1
fix checkstyle
g2vinay Oct 5, 2023
37deb84
update azd cli flow
g2vinay Oct 5, 2023
ebd9edf
add comment
g2vinay Oct 16, 2023
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
4 changes: 4 additions & 0 deletions ...ty/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ AccessToken getTokenFromAzureCLIAuthentication(StringBuilder azCommand) {
}

ProcessBuilder builder = new ProcessBuilder(starter, switcher, azCommand.toString());
// Redirects stdin to dev null, helps to avoid messages sent in by the cmd process to upgrade etc.
builder.redirectInput(ProcessBuilder.Redirect.from(IdentityUtil.NULL_FILE));

String workingDirectory = getSafeWorkingDirectory();
if (workingDirectory != null) {
Expand Down Expand Up @@ -619,6 +621,8 @@ AccessToken getTokenFromAzureDeveloperCLIAuthentication(StringBuilder azdCommand
}

ProcessBuilder builder = new ProcessBuilder(starter, switcher, azdCommand.toString());
// Redirects stdin to dev null, helps to avoid messages sent in by the cmd process to upgrade etc.
builder.redirectInput(ProcessBuilder.Redirect.from(IdentityUtil.NULL_FILE));
Copy link
Member

@joshfree joshfree Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. could you add a comment here mentioning why we're doing the redirection
  2. could you include a test case in the PR for the scenario


String workingDirectory = getSafeWorkingDirectory();
if (workingDirectory != null) {
Expand Down
3 changes: 3 additions & 0 deletions ...ity/azure-identity/src/main/java/com/azure/identity/implementation/util/IdentityUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.azure.identity.BrowserCustomizationOptions;
import com.azure.identity.implementation.IdentityClientOptions;

import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand All @@ -22,6 +23,8 @@ public final class IdentityUtil {
public static final String ALL_TENANTS = "*";
public static final String DEFAULT_TENANT = "organizations";

public static final File NULL_FILE =
new File((System.getProperty("os.name").startsWith("Windows") ? "NUL" : "/dev/null"));

private IdentityUtil() { }
/**
Expand Down