diff --git a/cmd/pluto/main.go b/cmd/pluto/main.go index b7f2aed4..f9403873 100644 --- a/cmd/pluto/main.go +++ b/cmd/pluto/main.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ package main import ( - plutoversionsfile "github.com/fairwindsops/pluto/v5" + plutoversionsfile "github.com/fairwindsops/pluto" "github.com/fairwindsops/pluto/v5/cmd" ) diff --git a/cmd/root.go b/cmd/root.go index 403215d2..31193b04 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -35,12 +35,12 @@ import ( "os" "strings" - "github.com/fairwindsops/pluto/v5/pkg/api" - discoveryapi "github.com/fairwindsops/pluto/v5/pkg/discovery-api" - "github.com/fairwindsops/pluto/v5/pkg/finder" - "github.com/fairwindsops/pluto/v5/pkg/helm" - "github.com/rogpeppe/go-internal/semver" + "golang.org/x/mod/semver" + "github.com/fairwindsops/pluto/pkg/api" + discoveryapi "github.com/fairwindsops/pluto/pkg/discovery-api" + "github.com/fairwindsops/pluto/pkg/finder" + "github.com/fairwindsops/pluto/pkg/helm" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" diff --git a/go.mod b/go.mod index fde13225..365981ae 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.21 require ( github.com/fairwindsops/pluto/v5 v5.18.4 github.com/olekukonko/tablewriter v0.0.5 - github.com/rogpeppe/go-internal v1.11.0 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.17.0 @@ -62,6 +61,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rivo/uniseg v0.4.4 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rubenv/sql-migrate v1.5.2 // indirect github.com/sagikazarmark/locafero v0.3.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect diff --git a/pkg/discovery-api/discovery_api.go b/pkg/discovery-api/discovery_api.go index e8f9f265..1bade78e 100644 --- a/pkg/discovery-api/discovery_api.go +++ b/pkg/discovery-api/discovery_api.go @@ -40,8 +40,8 @@ import ( "k8s.io/client-go/rest" "k8s.io/klog/v2" - "github.com/fairwindsops/pluto/v5/pkg/api" - "github.com/fairwindsops/pluto/v5/pkg/kube" + "github.com/fairwindsops/pluto/pkg/api" + "github.com/fairwindsops/pluto/pkg/kube" ) // DiscoveryClient is the declaration to hold objects needed for client-go/discovery. diff --git a/pkg/finder/finder.go b/pkg/finder/finder.go index 6cfe59d5..e1aefed8 100644 --- a/pkg/finder/finder.go +++ b/pkg/finder/finder.go @@ -35,7 +35,7 @@ import ( "k8s.io/klog/v2" - "github.com/fairwindsops/pluto/v5/pkg/api" + "github.com/fairwindsops/pluto/pkg/api" ) // Dir is the finder dirlication diff --git a/pkg/finder/finder_test.go b/pkg/finder/finder_test.go index 7326e86a..eae40ab3 100644 --- a/pkg/finder/finder_test.go +++ b/pkg/finder/finder_test.go @@ -32,7 +32,7 @@ import ( "os" "testing" - "github.com/fairwindsops/pluto/v5/pkg/api" + "github.com/fairwindsops/pluto/pkg/api" "github.com/stretchr/testify/assert" ) diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index c0444178..c715ef0c 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -42,8 +42,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - "github.com/fairwindsops/pluto/v5/pkg/api" - "github.com/fairwindsops/pluto/v5/pkg/kube" + "github.com/fairwindsops/pluto/pkg/api" + "github.com/fairwindsops/pluto/pkg/kube" ) // Helm represents all current releases that we can find in the cluster diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go index e388c79e..9a407119 100644 --- a/pkg/helm/helm_test.go +++ b/pkg/helm/helm_test.go @@ -32,8 +32,8 @@ import ( "context" "testing" - "github.com/fairwindsops/pluto/v5/pkg/api" - "github.com/fairwindsops/pluto/v5/pkg/kube" + "github.com/fairwindsops/pluto/pkg/api" + "github.com/fairwindsops/pluto/pkg/kube" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -45,10 +45,10 @@ import ( var kubeClient *kube.Kube func getMockConfigInstance() *kube.Kube { - kubeClient = &kube.Kube{ - Client: testclient.NewSimpleClientset(), - } - return kubeClient + kubeClient = &kube.Kube{ + Client: testclient.NewSimpleClientset(), + } + return kubeClient } var (