fix internal/test commit miss

Signed-off-by: Sean Chittenden <sean.chittenden@crowdstrike.com>

Author: sean-

internal/test/config.go

@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// The OpenSearch Contributors require contributions made to
+// this file be licensed under the Apache-2.0 license or a
+// compatible open source license.
+
+package ostest
+
+import (
+	"crypto/tls"
+	"net/http"
+	"os"
+
+	"github.com/opensearch-project/opensearch-go/v4"
+	"github.com/opensearch-project/opensearch-go/v4/opensearchapi"
+)
+
+// IsSecure returns true when SECURE_INTEGRATION env is set to true
+func IsSecure() bool {
+	return os.Getenv("SECURE_INTEGRATION") == "true"
+}
+
+// ClientConfig returns an opensearchapi.Config for secure opensearch
+func ClientConfig() (*opensearchapi.Config, error) {
+	if IsSecure() {
+		password, err := GetPassword()
+		if err != nil {
+			return nil, err
+		}
+
+		return &opensearchapi.Config{
+			Client: opensearch.Config{
+				Username:  "admin",
+				Password:  password,
+				Addresses: []string{"https://localhost:9200"},
+				Transport: &http.Transport{
+					TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+				},
+			},
+		}, nil
+	}
+	//nolint:nilnil // easier to test with nil rather then doing complex error handling for tests
+	return nil, nil
+}
+
+// GetPassword returns the password suited for the opensearch version
+func GetPassword() (string, error) {
+	var (
+		major, minor int64
+		err          error
+	)
+	password := "admin"
+	version := os.Getenv("OPENSEARCH_VERSION")
+
+	if version != "latest" && version != "" {
+		major, minor, _, err = opensearch.ParseVersion(version)
+		if err != nil {
+			return "", err
+		}
+		if version == "latest" || major > 2 || (major == 2 && minor >= 12) {
+			password = "myStrongPassword123!"
+		}
+	} else {
+		password = "myStrongPassword123!"
+	}
+	return password, nil
+}

internal/test/doc.go

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// The OpenSearch Contributors require contributions made to
+// this file be licensed under the Apache-2.0 license or a
+// compatible open source license.
+
+// Package ostest provides OpenSearch testing utilities and infrastructure.
+// Integration-specific functionality is available only when building with integration tags.
+package ostest

internal/test/helper.go

@@ -3,16 +3,15 @@
 // The OpenSearch Contributors require contributions made to
 // this file be licensed under the Apache-2.0 license or a
 // compatible open source license.
+//go:build integration
 
 package ostest
 
 import (
 	"context"
-	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io"
-	"net/http"
 	"os"
 	"testing"
 	"time"
@@ -37,7 +36,12 @@ func NewClient(t *testing.T) (*opensearchapi.Client, error) {
 	if config != nil {
 		client, err = opensearchapi.NewClient(*config)
 	} else {
-		client, err = opensearchapi.NewDefaultClient()
+		// For insecure integration tests, explicitly use HTTP
+		client, err = opensearchapi.NewClient(opensearchapi.Config{
+			Client: opensearch.Config{
+				Addresses: []string{"http://localhost:9200"},
+			},
+		})
 	}
 	if err != nil {
 		return nil, err
@@ -117,59 +121,11 @@ func validateClusterReadiness(ctx context.Context, client *opensearchapi.Client)
 	return nil
 }
 
-// IsSecure returns true when SECURE_INTEGRATION env is set to true
-func IsSecure() bool {
-	return os.Getenv("SECURE_INTEGRATION") == "true"
-}
-
-// ClientConfig returns an opensearchapi.Config for secure opensearch
-func ClientConfig() (*opensearchapi.Config, error) {
-	if IsSecure() {
-		password, err := GetPassword()
-		if err != nil {
-			return nil, err
-		}
-
-		return &opensearchapi.Config{
-			Client: opensearch.Config{
-				Username:  "admin",
-				Password:  password,
-				Addresses: []string{"https://localhost:9200"},
-				Transport: &http.Transport{
-					TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-				},
-			},
-		}, nil
-	}
-	//nolint:nilnil // easier to test with nil rather then doing complex error handling for tests
-	return nil, nil
-}
-
-// GetPassword returns the password suited for the opensearch version
-func GetPassword() (string, error) {
-	var (
-		major, minor int64
-		err          error
-	)
-	password := "admin"
-	version := os.Getenv("OPENSEARCH_VERSION")
-
-	if version != "latest" && version != "" {
-		major, minor, _, err = opensearch.ParseVersion(version)
-		if err != nil {
-			return "", err
-		}
-		if version == "latest" || major > 2 || (major == 2 && minor >= 12) {
-			password = "myStrongPassword123!"
-		}
-	} else {
-		password = "myStrongPassword123!"
-	}
-	return password, nil
-}
-
 // GetVersion gets cluster info and returns version as int's
 func GetVersion(client *opensearchapi.Client) (int64, int64, int64, error) {
+	if client == nil {
+		return 0, 0, 0, fmt.Errorf("client cannot be nil")
+	}
 	resp, err := client.Info(context.Background(), nil)
 	if err != nil {
 		return 0, 0, 0, err