Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v14] Remove direct dependency on github.com/hashicorp/go-version #43744

Merged
merged 1 commit into from
Jul 2, 2024
Merged

[v14] Remove direct dependency on github.com/hashicorp/go-version #43744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ linters-settings:
desc: 'use "github.com/sirupsen/logrus" instead'
- pkg: go.uber.org/atomic
desc: 'use "sync/atomic" instead'
- pkg: golang.design
desc: 'experimental project, not to be confused with official Go packages'
- pkg: github.com/hashicorp/go-version
desc: 'use "golang.org/x/mod/semver" or "coreos/go-semver/semver" instead'
gci:
sections:
- standard # Standard section: captures all standard packages.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ require (
github.com/gravitational/ttlmap v0.0.0-20171116003245-91fd36b9004c
github.com/grpc-ecosystem/go-grpc-middleware/providers/openmetrics/v2 v2.0.0-rc.3
github.com/guptarohit/asciigraph v0.5.6
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/golang-lru/v2 v2.0.6
github.com/icza/mjpeg v0.0.0-20220812133530-f79265a232f2
github.com/jackc/pgconn v1.14.3
Expand Down Expand Up @@ -332,6 +331,7 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand Down
3 changes: 2 additions & 1 deletion integrations/access/common/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/gravitational/teleport/integrations/access/common/teleport"
"github.com/gravitational/teleport/integrations/lib"
"github.com/gravitational/teleport/integrations/lib/logger"
"github.com/gravitational/teleport/lib/utils"
)

const (
Expand Down Expand Up @@ -94,7 +95,7 @@ func (a *BaseApp) checkTeleportVersion(ctx context.Context) (proto.PingResponse,
}
return pong, trace.Wrap(err, "Unable to get Teleport server version")
}
err = lib.AssertServerVersion(pong, minServerVersion)
err = utils.CheckVersion(pong.ServerVersion, minServerVersion)
return pong, trace.Wrap(err)
}

Expand Down
3 changes: 2 additions & 1 deletion integrations/access/jira/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/gravitational/teleport/integrations/lib/backoff"
"github.com/gravitational/teleport/integrations/lib/logger"
"github.com/gravitational/teleport/integrations/lib/watcherjob"
"github.com/gravitational/teleport/lib/utils"
)

const (
Expand Down Expand Up @@ -233,7 +234,7 @@ func (a *App) checkTeleportVersion(ctx context.Context) (proto.PingResponse, err
log.Error("Unable to get Teleport server version")
return pong, trace.Wrap(err)
}
err = lib.AssertServerVersion(pong, minServerVersion)
err = utils.CheckVersion(pong.ServerVersion, minServerVersion)
return pong, trace.Wrap(err)
}

Expand Down
3 changes: 2 additions & 1 deletion integrations/access/opsgenie/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/gravitational/teleport/integrations/lib/backoff"
"github.com/gravitational/teleport/integrations/lib/logger"
"github.com/gravitational/teleport/integrations/lib/watcherjob"
"github.com/gravitational/teleport/lib/utils"
)

const (
Expand Down Expand Up @@ -168,7 +169,7 @@ func (a *App) checkTeleportVersion(ctx context.Context) (proto.PingResponse, err
log.Error("Unable to get Teleport server version")
return pong, trace.Wrap(err)
}
err = lib.AssertServerVersion(pong, minServerVersion)
err = utils.CheckVersion(pong.ServerVersion, minServerVersion)
return pong, trace.Wrap(err)
}

Expand Down
3 changes: 2 additions & 1 deletion integrations/access/pagerduty/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/gravitational/teleport/integrations/lib/backoff"
"github.com/gravitational/teleport/integrations/lib/logger"
"github.com/gravitational/teleport/integrations/lib/watcherjob"
"github.com/gravitational/teleport/lib/utils"
)

const (
Expand Down Expand Up @@ -186,7 +187,7 @@ func (a *App) checkTeleportVersion(ctx context.Context) (proto.PingResponse, err
log.Error("Unable to get Teleport server version")
return pong, trace.Wrap(err)
}
err = lib.AssertServerVersion(pong, minServerVersion)
err = utils.CheckVersion(pong.ServerVersion, minServerVersion)
return pong, trace.Wrap(err)
}

Expand Down
3 changes: 2 additions & 1 deletion integrations/access/servicenow/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/gravitational/teleport/integrations/lib/backoff"
"github.com/gravitational/teleport/integrations/lib/logger"
"github.com/gravitational/teleport/integrations/lib/watcherjob"
"github.com/gravitational/teleport/lib/utils"
)

const (
Expand Down Expand Up @@ -180,7 +181,7 @@ func (a *App) checkTeleportVersion(ctx context.Context) (proto.PingResponse, err
log.Error("Unable to get Teleport server version")
return pong, trace.Wrap(err)
}
err = lib.AssertServerVersion(pong, minServerVersion)
err = utils.CheckVersion(pong.ServerVersion, minServerVersion)
return pong, trace.Wrap(err)
}

Expand Down
12 changes: 6 additions & 6 deletions integrations/lib/testing/integration/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"sync"
"time"

"github.com/coreos/go-semver/semver"
"github.com/gravitational/trace"
"github.com/hashicorp/go-version"
"google.golang.org/grpc"

"github.com/gravitational/teleport/api/client"
Expand All @@ -47,7 +47,7 @@ import (
const IntegrationAdminRole = "integration-admin"
const DefaultLicensePath = "/var/lib/teleport/license.pem"

var regexpVersion = regexp.MustCompile(`^Teleport( Enterprise)? ([^ ]+)`)
var regexpVersion = regexp.MustCompile(`^Teleport( Enterprise)? v([^ ]+)`)

type Integration struct {
mu sync.Mutex
Expand Down Expand Up @@ -85,7 +85,7 @@ type Service interface {
}

type Version struct {
*version.Version
*semver.Version
IsEnterprise bool
}

Expand All @@ -97,12 +97,12 @@ type SignTLSPaths struct {

const serviceShutdownTimeout = 10 * time.Second

func requireBinaryVersion(ctx context.Context, path string, targetVersion *version.Version) error {
func requireBinaryVersion(ctx context.Context, path string, targetVersion *semver.Version) error {
v, err := getBinaryVersion(ctx, path)
if err != nil {
return trace.Wrap(err, "failed to get %s version", filepath.Base(path))
}
if !targetVersion.Equal(v.Version) {
if !targetVersion.Equal(*v.Version) {
return trace.Errorf("%s version %s does not match target version %s", filepath.Base(path), v.Version, targetVersion)
}

Expand Down Expand Up @@ -522,7 +522,7 @@ func getBinaryVersion(ctx context.Context, binaryPath string) (Version, error) {
return Version{}, trace.Wrap(err)
}

version, err := version.NewVersion(submatch[2])
version, err := semver.NewVersion(submatch[2])
if err != nil {
return Version{}, trace.Wrap(err)
}
Expand Down
39 changes: 0 additions & 39 deletions integrations/lib/versions.go
View file
Open in desktop

This file was deleted.

Loading