mykso · Zebradil · May 10, 2024 · Mar 24, 2024 · Mar 24, 2024 · Mar 24, 2024
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@ bin/*
 dist
 .idea
 .run
-/myks
-**/.myks/tmp
+.myks
+.vendor
 coverage.txt
-vendor/
diff --git a/examples/charts/render-test-chart/Chart.yaml → .../_lib/charts/render-test-chart/Chart.yaml b/examples/charts/render-test-chart/Chart.yaml → .../_lib/charts/render-test-chart/Chart.yaml
diff --git a/...s/render-test-chart/templates/output.yaml → ...s/render-test-chart/templates/output.yaml b/...s/render-test-chart/templates/output.yaml → ...s/render-test-chart/templates/output.yaml
@@ -1,5 +1,5 @@
 kind: rendering
 metadata:
-  name: render-test
+  name: helm-{{ .Release.Name }}
 outputYaml:
 {{ toYaml .Values.outputYaml | indent 2 }}
diff --git a/...ples/charts/render-test-chart/values.yaml → ..._lib/charts/render-test-chart/values.yaml b/...ples/charts/render-test-chart/values.yaml → ..._lib/charts/render-test-chart/values.yaml
diff --git a/examples/_lib/ytt/render-test-1/all.ytt.yaml b/examples/_lib/ytt/render-test-1/all.ytt.yaml
@@ -0,0 +1,4 @@
+---
+kind: rendering
+metadata:
+  name: ytt-render-test-1
diff --git a/examples/_lib/ytt/render-test-2/all.ytt.yaml b/examples/_lib/ytt/render-test-2/all.ytt.yaml
@@ -0,0 +1,4 @@
+---
+kind: rendering
+metadata:
+  name: ytt-render-test-2
diff --git a/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.lock.yaml b/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.lock.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.yaml b/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.lock.yaml b/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.lock.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.yaml b/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml b/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.lock.yaml b/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.lock.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.yaml b/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.yaml
diff --git a/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/helm/render-test.yaml b/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/helm/render-test.yaml
diff --git a/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.lock.yaml b/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.lock.yaml
diff --git a/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.yaml b/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.yaml
diff --git a/examples/integration-tests/envs/dev/env-data.ytt.yaml b/examples/integration-tests/envs/dev/env-data.ytt.yaml
@@ -7,6 +7,8 @@ environment:
   applications:
     - proto: helm-render-test
       name: helm-installation
+    - proto: multiple-sources
+    - proto: multiple-contents-sources
     - proto: ytt-render-test
       name: ytt-installation
     - proto: static-test
diff --git a/examples/integration-tests/prototypes/helm-render-test/vendir/base.ytt.yaml b/examples/integration-tests/prototypes/helm-render-test/vendir/base.ytt.yaml
@@ -9,4 +9,4 @@ directories:
     contents:
       - path: .
         directory:
-          path: ../charts/render-test-chart
+          path: ../_lib/charts/render-test-chart
diff --git a/examples/integration-tests/prototypes/multiple-contents-sources/vendir/all.ytt.yaml b/examples/integration-tests/prototypes/multiple-contents-sources/vendir/all.ytt.yaml
@@ -0,0 +1,17 @@
+apiVersion: vendir.k14s.io/v1alpha1
+kind: Config
+directories:
+  - path: .
+    contents:
+      - path: charts/render-test-1
+        directory:
+          path: ../_lib/charts/render-test-chart
+      - path: charts/render-test-2
+        directory:
+          path: ../_lib/charts/render-test-chart
+      - path: ytt/render-test-1
+        directory:
+          path: ../_lib/ytt/render-test-1
+      - path: ytt/render-test-2
+        directory:
+          path: ../_lib/ytt/render-test-2
diff --git a/examples/integration-tests/prototypes/multiple-sources/vendir/all.ytt.yaml b/examples/integration-tests/prototypes/multiple-sources/vendir/all.ytt.yaml
@@ -0,0 +1,23 @@
+apiVersion: vendir.k14s.io/v1alpha1
+kind: Config
+directories:
+  - path: charts/render-test-1
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/charts/render-test-chart
+  - path: charts/render-test-2
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/charts/render-test-chart
+  - path: ytt/render-test-1
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/ytt/render-test-1
+  - path: ytt/render-test-2
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/ytt/render-test-2
diff --git a/examples/integration-tests/rendered/argocd/mykso-dev/app-multiple-contents-sources.yaml b/examples/integration-tests/rendered/argocd/mykso-dev/app-multiple-contents-sources.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: app-mykso-dev-multiple-contents-sources
+  namespace: system-argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: env-mykso-dev
+  destination:
+    name: mykso-dev
+    namespace: multiple-contents-sources
+  source:
+    path: examples/integration-tests/rendered/envs/mykso-dev/multiple-contents-sources
+    plugin:
+      name: argocd-vault-plugin-v1.0.0
+    repoURL: [email protected]:mykso/myks.git
+    targetRevision: main
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+    - CreateNamespace=true
+    - ServerSideApply=true
diff --git a/examples/integration-tests/rendered/argocd/mykso-dev/app-multiple-sources.yaml b/examples/integration-tests/rendered/argocd/mykso-dev/app-multiple-sources.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: app-mykso-dev-multiple-sources
+  namespace: system-argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: env-mykso-dev
+  destination:
+    name: mykso-dev
+    namespace: multiple-sources
+  source:
+    path: examples/integration-tests/rendered/envs/mykso-dev/multiple-sources
+    plugin:
+      name: argocd-vault-plugin-v1.0.0
+    repoURL: [email protected]:mykso/myks.git
+    targetRevision: main
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+    - CreateNamespace=true
+    - ServerSideApply=true
diff --git a/...m-installation/rendering-render-test.yaml → ...tallation/rendering-helm-render-test.yaml b/...m-installation/rendering-render-test.yaml → ...tallation/rendering-helm-render-test.yaml
@@ -1,6 +1,6 @@
 kind: rendering
 metadata:
