Skip to content

Commit

Permalink
enable semantic import versioning for go mod compat (databus23#233)
Browse files Browse the repository at this point in the history
  • Loading branch information
tariq1890 authored Aug 15, 2020
1 parent c97f9dd commit fde6d08
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 103 deletions.
4 changes: 2 additions & 2 deletions cmd/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"

"github.com/databus23/helm-diff/diff"
"github.com/databus23/helm-diff/manifest"
"github.com/databus23/helm-diff/v3/diff"
"github.com/databus23/helm-diff/v3/manifest"
)

type release struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/revision.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"

"github.com/databus23/helm-diff/diff"
"github.com/databus23/helm-diff/manifest"
"github.com/databus23/helm-diff/v3/diff"
"github.com/databus23/helm-diff/v3/manifest"
)

type revision struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/rollback.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"

"github.com/databus23/helm-diff/diff"
"github.com/databus23/helm-diff/manifest"
"github.com/databus23/helm-diff/v3/diff"
"github.com/databus23/helm-diff/v3/manifest"
)

type rollback struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/helm/pkg/helm"

"github.com/databus23/helm-diff/diff"
"github.com/databus23/helm-diff/manifest"
"github.com/databus23/helm-diff/v3/diff"
"github.com/databus23/helm-diff/v3/manifest"
)

type diffCmd struct {
Expand Down
2 changes: 1 addition & 1 deletion diff/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/client-go/kubernetes/scheme"

"github.com/databus23/helm-diff/manifest"
"github.com/databus23/helm-diff/v3/manifest"
)

// Manifests diff on manifests
Expand Down
2 changes: 1 addition & 1 deletion diff/diff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/mgutz/ansi"
"github.com/stretchr/testify/require"

"github.com/databus23/helm-diff/manifest"
"github.com/databus23/helm-diff/v3/manifest"
)

var text1 = "" +
Expand Down
17 changes: 2 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/databus23/helm-diff
module github.com/databus23/helm-diff/v3

go 1.14

Expand All @@ -10,14 +10,8 @@ require (
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/ghodss/yaml v1.0.0
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.1 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
github.com/mitchellh/copystructure v1.0.0 // indirect
Expand All @@ -26,17 +20,10 @@ require (
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
golang.org/x/text v0.3.3 // indirect
google.golang.org/genproto v0.0.0-20200726014623-da3ae01ef02d // indirect
google.golang.org/grpc v1.30.0
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.6
k8s.io/apimachinery v0.18.6
k8s.io/client-go v11.0.0+incompatible
k8s.io/client-go v0.18.6
k8s.io/helm v2.16.9+incompatible
)
130 changes: 54 additions & 76 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/databus23/helm-diff/cmd"
"github.com/databus23/helm-diff/v3/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion manifest/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/require"

. "github.com/databus23/helm-diff/manifest"
. "github.com/databus23/helm-diff/v3/manifest"
)

func foundObjects(result map[string]*MappingResult) []string {
Expand Down

0 comments on commit fde6d08

Please sign in to comment.