Remove WithUsrPwd (#4600) (#4601)

(cherry picked from commit 79b9795)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>

Author: mergify[bot]

internal/pkg/bulk/setup_test.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/Pallinder/go-randomdata"
+	"github.com/elastic/go-elasticsearch/v8"
 	"github.com/elastic/go-ucfg/yaml"
 	"github.com/rs/xid"
 
@@ -133,7 +134,11 @@ func SetupBulk(ctx context.Context, t testing.TB, opts ...BulkOpt) Bulk {
 
 	// Set up the client with username and password since this test is generic for any index and uses it's own index/mapping
 	e := getEnvironment()
-	cli, err := es.NewClient(ctx, &defaultCfg, false, es.WithUsrPwd(e.Username, e.Password))
+	cli, err := es.NewClient(ctx, &defaultCfg, false, func(config *elasticsearch.Config) {
+		config.ServiceToken = "" // reset service token
+		config.Username = e.Username
+		config.Password = e.Password
+	})
 	if err != nil {
 		t.Fatal(err)
 	}

internal/pkg/es/client.go

@@ -61,15 +61,6 @@ func WithUserAgent(name string, bi build.Info) ConfigOption {
 	}
 }
 
-// WithUsrPwd is intended to be used by integration tests ONLY!
-func WithUsrPwd(usr, pwd string) ConfigOption {
-	return func(config *elasticsearch.Config) {
-		config.ServiceToken = "" // reset service token
-		config.Username = usr
-		config.Password = pwd
-	}
-}
-
 func InstrumentRoundTripper() ConfigOption {
 	return func(config *elasticsearch.Config) {
 		config.Transport = apmelasticsearch.WrapRoundTripper(