Skip to content

Commit

Permalink
Merge pull request #878 from carvel-dev/vanity-urls
Browse files Browse the repository at this point in the history
Update the module name to start using carvel.dev URLs
  • Loading branch information
prembhaskal authored Feb 6, 2024
2 parents b4d0ff0 + 5042c41 commit 6d2001d
Show file tree
Hide file tree
Showing 139 changed files with 313 additions and 311 deletions.
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-ytt/pkg/version.Version={{ .Version }}
- -X carvel.dev/ytt/pkg/version.Version={{ .Version }}

archives:
- format: binary
Expand Down
2 changes: 1 addition & 1 deletion cmd/ytt-lambda-website/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"
"net/http"

"carvel.dev/ytt/pkg/cmd"
"github.com/aws/aws-lambda-go/events"
"github.com/aws/aws-lambda-go/lambda"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd"
)

type HandlerFuncAdapter struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ytt/ytt.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"os"
"time"

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

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/integrating-with-ytt/apis.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Examples of how this can be done in Go:
...
require (
...
github.com/vmware-tanzu/carvel-ytt v0.40.0
carvel.dev/ytt v0.40.0
...
)
```
Expand Down
4 changes: 2 additions & 2 deletions examples/integrating-with-ytt/internal-templating/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module example_internal_templating
go 1.17

// ensure example works with this copy of ytt; remove before use
replace github.com/vmware-tanzu/carvel-ytt => ../../../
replace carvel.dev/ytt => ../../../

require github.com/vmware-tanzu/carvel-ytt v0.44.1
require carvel.dev/ytt v0.44.1

require (
github.com/hashicorp/go-version v1.6.0 // indirect
Expand Down
6 changes: 3 additions & 3 deletions examples/integrating-with-ytt/internal-templating/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"io"
"os"

yttcmd "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
yttui "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
yttfiles "github.com/vmware-tanzu/carvel-ytt/pkg/files"
yttcmd "carvel.dev/ytt/pkg/cmd/template"
yttui "carvel.dev/ytt/pkg/cmd/ui"
yttfiles "carvel.dev/ytt/pkg/files"
)

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

go 1.21

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-ytt/pkg/version.Version=$VERSION"
LDFLAGS="-X carvel.dev/ytt/pkg/version.Version=$VERSION"

./hack/generate-website-assets.sh

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

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

rm -f website/generated.go

Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/fmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"os"
"time"

"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"carvel.dev/ytt/pkg/yamlfmt"
"carvel.dev/ytt/pkg/yamlmeta"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlfmt"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
)

type FmtOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
package cmd

import (
"carvel.dev/ytt/pkg/cmd/template"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"

// Load ytt library extensions (should be available in ytt binary)
_ "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibraryext"
_ "carvel.dev/ytt/pkg/yttlibraryext"
)

// NewCmd construct main ytt command. It has been moved out of "template" package
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/template/bulk_input.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package template
import (
"encoding/json"

"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
)

type BulkFilesSourceOpts struct {
Expand Down
12 changes: 6 additions & 6 deletions pkg/cmd/template/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"fmt"
"time"

"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"github.com/vmware-tanzu/carvel-ytt/pkg/schema"
"github.com/vmware-tanzu/carvel-ytt/pkg/workspace"
"github.com/vmware-tanzu/carvel-ytt/pkg/workspace/datavalues"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"carvel.dev/ytt/pkg/schema"
"carvel.dev/ytt/pkg/workspace"
"carvel.dev/ytt/pkg/workspace/datavalues"
"carvel.dev/ytt/pkg/yamlmeta"
)

// Options both contains the configuration for a "template" command AND the
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/cmd_data_values_file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"fmt"
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func TestDataValuesFilesFlag_acceptsPlainYAML(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/cmd_data_values_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"fmt"
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func TestEmptyDataValues(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/cmd_library_module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package template_test
import (
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func TestLibraryModule(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/cmd_overlays_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package template_test
import (
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func TestDocumentOverlays(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/template/cmd_root_library_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package template_test
import (
"testing"

"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"carvel.dev/ytt/pkg/files"
)

func TestLoadAbs(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/template/cmd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"os"
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/experiments"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/experiments"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

// TestMain is invoked when any tests are run in this package, *instead of* those tests being run directly.
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/template/data_values_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package template

import (
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
"github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay"
"carvel.dev/ytt/pkg/yamlmeta"
"carvel.dev/ytt/pkg/yttlibrary/overlay"
)

type DataValuesFile struct {
Expand Down
14 changes: 7 additions & 7 deletions pkg/cmd/template/data_values_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
"os"
"strings"

"carvel.dev/ytt/pkg/filepos"
"carvel.dev/ytt/pkg/files"
"carvel.dev/ytt/pkg/template"
"carvel.dev/ytt/pkg/workspace/datavalues"
"carvel.dev/ytt/pkg/workspace/ref"
"carvel.dev/ytt/pkg/yamlmeta"
yttoverlay "carvel.dev/ytt/pkg/yttlibrary/overlay"
"github.com/k14s/starlark-go/starlark"
"github.com/vmware-tanzu/carvel-ytt/pkg/filepos"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"github.com/vmware-tanzu/carvel-ytt/pkg/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/workspace/datavalues"
"github.com/vmware-tanzu/carvel-ytt/pkg/workspace/ref"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
yttoverlay "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/template/file_marks.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"regexp"
"strings"

"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"carvel.dev/ytt/pkg/files"
)

type FileMarksOpts struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/regular_input.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"io"
"strings"

"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"carvel.dev/ytt/pkg/yamlmeta"
)

// RegularFilesSourceOpts holds configuration for when regular files are the input/output
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/regular_input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"os"
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func Test_Non_YAML_Files_With_No_Output_Flag_Produces_Warning(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/template/schema_author_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package template_test
import (
"testing"

cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/files"
)

func TestSchema_Unused_returns_error(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/schema_consumer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"testing"
"time"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func TestSchema_passes_when_DataValues_conform(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/template/schema_inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package template_test
import (
"testing"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/files"
"github.com/stretchr/testify/require"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

func TestSchemaInspect_exports_an_OpenAPI_doc(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/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/ytt/pkg/experiments"
"carvel.dev/ytt/pkg/version"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-ytt/pkg/experiments"
"github.com/vmware-tanzu/carvel-ytt/pkg/version"
)

type VersionOptions struct{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/website.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"os"
"os/exec"

cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/website"
"github.com/spf13/cobra"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/website"
)

type WebsiteOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/ytt.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
package cmd

import (
cmdtpl "carvel.dev/ytt/pkg/cmd/template"
"carvel.dev/ytt/pkg/version"
"github.com/cppforlife/cobrautil"
"github.com/spf13/cobra"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/version"
)

type YttOptions struct{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ itself to use this powerful editing feature.
"Standard Library" modules that have Go dependencies are included as
"extensions" to minimize the set of transitive dependencies that come from the
github.com/vmware-tanzu/carvel-ytt module.
carvel.dev/ytt module.
(1) => pkg/yttlibraryext => (1)
(1) => pkg/yttlibraryext/toml => (4)
Expand Down
2 changes: 1 addition & 1 deletion pkg/files/output_directory.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"strings"

"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"carvel.dev/ytt/pkg/cmd/ui"
)

var (
Expand Down
Loading

0 comments on commit 6d2001d

Please sign in to comment.