From f6ec255a0f9af4ee8b304c877855071649c305fc Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Thu, 22 Aug 2024 23:11:07 +0200 Subject: [PATCH] chore: update alias across code base and set in golint (#1193) * chore: update alias across code base and set in golint Signed-off-by: Wen Zhou * Apply suggestions from code review Co-authored-by: Bartosz Majsak * fix: more linter rename Signed-off-by: Wen Zhou --------- Signed-off-by: Wen Zhou Co-authored-by: Bartosz Majsak --- .golangci.yml | 4 ++++ controllers/dscinitialization/suite_test.go | 4 ++-- main.go | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 3ee5532a021..af1ffddee58 100644 --- 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 index 5659f00ba7e..f3ef428f878 100644 --- 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 index 4167b53ffad..74e62f263d1 100644 --- 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, },