Skip to content

Commit 8ba60a7

Browse files
loretoloreto
authored
Replace go.jetpack.io with go.jetify.com (#435)
## Community Contribution License All community contributions in this pull request are licensed to the project maintainers under the terms of the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0). By creating this pull request I represent that I have the right to license the contributions to the project maintainers under the Apache 2 license. ## Summary Migrate to go.jetify.com in the opensource repo. As expected, after I merge this in, everything will break ... but I need to check it in first, before I can update all the go.mods. Plan is as follows: - [ ] Merge this PR - [ ] Run go tidy inside opensource - [ ] Update imports in axiom, and run go tidy - [ ] Bump major version of any opensource packages we are officially releasing (like typeid). If we're not doing tagged releases, I'm gonna assume people shouldn't be depending directly on HEAD, so I'm ok breaking there. ## How was it tested? Wasn't.
1 parent 8781948 commit 8ba60a7

File tree

84 files changed

+135
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+135
-135
lines changed

‎api/buf.gen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ managed:
55
enabled: true
66
override:
77
- file_option: go_package_prefix
8-
value: go.jetpack.io/axiom/api/gen
8+
value: go.jetify.com/axiom/api/gen
99
inputs:
1010
- directory: proto
1111
- module: buf.build/googleapis/googleapis

‎api/go/gen/pub/sandbox/v1alpha1/sandboxv1alpha1connect/sandbox.connect.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎devbox.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"shell": {
66
"scripts": {
77
"update-internal-deps": [
8-
"for_each_gomod go get -u go.jetpack.io/pkg@main go.jetify.com/typeid@main || true",
8+
"for_each_gomod go get -u go.jetify.com/pkg@main go.jetify.com/typeid@main || true",
99
"devbox run tidy"
1010
]
1111
}

‎envsec/.goreleaser.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ builds:
1212
mod_timestamp: "{{ .CommitTimestamp }}" # For reproducible builds
1313
ldflags:
1414
- -s -w # Strip debug
15-
- -X go.jetpack.io/envsec/internal/build.Version={{.Version}}
16-
- -X go.jetpack.io/envsec/internal/build.Commit={{.Commit}}
17-
- -X go.jetpack.io/envsec/internal/build.CommitDate={{.CommitDate}}
15+
- -X go.jetify.com/envsec/internal/build.Version={{.Version}}
16+
- -X go.jetify.com/envsec/internal/build.Commit={{.Commit}}
17+
- -X go.jetify.com/envsec/internal/build.CommitDate={{.CommitDate}}
1818
env:
1919
- CGO_ENABLED=0
2020
- GO111MODULE=on

‎envsec/cmd/envsec/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"os"
99

10-
"go.jetpack.io/envsec/pkg/envcli"
10+
"go.jetify.com/envsec/pkg/envcli"
1111
)
1212

1313
func main() {

‎envsec/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module go.jetpack.io/envsec
1+
module go.jetify.com/envsec
22

33
go 1.23
44

@@ -24,7 +24,7 @@ require (
2424
github.com/samber/lo v1.39.0
2525
github.com/spf13/cobra v1.8.0
2626
go.jetify.com/typeid v1.3.1-0.20241211224430-39758d55f188
27-
go.jetpack.io/pkg v0.0.0-20250222021558-d8c54e43d747
27+
go.jetify.com/pkg v0.0.0-20250222021558-d8c54e43d747
2828
golang.org/x/text v0.14.0
2929
)
3030

‎envsec/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8
141141
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
142142
go.jetify.com/typeid v1.3.1-0.20241211224430-39758d55f188 h1:gLbyaE7KA2/qqUSw5j9RweZ2tZvM4nSVOCFXrWSPo7c=
143143
go.jetify.com/typeid v1.3.1-0.20241211224430-39758d55f188/go.mod h1:Qlbkqu/YQVknz7AhsKUnDJDmOfKR6G/YUiEbxt12PXY=
144-
go.jetpack.io/pkg v0.0.0-20250222021558-d8c54e43d747 h1:RZx7SBvb3WTYVPQpVahDdZkphHAkEZV+GkYStkatPG4=
145-
go.jetpack.io/pkg v0.0.0-20250222021558-d8c54e43d747/go.mod h1:YpbOzlAy8v8lUKOKIx/FrqBmiVzNt8J6HSFeleMLeYw=
144+
go.jetify.com/pkg v0.0.0-20250222021558-d8c54e43d747 h1:RZx7SBvb3WTYVPQpVahDdZkphHAkEZV+GkYStkatPG4=
145+
go.jetify.com/pkg v0.0.0-20250222021558-d8c54e43d747/go.mod h1:YpbOzlAy8v8lUKOKIx/FrqBmiVzNt8J6HSFeleMLeYw=
146146
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
147147
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
148148
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=

‎envsec/internal/flow/init.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111

1212
"github.com/AlecAivazis/survey/v2"
1313
"github.com/fatih/color"
14+
"go.jetify.com/envsec/internal/git"
15+
"go.jetify.com/pkg/api"
16+
membersv1alpha1 "go.jetify.com/pkg/api/gen/priv/members/v1alpha1"
17+
projectsv1alpha1 "go.jetify.com/pkg/api/gen/priv/projects/v1alpha1"
18+
"go.jetify.com/pkg/auth/session"
19+
"go.jetify.com/pkg/id"
1420
"go.jetify.com/typeid"
15-
"go.jetpack.io/envsec/internal/git"
16-
"go.jetpack.io/pkg/api"
17-
membersv1alpha1 "go.jetpack.io/pkg/api/gen/priv/members/v1alpha1"
18-
projectsv1alpha1 "go.jetpack.io/pkg/api/gen/priv/projects/v1alpha1"
19-
"go.jetpack.io/pkg/auth/session"
20-
"go.jetpack.io/pkg/id"
2121
)
2222

2323
// flow:

‎envsec/pkg/awsfed/awsfed.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
"github.com/aws/aws-sdk-go-v2/service/cognitoidentity"
1010
"github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types"
11-
"go.jetpack.io/pkg/auth/session"
12-
"go.jetpack.io/pkg/envvar"
13-
"go.jetpack.io/pkg/filecache"
11+
"go.jetify.com/pkg/auth/session"
12+
"go.jetify.com/pkg/envvar"
13+
"go.jetify.com/pkg/filecache"
1414
)
1515

