From 3530412041847f37e2e4ed15267dac5619cb3a8e Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 28 Aug 2024 19:42:48 +0200 Subject: [PATCH 1/2] Updating tests for more readability and better code style --- tests/templates/kuttl/smoke/41-assert.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/templates/kuttl/smoke/41-assert.yaml b/tests/templates/kuttl/smoke/41-assert.yaml index 68389607..ff905d91 100644 --- a/tests/templates/kuttl/smoke/41-assert.yaml +++ b/tests/templates/kuttl/smoke/41-assert.yaml @@ -7,5 +7,16 @@ commands: # Test envOverrides # - script: | - kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "COMMON_HEADER_VAR = \"group-value\"" - kubectl -n $NAMESPACE get cm airflow-webserver-default -o yaml | yq -e '.data."webserver_config.py"' | grep "ROLE_FOOTER_VAR = \"role-value\"" + #!/usr/bin/env bash + set -euo pipefail + + # Config Test Data + SUPERSET_CONFIG=$( + kubectl -n "$NAMESPACE" get cm superset-node-default -o yaml \ + | yq -e '.data["superset_config.py"]' + ) + + # Config Test Assertions + echo "$SUPERSET_CONFIG" | grep 'COMMON_HEADER_VAR = "group-value"' + echo "$SUPERSET_CONFIG" | grep 'ROLE_FOOTER_VAR = "role-value"' + echo "$SUPERSET_CONFIG" | grep -v 'ROLE_HEADER_VAR = "role-value"' From da5801593f6e7e0c6e93121538e74a645a0c5ee8 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 28 Aug 2024 19:49:25 +0200 Subject: [PATCH 2/2] Adopting to airflow tests --- tests/templates/kuttl/smoke/41-assert.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/templates/kuttl/smoke/41-assert.yaml b/tests/templates/kuttl/smoke/41-assert.yaml index ff905d91..f099e0a6 100644 --- a/tests/templates/kuttl/smoke/41-assert.yaml +++ b/tests/templates/kuttl/smoke/41-assert.yaml @@ -11,12 +11,12 @@ commands: set -euo pipefail # Config Test Data - SUPERSET_CONFIG=$( - kubectl -n "$NAMESPACE" get cm superset-node-default -o yaml \ - | yq -e '.data["superset_config.py"]' + AIRFLOW_CONFIG=$( + kubectl -n "$NAMESPACE" get cm airflow-webserver-default -o yaml \ + | yq -e '.data["webserver_config.py"]' ) # Config Test Assertions - echo "$SUPERSET_CONFIG" | grep 'COMMON_HEADER_VAR = "group-value"' - echo "$SUPERSET_CONFIG" | grep 'ROLE_FOOTER_VAR = "role-value"' - echo "$SUPERSET_CONFIG" | grep -v 'ROLE_HEADER_VAR = "role-value"' + echo "$AIRFLOW_CONFIG" | grep 'COMMON_HEADER_VAR = "group-value"' + echo "$AIRFLOW_CONFIG" | grep 'ROLE_FOOTER_VAR = "role-value"' + echo "$AIRFLOW_CONFIG" | grep -v 'ROLE_HEADER_VAR = "role-value"'