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.

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

Update vanity URL #312

Merged
merged 2 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builds:
- -trimpath

ldflags:
- -X github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version.Version={{ .Version }}
- -X carvel.dev/vendir/pkg/vendir/version.Version={{ .Version }}

archives:
- format: binary
Expand Down
2 changes: 1 addition & 1 deletion cmd/vendir/vendir.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"os"
"time"

"carvel.dev/vendir/pkg/vendir/cmd"
uierrs "github.com/cppforlife/go-cli-ui/errors"
"github.com/cppforlife/go-cli-ui/ui"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module github.com/vmware-tanzu/carvel-vendir
module carvel.dev/vendir

go 1.21

require (
carvel.dev/imgpkg v0.39.0
github.com/bmatcuk/doublestar v1.2.1
github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695
github.com/cppforlife/cobrautil v0.0.0-20221021151949-d60711905d65
Expand All @@ -17,7 +18,6 @@ require (
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
github.com/vmware-tanzu/carvel-imgpkg v0.38.2
golang.org/x/crypto v0.14.0
golang.org/x/oauth2 v0.8.0
golang.org/x/tools v0.12.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
carvel.dev/imgpkg v0.39.0 h1:faaWTLGo+CyhryyihSfSQpMoE5eHJDI1eloRbmCy7gM=
carvel.dev/imgpkg v0.39.0/go.mod h1:7aFGpUJsheXAZ8/fXMiMwU4pKXafS/ddLRjTHW9fMx8=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds=
cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
Expand Down Expand Up @@ -335,8 +337,6 @@ github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RV
github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=
github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs=
github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA=
github.com/vmware-tanzu/carvel-imgpkg v0.38.2 h1:fSeYT7TbLV6P2JcfLW6MF9miNVJaEDpV3gfLxpZA6nA=
github.com/vmware-tanzu/carvel-imgpkg v0.38.2/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
Expand Down
2 changes: 1 addition & 1 deletion hack/build-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ VERSION="${1:-`get_latest_git_tag`}"

# makes builds reproducible
export CGO_ENABLED=0
LDFLAGS="-X github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version.Version=$VERSION"
LDFLAGS="-X carvel.dev/vendir/pkg/vendir/version.Version=$VERSION"
repro_flags="-trimpath -mod=vendor"


Expand Down
2 changes: 1 addition & 1 deletion hack/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ VERSION="${1:-0.0.0+develop}"

# makes builds reproducible
export CGO_ENABLED=0
LDFLAGS="-X github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version.Version=$VERSION"
LDFLAGS="-X carvel.dev/vendir/pkg/vendir/version.Version=$VERSION"
repro_flags="-trimpath -mod=vendor"

go mod vendor
Expand Down
6 changes: 3 additions & 3 deletions hack/gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ set -e -x

# Based on vendor/k8s.io/code-generator/generate-groups.sh
go run vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go \
--input-dirs github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1 \
--input-dirs carvel.dev/vendir/pkg/vendir/versions/v1alpha1 \
-O zz_generated.deepcopy \
--bounding-dirs github.com/vmware-tanzu/carvel-vendir/pkg/vendir \
--bounding-dirs carvel.dev/vendir/pkg/vendir \
--go-header-file ./hack/gen-boilerplate.txt

# Install protoc binary as directed by https://github.com/gogo/protobuf#installation
Expand All @@ -28,7 +28,7 @@ export PATH=$PWD/tmp/gen-apiserver-bin/:$PATH

go run vendor/k8s.io/code-generator/cmd/go-to-protobuf/main.go \
--proto-import vendor \
--packages "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" \
--packages "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" \
--go-header-file ./hack/gen-boilerplate.txt

# TODO It seems that above command messes around with protos in vendor directory
Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/cmd/sort_semver.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package cmd
import (
"strings"

ctlver "carvel.dev/vendir/pkg/vendir/versions"
"carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
"github.com/cppforlife/go-cli-ui/ui"
uitable "github.com/cppforlife/go-cli-ui/ui/table"
"github.com/spf13/cobra"
ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
)

type SortSemverOptions struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/vendir/cmd/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"path/filepath"
"strings"

ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctldir "carvel.dev/vendir/pkg/vendir/directory"
ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache"
"github.com/cppforlife/go-cli-ui/ui"
"github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctldir "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/directory"
ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/cmd/vendir.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package cmd
import (
"io"

"carvel.dev/vendir/pkg/vendir/version"
"github.com/cppforlife/cobrautil"
"github.com/cppforlife/go-cli-ui/ui"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version"
)

type VendirOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package cmd
import (
"fmt"

"carvel.dev/vendir/pkg/vendir/version"
"github.com/cppforlife/go-cli-ui/ui"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version"
)

type VersionOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"reflect"
"strings"

"carvel.dev/vendir/pkg/vendir/version"
semver "github.com/hashicorp/go-version"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version"
"sigs.k8s.io/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"path/filepath"
"testing"

"carvel.dev/vendir/pkg/vendir/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
)

func TestEmptyLineStartsConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/config/directory.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"strings"

ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
ctlver "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/config/dockerconfigjson_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package config_test
import (
"testing"

. "carvel.dev/vendir/pkg/vendir/config"
"github.com/stretchr/testify/require"
. "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
)

func TestSecretToRegistryAuthSecretsNoop(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/config/lock_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"path/filepath"
"testing"

"carvel.dev/vendir/pkg/vendir/config"
"github.com/stretchr/testify/require"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
)

func TestNewLockConfigFromBytes(t *testing.T) {
Expand Down
22 changes: 11 additions & 11 deletions pkg/vendir/directory/directory.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ import (
"path/filepath"
"sigs.k8s.io/yaml"

ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
ctlcache "carvel.dev/vendir/pkg/vendir/fetch/cache"
ctlgit "carvel.dev/vendir/pkg/vendir/fetch/git"
ctlghr "carvel.dev/vendir/pkg/vendir/fetch/githubrelease"
ctlhelmc "carvel.dev/vendir/pkg/vendir/fetch/helmchart"
ctlhg "carvel.dev/vendir/pkg/vendir/fetch/hg"
ctlhttp "carvel.dev/vendir/pkg/vendir/fetch/http"
ctlimg "carvel.dev/vendir/pkg/vendir/fetch/image"
ctlimgpkgbundle "carvel.dev/vendir/pkg/vendir/fetch/imgpkgbundle"
ctlinl "carvel.dev/vendir/pkg/vendir/fetch/inline"
"github.com/cppforlife/go-cli-ui/ui"
dircopy "github.com/otiai10/copy"
ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlcache "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache"
ctlgit "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/git"
ctlghr "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/githubrelease"
ctlhelmc "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/helmchart"
ctlhg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/hg"
ctlhttp "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/http"
ctlimg "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/image"
ctlimgpkgbundle "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/imgpkgbundle"
ctlinl "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/inline"
)

type Directory struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/directory/file_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"path/filepath"

ctlconf "carvel.dev/vendir/pkg/vendir/config"
"github.com/bmatcuk/doublestar"
ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
)

type FileFilter struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/directory/named_ref_fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package directory
import (
"fmt"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
)

type NamedRefFetcher struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/directory/staging_dir.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"
"strings"

ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
"github.com/bmatcuk/doublestar"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
)

