From b50fd584133ce57a147c9fa050bd4acea684a259 Mon Sep 17 00:00:00 2001 From: Garrett Cheadle <67297250+gcheadle-vmware@users.noreply.github.com> Date: Thu, 17 Feb 2022 10:03:00 -0800 Subject: [PATCH] Update Go Module name to "github.com/vmware-tanzu/carvel-ytt" (#606) * rename module in pkg and cmd packages * change module name in gh actions file * update dev docs --- .goreleaser.yml | 2 +- cmd/ytt-lambda-website/main.go | 2 +- cmd/ytt/ytt.go | 2 +- docs/dev.md | 4 +++- examples/integrating-with-ytt/apis.md | 2 +- go.mod | 2 +- hack/build-binaries.sh | 2 +- hack/build.sh | 2 +- pkg/cmd/fmt.go | 8 ++++---- pkg/cmd/template/bulk_input.go | 4 ++-- pkg/cmd/template/cmd.go | 12 ++++++------ pkg/cmd/template/cmd_data_values_file_test.go | 6 +++--- pkg/cmd/template/cmd_data_values_test.go | 6 +++--- pkg/cmd/template/cmd_library_module_test.go | 6 +++--- pkg/cmd/template/cmd_overlays_test.go | 6 +++--- pkg/cmd/template/cmd_root_library_test.go | 2 +- pkg/cmd/template/cmd_test.go | 6 +++--- pkg/cmd/template/data_values_file.go | 4 ++-- pkg/cmd/template/data_values_flags.go | 10 +++++----- pkg/cmd/template/file_marks.go | 2 +- pkg/cmd/template/regular_input.go | 6 +++--- pkg/cmd/template/regular_input_test.go | 8 ++++---- pkg/cmd/template/schema_author_test.go | 4 ++-- pkg/cmd/template/schema_consumer_test.go | 6 +++--- pkg/cmd/template/schema_inspect_test.go | 6 +++--- pkg/cmd/version.go | 2 +- pkg/cmd/website.go | 4 ++-- pkg/cmd/ytt.go | 4 ++-- pkg/files/output_directory.go | 2 +- pkg/schema/annotations.go | 8 ++++---- pkg/schema/assign.go | 2 +- pkg/schema/check.go | 2 +- pkg/schema/error.go | 6 +++--- pkg/schema/openapi.go | 2 +- pkg/schema/schema.go | 4 ++-- pkg/schema/type.go | 4 ++-- pkg/schema/yamlmeta.go | 2 +- pkg/template/ancestors_test.go | 2 +- pkg/template/annotations.go | 2 +- pkg/template/compiled_template.go | 4 ++-- pkg/template/compiled_template_error.go | 2 +- pkg/template/compiled_template_test.go | 2 +- pkg/template/core/go_value.go | 2 +- pkg/template/core/starlark_struct.go | 2 +- pkg/template/core/starlark_value.go | 2 +- pkg/template/error_hints_test.go | 2 +- pkg/template/evaluation_ctx.go | 4 ++-- pkg/template/meta.go | 2 +- pkg/template/nodes.go | 2 +- pkg/template/source.go | 2 +- pkg/texttemplate/ast.go | 4 ++-- pkg/texttemplate/evaluation_ctx.go | 2 +- pkg/texttemplate/parser.go | 2 +- pkg/texttemplate/template.go | 2 +- pkg/texttemplate/template_test.go | 4 ++-- pkg/workspace/data_loader.go | 2 +- pkg/workspace/data_values_pre_processing.go | 8 ++++---- .../data_values_schema_pre_processing.go | 6 +++--- pkg/workspace/datavalues/envelope.go | 10 +++++----- pkg/workspace/datavalues/schema.go | 8 ++++---- pkg/workspace/doc_extractor.go | 6 +++--- pkg/workspace/library.go | 2 +- pkg/workspace/library_execution.go | 10 +++++----- pkg/workspace/library_execution_factory.go | 2 +- pkg/workspace/library_module.go | 14 +++++++------- pkg/workspace/overlay_post_processing.go | 6 +++--- pkg/workspace/ref/library_ref.go | 4 ++-- pkg/workspace/template_loader.go | 16 ++++++++-------- pkg/yamlfmt/printer.go | 2 +- pkg/yamlfmt/printer_test.go | 4 ++-- pkg/yamlmeta/ast.go | 2 +- pkg/yamlmeta/construct.go | 2 +- pkg/yamlmeta/convert.go | 6 +++--- pkg/yamlmeta/document.go | 2 +- pkg/yamlmeta/file_position_printer.go | 4 ++-- pkg/yamlmeta/internal/yaml.v2/README.md | 2 +- pkg/yamlmeta/internal/yaml.v2/decode_test.go | 2 +- pkg/yamlmeta/internal/yaml.v2/encode_test.go | 2 +- .../internal/yaml.v2/example_embedded_test.go | 2 +- pkg/yamlmeta/map_key_overrides.go | 2 +- pkg/yamlmeta/map_key_overrides_test.go | 2 +- pkg/yamlmeta/node.go | 6 +++--- pkg/yamlmeta/parser.go | 4 ++-- pkg/yamlmeta/parser_strict_test.go | 4 ++-- pkg/yamlmeta/parser_test.go | 4 ++-- pkg/yamlmeta/plain.go | 2 +- pkg/yamlmeta/plain_test.go | 4 ++-- pkg/yamlmeta/printer.go | 2 +- pkg/yamlmeta/printers.go | 2 +- pkg/yamltemplate/evaluation_ctx.go | 8 ++++---- pkg/yamltemplate/go_value_with_yaml.go | 4 ++-- pkg/yamltemplate/map_key_overrides.go | 4 ++-- pkg/yamltemplate/metas.go | 6 +++--- pkg/yamltemplate/starlark_fragment.go | 4 ++-- pkg/yamltemplate/template.go | 8 ++++---- pkg/yamltemplate/template_test.go | 12 ++++++------ pkg/yttlibrary/all.go | 4 ++-- pkg/yttlibrary/assert.go | 2 +- pkg/yttlibrary/base64.go | 2 +- pkg/yttlibrary/data.go | 4 ++-- pkg/yttlibrary/ip.go | 4 ++-- pkg/yttlibrary/json.go | 6 +++--- pkg/yttlibrary/md5.go | 2 +- pkg/yttlibrary/module.go | 2 +- pkg/yttlibrary/overlay/annotations.go | 4 ++-- pkg/yttlibrary/overlay/api.go | 6 +++--- pkg/yttlibrary/overlay/array.go | 2 +- .../overlay/array_item_match_annotation.go | 10 +++++----- pkg/yttlibrary/overlay/assert_annotation.go | 8 ++++---- pkg/yttlibrary/overlay/compare.go | 2 +- pkg/yttlibrary/overlay/document.go | 2 +- .../overlay/document_match_annotation.go | 10 +++++----- pkg/yttlibrary/overlay/insert_annotation.go | 4 ++-- pkg/yttlibrary/overlay/map.go | 2 +- .../overlay/map_item_match_annotation.go | 10 +++++----- .../overlay/match_annotation_expects_kwarg.go | 2 +- .../overlay/match_child_defaults_annotation.go | 2 +- pkg/yttlibrary/overlay/op.go | 4 ++-- pkg/yttlibrary/overlay/plain_merge.go | 6 +++--- pkg/yttlibrary/overlay/replace_annotation.go | 6 +++--- pkg/yttlibrary/regexp.go | 2 +- pkg/yttlibrary/sha256.go | 2 +- pkg/yttlibrary/struct.go | 4 ++-- pkg/yttlibrary/template.go | 2 +- pkg/yttlibrary/toml.go | 6 +++--- pkg/yttlibrary/url.go | 4 ++-- pkg/yttlibrary/version.go | 4 ++-- pkg/yttlibrary/yaml.go | 4 ++-- 128 files changed, 272 insertions(+), 270 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index b62b8359..b282570b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -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 diff --git a/cmd/ytt-lambda-website/main.go b/cmd/ytt-lambda-website/main.go index 27b346f6..1f77e29c 100644 --- a/cmd/ytt-lambda-website/main.go +++ b/cmd/ytt-lambda-website/main.go @@ -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 { diff --git a/cmd/ytt/ytt.go b/cmd/ytt/ytt.go index 7e6fb571..ab0eb966 100644 --- a/cmd/ytt/ytt.go +++ b/cmd/ytt/ytt.go @@ -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() { diff --git a/docs/dev.md b/docs/dev.md index 43657e9e..fcc60a30 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -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 diff --git a/examples/integrating-with-ytt/apis.md b/examples/integrating-with-ytt/apis.md index 0f76ca5c..96ab01e7 100644 --- a/examples/integrating-with-ytt/apis.md +++ b/examples/integrating-with-ytt/apis.md @@ -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 ... ) ``` diff --git a/go.mod b/go.mod index 85289d99..c8ecf89f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/k14s/ytt +module github.com/vmware-tanzu/carvel-ytt go 1.17 diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index f5f726d0..d5112523 100755 --- a/hack/build-binaries.sh +++ b/hack/build-binaries.sh @@ -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 diff --git a/hack/build.sh b/hack/build.sh index 86d46d51..93f3199f 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -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 diff --git a/pkg/cmd/fmt.go b/pkg/cmd/fmt.go index 0e922e64..f69b28a4 100644 --- a/pkg/cmd/fmt.go +++ b/pkg/cmd/fmt.go @@ -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 { diff --git a/pkg/cmd/template/bulk_input.go b/pkg/cmd/template/bulk_input.go index f9b50d49..744709fe 100644 --- a/pkg/cmd/template/bulk_input.go +++ b/pkg/cmd/template/bulk_input.go @@ -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 { diff --git a/pkg/cmd/template/cmd.go b/pkg/cmd/template/cmd.go index bd7e9276..7f5ad184 100644 --- a/pkg/cmd/template/cmd.go +++ b/pkg/cmd/template/cmd.go @@ -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 { diff --git a/pkg/cmd/template/cmd_data_values_file_test.go b/pkg/cmd/template/cmd_data_values_file_test.go index 1f2439c5..9ab260b9 100644 --- a/pkg/cmd/template/cmd_data_values_file_test.go +++ b/pkg/cmd/template/cmd_data_values_file_test.go @@ -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) { diff --git a/pkg/cmd/template/cmd_data_values_test.go b/pkg/cmd/template/cmd_data_values_test.go index 1bd87058..0e113c0f 100644 --- a/pkg/cmd/template/cmd_data_values_test.go +++ b/pkg/cmd/template/cmd_data_values_test.go @@ -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) { diff --git a/pkg/cmd/template/cmd_library_module_test.go b/pkg/cmd/template/cmd_library_module_test.go index 2fa4f597..239d0330 100644 --- a/pkg/cmd/template/cmd_library_module_test.go +++ b/pkg/cmd/template/cmd_library_module_test.go @@ -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) { diff --git a/pkg/cmd/template/cmd_overlays_test.go b/pkg/cmd/template/cmd_overlays_test.go index d4b35014..16d74d20 100644 --- a/pkg/cmd/template/cmd_overlays_test.go +++ b/pkg/cmd/template/cmd_overlays_test.go @@ -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) { diff --git a/pkg/cmd/template/cmd_root_library_test.go b/pkg/cmd/template/cmd_root_library_test.go index 056a8c7a..d18d5f39 100644 --- a/pkg/cmd/template/cmd_root_library_test.go +++ b/pkg/cmd/template/cmd_root_library_test.go @@ -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) { diff --git a/pkg/cmd/template/cmd_test.go b/pkg/cmd/template/cmd_test.go index 072c2509..f6e5c81d 100644 --- a/pkg/cmd/template/cmd_test.go +++ b/pkg/cmd/template/cmd_test.go @@ -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) { diff --git a/pkg/cmd/template/data_values_file.go b/pkg/cmd/template/data_values_file.go index b0765bc0..85989978 100644 --- a/pkg/cmd/template/data_values_file.go +++ b/pkg/cmd/template/data_values_file.go @@ -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 { diff --git a/pkg/cmd/template/data_values_flags.go b/pkg/cmd/template/data_values_flags.go index b3f1724b..57dcb4ab 100644 --- a/pkg/cmd/template/data_values_flags.go +++ b/pkg/cmd/template/data_values_flags.go @@ -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 ( diff --git a/pkg/cmd/template/file_marks.go b/pkg/cmd/template/file_marks.go index dcd43095..38ebf6f9 100644 --- a/pkg/cmd/template/file_marks.go +++ b/pkg/cmd/template/file_marks.go @@ -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 { diff --git a/pkg/cmd/template/regular_input.go b/pkg/cmd/template/regular_input.go index eeb42994..30333b77 100644 --- a/pkg/cmd/template/regular_input.go +++ b/pkg/cmd/template/regular_input.go @@ -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 diff --git a/pkg/cmd/template/regular_input_test.go b/pkg/cmd/template/regular_input_test.go index e0ce1b09..1d232f7b 100644 --- a/pkg/cmd/template/regular_input_test.go +++ b/pkg/cmd/template/regular_input_test.go @@ -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) { diff --git a/pkg/cmd/template/schema_author_test.go b/pkg/cmd/template/schema_author_test.go index e496fe48..1b698b98 100644 --- a/pkg/cmd/template/schema_author_test.go +++ b/pkg/cmd/template/schema_author_test.go @@ -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) { diff --git a/pkg/cmd/template/schema_consumer_test.go b/pkg/cmd/template/schema_consumer_test.go index 5fb65507..66eab997 100644 --- a/pkg/cmd/template/schema_consumer_test.go +++ b/pkg/cmd/template/schema_consumer_test.go @@ -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) { diff --git a/pkg/cmd/template/schema_inspect_test.go b/pkg/cmd/template/schema_inspect_test.go index e4fc46d8..53839439 100644 --- a/pkg/cmd/template/schema_inspect_test.go +++ b/pkg/cmd/template/schema_inspect_test.go @@ -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) { diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go index 097da2e7..d2f4eb8b 100644 --- a/pkg/cmd/version.go +++ b/pkg/cmd/version.go @@ -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{} diff --git a/pkg/cmd/website.go b/pkg/cmd/website.go index 704c0ec3..ad46378a 100644 --- a/pkg/cmd/website.go +++ b/pkg/cmd/website.go @@ -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 { diff --git a/pkg/cmd/ytt.go b/pkg/cmd/ytt.go index 96845278..af5ee75d 100644 --- a/pkg/cmd/ytt.go +++ b/pkg/cmd/ytt.go @@ -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{} diff --git a/pkg/files/output_directory.go b/pkg/files/output_directory.go index e8ce17ad..84da0c29 100644 --- a/pkg/files/output_directory.go +++ b/pkg/files/output_directory.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/k14s/ytt/pkg/cmd/ui" + "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" ) var ( diff --git a/pkg/schema/annotations.go b/pkg/schema/annotations.go index 384b103a..807d39c1 100644 --- a/pkg/schema/annotations.go +++ b/pkg/schema/annotations.go @@ -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 ( diff --git a/pkg/schema/assign.go b/pkg/schema/assign.go index 7b8bf1d1..de9708fd 100644 --- a/pkg/schema/assign.go +++ b/pkg/schema/assign.go @@ -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`. diff --git a/pkg/schema/check.go b/pkg/schema/check.go index 8f60369f..99c98a6b 100644 --- a/pkg/schema/check.go +++ b/pkg/schema/check.go @@ -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. diff --git a/pkg/schema/error.go b/pkg/schema/error.go index c5ba461a..5b9bedf7 100644 --- a/pkg/schema/error.go +++ b/pkg/schema/error.go @@ -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 = ` diff --git a/pkg/schema/openapi.go b/pkg/schema/openapi.go index c0aaa65b..d65d97ac 100644 --- a/pkg/schema/openapi.go +++ b/pkg/schema/openapi.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // keys used when generating an OpenAPI Document diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go index 4483f1a3..ff5d8c98 100644 --- a/pkg/schema/schema.go +++ b/pkg/schema/schema.go @@ -6,8 +6,8 @@ package schema import ( "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // NewDocumentType constructs a complete DocumentType based on the contents of a schema YAML document. diff --git a/pkg/schema/type.go b/pkg/schema/type.go index 0c326e74..d35bf23b 100644 --- a/pkg/schema/type.go +++ b/pkg/schema/type.go @@ -6,8 +6,8 @@ package schema import ( "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // Type encapsulates a schema that describes a yamlmeta.Node. diff --git a/pkg/schema/yamlmeta.go b/pkg/schema/yamlmeta.go index f1c4ed15..fc3174c1 100644 --- a/pkg/schema/yamlmeta.go +++ b/pkg/schema/yamlmeta.go @@ -3,7 +3,7 @@ package schema -import "github.com/k14s/ytt/pkg/yamlmeta" +import "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" // GetType retrieves schema metadata from `n`, set previously via SetType(). func GetType(n yamlmeta.Node) Type { diff --git a/pkg/template/ancestors_test.go b/pkg/template/ancestors_test.go index c5358b19..b77ea617 100644 --- a/pkg/template/ancestors_test.go +++ b/pkg/template/ancestors_test.go @@ -6,7 +6,7 @@ package template_test import ( "testing" - . "github.com/k14s/ytt/pkg/template" + . "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) func TestAncestorsDeep(t *testing.T) { diff --git a/pkg/template/annotations.go b/pkg/template/annotations.go index 37aef491..8bf6b56e 100644 --- a/pkg/template/annotations.go +++ b/pkg/template/annotations.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) const ( diff --git a/pkg/template/compiled_template.go b/pkg/template/compiled_template.go index b14d0b66..de4104c5 100644 --- a/pkg/template/compiled_template.go +++ b/pkg/template/compiled_template.go @@ -11,8 +11,8 @@ import ( "github.com/k14s/starlark-go/resolve" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/syntax" - "github.com/k14s/ytt/pkg/filepos" - tplcore "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) type EvaluationCtxDialectName string diff --git a/pkg/template/compiled_template_error.go b/pkg/template/compiled_template_error.go index c9f126a6..5b7b0313 100644 --- a/pkg/template/compiled_template_error.go +++ b/pkg/template/compiled_template_error.go @@ -11,7 +11,7 @@ import ( "github.com/k14s/starlark-go/resolve" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/syntax" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type CompiledTemplateMultiError struct { diff --git a/pkg/template/compiled_template_test.go b/pkg/template/compiled_template_test.go index 6f2ff66b..8d461c0b 100644 --- a/pkg/template/compiled_template_test.go +++ b/pkg/template/compiled_template_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) func TestEvalExecutesStarlarkAndReturnsGlobals(t *testing.T) { diff --git a/pkg/template/core/go_value.go b/pkg/template/core/go_value.go index d9b5ca33..56f3a09c 100644 --- a/pkg/template/core/go_value.go +++ b/pkg/template/core/go_value.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" ) type GoValueToStarlarkValueConversion interface { diff --git a/pkg/template/core/starlark_struct.go b/pkg/template/core/starlark_struct.go index c1f527cb..18596440 100644 --- a/pkg/template/core/starlark_struct.go +++ b/pkg/template/core/starlark_struct.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" ) type StarlarkStruct struct { diff --git a/pkg/template/core/starlark_value.go b/pkg/template/core/starlark_value.go index 11ef50ea..f1780bce 100644 --- a/pkg/template/core/starlark_value.go +++ b/pkg/template/core/starlark_value.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" ) type StarlarkValueToGoValueConversion interface { diff --git a/pkg/template/error_hints_test.go b/pkg/template/error_hints_test.go index a1015a11..2c5c0507 100644 --- a/pkg/template/error_hints_test.go +++ b/pkg/template/error_hints_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) type ErrorHintTest struct { diff --git a/pkg/template/evaluation_ctx.go b/pkg/template/evaluation_ctx.go index 77d925a7..68c97647 100644 --- a/pkg/template/evaluation_ctx.go +++ b/pkg/template/evaluation_ctx.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" // Should not import template specific packages here (like yamlmeta) ) diff --git a/pkg/template/meta.go b/pkg/template/meta.go index 3d9a6963..d1ef1139 100644 --- a/pkg/template/meta.go +++ b/pkg/template/meta.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type AnnotationName string diff --git a/pkg/template/nodes.go b/pkg/template/nodes.go index 06e37094..838500c9 100644 --- a/pkg/template/nodes.go +++ b/pkg/template/nodes.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/template/source.go b/pkg/template/source.go index 0061ee14..ee3233d6 100644 --- a/pkg/template/source.go +++ b/pkg/template/source.go @@ -6,7 +6,7 @@ package template import ( "bytes" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type Line struct { diff --git a/pkg/texttemplate/ast.go b/pkg/texttemplate/ast.go index 3575d8c9..9e7f32b9 100644 --- a/pkg/texttemplate/ast.go +++ b/pkg/texttemplate/ast.go @@ -6,8 +6,8 @@ package texttemplate import ( "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) type NodeRoot struct { diff --git a/pkg/texttemplate/evaluation_ctx.go b/pkg/texttemplate/evaluation_ctx.go index c021c874..c46bebf6 100644 --- a/pkg/texttemplate/evaluation_ctx.go +++ b/pkg/texttemplate/evaluation_ctx.go @@ -6,7 +6,7 @@ package texttemplate import ( "fmt" - "github.com/k14s/ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) const ( diff --git a/pkg/texttemplate/parser.go b/pkg/texttemplate/parser.go index b6542e89..7f0e5cb2 100644 --- a/pkg/texttemplate/parser.go +++ b/pkg/texttemplate/parser.go @@ -6,7 +6,7 @@ package texttemplate import ( "fmt" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type Parser struct { diff --git a/pkg/texttemplate/template.go b/pkg/texttemplate/template.go index 375d9082..0f35767a 100644 --- a/pkg/texttemplate/template.go +++ b/pkg/texttemplate/template.go @@ -8,7 +8,7 @@ import ( "strings" "unicode" - "github.com/k14s/ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) type Template struct { diff --git a/pkg/texttemplate/template_test.go b/pkg/texttemplate/template_test.go index e8164606..ce31a1b3 100644 --- a/pkg/texttemplate/template_test.go +++ b/pkg/texttemplate/template_test.go @@ -13,8 +13,8 @@ import ( "testing" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/texttemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/texttemplate" ) var ( diff --git a/pkg/workspace/data_loader.go b/pkg/workspace/data_loader.go index 21f55f4d..c56739f4 100644 --- a/pkg/workspace/data_loader.go +++ b/pkg/workspace/data_loader.go @@ -4,7 +4,7 @@ package workspace import ( - "github.com/k14s/ytt/pkg/files" + "github.com/vmware-tanzu/carvel-ytt/pkg/files" ) type DataLoader struct { diff --git a/pkg/workspace/data_values_pre_processing.go b/pkg/workspace/data_values_pre_processing.go index 5bd9fd4f..403e660f 100644 --- a/pkg/workspace/data_values_pre_processing.go +++ b/pkg/workspace/data_values_pre_processing.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/schema" - "github.com/k14s/ytt/pkg/workspace/datavalues" - "github.com/k14s/ytt/pkg/yamlmeta" - yttoverlay "github.com/k14s/ytt/pkg/yttlibrary/overlay" + "github.com/vmware-tanzu/carvel-ytt/pkg/schema" + "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" ) // DataValuesPreProcessing combines all data values documents (and any overlays) into a result set. diff --git a/pkg/workspace/data_values_schema_pre_processing.go b/pkg/workspace/data_values_schema_pre_processing.go index 5b898859..98117f58 100644 --- a/pkg/workspace/data_values_schema_pre_processing.go +++ b/pkg/workspace/data_values_schema_pre_processing.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/workspace/datavalues" - "github.com/k14s/ytt/pkg/yamlmeta" - yttoverlay "github.com/k14s/ytt/pkg/yttlibrary/overlay" + "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" ) // DataValuesSchemaPreProcessing combines all data values schema documents (and any overlays) into a result set. diff --git a/pkg/workspace/datavalues/envelope.go b/pkg/workspace/datavalues/envelope.go index a15a6acc..467edb5c 100644 --- a/pkg/workspace/datavalues/envelope.go +++ b/pkg/workspace/datavalues/envelope.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/workspace/ref" - "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/workspace/ref" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/workspace/datavalues/schema.go b/pkg/workspace/datavalues/schema.go index 6dc7ad19..2cafd08f 100644 --- a/pkg/workspace/datavalues/schema.go +++ b/pkg/workspace/datavalues/schema.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "github.com/k14s/ytt/pkg/schema" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/workspace/ref" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/schema" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/workspace/ref" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // Schema is a definition of types and default values for Envelope. diff --git a/pkg/workspace/doc_extractor.go b/pkg/workspace/doc_extractor.go index 2b626c85..f73ec774 100644 --- a/pkg/workspace/doc_extractor.go +++ b/pkg/workspace/doc_extractor.go @@ -6,9 +6,9 @@ package workspace import ( "fmt" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) type DocExtractor struct { diff --git a/pkg/workspace/library.go b/pkg/workspace/library.go index 1f48dd7d..adad54e4 100644 --- a/pkg/workspace/library.go +++ b/pkg/workspace/library.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "github.com/k14s/ytt/pkg/files" + "github.com/vmware-tanzu/carvel-ytt/pkg/files" ) const ( diff --git a/pkg/workspace/library_execution.go b/pkg/workspace/library_execution.go index cc036c4d..6b9d2c92 100644 --- a/pkg/workspace/library_execution.go +++ b/pkg/workspace/library_execution.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/cmd/ui" - "github.com/k14s/ytt/pkg/files" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/workspace/datavalues" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" + "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/yamlmeta" ) type LibraryExecution struct { diff --git a/pkg/workspace/library_execution_factory.go b/pkg/workspace/library_execution_factory.go index b83154cc..7ac0c7ed 100644 --- a/pkg/workspace/library_execution_factory.go +++ b/pkg/workspace/library_execution_factory.go @@ -4,7 +4,7 @@ package workspace import ( - "github.com/k14s/ytt/pkg/cmd/ui" + "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" ) type LibraryExecutionContext struct { diff --git a/pkg/workspace/library_module.go b/pkg/workspace/library_module.go index b256255b..bef6b618 100644 --- a/pkg/workspace/library_module.go +++ b/pkg/workspace/library_module.go @@ -9,13 +9,13 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/workspace/datavalues" - "github.com/k14s/ytt/pkg/workspace/ref" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" - "github.com/k14s/ytt/pkg/yttlibrary/overlay" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "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" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay" ) type LibraryModule struct { diff --git a/pkg/workspace/overlay_post_processing.go b/pkg/workspace/overlay_post_processing.go index d3c2bee5..71582bf1 100644 --- a/pkg/workspace/overlay_post_processing.go +++ b/pkg/workspace/overlay_post_processing.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" - yttoverlay "github.com/k14s/ytt/pkg/yttlibrary/overlay" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + yttoverlay "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay" ) type OverlayPostProcessing struct { diff --git a/pkg/workspace/ref/library_ref.go b/pkg/workspace/ref/library_ref.go index 864fe623..087c732b 100644 --- a/pkg/workspace/ref/library_ref.go +++ b/pkg/workspace/ref/library_ref.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) const ( diff --git a/pkg/workspace/template_loader.go b/pkg/workspace/template_loader.go index da21681a..e4729e0f 100644 --- a/pkg/workspace/template_loader.go +++ b/pkg/workspace/template_loader.go @@ -8,14 +8,14 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/cmd/ui" - "github.com/k14s/ytt/pkg/files" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/texttemplate" - "github.com/k14s/ytt/pkg/workspace/datavalues" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" - "github.com/k14s/ytt/pkg/yttlibrary" + "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" + "github.com/vmware-tanzu/carvel-ytt/pkg/files" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/texttemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/workspace/datavalues" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary" ) type TemplateLoader struct { diff --git a/pkg/yamlfmt/printer.go b/pkg/yamlfmt/printer.go index cbecc1a2..f3871696 100644 --- a/pkg/yamlfmt/printer.go +++ b/pkg/yamlfmt/printer.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // TODO strict mode diff --git a/pkg/yamlfmt/printer_test.go b/pkg/yamlfmt/printer_test.go index a55ac005..7b3db1fa 100644 --- a/pkg/yamlfmt/printer_test.go +++ b/pkg/yamlfmt/printer_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/k14s/difflib" - "github.com/k14s/ytt/pkg/yamlfmt" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlfmt" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var ( diff --git a/pkg/yamlmeta/ast.go b/pkg/yamlmeta/ast.go index e462ad1f..74e0c2c2 100644 --- a/pkg/yamlmeta/ast.go +++ b/pkg/yamlmeta/ast.go @@ -4,7 +4,7 @@ package yamlmeta import ( - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type Node interface { diff --git a/pkg/yamlmeta/construct.go b/pkg/yamlmeta/construct.go index 64d761f8..6776c495 100644 --- a/pkg/yamlmeta/construct.go +++ b/pkg/yamlmeta/construct.go @@ -3,7 +3,7 @@ package yamlmeta -import "github.com/k14s/ytt/pkg/filepos" +import "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" // NewDocumentSet creates a new DocumentSet instance based on the given prototype func NewDocumentSet(val *DocumentSetProto) *DocumentSet { diff --git a/pkg/yamlmeta/convert.go b/pkg/yamlmeta/convert.go index 7e700d3b..73399b59 100644 --- a/pkg/yamlmeta/convert.go +++ b/pkg/yamlmeta/convert.go @@ -6,9 +6,9 @@ package yamlmeta import ( "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) func NewASTFromInterface(val interface{}) interface{} { diff --git a/pkg/yamlmeta/document.go b/pkg/yamlmeta/document.go index e2f96ca6..0e206457 100644 --- a/pkg/yamlmeta/document.go +++ b/pkg/yamlmeta/document.go @@ -4,7 +4,7 @@ package yamlmeta import ( - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) func (d *Document) IsEmpty() bool { diff --git a/pkg/yamlmeta/file_position_printer.go b/pkg/yamlmeta/file_position_printer.go index b7dcb58e..04a5f2b3 100644 --- a/pkg/yamlmeta/file_position_printer.go +++ b/pkg/yamlmeta/file_position_printer.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) type FilePositionPrinter struct { diff --git a/pkg/yamlmeta/internal/yaml.v2/README.md b/pkg/yamlmeta/internal/yaml.v2/README.md index 94f52272..bbd116a6 100644 --- a/pkg/yamlmeta/internal/yaml.v2/README.md +++ b/pkg/yamlmeta/internal/yaml.v2/README.md @@ -55,7 +55,7 @@ import ( "fmt" "log" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) var data = ` diff --git a/pkg/yamlmeta/internal/yaml.v2/decode_test.go b/pkg/yamlmeta/internal/yaml.v2/decode_test.go index f37ea616..912c7f71 100644 --- a/pkg/yamlmeta/internal/yaml.v2/decode_test.go +++ b/pkg/yamlmeta/internal/yaml.v2/decode_test.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" . "gopkg.in/check.v1" ) diff --git a/pkg/yamlmeta/internal/yaml.v2/encode_test.go b/pkg/yamlmeta/internal/yaml.v2/encode_test.go index c398e6c9..1e09030c 100644 --- a/pkg/yamlmeta/internal/yaml.v2/encode_test.go +++ b/pkg/yamlmeta/internal/yaml.v2/encode_test.go @@ -14,7 +14,7 @@ import ( "net" "os" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" . "gopkg.in/check.v1" ) diff --git a/pkg/yamlmeta/internal/yaml.v2/example_embedded_test.go b/pkg/yamlmeta/internal/yaml.v2/example_embedded_test.go index 26505d98..eb58313f 100644 --- a/pkg/yamlmeta/internal/yaml.v2/example_embedded_test.go +++ b/pkg/yamlmeta/internal/yaml.v2/example_embedded_test.go @@ -7,7 +7,7 @@ import ( "fmt" "log" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) // An example showing how to unmarshal embedded diff --git a/pkg/yamlmeta/map_key_overrides.go b/pkg/yamlmeta/map_key_overrides.go index 47667908..b89606ee 100644 --- a/pkg/yamlmeta/map_key_overrides.go +++ b/pkg/yamlmeta/map_key_overrides.go @@ -4,7 +4,7 @@ package yamlmeta import ( - "github.com/k14s/ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" ) type overrideMapKeys struct{} diff --git a/pkg/yamlmeta/map_key_overrides_test.go b/pkg/yamlmeta/map_key_overrides_test.go index 1a28acb9..9a3cb272 100644 --- a/pkg/yamlmeta/map_key_overrides_test.go +++ b/pkg/yamlmeta/map_key_overrides_test.go @@ -6,7 +6,7 @@ package yamlmeta_test import ( "testing" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) func TestMapKeyOverridePlainYAML(t *testing.T) { diff --git a/pkg/yamlmeta/node.go b/pkg/yamlmeta/node.go index b5751046..7a36a15f 100644 --- a/pkg/yamlmeta/node.go +++ b/pkg/yamlmeta/node.go @@ -7,9 +7,9 @@ import ( "encoding/json" "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) // TypeName returns the user-friendly name of the type of `val` diff --git a/pkg/yamlmeta/parser.go b/pkg/yamlmeta/parser.go index 9bdaa7b1..9f37b1ef 100644 --- a/pkg/yamlmeta/parser.go +++ b/pkg/yamlmeta/parser.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) var ( diff --git a/pkg/yamlmeta/parser_strict_test.go b/pkg/yamlmeta/parser_strict_test.go index 8ec33e75..9e668272 100644 --- a/pkg/yamlmeta/parser_strict_test.go +++ b/pkg/yamlmeta/parser_strict_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var _ = fmt.Sprintf diff --git a/pkg/yamlmeta/parser_test.go b/pkg/yamlmeta/parser_test.go index 2f0d915d..ceac2c2c 100644 --- a/pkg/yamlmeta/parser_test.go +++ b/pkg/yamlmeta/parser_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/k14s/difflib" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var _ = fmt.Sprintf diff --git a/pkg/yamlmeta/plain.go b/pkg/yamlmeta/plain.go index d4c8246e..8a500c1d 100644 --- a/pkg/yamlmeta/plain.go +++ b/pkg/yamlmeta/plain.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/k14s/ytt/pkg/yamlmeta/internal/yaml.v2" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" ) func PlainMarshal(in interface{}) ([]byte, error) { diff --git a/pkg/yamlmeta/plain_test.go b/pkg/yamlmeta/plain_test.go index d7d71be6..14329cec 100644 --- a/pkg/yamlmeta/plain_test.go +++ b/pkg/yamlmeta/plain_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var _ = fmt.Sprintf diff --git a/pkg/yamlmeta/printer.go b/pkg/yamlmeta/printer.go index 607b957b..e30c1354 100644 --- a/pkg/yamlmeta/printer.go +++ b/pkg/yamlmeta/printer.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type Printer struct { diff --git a/pkg/yamlmeta/printers.go b/pkg/yamlmeta/printers.go index d9017a6e..1fcdeb86 100644 --- a/pkg/yamlmeta/printers.go +++ b/pkg/yamlmeta/printers.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/k14s/ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" ) type DocumentPrinter interface { diff --git a/pkg/yamltemplate/evaluation_ctx.go b/pkg/yamltemplate/evaluation_ctx.go index e69a2b94..126e887b 100644 --- a/pkg/yamltemplate/evaluation_ctx.go +++ b/pkg/yamltemplate/evaluation_ctx.go @@ -6,10 +6,10 @@ package yamltemplate import ( "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/go_value_with_yaml.go b/pkg/yamltemplate/go_value_with_yaml.go index 655845bd..92a61e36 100644 --- a/pkg/yamltemplate/go_value_with_yaml.go +++ b/pkg/yamltemplate/go_value_with_yaml.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) func NewGoValueWithYAML(val interface{}) tplcore.GoValue { diff --git a/pkg/yamltemplate/map_key_overrides.go b/pkg/yamltemplate/map_key_overrides.go index 4234ac31..0f6b6e35 100644 --- a/pkg/yamltemplate/map_key_overrides.go +++ b/pkg/yamltemplate/map_key_overrides.go @@ -6,8 +6,8 @@ package yamltemplate import ( "fmt" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/metas.go b/pkg/yamltemplate/metas.go index 2cf81eab..65a6898b 100644 --- a/pkg/yamltemplate/metas.go +++ b/pkg/yamltemplate/metas.go @@ -8,9 +8,9 @@ import ( "strings" "unicode" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" - "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/yamlmeta" ) var ( diff --git a/pkg/yamltemplate/starlark_fragment.go b/pkg/yamltemplate/starlark_fragment.go index 6bb81d73..05c71562 100644 --- a/pkg/yamltemplate/starlark_fragment.go +++ b/pkg/yamltemplate/starlark_fragment.go @@ -9,8 +9,8 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/syntax" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/template.go b/pkg/yamltemplate/template.go index 9fb3ee58..bf9993bb 100644 --- a/pkg/yamltemplate/template.go +++ b/pkg/yamltemplate/template.go @@ -7,10 +7,10 @@ import ( "bytes" "fmt" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/texttemplate" - "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/texttemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/template_test.go b/pkg/yamltemplate/template_test.go index 37adf000..b891ce09 100644 --- a/pkg/yamltemplate/template_test.go +++ b/pkg/yamltemplate/template_test.go @@ -14,12 +14,12 @@ import ( "testing" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/version" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" - "github.com/k14s/ytt/pkg/yttlibrary" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/version" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary" ) var ( diff --git a/pkg/yttlibrary/all.go b/pkg/yttlibrary/all.go index 92c6323f..84b43c7c 100644 --- a/pkg/yttlibrary/all.go +++ b/pkg/yttlibrary/all.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yttlibrary/overlay" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay" ) type API struct { diff --git a/pkg/yttlibrary/assert.go b/pkg/yttlibrary/assert.go index c4b61877..8922a87f 100644 --- a/pkg/yttlibrary/assert.go +++ b/pkg/yttlibrary/assert.go @@ -8,7 +8,7 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/base64.go b/pkg/yttlibrary/base64.go index 07c56081..b65d34cc 100644 --- a/pkg/yttlibrary/base64.go +++ b/pkg/yttlibrary/base64.go @@ -9,7 +9,7 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/data.go b/pkg/yttlibrary/data.go index f7bf530d..53bddfbe 100644 --- a/pkg/yttlibrary/data.go +++ b/pkg/yttlibrary/data.go @@ -8,8 +8,8 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) type DataModule struct { diff --git a/pkg/yttlibrary/ip.go b/pkg/yttlibrary/ip.go index 4b4d5e20..eb5e5cc3 100644 --- a/pkg/yttlibrary/ip.go +++ b/pkg/yttlibrary/ip.go @@ -9,8 +9,8 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/json.go b/pkg/yttlibrary/json.go index 3fa5cfc8..9e5d37f9 100644 --- a/pkg/yttlibrary/json.go +++ b/pkg/yttlibrary/json.go @@ -10,9 +10,9 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var ( diff --git a/pkg/yttlibrary/md5.go b/pkg/yttlibrary/md5.go index cd931b15..ca76c6f3 100644 --- a/pkg/yttlibrary/md5.go +++ b/pkg/yttlibrary/md5.go @@ -9,7 +9,7 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/module.go b/pkg/yttlibrary/module.go index 71ad9866..11f3bf2b 100644 --- a/pkg/yttlibrary/module.go +++ b/pkg/yttlibrary/module.go @@ -6,7 +6,7 @@ package yttlibrary import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/overlay/annotations.go b/pkg/yttlibrary/overlay/annotations.go index b31793ad..9ddb99ee 100644 --- a/pkg/yttlibrary/overlay/annotations.go +++ b/pkg/yttlibrary/overlay/annotations.go @@ -6,8 +6,8 @@ package overlay import ( "fmt" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yttlibrary/overlay/api.go b/pkg/yttlibrary/overlay/api.go index 4f723fd4..ccc665cc 100644 --- a/pkg/yttlibrary/overlay/api.go +++ b/pkg/yttlibrary/overlay/api.go @@ -9,9 +9,9 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) var ( diff --git a/pkg/yttlibrary/overlay/array.go b/pkg/yttlibrary/overlay/array.go index b6ee71c9..e377ef57 100644 --- a/pkg/yttlibrary/overlay/array.go +++ b/pkg/yttlibrary/overlay/array.go @@ -4,7 +4,7 @@ package overlay import ( - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) func (o Op) mergeArrayItem( diff --git a/pkg/yttlibrary/overlay/array_item_match_annotation.go b/pkg/yttlibrary/overlay/array_item_match_annotation.go index 41df874a..cbdd4d69 100644 --- a/pkg/yttlibrary/overlay/array_item_match_annotation.go +++ b/pkg/yttlibrary/overlay/array_item_match_annotation.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) type ArrayItemMatchAnnotation struct { diff --git a/pkg/yttlibrary/overlay/assert_annotation.go b/pkg/yttlibrary/overlay/assert_annotation.go index c3661fea..4485aa56 100644 --- a/pkg/yttlibrary/overlay/assert_annotation.go +++ b/pkg/yttlibrary/overlay/assert_annotation.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) type AssertAnnotation struct { diff --git a/pkg/yttlibrary/overlay/compare.go b/pkg/yttlibrary/overlay/compare.go index 9c27e5dd..4d65f936 100644 --- a/pkg/yttlibrary/overlay/compare.go +++ b/pkg/yttlibrary/overlay/compare.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) type Comparison struct{} diff --git a/pkg/yttlibrary/overlay/document.go b/pkg/yttlibrary/overlay/document.go index 22911229..d8555717 100644 --- a/pkg/yttlibrary/overlay/document.go +++ b/pkg/yttlibrary/overlay/document.go @@ -6,7 +6,7 @@ package overlay import ( "fmt" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) func (o Op) mergeDocument( diff --git a/pkg/yttlibrary/overlay/document_match_annotation.go b/pkg/yttlibrary/overlay/document_match_annotation.go index 35d2ed09..77ac9015 100644 --- a/pkg/yttlibrary/overlay/document_match_annotation.go +++ b/pkg/yttlibrary/overlay/document_match_annotation.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) type DocumentMatchAnnotation struct { diff --git a/pkg/yttlibrary/overlay/insert_annotation.go b/pkg/yttlibrary/overlay/insert_annotation.go index 1c3aa131..b7e3f0bd 100644 --- a/pkg/yttlibrary/overlay/insert_annotation.go +++ b/pkg/yttlibrary/overlay/insert_annotation.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - tplcore "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) type InsertAnnotation struct { diff --git a/pkg/yttlibrary/overlay/map.go b/pkg/yttlibrary/overlay/map.go index b9c592b5..d5b8e40c 100644 --- a/pkg/yttlibrary/overlay/map.go +++ b/pkg/yttlibrary/overlay/map.go @@ -4,7 +4,7 @@ package overlay import ( - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) func (o Op) mergeMapItem(leftMap *yamlmeta.Map, newItem *yamlmeta.MapItem, diff --git a/pkg/yttlibrary/overlay/map_item_match_annotation.go b/pkg/yttlibrary/overlay/map_item_match_annotation.go index b0c9923c..83f577f9 100644 --- a/pkg/yttlibrary/overlay/map_item_match_annotation.go +++ b/pkg/yttlibrary/overlay/map_item_match_annotation.go @@ -8,11 +8,11 @@ import ( "reflect" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/filepos" - "github.com/k14s/ytt/pkg/template" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) type MapItemMatchAnnotation struct { diff --git a/pkg/yttlibrary/overlay/match_annotation_expects_kwarg.go b/pkg/yttlibrary/overlay/match_annotation_expects_kwarg.go index f80f0d8a..a4430438 100644 --- a/pkg/yttlibrary/overlay/match_annotation_expects_kwarg.go +++ b/pkg/yttlibrary/overlay/match_annotation_expects_kwarg.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/filepos" + "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) const ( diff --git a/pkg/yttlibrary/overlay/match_child_defaults_annotation.go b/pkg/yttlibrary/overlay/match_child_defaults_annotation.go index 95dbf721..ec370b73 100644 --- a/pkg/yttlibrary/overlay/match_child_defaults_annotation.go +++ b/pkg/yttlibrary/overlay/match_child_defaults_annotation.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" ) type MatchChildDefaultsAnnotation struct { diff --git a/pkg/yttlibrary/overlay/op.go b/pkg/yttlibrary/overlay/op.go index c19454e4..6eefaf38 100644 --- a/pkg/yttlibrary/overlay/op.go +++ b/pkg/yttlibrary/overlay/op.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) type Op struct { diff --git a/pkg/yttlibrary/overlay/plain_merge.go b/pkg/yttlibrary/overlay/plain_merge.go index f8f9dfb5..8ecc848d 100644 --- a/pkg/yttlibrary/overlay/plain_merge.go +++ b/pkg/yttlibrary/overlay/plain_merge.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - "github.com/k14s/ytt/pkg/yamlmeta" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) // AnnotateForPlainMerge configures `node` to be an overlay doing a "plain merge": diff --git a/pkg/yttlibrary/overlay/replace_annotation.go b/pkg/yttlibrary/overlay/replace_annotation.go index 9a09aac4..59238739 100644 --- a/pkg/yttlibrary/overlay/replace_annotation.go +++ b/pkg/yttlibrary/overlay/replace_annotation.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/k14s/starlark-go/starlark" - "github.com/k14s/ytt/pkg/template" - tplcore "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamltemplate" + "github.com/vmware-tanzu/carvel-ytt/pkg/template" + tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" ) const ( diff --git a/pkg/yttlibrary/regexp.go b/pkg/yttlibrary/regexp.go index b901c773..5acfd8cb 100644 --- a/pkg/yttlibrary/regexp.go +++ b/pkg/yttlibrary/regexp.go @@ -9,7 +9,7 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/sha256.go b/pkg/yttlibrary/sha256.go index 6e935971..935a02f9 100644 --- a/pkg/yttlibrary/sha256.go +++ b/pkg/yttlibrary/sha256.go @@ -9,7 +9,7 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/struct.go b/pkg/yttlibrary/struct.go index 6156a07a..802caf92 100644 --- a/pkg/yttlibrary/struct.go +++ b/pkg/yttlibrary/struct.go @@ -8,8 +8,8 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/template.go b/pkg/yttlibrary/template.go index df09002c..b0c7ecbe 100644 --- a/pkg/yttlibrary/template.go +++ b/pkg/yttlibrary/template.go @@ -6,7 +6,7 @@ package yttlibrary import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) type TemplateModule struct { diff --git a/pkg/yttlibrary/toml.go b/pkg/yttlibrary/toml.go index 6315f798..fa4e1ded 100644 --- a/pkg/yttlibrary/toml.go +++ b/pkg/yttlibrary/toml.go @@ -11,9 +11,9 @@ import ( "github.com/BurntSushi/toml" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var ( diff --git a/pkg/yttlibrary/url.go b/pkg/yttlibrary/url.go index 95e2f90a..b2f1f1a9 100644 --- a/pkg/yttlibrary/url.go +++ b/pkg/yttlibrary/url.go @@ -11,8 +11,8 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/orderedmap" - "github.com/k14s/ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/version.go b/pkg/yttlibrary/version.go index 71b04941..a48076a2 100644 --- a/pkg/yttlibrary/version.go +++ b/pkg/yttlibrary/version.go @@ -10,8 +10,8 @@ import ( semver "github.com/hashicorp/go-version" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/version" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/version" ) const ( diff --git a/pkg/yttlibrary/yaml.go b/pkg/yttlibrary/yaml.go index dbdb0dda..31e93e7c 100644 --- a/pkg/yttlibrary/yaml.go +++ b/pkg/yttlibrary/yaml.go @@ -8,8 +8,8 @@ import ( "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/k14s/ytt/pkg/template/core" - "github.com/k14s/ytt/pkg/yamlmeta" + "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var (