Skip to content

Commit

Permalink
Update Go Module name to "github.com/vmware-tanzu/carvel-ytt" (#606)
Browse files Browse the repository at this point in the history
* rename module in pkg and cmd packages

* change module name in gh actions file

* update dev docs
  • Loading branch information
gcheadle-vmware authored Feb 17, 2022
1 parent c43dcf0 commit b50fd58
Show file tree
Hide file tree
Showing 128 changed files with 272 additions and 270 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ builds:

ldflags:
- -buildid=
- -X github.com/k14s/ytt/pkg/version.Version={{ .Version }}
- -X github.com/vmware-tanzu/carvel-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 @@ -9,7 +9,7 @@ import (

"github.com/aws/aws-lambda-go/events"
"github.com/aws/aws-lambda-go/lambda"
"github.com/k14s/ytt/pkg/cmd"
"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 @@ -10,7 +10,7 @@ import (
"time"

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

func main() {
Expand Down
4 changes: 3 additions & 1 deletion docs/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ To keep source code documentation up to date, ytt uses [godoc](https://go.dev/bl

To view the docs
1. install godoc: `go get -v golang.org/x/tools/cmd/godoc`
1. Start the server: `godoc -http=:6060` and visit [`http://localhost:6060/pkg/github.com/k14s/ytt/`](http://localhost:6060/pkg/github.com/k14s/ytt/).
1. Start the server: `godoc -http=:6060` and visit [`http://localhost:6060/pkg/github.com/vmware-tanzu/carvel-ytt/`](http://localhost:6060/pkg/github.com/vmware-tanzu/carvel-ytt/).

The go module was renamed from `github.com/k14s` to `github.com/vmware-tanzu/carvel-ytt` in February 2022. Carvel started out as a suite named "k14s" short for Kubernetes Tools.

## Source Code Structure

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/k14s/ytt v0.38.0
github.com/vmware-tanzu/carvel-ytt v0.38.0
...
)
```
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/k14s/ytt
module github.com/vmware-tanzu/carvel-ytt

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion hack/build-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ go mod tidy

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

./hack/build.sh $VERSION # Used to generate website/generated.go used by ytt website

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/k14s/ytt/pkg/version.Version=$VERSION -buildid="
LDFLAGS="-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=$VERSION -buildid="

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"

"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
"github.com/k14s/ytt/pkg/yamlfmt"
"github.com/k14s/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/bulk_input.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package template
import (
"encoding/json"

"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-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,13 +7,13 @@ import (
"fmt"
"time"

"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
"github.com/k14s/ytt/pkg/schema"
"github.com/k14s/ytt/pkg/workspace"
"github.com/k14s/ytt/pkg/workspace/datavalues"
"github.com/k14s/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/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"
)

type Options struct {
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 "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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 TestDataValuesWithDataValuesFileFlags(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 @@ -6,11 +6,11 @@ package template_test
import (
"testing"

cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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 "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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 "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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/k14s/ytt/pkg/files"
"github.com/vmware-tanzu/carvel-ytt/pkg/files"
)

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

cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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 TestLoad(t *testing.T) {
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/k14s/ytt/pkg/yamlmeta"
"github.com/k14s/ytt/pkg/yttlibrary/overlay"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
"github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay"
)

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

"github.com/k14s/starlark-go/starlark"
"github.com/k14s/ytt/pkg/filepos"
"github.com/k14s/ytt/pkg/template"
"github.com/k14s/ytt/pkg/workspace/datavalues"
"github.com/k14s/ytt/pkg/yamlmeta"
yttoverlay "github.com/k14s/ytt/pkg/yttlibrary/overlay"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-ytt/pkg/filepos"
"github.com/vmware-tanzu/carvel-ytt/pkg/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/workspace/datavalues"
"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,8 +8,8 @@ import (
"regexp"
"strings"

"github.com/k14s/ytt/pkg/files"
"github.com/spf13/cobra"
"github.com/vmware-tanzu/carvel-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,10 +8,10 @@ import (
"io"
"strings"

"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
"github.com/k14s/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/yamlmeta"
)

// RegularFilesSourceOpts holds configuration for when regular files are the input/output
Expand Down
8 changes: 4 additions & 4 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"

"github.com/k14s/ytt/pkg/cmd/template"
cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
"github.com/stretchr/testify/require"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
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/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/files"
cmdtpl "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/template"
"github.com/vmware-tanzu/carvel-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 @@ -14,10 +14,10 @@ import (
"time"

fuzz "github.com/google/gofuzz"
cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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 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 "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/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
2 changes: 1 addition & 1 deletion pkg/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package cmd
import (
"fmt"

"github.com/k14s/ytt/pkg/version"
"github.com/spf13/cobra"
"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 "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/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 @@ -5,9 +5,9 @@ package cmd

import (
"github.com/cppforlife/cobrautil"
cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/version"
"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/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/k14s/ytt/pkg/cmd/ui"
"github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions pkg/schema/annotations.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"

"github.com/k14s/starlark-go/starlark"
"github.com/k14s/ytt/pkg/filepos"
"github.com/k14s/ytt/pkg/template"
"github.com/k14s/ytt/pkg/template/core"
"github.com/k14s/ytt/pkg/yamlmeta"
"github.com/vmware-tanzu/carvel-ytt/pkg/filepos"
"github.com/vmware-tanzu/carvel-ytt/pkg/template"
"github.com/vmware-tanzu/carvel-ytt/pkg/template/core"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/schema/assign.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package schema
import (
"fmt"

"github.com/k14s/ytt/pkg/yamlmeta"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
)

// AssignTypeTo assigns this schema metadata to `node`.
Expand Down
2 changes: 1 addition & 1 deletion pkg/schema/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package schema
import (
"fmt"

"github.com/k14s/ytt/pkg/yamlmeta"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
)

// CheckNode attempts type check of root node and its children.
Expand Down
6 changes: 3 additions & 3 deletions pkg/schema/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"text/template"

"github.com/k14s/ytt/pkg/filepos"
"github.com/k14s/ytt/pkg/spell"
"github.com/k14s/ytt/pkg/yamlmeta"
"github.com/vmware-tanzu/carvel-ytt/pkg/filepos"
"github.com/vmware-tanzu/carvel-ytt/pkg/spell"
"github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta"
)

const schemaErrorReportTemplate = `
Expand Down
Loading

0 comments on commit b50fd58

Please sign in to comment.