type StagingDir struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/directory/sub_path.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"strings"

ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
)

type SubPath struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/fetch/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"runtime"
"strings"

"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache/resources"
"carvel.dev/vendir/pkg/vendir/fetch/cache/resources"
)

// Cache functionality
Expand Down
2 changes: 1 addition & 1 deletion pkg/vendir/fetch/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"
"testing"

"carvel.dev/vendir/pkg/vendir/fetch/cache"
"github.com/stretchr/testify/require"
"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/cache"
)

type hitTest struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/vendir/fetch/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"strconv"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
ctlver "carvel.dev/vendir/pkg/vendir/versions"
)

type Git struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/fetch/git/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"os"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
)

type Sync struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/vendir/fetch/git/verification.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"os/exec"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
oarmor "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/openpgparmor"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
oarmor "carvel.dev/vendir/pkg/vendir/openpgparmor"
"golang.org/x/crypto/openpgp" //nolint:staticcheck
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"testing"

. "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/githubrelease"
. "carvel.dev/vendir/pkg/vendir/fetch/githubrelease"
)

func TestReleaseNotesChecksums(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/vendir/fetch/githubrelease/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"path/filepath"
"strings"

ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
ctlhttp "carvel.dev/vendir/pkg/vendir/fetch/http"
ctlver "carvel.dev/vendir/pkg/vendir/versions"
"github.com/bmatcuk/doublestar"
"github.com/google/go-github/github"
ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlhttp "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch/http"
ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
"golang.org/x/oauth2"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/fetch/helmchart/http_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"os/exec"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
)

type HTTPSource struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/fetch/helmchart/oci_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"os/exec"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/fetch/helmchart/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"path/filepath"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
"sigs.k8s.io/yaml"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/vendir/fetch/hg/hg.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"path/filepath"
"strings"

ctlconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
ctlfetch "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/fetch"
ctlconf "carvel.dev/vendir/pkg/vendir/config"
ctlfetch "carvel.dev/vendir/pkg/vendir/fetch"
)

type Hg struct {
Expand Down
Loading