chore: update alias across code base and set in golint (opendatahub-i…

…o#1193) * chore: update alias across code base and set in golint Signed-off-by: Wen Zhou <[email protected]> * Apply suggestions from code review Co-authored-by: Bartosz Majsak <[email protected]> * fix: more linter rename Signed-off-by: Wen Zhou <[email protected]> --------- Signed-off-by: Wen Zhou <[email protected]> Co-authored-by: Bartosz Majsak <[email protected]>
zdtsw-forking · Aug 22, 2024 · f6ec255 · f6ec255
1 parent 03c1abc
commit f6ec255
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -45,6 +45,10 @@ linters-settings:
         alias: $1$2
       - pkg: github.com/openshift/api/(\w+)/(v[\w\d]+)
         alias: $1$2
+      - pkg: github.com/opendatahub-io/opendatahub-operator/v2/controllers/datasciencecluster
+        alias: dscctrl
+      - pkg: github.com/opendatahub-io/opendatahub-operator/v2/controllers/dscinitialization
+        alias: dscictrl
   ireturn:
     allow:
       # defaults https://golangci-lint.run/usage/linters/#ireturn

diff --git a/controllers/dscinitialization/suite_test.go b/controllers/dscinitialization/suite_test.go
@@ -45,7 +45,7 @@ import (
 
 	dscv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/datasciencecluster/v1"
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
-	dsci "github.com/opendatahub-io/opendatahub-operator/v2/controllers/dscinitialization"
+	dscictrl "github.com/opendatahub-io/opendatahub-operator/v2/controllers/dscinitialization"
 	"github.com/opendatahub-io/opendatahub-operator/v2/tests/envtestutil"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -134,7 +134,7 @@ var _ = BeforeSuite(func() {
 
 	Expect(err).NotTo(HaveOccurred())
 
-	err = (&dsci.DSCInitializationReconciler{
+	err = (&dscictrl.DSCInitializationReconciler{
 		Client:   k8sClient,
 		Scheme:   testScheme,
 		Log:      ctrl.Log.WithName("controllers").WithName("DSCInitialization"),

diff --git a/main.go b/main.go
@@ -56,8 +56,8 @@ import (
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
 	featurev1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/features/v1"
 	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/certconfigmapgenerator"
-	dsccontr "github.com/opendatahub-io/opendatahub-operator/v2/controllers/datasciencecluster"
-	dscicontr "github.com/opendatahub-io/opendatahub-operator/v2/controllers/dscinitialization"
+	dscctrl "github.com/opendatahub-io/opendatahub-operator/v2/controllers/datasciencecluster"
+	dscictrl "github.com/opendatahub-io/opendatahub-operator/v2/controllers/dscinitialization"
 	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/secretgenerator"
 	"github.com/opendatahub-io/opendatahub-operator/v2/controllers/webhook"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
@@ -158,7 +158,7 @@ func main() { //nolint:funlen
 		Decoder: admission.NewDecoder(mgr.GetScheme()),
 	}).SetupWithManager(mgr)
 
-	if err = (&dscicontr.DSCInitializationReconciler{
+	if err = (&dscictrl.DSCInitializationReconciler{
 		Client:                mgr.GetClient(),
 		Scheme:                mgr.GetScheme(),
 		Log:                   logger.LogWithLevel(ctrl.Log.WithName(operatorName).WithName("controllers").WithName("DSCInitialization"), logmode),
@@ -169,11 +169,11 @@ func main() { //nolint:funlen
 		os.Exit(1)
 	}
 
-	if err = (&dsccontr.DataScienceClusterReconciler{
+	if err = (&dscctrl.DataScienceClusterReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 		Log:    logger.LogWithLevel(ctrl.Log.WithName(operatorName).WithName("controllers").WithName("DataScienceCluster"), logmode),
-		DataScienceCluster: &dsccontr.DataScienceClusterConfig{
+		DataScienceCluster: &dscctrl.DataScienceClusterConfig{
 			DSCISpec: &dsciv1.DSCInitializationSpec{
 				ApplicationsNamespace: dscApplicationsNamespace,
 			},