Fix duplicate imports and validateSplunkGeneralTerms call

gabrielm-splunk · claude · gabrielm-splunk · commit 30d2982b3355 · 2026-03-11T17:26:04.000-04:00
- Remove duplicate testutils imports from controller test files
- Remove duplicate scheme, ctrl2, config imports from controller_test.go
- Remove duplicate server import from testenv.go
- Remove duplicate validateSplunkGeneralTerms() call in configuration.go
- Run gofmt on all affected files

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/internal/controller/clustermanager_controller_test.go b/internal/controller/clustermanager_controller_test.go
@@ -3,7 +3,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
diff --git a/internal/controller/clustermaster_controller_test.go b/internal/controller/clustermaster_controller_test.go
@@ -3,7 +3,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
diff --git a/internal/controller/indexercluster_controller_test.go b/internal/controller/indexercluster_controller_test.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
-
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
 	"time"
diff --git a/internal/controller/licensemanager_controller_test.go b/internal/controller/licensemanager_controller_test.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
-
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
diff --git a/internal/controller/licensemaster_controller_test.go b/internal/controller/licensemaster_controller_test.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
-
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
diff --git a/internal/controller/monitoringconsole_controller_test.go b/internal/controller/monitoringconsole_controller_test.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
-
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
 	"time"
diff --git a/internal/controller/searchheadcluster_controller_test.go b/internal/controller/searchheadcluster_controller_test.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
-
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
 	"time"
diff --git a/internal/controller/standalone_controller_test.go b/internal/controller/standalone_controller_test.go
@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"github.com/splunk/splunk-operator/internal/controller/testutils"
 
-	"github.com/splunk/splunk-operator/internal/controller/testutils"
-
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
 	"time"
diff --git a/pkg/splunk/enterprise/configuration.go b/pkg/splunk/enterprise/configuration.go
@@ -410,11 +410,6 @@ func validateCommonSplunkSpec(ctx context.Context, c splcommon.ControllerClient,
 		return err
 	}
 
-	err = validateSplunkGeneralTerms()
-	if err != nil {
-		return err
-	}
-
 	// if not provided, set default values for imagePullSecrets
 	err = ValidateImagePullSecrets(ctx, c, cr, spec)
 	if err != nil {
diff --git a/pkg/splunk/splkcontroller/controller_test.go b/pkg/splunk/splkcontroller/controller_test.go
@@ -18,16 +18,9 @@ package splkcontroller
 import (
 	"context"
 	"errors"
-	"k8s.io/client-go/kubernetes/scheme"
 	"net/http"
-	ctrl2 "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/config"
 	"testing"
 
-	"k8s.io/client-go/kubernetes/scheme"
-	ctrl2 "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/config"
-
 	"github.com/go-logr/logr"
 	splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
 	spltest "github.com/splunk/splunk-operator/pkg/splunk/test"
@@ -37,11 +30,14 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
+	ctrl2 "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
diff --git a/test/secret/manager_secret_m4_test.go b/test/secret/manager_secret_m4_test.go
@@ -17,7 +17,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/secret/manager_secret_s1_test.go b/test/secret/manager_secret_s1_test.go
@@ -19,7 +19,6 @@ import (
 
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/secret/secret_c3_test.go b/test/secret/secret_c3_test.go
@@ -19,7 +19,6 @@ import (
 
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/secret/secret_m4_test.go b/test/secret/secret_m4_test.go
@@ -19,7 +19,6 @@ import (
 
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/secret/secret_s1_test.go b/test/secret/secret_s1_test.go
@@ -19,7 +19,6 @@ import (
 
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/smartstore/manager_smartstore_test.go b/test/smartstore/manager_smartstore_test.go
@@ -7,7 +7,6 @@ import (
 
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/smartstore/smartstore_test.go b/test/smartstore/smartstore_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/smoke/smoke_test.go b/test/smoke/smoke_test.go
@@ -17,7 +17,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
diff --git a/test/testenv/testenv.go b/test/testenv/testenv.go
@@ -20,11 +20,8 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"time"
 
-	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
-
 	enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 
@@ -41,6 +38,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 const (