-  name: render-test
+  name: helm-render-test
 outputYaml:
   fromAppConfig: true
   fromAppConfigAppData: true

diff --git a/...tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-helm-render-test-1.yaml b/...tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-helm-render-test-1.yaml
@@ -0,0 +1,5 @@
+kind: rendering
+metadata:
+  name: helm-render-test-1
+outputYaml:
+  fromChartDefaultValues: true
diff --git a/...tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-helm-render-test-2.yaml b/...tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-helm-render-test-2.yaml
@@ -0,0 +1,5 @@
+kind: rendering
+metadata:
+  name: helm-render-test-2
+outputYaml:
+  fromChartDefaultValues: true
diff --git a/...-tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-ytt-render-test-1.yaml b/...-tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-ytt-render-test-1.yaml
@@ -0,0 +1,3 @@
+kind: rendering
+metadata:
+  name: ytt-render-test-1
diff --git a/...-tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-ytt-render-test-2.yaml b/...-tests/rendered/envs/mykso-dev/multiple-contents-sources/rendering-ytt-render-test-2.yaml
@@ -0,0 +1,3 @@
+kind: rendering
+metadata:
+  name: ytt-render-test-2
diff --git a/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-1.yaml b/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-1.yaml
@@ -0,0 +1,5 @@
+kind: rendering
+metadata:
+  name: helm-render-test-1
+outputYaml:
+  fromChartDefaultValues: true
diff --git a/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-2.yaml b/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-2.yaml
@@ -0,0 +1,5 @@
+kind: rendering
+metadata:
+  name: helm-render-test-2
+outputYaml:
+  fromChartDefaultValues: true
diff --git a/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-1.yaml b/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-1.yaml
@@ -0,0 +1,3 @@
+kind: rendering
+metadata:
+  name: ytt-render-test-1
diff --git a/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-2.yaml b/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-2.yaml
@@ -0,0 +1,3 @@
+kind: rendering
+metadata:
+  name: ytt-render-test-2
diff --git a/examples/simple/envs/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml b/examples/simple/envs/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml
diff --git a/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.lock.yaml b/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.lock.yaml
diff --git a/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.yaml b/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.yaml
diff --git a/examples/simple/envs/prod/_apps/httpbingo/.myks/helm/httpbingo.yaml b/examples/simple/envs/prod/_apps/httpbingo/.myks/helm/httpbingo.yaml
diff --git a/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.lock.yaml b/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.lock.yaml
diff --git a/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.yaml b/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.yaml
diff --git a/go.sum b/go.sum
@@ -415,15 +415,11 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
-golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/internal/integration/render_test.go b/internal/integration/render_test.go
@@ -33,7 +33,7 @@ func findRepos(t *testing.T, basefolder string) []testRepo {
 		if !d.IsDir() {
 			continue
 		}
-		if d.Name() == "charts" {
+		if d.Name() == "_lib" {
 			continue
 		}
 		repos = append(repos, testRepo{