Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: pkg imported more than once #861

Merged
merged 1 commit into from
Jul 26, 2023
Merged

chore: pkg imported more than once #861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pkg/cmd/template/regular_input_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

"github.com/stretchr/testify/assert"
"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"
Expand All @@ -40,8 +39,8 @@ If you want to include those results, use the --output-files or --dangerous-empt
stderr := bytes.NewBufferString("")
ui := ui.NewCustomWriterTTY(false, stdout, stderr)
opts := cmdtpl.NewOptions()
rfsOpts := template.RegularFilesSourceOpts{OutputType: cmdtpl.OutputType{Types: []string{"yaml"}}}
rfs := template.NewRegularFilesSource(rfsOpts, ui)
rfsOpts := cmdtpl.RegularFilesSourceOpts{OutputType: cmdtpl.OutputType{Types: []string{"yaml"}}}
rfs := cmdtpl.NewRegularFilesSource(rfsOpts, ui)

out := opts.RunWithFiles(cmdtpl.Input{Files: filesToProcess}, ui)
require.NoError(t, out.Err)
Expand Down Expand Up @@ -76,8 +75,8 @@ organization=Acme Widgets Inc.`)
stderr := bytes.NewBufferString("")
ui := ui.NewCustomWriterTTY(false, stdout, stderr)
opts := cmdtpl.NewOptions()
rfsOpts := template.RegularFilesSourceOpts{OutputType: cmdtpl.OutputType{Types: []string{"yaml"}}, OutputFiles: outputDir}
rfs := template.NewRegularFilesSource(rfsOpts, ui)
rfsOpts := cmdtpl.RegularFilesSourceOpts{OutputType: cmdtpl.OutputType{Types: []string{"yaml"}}, OutputFiles: outputDir}
rfs := cmdtpl.NewRegularFilesSource(rfsOpts, ui)

out := opts.RunWithFiles(cmdtpl.Input{Files: filesToProcess}, ui)
require.NoError(t, out.Err)
Expand Down Expand Up @@ -121,8 +120,8 @@ func Test_FileMark_YAML_Shows_No_Warning(t *testing.T) {
ui := ui.NewCustomWriterTTY(false, stdout, stderr)
opts := cmdtpl.NewOptions()
opts.FileMarksOpts.FileMarks = []string{"yaml.txt:type=yaml-plain"}
rfsOpts := template.RegularFilesSourceOpts{OutputType: cmdtpl.OutputType{Types: []string{"yaml"}}}
rfs := template.NewRegularFilesSource(rfsOpts, ui)
rfsOpts := cmdtpl.RegularFilesSourceOpts{OutputType: cmdtpl.OutputType{Types: []string{"yaml"}}}
rfs := cmdtpl.NewRegularFilesSource(rfsOpts, ui)

out := opts.RunWithFiles(cmdtpl.Input{Files: filesToProcess}, ui)
require.NoError(t, out.Err)
Expand Down
Loading