Skip to content
This repository was archived by the owner on May 18, 2026. It is now read-only.

Commit 9fe6667

Browse files
odinnordicoWendy Maria Arango Chavarria
andauthored
feat: add suport for exclude files on local path (#145)
Signed-off-by: Diego Alfonso <dalfonso@vmware.com> Co-authored-by: Wendy Maria Arango Chavarria <warango@vmware.com>
1 parent 39dabc5 commit 9fe6667

32 files changed

Lines changed: 160 additions & 1501 deletions

File tree

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
dies.dev v0.4.0
77
github.com/AlecAivazis/survey/v2 v2.3.4
88
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
9-
github.com/cppforlife/go-cli-ui v0.0.0-20200716203538-1e47f820817f
9+
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
1010
github.com/fatih/color v1.13.0
1111
github.com/go-logr/logr v1.2.3
1212
github.com/google/go-cmp v0.5.8
@@ -163,8 +163,8 @@ require (
163163
github.com/subosito/gotenv v1.2.0 // indirect
164164
github.com/valyala/fastjson v1.6.3 // indirect
165165
github.com/vbatts/tar-split v0.11.2 // indirect
166-
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect
167-
github.com/vmware-tanzu/carvel-imgpkg v0.23.1 // indirect
166+
github.com/vito/go-interact v1.0.1 // indirect
167+
github.com/vmware-tanzu/carvel-imgpkg v0.25.0 // indirect
168168
github.com/vmware-tanzu/carvel-kapp-controller v0.25.0 // indirect
169169
github.com/vmware-tanzu/carvel-vendir v0.24.0 // indirect
170170
github.com/vmware-tanzu/carvel-ytt v0.40.0 // indirect
@@ -179,7 +179,7 @@ require (
179179
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
180180
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
181181
golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
182-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
182+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
183183
golang.org/x/text v0.3.7 // indirect
184184
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
185185
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect

go.sum

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,9 @@ github.com/cppforlife/cobrautil v0.0.0-20200514214827-bb86e6965d72/go.mod h1:2w+
485485
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 h1:mYQweUIBD+TBRjIeQnJmXr0GSVMpI6O0takyb/aaOgo=
486486
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835/go.mod h1:dYeVsKp1vvK8XjdTPR1gF+uk+9doxKeO3hqQTOCr7T4=
487487
github.com/cppforlife/go-cli-ui v0.0.0-20200506005011-4268990983cc/go.mod h1:I0qrzCmuPWYI6kAOvkllYjaW2aovclWbJ96+v+YyHb0=
488-
github.com/cppforlife/go-cli-ui v0.0.0-20200716203538-1e47f820817f h1:yVW0v4zDXzJo1i8G9G3vtvNpyzhvtLalO34BsN/K88E=
489488
github.com/cppforlife/go-cli-ui v0.0.0-20200716203538-1e47f820817f/go.mod h1:L18TqO77ci8i+hFtlMC4zSFz/D3O8lf84TyVU+zFF8E=
489+
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14 h1:MjRdR01xh0sfkeS3OOBv+MYkYsrbHuTDc4rfBnVdFaI=
490+
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14/go.mod h1:AlgTssDlstr4mf92TR4DPITLfl5+7wEY4cKStCmeeto=
490491
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
491492
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
492493
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -1330,6 +1331,7 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
13301331
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
13311332
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
13321333
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
1334+
github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
13331335
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
13341336
github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
13351337
github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
@@ -1508,6 +1510,7 @@ github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wql
15081510
github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
15091511
github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I=
15101512
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
1513+
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
15111514
github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
15121515
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
15131516
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
@@ -1682,12 +1685,13 @@ github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:tw
16821685
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
16831686
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
16841687
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
1685-
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec h1:Klu98tQ9Z1t23gvC7p7sCmvxkZxLhBHLNyrUPsWsYFg=
16861688
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo=
1689+
github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs=
1690+
github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA=
16871691
github.com/vmware-labs/reconciler-runtime v0.6.0 h1:N0KWTtN+oTLqfz/ZH8IroNeTJMC7WQ3rV7Fjv5wUsyA=
16881692
github.com/vmware-labs/reconciler-runtime v0.6.0/go.mod h1:eYOWMbAdK5GTCdfA/r31sOYZMXHyGXEkoPc/1F8XFBc=
1689-
github.com/vmware-tanzu/carvel-imgpkg v0.23.1 h1:sUHDtnvcIMMcY/Pudym6DJ0kv7+uyMCAqQby0SLnQVs=
1690-
github.com/vmware-tanzu/carvel-imgpkg v0.23.1/go.mod h1:2XNe+P0MDgya0FPEMOVZLAXku05VZhccVdDcXChhvy8=
1693+
github.com/vmware-tanzu/carvel-imgpkg v0.25.0 h1:ZCKPA57pRpiuscJWAqr6zaDN9WfVwuyA/hwdNuUU8fQ=
1694+
github.com/vmware-tanzu/carvel-imgpkg v0.25.0/go.mod h1:zCuSezsBU0mehp8DnIM324kkg+3g0WobptbFZPNBthE=
16911695
github.com/vmware-tanzu/carvel-kapp-controller v0.25.0 h1:/weI9nz749qwKFD/QGITlxSeRxuhNRSvH02nwWLNJlY=
16921696
github.com/vmware-tanzu/carvel-kapp-controller v0.25.0/go.mod h1:K4/0xokQUQblJCOpeZ/Wx9eSGnSkN37XbvPf3w5Pf/w=
16931697
github.com/vmware-tanzu/carvel-secretgen-controller v0.5.0 h1:3mSDyzhf52Y0jdvHrhJUf4Sk97CILBOkQt/WUaD8G/8=
@@ -2157,8 +2161,9 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
21572161
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
21582162
golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
21592163
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
2160-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
21612164
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
2165+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
2166+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
21622167
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
21632168
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
21642169
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

pkg/cli-runtime/config.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ import (
2929
"github.com/vmware-tanzu/apps-cli-plugin/pkg/cli-runtime/printer"
3030
)
3131

32+
const defaultTanzuIgnoreFile = ".tanzuignore"
33+
3234
type Config struct {
3335
Name string
3436
Client
3537
Scheme *runtime.Scheme
3638
ViperConfigFile string
3739
KubeConfigFile string
3840
CurrentContext string
41+
TanzuIgnoreFile string
3942
Exec func(ctx context.Context, command string, args ...string) *exec.Cmd
4043
Stdin io.Reader
4144
Stdout io.Writer
@@ -46,13 +49,14 @@ type Config struct {
4649
func NewDefaultConfig(name string, scheme *runtime.Scheme) *Config {
4750
var v int32
4851
return &Config{
49-
Name: name,
50-
Scheme: scheme,
51-
Exec: exec.CommandContext,
52-
Stdin: os.Stdin,
53-
Stdout: os.Stdout,
54-
Stderr: os.Stderr,
55-
Verbose: &v,
52+
Name: name,
53+
Scheme: scheme,
54+
Exec: exec.CommandContext,
55+
Stdin: os.Stdin,
56+
Stdout: os.Stdout,
57+
Stderr: os.Stderr,
58+
Verbose: &v,
59+
TanzuIgnoreFile: defaultTanzuIgnoreFile,
5660
}
5761
}
5862

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# this is a comment
2+
3+
Tiltfile
4+
5+
excludable
6+
7+
resources/config/dev
8+
# This does not exist
9+
noExistentDirectory
10+
11+
noExistentDirectory2/
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
SOURCE_IMAGE = os.getenv("SOURCE_IMAGE", default='your-registry.io/project/source')
2+
LOCAL_PATH = os.getenv("LOCAL_PATH", default='.')
3+
NAMESPACE = os.getenv("NAMESPACE", default='default')
4+
5+
k8s_custom_deploy(
6+
'app',
7+
apply_cmd="tanzu apps workload apply -f config/workload.yaml --live-update" +
8+
" --local-path " + LOCAL_PATH +
9+
" --source-image " + SOURCE_IMAGE +
10+
" --namespace " + NAMESPACE +
11+
" --yes >/dev/null" +
12+
" && kubectl get workload tanzu-java-web-app --namespace " + NAMESPACE + " -o yaml",
13+
delete_cmd="tanzu apps workload delete -f config/workload.yaml --namespace " + NAMESPACE + " --yes",
14+
deps=['pom.xml', './target/classes'],
15+
container_selector='workload',
16+
live_update=[
17+
sync('./target/classes', '/workspace/BOOT-INF/classes')
18+
]
19+
)
20+
21+
k8s_resource('app, port_forwards=["8080:8080"],
22+
extra_pod_selectors=[{'serving.knative.dev/service': 'app}])
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
development
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
world!
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
development
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
production
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data

0 commit comments

Comments
 (0)