chore(opensearch): use testcontainers.Run

Author: mdelapenya

modules/opensearch/opensearch.go

@@ -35,17 +35,16 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize
 
 // Run creates an instance of the OpenSearch container type
 func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*OpenSearchContainer, error) {
-	req := testcontainers.ContainerRequest{
-		Image:        img,
-		ExposedPorts: []string{defaultHTTPPort, "9600/tcp"},
-		Env: map[string]string{
+	moduleOpts := []testcontainers.ContainerCustomizer{
+		testcontainers.WithExposedPorts(defaultHTTPPort, "9600/tcp"),
+		testcontainers.WithEnv(map[string]string{
 			"discovery.type":              "single-node",
 			"DISABLE_INSTALL_DEMO_CONFIG": "true",
 			"DISABLE_SECURITY_PLUGIN":     "true",
 			"OPENSEARCH_USERNAME":         defaultUsername,
 			"OPENSEARCH_PASSWORD":         defaultPassword,
-		},
-		HostConfigModifier: func(hc *container.HostConfig) {
+		}),
+		testcontainers.WithHostConfigModifier(func(hc *container.HostConfig) {
 			hc.Ulimits = []*units.Ulimit{
 				{
 					Name: "memlock",
@@ -58,73 +57,65 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 					Hard: 65536,
 				},
 			}
-		},
+		}),
 	}
 
-	genericContainerReq := testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	}
+	moduleOpts = append(moduleOpts, opts...)
 
 	// Gather all config options (defaults and then apply provided options)
 	settings := defaultOptions()
 	for _, opt := range opts {
 		if apply, ok := opt.(Option); ok {
 			apply(settings)
 		}
-		if err := opt.Customize(&genericContainerReq); err != nil {
-			return nil, err
-		}
 	}
 
 	// set credentials if they are provided, otherwise use the defaults
-	if settings.Username != "" {
-		genericContainerReq.Env["OPENSEARCH_USERNAME"] = settings.Username
-	}
-	if settings.Password != "" {
-		genericContainerReq.Env["OPENSEARCH_PASSWORD"] = settings.Password
-	}
-
-	username := genericContainerReq.Env["OPENSEARCH_USERNAME"]
-	password := genericContainerReq.Env["OPENSEARCH_PASSWORD"]
+	moduleOpts = append(moduleOpts, testcontainers.WithEnv(map[string]string{
+		"OPENSEARCH_USERNAME": settings.Username,
+		"OPENSEARCH_PASSWORD": settings.Password,
+	}))
 
 	// the wat strategy does not support TLS at the moment,
 	// so we need to disable it in the strategy for now.
-	genericContainerReq.WaitingFor = wait.ForHTTP("/").
-		WithPort("9200").
-		WithTLS(false).
-		WithStartupTimeout(120*time.Second).
-		WithStatusCodeMatcher(func(status int) bool {
-			return status == 200
-		}).
-		WithBasicAuth(username, password).
-		WithResponseMatcher(func(body io.Reader) bool {
-			bs, err := io.ReadAll(body)
-			if err != nil {
-				return false
-			}
-
-			type response struct {
-				Tagline string `json:"tagline"`
-			}
-
-			var r response
-			err = json.Unmarshal(bs, &r)
-			if err != nil {
-				return false
-			}
-
-			return r.Tagline == "The OpenSearch Project: https://opensearch.org/"
-		})
-
-	container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
+	moduleOpts = append(moduleOpts, testcontainers.WithAdditionalWaitStrategy(
+		wait.ForHTTP("/").
+			WithPort("9200").
+			WithTLS(false).
+			WithStartupTimeout(120*time.Second).
+			WithStatusCodeMatcher(func(status int) bool {
+				return status == 200
+			}).
+			WithBasicAuth(settings.Username, settings.Password).
+			WithResponseMatcher(func(body io.Reader) bool {
+				bs, err := io.ReadAll(body)
+				if err != nil {
+					return false
+				}
+
+				type response struct {
+					Tagline string `json:"tagline"`
+				}
+
+				var r response
+				err = json.Unmarshal(bs, &r)
+				if err != nil {
+					return false
+				}
+
+				return r.Tagline == "The OpenSearch Project: https://opensearch.org/"
+			}),
+	),
+	)
+
+	ctr, err := testcontainers.Run(ctx, img, moduleOpts...)
 	var c *OpenSearchContainer
-	if container != nil {
-		c = &OpenSearchContainer{Container: container, User: username, Password: password}
+	if ctr != nil {
+		c = &OpenSearchContainer{Container: ctr, User: settings.Username, Password: settings.Password}
 	}
 
 	if err != nil {
-		return c, fmt.Errorf("generic container: %w", err)
+		return c, fmt.Errorf("run: %w", err)
 	}
 
 	return c, nil