1616
const cacheKeyPrefix = "awsfed"

‎envsec/pkg/envcli/auth.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"os"
99

1010
"github.com/spf13/cobra"
11-
"go.jetpack.io/envsec/internal/build"
12-
"go.jetpack.io/pkg/auth"
13-
"go.jetpack.io/pkg/envvar"
11+
"go.jetify.com/envsec/internal/build"
12+
"go.jetify.com/pkg/auth"
13+
"go.jetify.com/pkg/envvar"
1414
)
1515

1616
func authCmd() *cobra.Command {

‎envsec/pkg/envcli/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package envcli
66
import (
77
"github.com/pkg/errors"
88
"github.com/spf13/cobra"
9-
"go.jetpack.io/envsec/pkg/envsec"
9+
"go.jetify.com/envsec/pkg/envsec"
1010
)
1111

1212
type downloadCmdFlags struct {

‎envsec/pkg/envcli/flags.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"github.com/pkg/errors"
1111
"github.com/spf13/cobra"
1212
"go.jetify.com/typeid"
13-
"go.jetpack.io/envsec/internal/build"
14-
"go.jetpack.io/envsec/pkg/envsec"
15-
"go.jetpack.io/envsec/pkg/stores/jetstore"
16-
"go.jetpack.io/envsec/pkg/stores/ssmstore"
17-
"go.jetpack.io/pkg/envvar"
18-
"go.jetpack.io/pkg/id"
13+
"go.jetify.com/envsec/internal/build"
14+
"go.jetify.com/envsec/pkg/envsec"
15+
"go.jetify.com/envsec/pkg/stores/jetstore"
16+
"go.jetify.com/envsec/pkg/stores/ssmstore"
17+
"go.jetify.com/pkg/envvar"
18+
"go.jetify.com/pkg/id"
1919
)
2020

2121
// to be composed into xyzCmdFlags structs

‎envsec/pkg/envcli/init.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"os"
55

66
"github.com/spf13/cobra"
7-
"go.jetpack.io/envsec/internal/build"
8-
"go.jetpack.io/envsec/pkg/envsec"
9-
"go.jetpack.io/pkg/envvar"
7+
"go.jetify.com/envsec/internal/build"
8+
"go.jetify.com/envsec/pkg/envsec"
9+
"go.jetify.com/pkg/envvar"
1010
)
1111

