rename

Author: EyalDelarea

common/commands/config.go

@@ -66,7 +66,7 @@ type ConfigCommand struct {
 	// For unit tests
 	disablePrompts  bool
 	cmdType         ConfigAction
-	oidcSetupParams *generic.ConfigOidcParams
+	oidcSetupParams *generic.OidcParams
 }
 
 func NewConfigCommand(cmdType ConfigAction, serverId string) *ConfigCommand {
@@ -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.oidcSetupParams = new(generic.OidcParams)
 	}
 
 	// Get configurations list
@@ -847,7 +847,7 @@ func (cc *ConfigCommand) handleWebLogin() error {
 	return nil
 }
 
-func (cc *ConfigCommand) SetOIDCParams(oidcDetails *generic.ConfigOidcParams) *ConfigCommand {
+func (cc *ConfigCommand) SetOIDCParams(oidcDetails *generic.OidcParams) *ConfigCommand {
 	cc.oidcSetupParams = 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 {

general/utils_test.go

@@ -29,7 +29,7 @@ func TestDeduceServerId(t *testing.T) {
 
 func TestSetProviderTypeAsString_CaseInsensitive(t *testing.T) {
 	cmd := token.NewOidcTokenExchangeCommand()
-	cmd.ConfigOidcParams = &token.ConfigOidcParams{}
+	cmd.OidcParams = &token.OidcParams{}
 
 	testCases := []struct {
 		input          string