From 6a27cd2719adb4516e101df307904302d1935d8f Mon Sep 17 00:00:00 2001 From: Joao Pereira Date: Fri, 20 Oct 2023 11:07:00 -0500 Subject: [PATCH] Update the module name to start using carvel.dev URLs Signed-off-by: Joao Pereira --- .goreleaser.yml | 2 +- cmd/ytt-lambda-website/main.go | 2 +- cmd/ytt/ytt.go | 2 +- examples/integrating-with-ytt/apis.md | 2 +- .../internal-templating/go.mod | 4 ++-- .../internal-templating/main.go | 6 +++--- go.mod | 2 +- hack/build-binaries.sh | 2 +- hack/build.sh | 2 +- pkg/cmd/fmt.go | 8 ++++---- pkg/cmd/template.go | 4 ++-- 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 | 8 ++++---- pkg/cmd/template/data_values_file.go | 4 ++-- pkg/cmd/template/data_values_flags.go | 14 +++++++------- pkg/cmd/template/file_marks.go | 2 +- pkg/cmd/template/regular_input.go | 6 +++--- pkg/cmd/template/regular_input_test.go | 6 +++--- 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 | 4 ++-- pkg/cmd/website.go | 4 ++-- pkg/cmd/ytt.go | 4 ++-- pkg/doc.go | 2 +- pkg/files/output_directory.go | 2 +- pkg/files/sources_test.go | 2 +- pkg/schema/annotations.go | 10 +++++----- pkg/schema/assign.go | 4 ++-- pkg/schema/check.go | 2 +- pkg/schema/error.go | 6 +++--- pkg/schema/openapi.go | 2 +- pkg/schema/schema.go | 6 +++--- pkg/schema/type.go | 6 +++--- 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 | 2 +- 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/validations/annotations.go | 6 +++--- pkg/validations/validate.go | 12 ++++++------ pkg/validations/validations_test.go | 10 +++++----- pkg/validations/yamlmeta.go | 2 +- 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 | 12 ++++++------ 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 | 10 +++++----- pkg/yttlibrary/all.go | 6 +++--- pkg/yttlibrary/assert.go | 4 ++-- pkg/yttlibrary/base64.go | 2 +- pkg/yttlibrary/data.go | 4 ++-- pkg/yttlibrary/ip.go | 4 ++-- pkg/yttlibrary/json.go | 6 +++--- pkg/yttlibrary/math.go | 4 ++-- 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 | 7 ++++--- 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/url.go | 4 ++-- pkg/yttlibrary/version.go | 4 ++-- pkg/yttlibrary/yaml.go | 4 ++-- pkg/yttlibraryext/all.go | 2 +- pkg/yttlibraryext/toml/toml.go | 8 ++++---- test/filetests/filetests.go | 10 +++++----- 139 files changed, 312 insertions(+), 311 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 8b479e14..5eedbf46 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -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 diff --git a/cmd/ytt-lambda-website/main.go b/cmd/ytt-lambda-website/main.go index 1f77e29c..e1b51bfd 100644 --- a/cmd/ytt-lambda-website/main.go +++ b/cmd/ytt-lambda-website/main.go @@ -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 { diff --git a/cmd/ytt/ytt.go b/cmd/ytt/ytt.go index ab0eb966..bbdf63af 100644 --- a/cmd/ytt/ytt.go +++ b/cmd/ytt/ytt.go @@ -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() { diff --git a/examples/integrating-with-ytt/apis.md b/examples/integrating-with-ytt/apis.md index 6567be56..35b3f3a1 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/vmware-tanzu/carvel-ytt v0.40.0 + carvel.dev/ytt v0.40.0 ... ) ``` diff --git a/examples/integrating-with-ytt/internal-templating/go.mod b/examples/integrating-with-ytt/internal-templating/go.mod index c9930f57..8c2d3d69 100644 --- a/examples/integrating-with-ytt/internal-templating/go.mod +++ b/examples/integrating-with-ytt/internal-templating/go.mod @@ -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 diff --git a/examples/integrating-with-ytt/internal-templating/main.go b/examples/integrating-with-ytt/internal-templating/main.go index 7dc92893..93e8cb44 100644 --- a/examples/integrating-with-ytt/internal-templating/main.go +++ b/examples/integrating-with-ytt/internal-templating/main.go @@ -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() { diff --git a/go.mod b/go.mod index 89f4340c..8f014bc9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu/carvel-ytt +module carvel.dev/ytt go 1.21 diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index fc3c959f..5f1df2fd 100755 --- a/hack/build-binaries.sh +++ b/hack/build-binaries.sh @@ -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 diff --git a/hack/build.sh b/hack/build.sh index ad8174c1..d21f9f57 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/vmware-tanzu/carvel-ytt/pkg/version.Version=$VERSION" +LDFLAGS="-X carvel.dev/ytt/pkg/version.Version=$VERSION" rm -f website/generated.go diff --git a/pkg/cmd/fmt.go b/pkg/cmd/fmt.go index f69b28a4..4e747113 100644 --- a/pkg/cmd/fmt.go +++ b/pkg/cmd/fmt.go @@ -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 { diff --git a/pkg/cmd/template.go b/pkg/cmd/template.go index 2ca0db10..b37720e6 100644 --- a/pkg/cmd/template.go +++ b/pkg/cmd/template.go @@ -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 diff --git a/pkg/cmd/template/bulk_input.go b/pkg/cmd/template/bulk_input.go index 2465cacc..22361964 100644 --- a/pkg/cmd/template/bulk_input.go +++ b/pkg/cmd/template/bulk_input.go @@ -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 { diff --git a/pkg/cmd/template/cmd.go b/pkg/cmd/template/cmd.go index 8f33a321..6fa31359 100644 --- a/pkg/cmd/template/cmd.go +++ b/pkg/cmd/template/cmd.go @@ -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 diff --git a/pkg/cmd/template/cmd_data_values_file_test.go b/pkg/cmd/template/cmd_data_values_file_test.go index c1172c72..a85abfbb 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 "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) { diff --git a/pkg/cmd/template/cmd_data_values_test.go b/pkg/cmd/template/cmd_data_values_test.go index e6496f69..f0733fb5 100644 --- a/pkg/cmd/template/cmd_data_values_test.go +++ b/pkg/cmd/template/cmd_data_values_test.go @@ -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) { diff --git a/pkg/cmd/template/cmd_library_module_test.go b/pkg/cmd/template/cmd_library_module_test.go index cf71e3c8..67d948a3 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 "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) { diff --git a/pkg/cmd/template/cmd_overlays_test.go b/pkg/cmd/template/cmd_overlays_test.go index 16d74d20..2ed48ffa 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 "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) { diff --git a/pkg/cmd/template/cmd_root_library_test.go b/pkg/cmd/template/cmd_root_library_test.go index d18d5f39..378b3e0d 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/vmware-tanzu/carvel-ytt/pkg/files" + "carvel.dev/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 42539140..94c9c2a1 100644 --- a/pkg/cmd/template/cmd_test.go +++ b/pkg/cmd/template/cmd_test.go @@ -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. diff --git a/pkg/cmd/template/data_values_file.go b/pkg/cmd/template/data_values_file.go index 85989978..ef8e4361 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/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 { diff --git a/pkg/cmd/template/data_values_flags.go b/pkg/cmd/template/data_values_flags.go index dbafbe67..1589777d 100644 --- a/pkg/cmd/template/data_values_flags.go +++ b/pkg/cmd/template/data_values_flags.go @@ -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 ( diff --git a/pkg/cmd/template/file_marks.go b/pkg/cmd/template/file_marks.go index 745f5443..daf6ebb0 100644 --- a/pkg/cmd/template/file_marks.go +++ b/pkg/cmd/template/file_marks.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/files" + "carvel.dev/ytt/pkg/files" ) type FileMarksOpts struct { diff --git a/pkg/cmd/template/regular_input.go b/pkg/cmd/template/regular_input.go index 69df63b4..46c49ae6 100644 --- a/pkg/cmd/template/regular_input.go +++ b/pkg/cmd/template/regular_input.go @@ -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 diff --git a/pkg/cmd/template/regular_input_test.go b/pkg/cmd/template/regular_input_test.go index 569ff30f..46aa9a22 100644 --- a/pkg/cmd/template/regular_input_test.go +++ b/pkg/cmd/template/regular_input_test.go @@ -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) { diff --git a/pkg/cmd/template/schema_author_test.go b/pkg/cmd/template/schema_author_test.go index 16028ce9..c7807b5c 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/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) { diff --git a/pkg/cmd/template/schema_consumer_test.go b/pkg/cmd/template/schema_consumer_test.go index 354073a4..1623ffa9 100644 --- a/pkg/cmd/template/schema_consumer_test.go +++ b/pkg/cmd/template/schema_consumer_test.go @@ -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) { diff --git a/pkg/cmd/template/schema_inspect_test.go b/pkg/cmd/template/schema_inspect_test.go index 53839439..865fbd5c 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 "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) { diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go index 6a700791..0e3dcb4a 100644 --- a/pkg/cmd/version.go +++ b/pkg/cmd/version.go @@ -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{} diff --git a/pkg/cmd/website.go b/pkg/cmd/website.go index ad46378a..4a946d5e 100644 --- a/pkg/cmd/website.go +++ b/pkg/cmd/website.go @@ -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 { diff --git a/pkg/cmd/ytt.go b/pkg/cmd/ytt.go index 08a7c49b..dd709ec3 100644 --- a/pkg/cmd/ytt.go +++ b/pkg/cmd/ytt.go @@ -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{} diff --git a/pkg/doc.go b/pkg/doc.go index 25228ae1..4a27146b 100644 --- a/pkg/doc.go +++ b/pkg/doc.go @@ -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) diff --git a/pkg/files/output_directory.go b/pkg/files/output_directory.go index 84da0c29..91964b2c 100644 --- a/pkg/files/output_directory.go +++ b/pkg/files/output_directory.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" + "carvel.dev/ytt/pkg/cmd/ui" ) var ( diff --git a/pkg/files/sources_test.go b/pkg/files/sources_test.go index 0562abef..f702f754 100644 --- a/pkg/files/sources_test.go +++ b/pkg/files/sources_test.go @@ -10,8 +10,8 @@ import ( "net/http" "testing" + "carvel.dev/ytt/pkg/files" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-ytt/pkg/files" ) func TestHTTPFileSources(t *testing.T) { diff --git a/pkg/schema/annotations.go b/pkg/schema/annotations.go index c517532b..a2c02c89 100644 --- a/pkg/schema/annotations.go +++ b/pkg/schema/annotations.go @@ -7,12 +7,12 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/validations" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" - "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/validations" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // Declare @schema/... annotation names diff --git a/pkg/schema/assign.go b/pkg/schema/assign.go index be82d4fc..5e787016 100644 --- a/pkg/schema/assign.go +++ b/pkg/schema/assign.go @@ -6,8 +6,8 @@ package schema import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/validations" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/validations" + "carvel.dev/ytt/pkg/yamlmeta" ) // AssignTypeTo assigns this schema metadata to `node`. diff --git a/pkg/schema/check.go b/pkg/schema/check.go index 9a10be89..fb26e221 100644 --- a/pkg/schema/check.go +++ b/pkg/schema/check.go @@ -6,7 +6,7 @@ package schema import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/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 5b9bedf7..2f74fb9a 100644 --- a/pkg/schema/error.go +++ b/pkg/schema/error.go @@ -11,9 +11,9 @@ import ( "strings" "text/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/spell" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/spell" + "carvel.dev/ytt/pkg/yamlmeta" ) const schemaErrorReportTemplate = ` diff --git a/pkg/schema/openapi.go b/pkg/schema/openapi.go index d65d97ac..d80361b4 100644 --- a/pkg/schema/openapi.go +++ b/pkg/schema/openapi.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamlmeta" ) // keys used when generating an OpenAPI Document diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go index 8d79f453..45a96e77 100644 --- a/pkg/schema/schema.go +++ b/pkg/schema/schema.go @@ -6,9 +6,9 @@ package schema import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/validations" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/validations" + "carvel.dev/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 0a3dfaed..b41452f4 100644 --- a/pkg/schema/type.go +++ b/pkg/schema/type.go @@ -6,9 +6,9 @@ package schema import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/validations" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/validations" + "carvel.dev/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 929bb04a..481f0136 100644 --- a/pkg/schema/yamlmeta.go +++ b/pkg/schema/yamlmeta.go @@ -3,7 +3,7 @@ package schema -import "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" +import "carvel.dev/ytt/pkg/yamlmeta" const schemaType = "schema/type" diff --git a/pkg/template/ancestors_test.go b/pkg/template/ancestors_test.go index b77ea617..93719c34 100644 --- a/pkg/template/ancestors_test.go +++ b/pkg/template/ancestors_test.go @@ -6,7 +6,7 @@ package template_test import ( "testing" - . "github.com/vmware-tanzu/carvel-ytt/pkg/template" + . "carvel.dev/ytt/pkg/template" ) func TestAncestorsDeep(t *testing.T) { diff --git a/pkg/template/annotations.go b/pkg/template/annotations.go index d675f693..7d1084a7 100644 --- a/pkg/template/annotations.go +++ b/pkg/template/annotations.go @@ -6,8 +6,8 @@ package template import ( "strings" + "carvel.dev/ytt/pkg/filepos" "github.com/k14s/starlark-go/starlark" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" ) type NodeAnnotations map[AnnotationName]NodeAnnotation diff --git a/pkg/template/compiled_template.go b/pkg/template/compiled_template.go index 72c93e67..2fa6b5a4 100644 --- a/pkg/template/compiled_template.go +++ b/pkg/template/compiled_template.go @@ -8,11 +8,11 @@ import ( "strings" "unicode" + "carvel.dev/ytt/pkg/filepos" + tplcore "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/resolve" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/syntax" - "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 ef5ce4d4..bb552a26 100644 --- a/pkg/template/compiled_template_error.go +++ b/pkg/template/compiled_template_error.go @@ -9,10 +9,10 @@ import ( "regexp" "strings" + "carvel.dev/ytt/pkg/filepos" "github.com/k14s/starlark-go/resolve" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/syntax" - "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 8d461c0b..0538e9f9 100644 --- a/pkg/template/compiled_template_test.go +++ b/pkg/template/compiled_template_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "carvel.dev/ytt/pkg/template" "github.com/k14s/starlark-go/starlark" - "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 56f3a09c..c056d921 100644 --- a/pkg/template/core/go_value.go +++ b/pkg/template/core/go_value.go @@ -6,8 +6,8 @@ package core import ( "fmt" + "carvel.dev/ytt/pkg/orderedmap" "github.com/k14s/starlark-go/starlark" - "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 18596440..ad0d54de 100644 --- a/pkg/template/core/starlark_struct.go +++ b/pkg/template/core/starlark_struct.go @@ -6,8 +6,8 @@ package core import ( "fmt" + "carvel.dev/ytt/pkg/orderedmap" "github.com/k14s/starlark-go/starlark" - "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 972eae2e..c26e2649 100644 --- a/pkg/template/core/starlark_value.go +++ b/pkg/template/core/starlark_value.go @@ -6,8 +6,8 @@ package core import ( "fmt" + "carvel.dev/ytt/pkg/orderedmap" "github.com/k14s/starlark-go/starlark" - "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 2c5c0507..9f8762cc 100644 --- a/pkg/template/error_hints_test.go +++ b/pkg/template/error_hints_test.go @@ -6,8 +6,8 @@ package template_test import ( "testing" + "carvel.dev/ytt/pkg/template" "github.com/k14s/starlark-go/starlark" - "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 38aabaee..034c6dd5 100644 --- a/pkg/template/evaluation_ctx.go +++ b/pkg/template/evaluation_ctx.go @@ -4,9 +4,9 @@ package template import ( + "carvel.dev/ytt/pkg/template/core" "fmt" "github.com/k14s/starlark-go/starlark" - "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 315c0f6b..5938e7a0 100644 --- a/pkg/template/meta.go +++ b/pkg/template/meta.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "carvel.dev/ytt/pkg/filepos" ) type AnnotationName string diff --git a/pkg/template/nodes.go b/pkg/template/nodes.go index 9223460a..bd218e82 100644 --- a/pkg/template/nodes.go +++ b/pkg/template/nodes.go @@ -6,8 +6,8 @@ package template import ( "strconv" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/template/source.go b/pkg/template/source.go index ee3233d6..3d1ecb51 100644 --- a/pkg/template/source.go +++ b/pkg/template/source.go @@ -6,7 +6,7 @@ package template import ( "bytes" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "carvel.dev/ytt/pkg/filepos" ) type Line struct { diff --git a/pkg/texttemplate/ast.go b/pkg/texttemplate/ast.go index 99e56313..dc0931fb 100644 --- a/pkg/texttemplate/ast.go +++ b/pkg/texttemplate/ast.go @@ -6,8 +6,8 @@ package texttemplate import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" ) type NodeRoot struct { diff --git a/pkg/texttemplate/evaluation_ctx.go b/pkg/texttemplate/evaluation_ctx.go index c46bebf6..0618216e 100644 --- a/pkg/texttemplate/evaluation_ctx.go +++ b/pkg/texttemplate/evaluation_ctx.go @@ -6,7 +6,7 @@ package texttemplate import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "carvel.dev/ytt/pkg/template" ) const ( diff --git a/pkg/texttemplate/parser.go b/pkg/texttemplate/parser.go index 73d07d0f..c6d476e4 100644 --- a/pkg/texttemplate/parser.go +++ b/pkg/texttemplate/parser.go @@ -6,7 +6,7 @@ package texttemplate import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "carvel.dev/ytt/pkg/filepos" ) type Parser struct { diff --git a/pkg/texttemplate/template.go b/pkg/texttemplate/template.go index 8d05a436..2c44123a 100644 --- a/pkg/texttemplate/template.go +++ b/pkg/texttemplate/template.go @@ -8,7 +8,7 @@ import ( "strings" "unicode" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" + "carvel.dev/ytt/pkg/template" ) type Template struct { diff --git a/pkg/texttemplate/template_test.go b/pkg/texttemplate/template_test.go index a615fd94..fff0a1c0 100644 --- a/pkg/texttemplate/template_test.go +++ b/pkg/texttemplate/template_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/texttemplate" "github.com/k14s/starlark-go/starlark" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/texttemplate" ) var ( diff --git a/pkg/validations/annotations.go b/pkg/validations/annotations.go index 2edc8bca..65938fba 100644 --- a/pkg/validations/annotations.go +++ b/pkg/validations/annotations.go @@ -6,10 +6,10 @@ package validations import ( "fmt" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // Declare @assert/... annotation and keyword argument names diff --git a/pkg/validations/validate.go b/pkg/validations/validate.go index 6194a83e..061d73e2 100644 --- a/pkg/validations/validate.go +++ b/pkg/validations/validate.go @@ -9,13 +9,13 @@ import ( "sort" "strings" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" + "carvel.dev/ytt/pkg/yttlibrary" "github.com/k14s/starlark-go/starlark" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "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" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" - "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary" ) // NodeValidation represents a validationRun attached to a Node via an annotation. diff --git a/pkg/validations/validations_test.go b/pkg/validations/validations_test.go index 9ffd150f..a51090c7 100644 --- a/pkg/validations/validations_test.go +++ b/pkg/validations/validations_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "github.com/vmware-tanzu/carvel-ytt/pkg/experiments" - "github.com/vmware-tanzu/carvel-ytt/pkg/validations" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" - _ "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibraryext" - "github.com/vmware-tanzu/carvel-ytt/test/filetests" + "carvel.dev/ytt/pkg/experiments" + "carvel.dev/ytt/pkg/validations" + "carvel.dev/ytt/pkg/yamlmeta" + _ "carvel.dev/ytt/pkg/yttlibraryext" + "carvel.dev/ytt/test/filetests" ) // TestMain is invoked when any tests are run in this package, *instead of* those tests being run directly. diff --git a/pkg/validations/yamlmeta.go b/pkg/validations/yamlmeta.go index fabef7ad..cc425dd1 100644 --- a/pkg/validations/yamlmeta.go +++ b/pkg/validations/yamlmeta.go @@ -4,7 +4,7 @@ package validations import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamlmeta" ) const validationsMeta = "validations" diff --git a/pkg/workspace/data_loader.go b/pkg/workspace/data_loader.go index c56739f4..330af1e6 100644 --- a/pkg/workspace/data_loader.go +++ b/pkg/workspace/data_loader.go @@ -4,7 +4,7 @@ package workspace import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/files" + "carvel.dev/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 190f119e..ceae366e 100644 --- a/pkg/workspace/data_values_pre_processing.go +++ b/pkg/workspace/data_values_pre_processing.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/schema" + "carvel.dev/ytt/pkg/workspace/datavalues" + "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/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 d88709a0..dbf15729 100644 --- a/pkg/workspace/data_values_schema_pre_processing.go +++ b/pkg/workspace/data_values_schema_pre_processing.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/workspace/datavalues" + "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/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 bbd158b4..f32c28be 100644 --- a/pkg/workspace/datavalues/envelope.go +++ b/pkg/workspace/datavalues/envelope.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "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" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/workspace/ref" + "carvel.dev/ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/workspace/datavalues/schema.go b/pkg/workspace/datavalues/schema.go index 2cafd08f..c476b6b6 100644 --- a/pkg/workspace/datavalues/schema.go +++ b/pkg/workspace/datavalues/schema.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" - "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" + "carvel.dev/ytt/pkg/schema" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/workspace/ref" + "carvel.dev/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 32eeb4aa..1bd6a26b 100644 --- a/pkg/workspace/doc_extractor.go +++ b/pkg/workspace/doc_extractor.go @@ -6,9 +6,9 @@ package workspace import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamltemplate" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" ) type DocExtractor struct { diff --git a/pkg/workspace/library.go b/pkg/workspace/library.go index adad54e4..22dbc166 100644 --- a/pkg/workspace/library.go +++ b/pkg/workspace/library.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/files" + "carvel.dev/ytt/pkg/files" ) const ( diff --git a/pkg/workspace/library_execution.go b/pkg/workspace/library_execution.go index 91d3343f..422022fa 100644 --- a/pkg/workspace/library_execution.go +++ b/pkg/workspace/library_execution.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/cmd/ui" + "carvel.dev/ytt/pkg/files" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/validations" + "carvel.dev/ytt/pkg/workspace/datavalues" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" - "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/validations" - "github.com/vmware-tanzu/carvel-ytt/pkg/workspace/datavalues" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) // LibraryExecution is the total set of configuration and dependencies that are used to accomplish the execution of a diff --git a/pkg/workspace/library_execution_factory.go b/pkg/workspace/library_execution_factory.go index 10103cec..f6f5bdf8 100644 --- a/pkg/workspace/library_execution_factory.go +++ b/pkg/workspace/library_execution_factory.go @@ -4,7 +4,7 @@ package workspace import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" + "carvel.dev/ytt/pkg/cmd/ui" ) // LibraryExecutionContext holds the total set of inputs that are involved in a LibraryExecution. diff --git a/pkg/workspace/library_module.go b/pkg/workspace/library_module.go index 66d94c76..fb2991b9 100644 --- a/pkg/workspace/library_module.go +++ b/pkg/workspace/library_module.go @@ -7,15 +7,15 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/workspace/datavalues" + "carvel.dev/ytt/pkg/workspace/ref" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" + "carvel.dev/ytt/pkg/yttlibrary/overlay" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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" ) // LibraryModule is the definition of the ytt-supplied Starlark module `@ytt:library` diff --git a/pkg/workspace/overlay_post_processing.go b/pkg/workspace/overlay_post_processing.go index 71582bf1..880b628e 100644 --- a/pkg/workspace/overlay_post_processing.go +++ b/pkg/workspace/overlay_post_processing.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/template" + "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/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 087c732b..fb573c39 100644 --- a/pkg/workspace/ref/library_ref.go +++ b/pkg/workspace/ref/library_ref.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/template/core" ) const ( diff --git a/pkg/workspace/template_loader.go b/pkg/workspace/template_loader.go index d47dcfaa..a1683b50 100644 --- a/pkg/workspace/template_loader.go +++ b/pkg/workspace/template_loader.go @@ -7,15 +7,15 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/cmd/ui" + "carvel.dev/ytt/pkg/files" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/texttemplate" + "carvel.dev/ytt/pkg/workspace/datavalues" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" + "carvel.dev/ytt/pkg/yttlibrary" "github.com/k14s/starlark-go/starlark" - "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 f3871696..af103acf 100644 --- a/pkg/yamlfmt/printer.go +++ b/pkg/yamlfmt/printer.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamlmeta" ) // TODO strict mode diff --git a/pkg/yamlfmt/printer_test.go b/pkg/yamlfmt/printer_test.go index 143049ed..32a0e98a 100644 --- a/pkg/yamlfmt/printer_test.go +++ b/pkg/yamlfmt/printer_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "carvel.dev/ytt/pkg/yamlfmt" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/difflib" - "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 74e0c2c2..f5cf2e74 100644 --- a/pkg/yamlmeta/ast.go +++ b/pkg/yamlmeta/ast.go @@ -4,7 +4,7 @@ package yamlmeta import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "carvel.dev/ytt/pkg/filepos" ) type Node interface { diff --git a/pkg/yamlmeta/construct.go b/pkg/yamlmeta/construct.go index 6776c495..d489e036 100644 --- a/pkg/yamlmeta/construct.go +++ b/pkg/yamlmeta/construct.go @@ -3,7 +3,7 @@ package yamlmeta -import "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" +import "carvel.dev/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 73399b59..100ab617 100644 --- a/pkg/yamlmeta/convert.go +++ b/pkg/yamlmeta/convert.go @@ -6,9 +6,9 @@ package yamlmeta import ( "fmt" - "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" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/yamlmeta/internal/yaml.v2" ) func NewASTFromInterface(val interface{}) interface{} { diff --git a/pkg/yamlmeta/document.go b/pkg/yamlmeta/document.go index 0e206457..d2321571 100644 --- a/pkg/yamlmeta/document.go +++ b/pkg/yamlmeta/document.go @@ -4,7 +4,7 @@ package yamlmeta import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/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 04a5f2b3..568aea0e 100644 --- a/pkg/yamlmeta/file_position_printer.go +++ b/pkg/yamlmeta/file_position_printer.go @@ -9,8 +9,8 @@ import ( "io" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/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 bbd116a6..a25de673 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/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/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 912c7f71..731bcaa7 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/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/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 1e09030c..70e25e43 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/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/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 eb58313f..f3a6cefd 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/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/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 b89606ee..1ac1f27b 100644 --- a/pkg/yamlmeta/map_key_overrides.go +++ b/pkg/yamlmeta/map_key_overrides.go @@ -4,7 +4,7 @@ package yamlmeta import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "carvel.dev/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 9a3cb272..98cd27f4 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/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamlmeta" ) func TestMapKeyOverridePlainYAML(t *testing.T) { diff --git a/pkg/yamlmeta/node.go b/pkg/yamlmeta/node.go index 7a36a15f..ea879f74 100644 --- a/pkg/yamlmeta/node.go +++ b/pkg/yamlmeta/node.go @@ -7,9 +7,9 @@ import ( "encoding/json" "fmt" - "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" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/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 45ab867b..65a6a77e 100644 --- a/pkg/yamlmeta/parser.go +++ b/pkg/yamlmeta/parser.go @@ -14,8 +14,8 @@ import ( "strconv" "strings" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/yamlmeta/internal/yaml.v2" ) var ( diff --git a/pkg/yamlmeta/parser_strict_test.go b/pkg/yamlmeta/parser_strict_test.go index 9e668272..77447308 100644 --- a/pkg/yamlmeta/parser_strict_test.go +++ b/pkg/yamlmeta/parser_strict_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/yamlmeta" ) var _ = fmt.Sprintf diff --git a/pkg/yamlmeta/parser_test.go b/pkg/yamlmeta/parser_test.go index 70af776d..de015f99 100644 --- a/pkg/yamlmeta/parser_test.go +++ b/pkg/yamlmeta/parser_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/difflib" - "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 8a500c1d..2d630899 100644 --- a/pkg/yamlmeta/plain.go +++ b/pkg/yamlmeta/plain.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta/internal/yaml.v2" + "carvel.dev/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 14329cec..e0d790d4 100644 --- a/pkg/yamlmeta/plain_test.go +++ b/pkg/yamlmeta/plain_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/yamlmeta" ) var _ = fmt.Sprintf diff --git a/pkg/yamlmeta/printer.go b/pkg/yamlmeta/printer.go index f8577e9f..2e30ecd2 100644 --- a/pkg/yamlmeta/printer.go +++ b/pkg/yamlmeta/printer.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" + "carvel.dev/ytt/pkg/filepos" ) type Printer struct { diff --git a/pkg/yamlmeta/printers.go b/pkg/yamlmeta/printers.go index 1fcdeb86..71e5d505 100644 --- a/pkg/yamlmeta/printers.go +++ b/pkg/yamlmeta/printers.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/orderedmap" ) type DocumentPrinter interface { diff --git a/pkg/yamltemplate/evaluation_ctx.go b/pkg/yamltemplate/evaluation_ctx.go index 126e887b..8229757e 100644 --- a/pkg/yamltemplate/evaluation_ctx.go +++ b/pkg/yamltemplate/evaluation_ctx.go @@ -6,10 +6,10 @@ package yamltemplate import ( "fmt" - "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" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/go_value_with_yaml.go b/pkg/yamltemplate/go_value_with_yaml.go index 92a61e36..3270b407 100644 --- a/pkg/yamltemplate/go_value_with_yaml.go +++ b/pkg/yamltemplate/go_value_with_yaml.go @@ -6,9 +6,9 @@ package yamltemplate import ( "fmt" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" - 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 0f6b6e35..d122b48a 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/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/metas.go b/pkg/yamltemplate/metas.go index dc01bb69..efbe27f6 100644 --- a/pkg/yamltemplate/metas.go +++ b/pkg/yamltemplate/metas.go @@ -8,9 +8,9 @@ import ( "strings" "unicode" - "github.com/vmware-tanzu/carvel-ytt/pkg/filepos" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" ) var ( diff --git a/pkg/yamltemplate/starlark_fragment.go b/pkg/yamltemplate/starlark_fragment.go index 05c71562..336b0d29 100644 --- a/pkg/yamltemplate/starlark_fragment.go +++ b/pkg/yamltemplate/starlark_fragment.go @@ -7,10 +7,10 @@ import ( "fmt" "reflect" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/syntax" - 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 6a681c98..cfb494b9 100644 --- a/pkg/yamltemplate/template.go +++ b/pkg/yamltemplate/template.go @@ -7,10 +7,10 @@ import ( "bytes" "fmt" - "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" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/texttemplate" + "carvel.dev/ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yamltemplate/template_test.go b/pkg/yamltemplate/template_test.go index 1b0372f6..2f9cd46f 100644 --- a/pkg/yamltemplate/template_test.go +++ b/pkg/yamltemplate/template_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "github.com/vmware-tanzu/carvel-ytt/pkg/experiments" - "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" - _ "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibraryext" - "github.com/vmware-tanzu/carvel-ytt/test/filetests" + "carvel.dev/ytt/pkg/experiments" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/yamlmeta" + _ "carvel.dev/ytt/pkg/yttlibraryext" + "carvel.dev/ytt/test/filetests" ) // TestMain is invoked when any tests are run in this package, *instead of* those tests being run directly. diff --git a/pkg/yttlibrary/all.go b/pkg/yttlibrary/all.go index 500d2a8f..92ca7f5f 100644 --- a/pkg/yttlibrary/all.go +++ b/pkg/yttlibrary/all.go @@ -6,11 +6,11 @@ package yttlibrary import ( "fmt" + "carvel.dev/ytt/pkg/cmd/ui" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yttlibrary/overlay" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" - tplcore "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" - "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary/overlay" ) var registeredExts []*starlarkstruct.Module diff --git a/pkg/yttlibrary/assert.go b/pkg/yttlibrary/assert.go index 5760e9c5..569c1e8b 100644 --- a/pkg/yttlibrary/assert.go +++ b/pkg/yttlibrary/assert.go @@ -6,11 +6,11 @@ package yttlibrary import ( "fmt" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" "github.com/k14s/starlark-go/syntax" - "github.com/vmware-tanzu/carvel-ytt/pkg/orderedmap" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) // NewAssertModule constructs a new instance of AssertModule, respecting the "validations" experiment flag. diff --git a/pkg/yttlibrary/base64.go b/pkg/yttlibrary/base64.go index b65d34cc..61951263 100644 --- a/pkg/yttlibrary/base64.go +++ b/pkg/yttlibrary/base64.go @@ -7,9 +7,9 @@ import ( "encoding/base64" "fmt" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/data.go b/pkg/yttlibrary/data.go index 53bddfbe..885bec0c 100644 --- a/pkg/yttlibrary/data.go +++ b/pkg/yttlibrary/data.go @@ -6,10 +6,10 @@ package yttlibrary import ( "fmt" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 796802f0..a789ee63 100644 --- a/pkg/yttlibrary/ip.go +++ b/pkg/yttlibrary/ip.go @@ -7,10 +7,10 @@ import ( "fmt" "net" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 9e5d37f9..b7eeb41b 100644 --- a/pkg/yttlibrary/json.go +++ b/pkg/yttlibrary/json.go @@ -8,11 +8,11 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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/math.go b/pkg/yttlibrary/math.go index 1cbfaca2..f2370537 100644 --- a/pkg/yttlibrary/math.go +++ b/pkg/yttlibrary/math.go @@ -36,10 +36,10 @@ import ( "fmt" "math" + "carvel.dev/ytt/pkg/cmd/ui" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/cmd/ui" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) // MathModule contains the definition of the @ytt:math module. diff --git a/pkg/yttlibrary/md5.go b/pkg/yttlibrary/md5.go index ca76c6f3..58cd21d9 100644 --- a/pkg/yttlibrary/md5.go +++ b/pkg/yttlibrary/md5.go @@ -7,9 +7,9 @@ import ( "crypto/md5" "fmt" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/module.go b/pkg/yttlibrary/module.go index 11f3bf2b..fbb9eeab 100644 --- a/pkg/yttlibrary/module.go +++ b/pkg/yttlibrary/module.go @@ -4,9 +4,9 @@ package yttlibrary import ( + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 9ddb99ee..2612447f 100644 --- a/pkg/yttlibrary/overlay/annotations.go +++ b/pkg/yttlibrary/overlay/annotations.go @@ -6,8 +6,8 @@ package overlay import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/template" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" ) const ( diff --git a/pkg/yttlibrary/overlay/api.go b/pkg/yttlibrary/overlay/api.go index ccc665cc..f22d34f0 100644 --- a/pkg/yttlibrary/overlay/api.go +++ b/pkg/yttlibrary/overlay/api.go @@ -7,11 +7,11 @@ import ( "fmt" "reflect" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 9c62aac1..8b3203ae 100644 --- a/pkg/yttlibrary/overlay/array.go +++ b/pkg/yttlibrary/overlay/array.go @@ -4,7 +4,7 @@ package overlay import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/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 cbdd4d69..dbf067d9 100644 --- a/pkg/yttlibrary/overlay/array_item_match_annotation.go +++ b/pkg/yttlibrary/overlay/array_item_match_annotation.go @@ -6,12 +6,12 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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 4485aa56..3642baf5 100644 --- a/pkg/yttlibrary/overlay/assert_annotation.go +++ b/pkg/yttlibrary/overlay/assert_annotation.go @@ -6,11 +6,11 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/template" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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 4d65f936..6d4372ba 100644 --- a/pkg/yttlibrary/overlay/compare.go +++ b/pkg/yttlibrary/overlay/compare.go @@ -7,7 +7,7 @@ import ( "fmt" "reflect" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamlmeta" ) type Comparison struct{} diff --git a/pkg/yttlibrary/overlay/document.go b/pkg/yttlibrary/overlay/document.go index cb2a1f15..01ca08a3 100644 --- a/pkg/yttlibrary/overlay/document.go +++ b/pkg/yttlibrary/overlay/document.go @@ -6,7 +6,7 @@ package overlay import ( "fmt" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/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 77ac9015..8b7d057c 100644 --- a/pkg/yttlibrary/overlay/document_match_annotation.go +++ b/pkg/yttlibrary/overlay/document_match_annotation.go @@ -6,12 +6,12 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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 5a39b02a..067ead6a 100644 --- a/pkg/yttlibrary/overlay/insert_annotation.go +++ b/pkg/yttlibrary/overlay/insert_annotation.go @@ -5,10 +5,11 @@ package overlay import ( "fmt" + + "carvel.dev/ytt/pkg/template" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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" ) // Kwargs of overlay/insert diff --git a/pkg/yttlibrary/overlay/map.go b/pkg/yttlibrary/overlay/map.go index d5b8e40c..0263e83c 100644 --- a/pkg/yttlibrary/overlay/map.go +++ b/pkg/yttlibrary/overlay/map.go @@ -4,7 +4,7 @@ package overlay import ( - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" + "carvel.dev/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 83f577f9..836440fe 100644 --- a/pkg/yttlibrary/overlay/map_item_match_annotation.go +++ b/pkg/yttlibrary/overlay/map_item_match_annotation.go @@ -7,12 +7,12 @@ import ( "fmt" "reflect" + "carvel.dev/ytt/pkg/filepos" + "carvel.dev/ytt/pkg/template" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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 a4430438..f8ff9126 100644 --- a/pkg/yttlibrary/overlay/match_annotation_expects_kwarg.go +++ b/pkg/yttlibrary/overlay/match_annotation_expects_kwarg.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" + "carvel.dev/ytt/pkg/filepos" "github.com/k14s/starlark-go/starlark" - "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 ec370b73..e24671fc 100644 --- a/pkg/yttlibrary/overlay/match_child_defaults_annotation.go +++ b/pkg/yttlibrary/overlay/match_child_defaults_annotation.go @@ -6,8 +6,8 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/template" "github.com/k14s/starlark-go/starlark" - "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 6eefaf38..d78996f2 100644 --- a/pkg/yttlibrary/overlay/op.go +++ b/pkg/yttlibrary/overlay/op.go @@ -6,9 +6,9 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" - "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 8ecc848d..18bede5c 100644 --- a/pkg/yttlibrary/overlay/plain_merge.go +++ b/pkg/yttlibrary/overlay/plain_merge.go @@ -6,10 +6,10 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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 b983432e..55a3b4c5 100644 --- a/pkg/yttlibrary/overlay/replace_annotation.go +++ b/pkg/yttlibrary/overlay/replace_annotation.go @@ -6,10 +6,10 @@ package overlay import ( "fmt" + "carvel.dev/ytt/pkg/template" + tplcore "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamltemplate" "github.com/k14s/starlark-go/starlark" - "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 5acfd8cb..30bcdb00 100644 --- a/pkg/yttlibrary/regexp.go +++ b/pkg/yttlibrary/regexp.go @@ -7,9 +7,9 @@ import ( "fmt" "regexp" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/sha256.go b/pkg/yttlibrary/sha256.go index 935a02f9..c274cec4 100644 --- a/pkg/yttlibrary/sha256.go +++ b/pkg/yttlibrary/sha256.go @@ -7,9 +7,9 @@ import ( "crypto/sha256" "fmt" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) var ( diff --git a/pkg/yttlibrary/struct.go b/pkg/yttlibrary/struct.go index 802caf92..e5800f7e 100644 --- a/pkg/yttlibrary/struct.go +++ b/pkg/yttlibrary/struct.go @@ -6,10 +6,10 @@ package yttlibrary import ( "fmt" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 b0c7ecbe..683ce1eb 100644 --- a/pkg/yttlibrary/template.go +++ b/pkg/yttlibrary/template.go @@ -4,9 +4,9 @@ package yttlibrary import ( + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" ) type TemplateModule struct { diff --git a/pkg/yttlibrary/url.go b/pkg/yttlibrary/url.go index b2f1f1a9..00f7070a 100644 --- a/pkg/yttlibrary/url.go +++ b/pkg/yttlibrary/url.go @@ -9,10 +9,10 @@ import ( "sort" "strings" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 a48076a2..6cc2e202 100644 --- a/pkg/yttlibrary/version.go +++ b/pkg/yttlibrary/version.go @@ -7,11 +7,11 @@ import ( "fmt" "regexp" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/version" semver "github.com/hashicorp/go-version" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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 9b1a2212..d217b45a 100644 --- a/pkg/yttlibrary/yaml.go +++ b/pkg/yttlibrary/yaml.go @@ -6,10 +6,10 @@ package yttlibrary import ( "fmt" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "github.com/vmware-tanzu/carvel-ytt/pkg/template/core" - "github.com/vmware-tanzu/carvel-ytt/pkg/yamlmeta" ) var ( diff --git a/pkg/yttlibraryext/all.go b/pkg/yttlibraryext/all.go index abf24a8c..10c96658 100644 --- a/pkg/yttlibraryext/all.go +++ b/pkg/yttlibraryext/all.go @@ -10,5 +10,5 @@ package yttlibraryext import ( - _ "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibraryext/toml" // include toml + _ "carvel.dev/ytt/pkg/yttlibraryext/toml" // include toml ) diff --git a/pkg/yttlibraryext/toml/toml.go b/pkg/yttlibraryext/toml/toml.go index 693a70d9..6aa484af 100644 --- a/pkg/yttlibraryext/toml/toml.go +++ b/pkg/yttlibraryext/toml/toml.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" + "carvel.dev/ytt/pkg/orderedmap" + "carvel.dev/ytt/pkg/template/core" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yttlibrary" "github.com/BurntSushi/toml" "github.com/k14s/starlark-go/starlark" "github.com/k14s/starlark-go/starlarkstruct" - "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" - "github.com/vmware-tanzu/carvel-ytt/pkg/yttlibrary" ) var ( diff --git a/test/filetests/filetests.go b/test/filetests/filetests.go index 6a2a8dca..95795bbc 100644 --- a/test/filetests/filetests.go +++ b/test/filetests/filetests.go @@ -16,12 +16,12 @@ import ( "strings" "testing" + "carvel.dev/ytt/pkg/template" + "carvel.dev/ytt/pkg/version" + "carvel.dev/ytt/pkg/yamlmeta" + "carvel.dev/ytt/pkg/yamltemplate" + "carvel.dev/ytt/pkg/yttlibrary" "github.com/k14s/starlark-go/starlark" - "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" ) // MarshalableResult is a template evaluation result that can be (likely) marshaled into a slice of bytes.