1212
type initCmdFlags struct {

‎envsec/pkg/envcli/ls.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package envcli
55

66
import (
77
"github.com/spf13/cobra"
8-
"go.jetpack.io/envsec/pkg/envsec"
8+
"go.jetify.com/envsec/pkg/envsec"
99
)
1010

1111
const environmentFlagName = "environment"

‎envsec/pkg/envcli/set.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package envcli
66
import (
77
"github.com/pkg/errors"
88
"github.com/spf13/cobra"
9-
"go.jetpack.io/envsec/pkg/envsec"
9+
"go.jetify.com/envsec/pkg/envsec"
1010
)
1111

1212
type setCmdFlags struct {

‎envsec/pkg/envcli/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package envcli
55

66
import (
77
"github.com/spf13/cobra"
8-
"go.jetpack.io/envsec/pkg/envsec"
8+
"go.jetify.com/envsec/pkg/envsec"
99
)
1010

1111
type uploadCmdFlags struct {

‎envsec/pkg/envcli/usage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package envcli
66
import (
77
"github.com/MakeNowJust/heredoc"
88
"github.com/spf13/cobra"
9-
"go.jetpack.io/envsec/internal/tux"
9+
"go.jetify.com/envsec/internal/tux"
1010
)
1111

1212
// TODO: move to file

‎envsec/pkg/envcli/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"runtime"
99

1010
"github.com/spf13/cobra"
11-
"go.jetpack.io/envsec/internal/build"
11+
"go.jetify.com/envsec/internal/build"
1212
)
1313

1414
type versionFlags struct {

‎envsec/pkg/envsec/auth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"io"
77

8-
"go.jetpack.io/pkg/api"
9-
"go.jetpack.io/pkg/auth"
8+
"go.jetify.com/pkg/api"
9+
"go.jetify.com/pkg/auth"
1010
)
1111

1212
func (e *Envsec) AuthClient() (*auth.Client, error) {

‎envsec/pkg/envsec/delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"strings"
66

7-
"go.jetpack.io/envsec/internal/tux"
7+
"go.jetify.com/envsec/internal/tux"
88
)
99

1010
func (e *Envsec) DeleteAll(ctx context.Context, envNames ...string) error {

‎envsec/pkg/envsec/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/joho/godotenv"
1212
"github.com/pkg/errors"
13-
"go.jetpack.io/envsec/internal/tux"
13+
"go.jetify.com/envsec/internal/tux"
1414
)
1515

1616
// Download downloads the environment variables for the environment specified.

‎envsec/pkg/envsec/envsec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"io"
66

7-
"go.jetpack.io/pkg/auth/session"
7+
"go.jetify.com/pkg/auth/session"
88
)
99

1010
type Envsec struct {

‎envsec/pkg/envsec/init.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"path/filepath"
99

1010
"go.jetify.com/typeid"
11-
"go.jetpack.io/envsec/internal/flow"
12-
"go.jetpack.io/envsec/internal/git"
13-
"go.jetpack.io/pkg/api"
14-
"go.jetpack.io/pkg/id"
11+
"go.jetify.com/envsec/internal/flow"
12+
"go.jetify.com/envsec/internal/git"
13+
"go.jetify.com/pkg/api"
14+
"go.jetify.com/pkg/id"
1515
)
1616

1717
var (

‎envsec/pkg/envsec/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/olekukonko/tablewriter"
1111
"github.com/pkg/errors"
12-
"go.jetpack.io/envsec/internal/tux"
12+
"go.jetify.com/envsec/internal/tux"
1313
)
1414

1515
func (e *Envsec) List(ctx context.Context) ([]EnvVar, error) {

‎envsec/pkg/envsec/projects.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"io"
66

77
"connectrpc.com/connect"
8-
"go.jetpack.io/envsec/internal/tux"
9-
"go.jetpack.io/pkg/api"
10-
v1alpha1 "go.jetpack.io/pkg/api/gen/priv/projects/v1alpha1"
8+
"go.jetify.com/envsec/internal/tux"
9+
"go.jetify.com/pkg/api"
10+
v1alpha1 "go.jetify.com/pkg/api/gen/priv/projects/v1alpha1"
1111
)
1212

1313
func (e *Envsec) DescribeCurrentProject(

‎envsec/pkg/envsec/set.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/pkg/errors"
1010
"github.com/samber/lo"
11-
"go.jetpack.io/envsec/internal/tux"
11+
"go.jetify.com/envsec/internal/tux"
1212
)
1313

1414
func (e *Envsec) Set(ctx context.Context, name string, value string) error {

‎envsec/pkg/envsec/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"errors"
66

7-
"go.jetpack.io/pkg/auth/session"
7+
"go.jetify.com/pkg/auth/session"
88
)
99

1010
// Uniquely identifies an environment in which we store environment variables.

‎envsec/pkg/envsec/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/joho/godotenv"
1010
"github.com/pkg/errors"
11-
"go.jetpack.io/pkg/fileutil"
11+
"go.jetify.com/pkg/fileutil"
1212
)
1313

