diff --git a/class/solution-backup.yml b/class/solution-backup.yml index e6fb1c7..431c2d1 100644 --- a/class/solution-backup.yml +++ b/class/solution-backup.yml @@ -8,4 +8,4 @@ parameters: - input_paths: - ${_base_directory}/component/main.jsonnet input_type: jsonnet - output_path: solution-backup/ + output_path: ${_instance} diff --git a/tests/golden/defaults/defaults/solution-backup/clusterRole.yaml b/tests/golden/defaults/defaults/defaults/clusterRole.yaml similarity index 100% rename from tests/golden/defaults/defaults/solution-backup/clusterRole.yaml rename to tests/golden/defaults/defaults/defaults/clusterRole.yaml diff --git a/tests/golden/defaults/defaults/solution-backup/clusterRoleBinding.yaml b/tests/golden/defaults/defaults/defaults/clusterRoleBinding.yaml similarity index 100% rename from tests/golden/defaults/defaults/solution-backup/clusterRoleBinding.yaml rename to tests/golden/defaults/defaults/defaults/clusterRoleBinding.yaml diff --git a/tests/golden/defaults/defaults/solution-backup/managedResource.yaml b/tests/golden/defaults/defaults/defaults/managedResource.yaml similarity index 100% rename from tests/golden/defaults/defaults/solution-backup/managedResource.yaml rename to tests/golden/defaults/defaults/defaults/managedResource.yaml diff --git a/tests/golden/defaults/defaults/solution-backup/namespace.yaml b/tests/golden/defaults/defaults/defaults/namespace.yaml similarity index 100% rename from tests/golden/defaults/defaults/solution-backup/namespace.yaml rename to tests/golden/defaults/defaults/defaults/namespace.yaml diff --git a/tests/golden/defaults/defaults/solution-backup/serviceAccount.yaml b/tests/golden/defaults/defaults/defaults/serviceAccount.yaml similarity index 100% rename from tests/golden/defaults/defaults/solution-backup/serviceAccount.yaml rename to tests/golden/defaults/defaults/defaults/serviceAccount.yaml diff --git a/tests/golden/override-labels/override-labels/solution-backup/clusterRole.yaml b/tests/golden/override-labels/override-labels/override-labels/clusterRole.yaml similarity index 100% rename from tests/golden/override-labels/override-labels/solution-backup/clusterRole.yaml rename to tests/golden/override-labels/override-labels/override-labels/clusterRole.yaml diff --git a/tests/golden/override-labels/override-labels/solution-backup/clusterRoleBinding.yaml b/tests/golden/override-labels/override-labels/override-labels/clusterRoleBinding.yaml similarity index 100% rename from tests/golden/override-labels/override-labels/solution-backup/clusterRoleBinding.yaml rename to tests/golden/override-labels/override-labels/override-labels/clusterRoleBinding.yaml diff --git a/tests/golden/override-labels/override-labels/solution-backup/managedResource.yaml b/tests/golden/override-labels/override-labels/override-labels/managedResource.yaml similarity index 100% rename from tests/golden/override-labels/override-labels/solution-backup/managedResource.yaml rename to tests/golden/override-labels/override-labels/override-labels/managedResource.yaml diff --git a/tests/golden/override-labels/override-labels/solution-backup/namespace.yaml b/tests/golden/override-labels/override-labels/override-labels/namespace.yaml similarity index 100% rename from tests/golden/override-labels/override-labels/solution-backup/namespace.yaml rename to tests/golden/override-labels/override-labels/override-labels/namespace.yaml diff --git a/tests/golden/override-labels/override-labels/solution-backup/serviceAccount.yaml b/tests/golden/override-labels/override-labels/override-labels/serviceAccount.yaml similarity index 100% rename from tests/golden/override-labels/override-labels/solution-backup/serviceAccount.yaml rename to tests/golden/override-labels/override-labels/override-labels/serviceAccount.yaml diff --git a/tests/golden/override-schedules/override-schedules/solution-backup/clusterRole.yaml b/tests/golden/override-schedules/override-schedules/override-schedules/clusterRole.yaml similarity index 100% rename from tests/golden/override-schedules/override-schedules/solution-backup/clusterRole.yaml rename to tests/golden/override-schedules/override-schedules/override-schedules/clusterRole.yaml diff --git a/tests/golden/override-schedules/override-schedules/solution-backup/clusterRoleBinding.yaml b/tests/golden/override-schedules/override-schedules/override-schedules/clusterRoleBinding.yaml similarity index 100% rename from tests/golden/override-schedules/override-schedules/solution-backup/clusterRoleBinding.yaml rename to tests/golden/override-schedules/override-schedules/override-schedules/clusterRoleBinding.yaml diff --git a/tests/golden/override-schedules/override-schedules/solution-backup/managedResource.yaml b/tests/golden/override-schedules/override-schedules/override-schedules/managedResource.yaml similarity index 100% rename from tests/golden/override-schedules/override-schedules/solution-backup/managedResource.yaml rename to tests/golden/override-schedules/override-schedules/override-schedules/managedResource.yaml diff --git a/tests/golden/override-schedules/override-schedules/solution-backup/namespace.yaml b/tests/golden/override-schedules/override-schedules/override-schedules/namespace.yaml similarity index 100% rename from tests/golden/override-schedules/override-schedules/solution-backup/namespace.yaml rename to tests/golden/override-schedules/override-schedules/override-schedules/namespace.yaml diff --git a/tests/golden/override-schedules/override-schedules/solution-backup/serviceAccount.yaml b/tests/golden/override-schedules/override-schedules/override-schedules/serviceAccount.yaml similarity index 100% rename from tests/golden/override-schedules/override-schedules/solution-backup/serviceAccount.yaml rename to tests/golden/override-schedules/override-schedules/override-schedules/serviceAccount.yaml diff --git a/tests/render/run.sh b/tests/render/run.sh index bf7468c..22c0493 100644 --- a/tests/render/run.sh +++ b/tests/render/run.sh @@ -10,7 +10,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)" -MANIFEST="$ROOT/compiled/defaults/solution-backup/managedResource.yaml" +MANIFEST="$ROOT/compiled/defaults/defaults/managedResource.yaml" INPUTS="$ROOT/tests/render/inputs" EXPECTED="$ROOT/tests/render/expected"