Fix access tests (#2944)

Author: EyalDelarea

access_test.go

@@ -282,32 +282,20 @@ func TestOidcExchangeToken(t *testing.T) {
 		name           string
 		args           []string
 		expectedOutput string
-		expectError    bool
 	}{
 		{
 			name:           "Successful exchange",
-			args:           []string{"eot", "--url=https://ecosysjfrog.jfrog.io", "--oidc-provider-name=setup-jfrog-cli-test"},
-			expectedOutput: `\{ AccessToken: \*\*\*\* Username: \*\*\*\* \}\n`,
-			expectError:    false,
-		},
-		{
-			name:           "Missing OIDC provider name",
-			args:           []string{"eot", "--url=https://ecosysjfrog.jfrog.io"},
-			expectedOutput: "Error: --oidc-provider-name is required",
-			expectError:    true,
+			args:           []string{"eot", "setup-jfrog-cli-test", "--url=https://ecosysjfrog.jfrog.io"},
+			expectedOutput: `\{ AccessToken: [^\s]+ Username: [^\s]+ \}`,
 		},
 	}
 
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			output := accessCli.RunCliCmdWithOutput(t, testCase.args...)
-			if testCase.expectError {
-				assert.Contains(t, output, testCase.expectedOutput)
-			} else {
-				matched, err := regexp.MatchString(testCase.expectedOutput, output)
-				assert.NoError(t, err)
-				assert.True(t, matched, "Output did not match expected pattern")
-			}
+			matched, err := regexp.MatchString(testCase.expectedOutput, output)
+			assert.NoError(t, err)
+			assert.True(t, matched, "Output did not match expected pattern")
 		})
 	}
 }

docs/general/oidc/help.go

@@ -1,13 +1,13 @@
 package token
 
-var Usage = []string{"eot <platformUrl>  <oidc-provider-name> <oidc-token-id> [--oidc-audience <audience>] [--oidc-provider-type <type>] [--application-key <key>] [--Project <project>] [--repository <repository>]"}
+var Usage = []string{"eot  <oidc-provider-name> <oidc-token-id> [--platformUrl <platformUrl>] [--oidc-audience <audience>] [--oidc-provider-type <type>] [--application-key <key>] [--Project <project>] [--repository <repository>]"}
 
 func GetDescription() string {
 	return `Exchanges a token ID from an OIDC provider with a JFrog server to a valid access token and returns the access token and the username.`
 }
 
 func GetArguments() string {
-	return `	 --platformUrl (mandatory)   The JFrog platform base URL to which the OIDC token will be exchanged for an access token (e.g., https://mycompany.jfrog.io)."
+	return `	 
 
      --oidc-provider-name (mandatory)
       The provider name.

general/token/cli.go

@@ -70,7 +70,7 @@ func AccessTokenCreateCmd(c *cli.Context) error {
 }
 
 func ExchangeOidcTokenCmd(c *cli.Context) error {
-	if c.NArg() > 3 {
+	if c.NArg() < 1 {
 		return cliutils.WrongNumberOfArgumentsHandler(c)
 	}
 
@@ -99,11 +99,12 @@ func CreateOidcTokenExchangeCommand(c *cli.Context, serverDetails *coreConfig.Se
 	if err := oidcAccessTokenCreateCmd.SetProviderTypeAsString(cliutils.GetFlagOrEnvValue(c, cliutils.OidcProviderType, coreutils.OidcProviderType)); err != nil {
 		return nil, err
 	}
+
 	oidcAccessTokenCreateCmd.
 		SetServerDetails(serverDetails).
 		// Mandatory flags
-		SetProviderName(c.String(cliutils.OidcProviderName)).
-		SetOidcTokenID(cliutils.GetFlagOrEnvValue(c, cliutils.OidcTokenID, coreutils.OidcExchangeTokenId)).
+		SetProviderName(c.Args().Get(0)).
+		SetOidcTokenID(getOidcTokenIdInput(c)).
 		SetAudience(c.String(cliutils.OidcAudience)).
 		// Optional values exported by CI servers
 		SetJobId(os.Getenv(coreutils.CIJobID)).
@@ -159,3 +160,14 @@ func assertAccessTokenAvailable(serverDetails *coreConfig.ServerDetails) error {
 	}
 	return nil
 }
+
+// The OIDC token ID can be provided as a command line argument or as a flag or environment variable.
+// Depends on the origin of the command.
+// For example when used in CI/CD, the token ID is provided as a environment variable.
+func getOidcTokenIdInput(c *cli.Context) string {
+	oidcTokenId := c.Args().Get(1)
+	if oidcTokenId == "" {
+		oidcTokenId = cliutils.GetFlagOrEnvValue(c, cliutils.OidcTokenID, coreutils.OidcExchangeTokenId)
+	}
+	return oidcTokenId
+}