1414
// Upload uploads the environment variables for the environment specified from

‎envsec/pkg/stores/jetstore/jetstore.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55

66
"connectrpc.com/connect"
7-
"go.jetpack.io/envsec/pkg/envsec"
8-
"go.jetpack.io/pkg/api"
9-
secretsv1alpha1 "go.jetpack.io/pkg/api/gen/priv/secrets/v1alpha1"
10-
"go.jetpack.io/pkg/api/gen/priv/secrets/v1alpha1/secretsv1alpha1connect"
11-
"go.jetpack.io/pkg/auth/session"
7+
"go.jetify.com/envsec/pkg/envsec"
8+
"go.jetify.com/pkg/api"
9+
secretsv1alpha1 "go.jetify.com/pkg/api/gen/priv/secrets/v1alpha1"
10+
"go.jetify.com/pkg/api/gen/priv/secrets/v1alpha1/secretsv1alpha1connect"
11+
"go.jetify.com/pkg/auth/session"
1212
)
1313

1414
type JetpackAPIStore struct {

‎envsec/pkg/stores/ssmstore/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ssmstore
33
import (
44
"path"
55

6-
"go.jetpack.io/envsec/pkg/envsec"
6+
"go.jetify.com/envsec/pkg/envsec"
77
)
88

99
const pathPrefix = "/jetpack-data/env"

‎envsec/pkg/stores/ssmstore/parameter_store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/hashicorp/go-multierror"
1717
"github.com/pkg/errors"
1818
"github.com/samber/lo"
19-
"go.jetpack.io/envsec/pkg/envsec"
19+
"go.jetify.com/envsec/pkg/envsec"
2020
"golang.org/x/text/collate"
2121
"golang.org/x/text/language"
2222
)

‎envsec/pkg/stores/ssmstore/ssmstore.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/hashicorp/go-multierror"
1212
"github.com/pkg/errors"
1313
"github.com/samber/lo"
14-
"go.jetpack.io/envsec/pkg/awsfed"
15-
"go.jetpack.io/envsec/pkg/envsec"
16-
"go.jetpack.io/pkg/auth/session"
14+
"go.jetify.com/envsec/pkg/awsfed"
15+
"go.jetify.com/envsec/pkg/envsec"
16+
"go.jetify.com/pkg/auth/session"
1717
)
1818

1919
type SSMStore struct {

‎pkg/api/buf.gen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: v1
22
managed:
33
enabled: true
44
go_package_prefix:
5-
default: go.jetpack.io/pkg/api/gen
5+
default: go.jetify.com/pkg/api/gen
66

77
plugins:
88
- plugin: go

‎pkg/api/client.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"context"
55
"sync"
66

7-
"go.jetpack.io/pkg/api/gen/priv/members/v1alpha1/membersv1alpha1connect"
8-
"go.jetpack.io/pkg/api/gen/priv/nix/v1alpha1/nixv1alpha1connect"
9-
"go.jetpack.io/pkg/api/gen/priv/projects/v1alpha1/projectsv1alpha1connect"
10-
"go.jetpack.io/pkg/api/gen/priv/secrets/v1alpha1/secretsv1alpha1connect"
11-
"go.jetpack.io/pkg/api/gen/priv/tokenservice/v1alpha1/tokenservicev1alpha1connect"
12-
"go.jetpack.io/pkg/auth/session"
7+
"go.jetify.com/pkg/api/gen/priv/members/v1alpha1/membersv1alpha1connect"
8+
"go.jetify.com/pkg/api/gen/priv/nix/v1alpha1/nixv1alpha1connect"
9+
"go.jetify.com/pkg/api/gen/priv/projects/v1alpha1/projectsv1alpha1connect"
10+
"go.jetify.com/pkg/api/gen/priv/secrets/v1alpha1/secretsv1alpha1connect"
11+
"go.jetify.com/pkg/api/gen/priv/tokenservice/v1alpha1/tokenservicev1alpha1connect"
12+
"go.jetify.com/pkg/auth/session"
1313
"golang.org/x/oauth2"
1414
)
1515

‎pkg/api/gen/priv/members/v1alpha1/members.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)