add and update unit tests

elastic · Dec 26, 2023 · e19ee20 · e19ee20
1 parent 16d8c31
commit e19ee20
Show file tree

Hide file tree

Showing 5 changed files with 491 additions and 69 deletions.
diff --git a/x-pack/filebeat/input/salesforce/config.go b/x-pack/filebeat/input/salesforce/config.go
@@ -15,7 +15,6 @@ type config struct {
 	EventMonitoringMethod *EventMonitoringMethod `config:"event_monitoring_method"`
 	URL                   string                 `config:"url" validate:"required"`
 	Version               int                    `config:"version" validate:"required"`
-	InitialInterval       time.Duration          `config:"initial_interval"`
 }
 
 type EventMonitoringMethod struct {

diff --git a/x-pack/filebeat/input/salesforce/config_auth_test.go b/x-pack/filebeat/input/salesforce/config_auth_test.go
@@ -21,7 +21,7 @@ func TestOAuth2Config(t *testing.T) {
 		"tokenURL missing":     {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: ""}, wantErr: errors.New("token_url must be provided")},
 		"clientID missing":     {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: "https://salesforce.com", ClientID: ""}, wantErr: errors.New("client.id must be provided")},
 		"clientSecret missing": {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: "https://salesforce.com", ClientID: "xyz", ClientSecret: ""}, wantErr: errors.New("client.secret must be provided")},
-		"user missing":         {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: "https://salesforce.com", ClientID: "xyz", ClientSecret: "abc", Username: ""}, wantErr: errors.New("username must be provided")},
+		"username missing":     {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: "https://salesforce.com", ClientID: "xyz", ClientSecret: "abc", Username: ""}, wantErr: errors.New("username must be provided")},
 		"password missing":     {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: "https://salesforce.com", ClientID: "xyz", ClientSecret: "abc", Username: "user", Password: ""}, wantErr: errors.New("password must be provided")},
 		"all present":          {config: UserPasswordFlow{Enabled: pointer(true), TokenURL: "https://salesforce.com", ClientID: "xyz", ClientSecret: "abc", Username: "user", Password: "pass"}, wantErr: nil},
 	}

diff --git a/x-pack/filebeat/input/salesforce/input.go b/x-pack/filebeat/input/salesforce/input.go
@@ -198,7 +198,7 @@ func (s *salesforceInput) SetupSFClientConnection() (*soql.Resource, error) {
 
 // FormQueryWithCursor takes a queryConfig and a cursor and returns a querier.
 func (s *salesforceInput) FormQueryWithCursor(queryConfig *QueryConfig, cursor mapstr.M) (*querier, error) {
-	qr, err := parseCursor(&s.config.InitialInterval, queryConfig, cursor, s.log)
+	qr, err := parseCursor(queryConfig, cursor, s.log)
 	if err != nil {
 		return nil, err
 	}
@@ -306,7 +306,7 @@ func (s *salesforceInput) RunEventLogFile() error {
 	totalEvents, firstEvent := 0, true
 	for res.Done() {
 		for _, rec := range res.Records() {
-			req, err := http.NewRequestWithContext(s.ctx, "GET", s.config.URL+rec.Record().Fields()["LogFile"].(string), nil)
+			req, err := http.NewRequestWithContext(s.ctx, http.MethodGet, s.config.URL+rec.Record().Fields()["LogFile"].(string), nil)
 			if err != nil {
 				return err
 			}