Simplify log-manager e2e suite (#2859)

Author: rarescosma

tests/common/bats/object-storage.bash

@@ -148,19 +148,24 @@ object_storage.delete() {
 object_storage.is_compacted() {
   local bucket="${1}"
   local prefix="${2}"
+  local cutoff="${3}"
 
   local object_storage_type
   object_storage_type="$(yq.get sc '.objectStorage.type')"
   case "${object_storage_type}" in
   "s3")
+    # "yyyy-mm-ddThh:mm:ssZ" -> "yyyy-mm-dd hh:mm"
+    local -r s3_cutoff="$(echo "${cutoff}" | cut -c1-16 | tr 'T' ' ')"
     # For some reason it doesn't like the single quotes for the awk input, likely because of the escaped pipes.
     # shellcheck disable=SC2016
-    run bats_pipe ck8s s3cmd ls --recursive "s3://${bucket}/${prefix}" \| awk '{print $4}' \| sed "s|s3://${bucket}/||" \| sed 's|\(.*\)/.*|\1|' \| sort \| uniq -d
+    run bats_pipe ck8s s3cmd ls --recursive "s3://${bucket}/${prefix}" \| awk -v cutoff="${s3_cutoff}" '$1" "$2 < cutoff' \| awk '{print $4}' \| sed "s|s3://${bucket}/||" \| sed 's|\(.*\)/.*|\1|' \| sort \| uniq -d
     assert_success
     refute_output
     ;;
   "azure")
-    run bats_pipe az storage blob list --container-name "${bucket}" --prefix "${prefix}" --query '[].name' \| jq -r '.[]' \| sed 's|\(.*\)/.*|\1|' \| sort \| uniq -d
+    # It thinks we intend to expand $cutoff in the jq expression, but we're passing it as an arg.
+    # shellcheck disable=SC2016
+    run bats_pipe az storage blob list --container-name "${bucket}" --prefix "${prefix}" \| jq -r --arg cutoff "${cutoff}" '.[] | select(.properties.createdOn < $cutoff) | .name' \| sed 's|\(.*\)/.*|\1|' \| sort \| uniq -d
     assert_success
     refute_output
     ;;

tests/end-to-end/log-manager/compaction-audit-sc.gen.bats

@@ -85,13 +85,9 @@ setup() {
   #       is still no guarantee.
   test_run_cronjob "${CRONJOB_NAME}" 1200
 
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
-}
-
-@test "audit-sc - log-manager compaction job runs fine when no logs needs compaction" {
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
+  local -r cutoff="$(_get_latest_job_start_time)"
 
-  test_run_cronjob "${CRONJOB_NAME}" 120
+  object_storage.is_compacted "${BUCKET}" "${PREFIX}" "${cutoff}"
 }
 
 _create_uncompacted_objects() {
@@ -111,3 +107,8 @@ _create_uncompacted_objects() {
 _get_cronjob_env() {
   kubectl -n "${NAMESPACE}" get cronjob "${CRONJOB_NAME}" -o jsonpath='{.spec.jobTemplate.spec.template.spec.containers[0].env[?(@.name=="'"${1}"'")].value}'
 }
+
+_get_latest_job_start_time() {
+  kubectl -n "${NAMESPACE}" get jobs -o json |
+    jq -r "[.items[] | select(.metadata.ownerReferences[]?.name==\"${CRONJOB_NAME}\")] | sort_by(.status.startTime) | .[-1].status.startTime"
+}

tests/end-to-end/log-manager/compaction-audit-wc.gen.bats

@@ -85,13 +85,9 @@ setup() {
   #       is still no guarantee.
   test_run_cronjob "${CRONJOB_NAME}" 1200
 
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
-}
-
-@test "audit-wc - log-manager compaction job runs fine when no logs needs compaction" {
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
+  local -r cutoff="$(_get_latest_job_start_time)"
 
-  test_run_cronjob "${CRONJOB_NAME}" 120
+  object_storage.is_compacted "${BUCKET}" "${PREFIX}" "${cutoff}"
 }
 
 _create_uncompacted_objects() {
@@ -111,3 +107,8 @@ _create_uncompacted_objects() {
 _get_cronjob_env() {
   kubectl -n "${NAMESPACE}" get cronjob "${CRONJOB_NAME}" -o jsonpath='{.spec.jobTemplate.spec.template.spec.containers[0].env[?(@.name=="'"${1}"'")].value}'
 }
+
+_get_latest_job_start_time() {
+  kubectl -n "${NAMESPACE}" get jobs -o json |
+    jq -r "[.items[] | select(.metadata.ownerReferences[]?.name==\"${CRONJOB_NAME}\")] | sort_by(.status.startTime) | .[-1].status.startTime"
+}

tests/end-to-end/log-manager/compaction-sc-logs.gen.bats

@@ -85,13 +85,9 @@ setup() {
   #       is still no guarantee.
   test_run_cronjob "${CRONJOB_NAME}" 1200
 
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
-}
-
-@test "sc-logs - log-manager compaction job runs fine when no logs needs compaction" {
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
+  local -r cutoff="$(_get_latest_job_start_time)"
 
-  test_run_cronjob "${CRONJOB_NAME}" 120
+  object_storage.is_compacted "${BUCKET}" "${PREFIX}" "${cutoff}"
 }
 
 _create_uncompacted_objects() {
@@ -111,3 +107,8 @@ _create_uncompacted_objects() {
 _get_cronjob_env() {
   kubectl -n "${NAMESPACE}" get cronjob "${CRONJOB_NAME}" -o jsonpath='{.spec.jobTemplate.spec.template.spec.containers[0].env[?(@.name=="'"${1}"'")].value}'
 }
+
+_get_latest_job_start_time() {
+  kubectl -n "${NAMESPACE}" get jobs -o json |
+    jq -r "[.items[] | select(.metadata.ownerReferences[]?.name==\"${CRONJOB_NAME}\")] | sort_by(.status.startTime) | .[-1].status.startTime"
+}

tests/end-to-end/log-manager/compaction.bats.gotmpl

@@ -88,13 +88,9 @@ setup() {
   #       is still no guarantee.
   test_run_cronjob "${CRONJOB_NAME}" 1200
 
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
-}
-
-@test "{{ .name }} - log-manager compaction job runs fine when no logs needs compaction" {
-  object_storage.is_compacted "${BUCKET}" "${PREFIX}"
+  local -r cutoff="$(_get_latest_job_start_time)"
 
-  test_run_cronjob "${CRONJOB_NAME}" 120
+  object_storage.is_compacted "${BUCKET}" "${PREFIX}" "${cutoff}"
 }
 
 _create_uncompacted_objects() {
@@ -114,6 +110,11 @@ _create_uncompacted_objects() {
 _get_cronjob_env() {
   kubectl -n "${NAMESPACE}" get cronjob "${CRONJOB_NAME}" -o jsonpath='{.spec.jobTemplate.spec.template.spec.containers[0].env[?(@.name=="'"${1}"'")].value}'
 }
+
+_get_latest_job_start_time() {
+  kubectl -n "${NAMESPACE}" get jobs -o json |
+    jq -r "[.items[] | select(.metadata.ownerReferences[]?.name==\"${CRONJOB_NAME}\")] | sort_by(.status.startTime) | .[-1].status.startTime"
+}
 {{ end }}
 
 # These tests are generated into these files:

tests/end-to-end/log-manager/retention-audit-sc.gen.bats

@@ -90,7 +90,7 @@ setup() {
   object_storage.has_none "${BUCKET}" "${TEST_DATA_PREFIX}"
 }
 
-@test "audit-sc - log-manager retention job runs fine when no logs needs to be deleted" {
+@test "audit-sc - log-manager retention job runs fine when no logs need to be deleted" {
   test_run_cronjob "${CRONJOB_NAME}" 120
 }
 

tests/end-to-end/log-manager/retention-audit-wc.gen.bats

@@ -90,7 +90,7 @@ setup() {
   object_storage.has_none "${BUCKET}" "${TEST_DATA_PREFIX}"
 }
 
-@test "audit-wc - log-manager retention job runs fine when no logs needs to be deleted" {
+@test "audit-wc - log-manager retention job runs fine when no logs need to be deleted" {
   test_run_cronjob "${CRONJOB_NAME}" 120
 }
 

tests/end-to-end/log-manager/retention-sc-logs.gen.bats

@@ -90,7 +90,7 @@ setup() {
   object_storage.has_none "${BUCKET}" "${TEST_DATA_PREFIX}"
 }
 
-@test "sc-logs - log-manager retention job runs fine when no logs needs to be deleted" {
+@test "sc-logs - log-manager retention job runs fine when no logs need to be deleted" {
   test_run_cronjob "${CRONJOB_NAME}" 120
 }
 

tests/end-to-end/log-manager/retention.bats.gotmpl

@@ -93,7 +93,7 @@ setup() {
   object_storage.has_none "${BUCKET}" "${TEST_DATA_PREFIX}"
 }
 
-@test "{{ .name }} - log-manager retention job runs fine when no logs needs to be deleted" {
+@test "{{ .name }} - log-manager retention job runs fine when no logs need to be deleted" {
   test_run_cronjob "${CRONJOB_NAME}" 120
 }