rename

Author: EyalDelarea

common/commands/config.go

@@ -64,9 +64,9 @@ type ConfigCommand struct {
 	// Forcibly make the configured server default.
 	makeDefault bool
 	// For unit tests
-	disablePrompts  bool
-	cmdType         ConfigAction
-	oidcSetupParams *generic.ConfigOidcParams
+	disablePrompts   bool
+	cmdType          ConfigAction
+	configOidcParams *generic.OidcParams
 }
 
 func NewConfigCommand(cmdType ConfigAction, serverId string) *ConfigCommand {
@@ -216,22 +216,22 @@ func (cc *ConfigCommand) getConfigurationNonInteractively() error {
 
 // When a user is configuration a new server with OIDC, we will exchange the token and set the access token.
 func exchangeOidcTokenAndSetAccessToken(cc *ConfigCommand) error {
-	if err := validateOidcParams(cc.details.Url, cc.oidcSetupParams); err != nil {
+	if err := validateOidcParams(cc.details.Url, cc.configOidcParams); err != nil {
 		return err
 	}
 	log.Debug("Exchanging OIDC token...")
 	exchangeOidcTokenCmd := generic.NewOidcTokenExchangeCommand()
 	exchangeOidcTokenCmd.
 		SetServerDetails(cc.details).
-		SetProviderName(cc.oidcSetupParams.ProviderName).
-		SetOidcTokenID(cc.oidcSetupParams.TokenId).
-		SetProviderType(cc.oidcSetupParams.ProviderType).
-		SetAudience(cc.oidcSetupParams.Audience).
-		SetApplicationKey(cc.oidcSetupParams.ApplicationKey).
-		SetProjectKey(cc.oidcSetupParams.ProjectKey).
-		SetRepository(cc.oidcSetupParams.Repository).
-		SetJobId(cc.oidcSetupParams.JobId).
-		SetRunId(cc.oidcSetupParams.RunId)
+		SetProviderName(cc.configOidcParams.ProviderName).
+		SetOidcTokenID(cc.configOidcParams.TokenId).
+		SetProviderType(cc.configOidcParams.ProviderType).
+		SetAudience(cc.configOidcParams.Audience).
+		SetApplicationKey(cc.configOidcParams.ApplicationKey).
+		SetProjectKey(cc.configOidcParams.ProjectKey).
+		SetRepository(cc.configOidcParams.Repository).
+		SetJobId(cc.configOidcParams.JobId).
+		SetRunId(cc.configOidcParams.RunId)
 
 	// Usage report will be sent only after execution in order to have valid token
 	err := ExecAndThenReportUsage(exchangeOidcTokenCmd)
@@ -300,7 +300,7 @@ func (cc *ConfigCommand) prepareConfigurationData() ([]*config.ServerDetails, er
 		if cc.defaultDetails != nil {
 			cc.details.InsecureTls = cc.defaultDetails.InsecureTls
 		}
-		cc.oidcSetupParams = new(generic.ConfigOidcParams)
+		cc.configOidcParams = new(generic.OidcParams)
 	}
 
 	// Get configurations list
@@ -505,12 +505,12 @@ func (cc *ConfigCommand) readClientCertInfoFromConsole() {
 }
 
 func (cc *ConfigCommand) SetOidcExchangeTokenId(id string) {
-	cc.oidcSetupParams.TokenId = id
+	cc.configOidcParams.TokenId = id
 }
 
 // If OIDC params were provided it indicates that we should use OIDC authentication method.
 func (cc *ConfigCommand) OidcAuthMethodUsed() bool {
-	return cc.oidcSetupParams != nil && cc.oidcSetupParams.ProviderName != ""
+	return cc.configOidcParams != nil && cc.configOidcParams.ProviderName != ""
 }
 
 func readAccessTokenFromConsole(details *config.ServerDetails) error {
@@ -847,8 +847,8 @@ func (cc *ConfigCommand) handleWebLogin() error {
 	return nil
 }
 
-func (cc *ConfigCommand) SetOIDCParams(oidcDetails *generic.ConfigOidcParams) *ConfigCommand {
-	cc.oidcSetupParams = oidcDetails
+func (cc *ConfigCommand) SetOIDCParams(oidcDetails *generic.OidcParams) *ConfigCommand {
+	cc.configOidcParams = oidcDetails
 	return cc
 }
 
@@ -887,7 +887,7 @@ func assertSingleAuthMethod(details *config.ServerDetails) error {
 
 type ConfigCommandConfiguration struct {
 	ServerDetails *config.ServerDetails
-	OidcParams    *generic.ConfigOidcParams
+	OidcParams    *generic.OidcParams
 	Interactive   bool
 	EncPassword   bool
 	BasicAuthOnly bool
@@ -905,7 +905,7 @@ func GetAllServerIds() []string {
 	return serverIds
 }
 
-func validateOidcParams(platformUrl string, oidcParams *generic.ConfigOidcParams) error {
+func validateOidcParams(platformUrl string, oidcParams *generic.OidcParams) error {
 	if platformUrl == "" {
 		return errorutils.CheckErrorf("the --url flag must be provided when --oidc-provider is used")
 	}

common/commands/config_test.go

@@ -351,14 +351,14 @@ func TestValidateOidcParams(t *testing.T) {
 	testsCases := []struct {
 		name        string
 		platformUrl string
-		oidcParams  *token.ConfigOidcParams
+		oidcParams  *token.OidcParams
 		expectError bool
 		errContains string
 	}{
 		{
 			name:        "All parameters set",
 			platformUrl: "https://my.jfrog.com",
-			oidcParams: &token.ConfigOidcParams{
+			oidcParams: &token.OidcParams{
 				TokenId:      "token123",
 				ProviderName: "MyProvider",
 			},
@@ -367,7 +367,7 @@ func TestValidateOidcParams(t *testing.T) {
 		{
 			name:        "Missing platform URL",
 			platformUrl: "",
-			oidcParams: &token.ConfigOidcParams{
+			oidcParams: &token.OidcParams{
 				TokenId:      "token123",
 				ProviderName: "MyProvider",
 			},
@@ -377,7 +377,7 @@ func TestValidateOidcParams(t *testing.T) {
 		{
 			name:        "Missing OIDC Token ID",
 			platformUrl: "https://my.jfrog.com",
-			oidcParams: &token.ConfigOidcParams{
+			oidcParams: &token.OidcParams{
 				TokenId:      "",
 				ProviderName: "MyProvider",
 			},
@@ -387,7 +387,7 @@ func TestValidateOidcParams(t *testing.T) {
 		{
 			name:        "Missing OIDC Provider Name",
 			platformUrl: "https://my.jfrog.com",
-			oidcParams: &token.ConfigOidcParams{
+			oidcParams: &token.OidcParams{
 				TokenId:      "token123",
 				ProviderName: "",
 			},

general/token/oidctokenexchange.go

@@ -47,12 +47,12 @@ func OidcProviderTypeFromString(providerType string) (OidcProviderType, error) {
 }
 
 type OidcTokenExchangeCommand struct {
-	*ConfigOidcParams
+	*OidcParams
 	serverDetails *config.ServerDetails
 	response      *auth.OidcTokenResponseData
 }
 
-type ConfigOidcParams struct {
+type OidcParams struct {
 	ProviderType OidcProviderType
 	ProviderName string
 	TokenId      string
@@ -66,7 +66,7 @@ type ConfigOidcParams struct {
 }
 
 func NewOidcTokenExchangeCommand() *OidcTokenExchangeCommand {
-	return &OidcTokenExchangeCommand{response: new(auth.OidcTokenResponseData), ConfigOidcParams: &ConfigOidcParams{}}
+	return &OidcTokenExchangeCommand{response: new(auth.OidcTokenResponseData), OidcParams: &OidcParams{}}
 }
 
 func (otc *OidcTokenExchangeCommand) SetServerDetails(serverDetails *config.ServerDetails) *OidcTokenExchangeCommand {