Skip to content

Commit

Permalink
[refactor] Update typeid import refs (#335)
Browse files Browse the repository at this point in the history
## Summary

typeid module name has been changed. Some dependencies have the new name
and some have the old one.

This updates most references. There's a few indirect ones that are still
showing up due to go mod tidy. I think once we public the new repos and
I repeat this step, the existing old references will go away.

## How was it tested?

builds, lints, etc.
  • Loading branch information
mikeland73 authored Jun 4, 2024
1 parent e9e1e85 commit 14d6538
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/samber/lo v1.39.0
github.com/spf13/cobra v1.8.0
go.jetify.com/typeid v1.1.0
go.jetpack.io/pkg v0.0.0-20240410183543-3f8b533312f1
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2
golang.org/x/text v0.14.0
)

Expand Down Expand Up @@ -62,6 +62,7 @@ require (
github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.jetify.com/typeid v1.1.0 h1:eRW/BBYx1Kh3DiOKBLaAHbwomxK4jm4/tWuNshN5wXY=
go.jetify.com/typeid v1.1.0/go.mod h1:68KXnMPJvJi4Pf2vUhr1QtWo5LfXzMwbUdLfwPlO4jI=
go.jetpack.io/pkg v0.0.0-20240410183543-3f8b533312f1 h1:nrUUQH8h8YVTmGnyrzEYBrVzGVivx7R0TsxdFXGDtC4=
go.jetpack.io/pkg v0.0.0-20240410183543-3f8b533312f1/go.mod h1:Y6IKqfaUudnvrYYLXpGCn5DWRmluWfdD5r51pTKgBzs=
go.jetpack.io/typeid v1.0.1-0.20240410183543-96a4fd53d1e2 h1:w9uWg8BAim374iWzxEuDhf6MJ/cMQVR/0xi/L3DgfT0=
Expand Down
2 changes: 1 addition & 1 deletion internal/flow/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (

"github.com/AlecAivazis/survey/v2"
"github.com/fatih/color"
"go.jetify.com/typeid"
"go.jetpack.io/envsec/internal/git"
"go.jetpack.io/pkg/api"
membersv1alpha1 "go.jetpack.io/pkg/api/gen/priv/members/v1alpha1"
projectsv1alpha1 "go.jetpack.io/pkg/api/gen/priv/projects/v1alpha1"
"go.jetpack.io/pkg/auth/session"
"go.jetpack.io/pkg/id"
"go.jetpack.io/typeid"
)

// flow:
Expand Down
2 changes: 1 addition & 1 deletion pkg/envcli/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (

"github.com/pkg/errors"
"github.com/spf13/cobra"
"go.jetify.com/typeid"
"go.jetpack.io/envsec/internal/build"
"go.jetpack.io/envsec/pkg/envsec"
"go.jetpack.io/envsec/pkg/stores/jetstore"
"go.jetpack.io/envsec/pkg/stores/ssmstore"
"go.jetpack.io/pkg/envvar"
"go.jetpack.io/pkg/id"
"go.jetpack.io/typeid"
)

// to be composed into xyzCmdFlags structs
Expand Down
2 changes: 1 addition & 1 deletion pkg/envsec/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"os"
"path/filepath"

"go.jetify.com/typeid"
"go.jetpack.io/envsec/internal/flow"
"go.jetpack.io/envsec/internal/git"
"go.jetpack.io/pkg/api"
"go.jetpack.io/pkg/id"
"go.jetpack.io/typeid"
)

var (
Expand Down

0 comments on commit 14d6538

Please sign in to comment.