print parameter value when provided via CLI arg or config

Brightspace · Jul 22, 2024 · 7233f66 · 7233f66
1 parent 55ae7ba
commit 7233f66
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/src/D2L.Bmx/AwsCredsCreator.cs b/src/D2L.Bmx/AwsCredsCreator.cs
@@ -30,12 +30,22 @@ bool cache
 			);
 		}
 
+		var accountSource = ParameterSource.CliArg;
 		if( string.IsNullOrEmpty( account ) && !string.IsNullOrEmpty( config.Account ) ) {
 			account = config.Account;
+			accountSource = ParameterSource.Config;
+		}
+		if( !string.IsNullOrEmpty( account ) && !nonInteractive ) {
+			Console.Error.WriteLine( $"{ParameterDescriptions.Account}: {account} (from {accountSource})" );
 		}
 
+		var roleSource = ParameterSource.CliArg;
 		if( string.IsNullOrEmpty( role ) && !string.IsNullOrEmpty( config.Role ) ) {
 			role = config.Role;
+			roleSource = ParameterSource.Config;
+		}
+		if( !string.IsNullOrEmpty( role ) && !nonInteractive ) {
+			Console.Error.WriteLine( $"{ParameterDescriptions.Role}: {role} (from {roleSource})" );
 		}
 
 		if( duration is null or 0 ) {

diff --git a/src/D2L.Bmx/OktaAuthenticator.cs b/src/D2L.Bmx/OktaAuthenticator.cs
@@ -21,24 +21,32 @@ public async Task<AuthenticatedOktaApi> AuthenticateAsync(
 		bool nonInteractive,
 		bool ignoreCache
 	) {
+		var orgSource = ParameterSource.CliArg;
+		if( string.IsNullOrEmpty( org ) && !string.IsNullOrEmpty( config.Org ) ) {
+			org = config.Org;
+			orgSource = ParameterSource.Config;
+		}
 		if( string.IsNullOrEmpty( org ) ) {
-			if( !string.IsNullOrEmpty( config.Org ) ) {
-				org = config.Org;
-			} else if( !nonInteractive ) {
-				org = consolePrompter.PromptOrg( allowEmptyInput: false );
-			} else {
+			if( nonInteractive ) {
 				throw new BmxException( "Org value was not provided" );
 			}
+			org = consolePrompter.PromptOrg( allowEmptyInput: false );
+		} else if( !nonInteractive ) {
+			Console.Error.WriteLine( $"{ParameterDescriptions.Org}: {org} (from {orgSource})" );
 		}
 
+		var userSource = ParameterSource.CliArg;
+		if( string.IsNullOrEmpty( user ) && !string.IsNullOrEmpty( config.User ) ) {
+			user = config.User;
+			userSource = ParameterSource.Config;
+		}
 		if( string.IsNullOrEmpty( user ) ) {
-			if( !string.IsNullOrEmpty( config.User ) ) {
-				user = config.User;
-			} else if( !nonInteractive ) {
-				user = consolePrompter.PromptUser( allowEmptyInput: false );
-			} else {
+			if( nonInteractive ) {
 				throw new BmxException( "User value was not provided" );
 			}
+			user = consolePrompter.PromptUser( allowEmptyInput: false );
+		} else if( !nonInteractive ) {
+			Console.Error.WriteLine( $"{ParameterDescriptions.User}: {user} (from {userSource})" );
 		}
 
 		oktaApi.SetOrganization( org );

diff --git a/src/D2L.Bmx/ParameterDescriptions.cs b/src/D2L.Bmx/ParameterDescriptions.cs
@@ -1,7 +1,7 @@
 namespace D2L.Bmx;
 
 internal static class ParameterDescriptions {
-	public const string Org = "Okta org short name or domain name";
+	public const string Org = "Okta org or domain name";
 	public const string User = "Okta username";
 	public const string Password = "Okta password";
 	public const string Account = "AWS account name";

diff --git a/src/D2L.Bmx/ParameterSource.cs b/src/D2L.Bmx/ParameterSource.cs
@@ -0,0 +1,14 @@
+namespace D2L.Bmx;
+
+internal record ParameterSource {
+	public string Description { get; init; }
+
+	private ParameterSource( string description ) {
+		Description = description;
+	}
+
+	public static ParameterSource CliArg => new( "command line argument" );
+	public static ParameterSource Config => new( "config file" );
+
+	public override string ToString() => Description;
+}