Merge branch 'trunk' into bug/TKP-9301_filter_function

3lvia · Feb 9, 2024 · a6216bf · a6216bf
2 parents 2f88bf0 + 3d51106
commit a6216bf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/pkg/sfkafkalib/kafka/kafkaconsumer.go b/pkg/sfkafkalib/kafka/kafkaconsumer.go
@@ -70,10 +70,12 @@ func CreateKafkaConsumer(ctx context.Context, conf *configuration.ConsumerConfig
 				fmt.Println("CONSUMING MESSAGE: " + message.Key__c)
 				if err := handleFunc(ctx, message); err != nil {
 					log.Sugar().ErrorwContext(ctx, "error in kafka handler", zap.Error(err))
+					panic(message)
 				}
 			case err := <-errChan:
 				fmt.Println("ERROR")
 				log.Sugar().ErrorwContext(ctx, "error in kafka handler", zap.Error(err))
+				panic(err)
 			}
 		}
 	}(ctx, outChan, errChan)

diff --git a/pkg/sfkafkalib/salesforce/client.go b/pkg/sfkafkalib/salesforce/client.go
@@ -53,9 +53,6 @@ type Authentication struct {
 type ConnectionConfig struct {
 	LoginURL     string // EG: "https://test.salesforce.com/services/oauth2/token"
 	ApiEndpoint  string // EG: "/services/data/v56.0/"; In vault only version is saved, we need to add the rest of the endpoint
-	Username     string // Integration user username
-	Password     string // Integration user pw
-	Token        string // Integration user security token
 	ClientId     string // Connected app ClientID
 	ClientSecret string // Connected app ClientSecret
 }
@@ -70,9 +67,6 @@ type AuthClient struct {
 func CreateAuthClient(ctx context.Context, conf ConnectionConfig) (authClient *AuthClient, err error) {
 
 	authParams := url.Values{}
-	authParams.Set("grant_type", "password")
-	authParams.Set("username", conf.Username)
-	authParams.Set("password", fmt.Sprintf("%v%v", conf.Password, conf.Token))
 	oauth2Conf := &clientcredentials.Config{
 		ClientID:       conf.ClientId,
 		ClientSecret:   conf.ClientSecret,

diff --git a/pkg/sfkafkalib/salesforce/connectionconfig.go b/pkg/sfkafkalib/salesforce/connectionconfig.go
@@ -33,18 +33,6 @@ func CreateSfConnConf(ctx context.Context, config configuration.ConsumerConfig,
 	if sfConnConf.ClientSecret == "" {
 		return nil, errors.New("Missing required connection config ClientSecret")
 	}
-	sfConnConf.Username = fmt.Sprint(secretMap["salesforce-username"])
-	if sfConnConf.Username == "" {
-		return nil, errors.New("Missing required connection config Username")
-	}
-	sfConnConf.Password = fmt.Sprint(secretMap["salesforce-password"])
-	if sfConnConf.Password == "" {
-		return nil, errors.New("Missing required connection config Password")
-	}
-	sfConnConf.Token = fmt.Sprint(secretMap["salesforce-security-token"])
-	if sfConnConf.Token == "" {
-		return nil, errors.New("Missing required connection config Token")
-	}
 
 	return sfConnConf, nil
 }