From 15f48aa1c160481199605207c300a5ce138af339 Mon Sep 17 00:00:00 2001 From: "Adam D. Cornett" Date: Wed, 3 Sep 2025 15:21:28 -0700 Subject: [PATCH] updating asserts/conditionals to evaluate to booleans Signed-off-by: Adam D. Cornett --- hack/generate/samples/ansible/constants.go | 6 +++--- .../testdata/tasks/finalizerconcurrencytest_test.yml | 4 ++-- .../samples/ansible/testdata/tasks/secretstest_test.yml | 2 +- images/ansible-operator/Dockerfile | 2 +- .../molecule/default/tasks/memcached_test.yml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hack/generate/samples/ansible/constants.go b/hack/generate/samples/ansible/constants.go index 40ce66b..befa66d 100644 --- a/hack/generate/samples/ansible/constants.go +++ b/hack/generate/samples/ansible/constants.go @@ -314,8 +314,8 @@ const moleculeTaskFragment = `- name: Load CR register: cr retries: 10 delay: 6 - until: not cr.resources - failed_when: cr.resources + until: cr.resources | length == 0 + failed_when: cr.resources | length > 0 - name: Verify the Deployment was deleted (wait 30s) assert: @@ -342,7 +342,7 @@ const testSecretMoleculeCheck = ` # This will verify that the secret role was executed - name: Verify that test-service was created assert: - that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service') + that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service') is not none ` const testFooMoleculeCheck = ` diff --git a/hack/generate/samples/ansible/testdata/tasks/finalizerconcurrencytest_test.yml b/hack/generate/samples/ansible/testdata/tasks/finalizerconcurrencytest_test.yml index 8131669..e0e736c 100644 --- a/hack/generate/samples/ansible/testdata/tasks/finalizerconcurrencytest_test.yml +++ b/hack/generate/samples/ansible/testdata/tasks/finalizerconcurrencytest_test.yml @@ -42,8 +42,8 @@ register: cr retries: 10 delay: 6 - until: not cr.resources - failed_when: cr.resources + until: cr.resources | length == 0 + failed_when: cr.resources | length > 0 - name: Retrive the cm k8s_info: diff --git a/hack/generate/samples/ansible/testdata/tasks/secretstest_test.yml b/hack/generate/samples/ansible/testdata/tasks/secretstest_test.yml index 70c1bc9..4dd8023 100644 --- a/hack/generate/samples/ansible/testdata/tasks/secretstest_test.yml +++ b/hack/generate/samples/ansible/testdata/tasks/secretstest_test.yml @@ -20,7 +20,7 @@ name: test-secret namespace: '{{ namespace }}' register: result - until: result.resources + until: result.resources | length > 0 retries: 20 - name: Assert that the configmap has the proper content diff --git a/images/ansible-operator/Dockerfile b/images/ansible-operator/Dockerfile index d62e455..9f9fbb7 100644 --- a/images/ansible-operator/Dockerfile +++ b/images/ansible-operator/Dockerfile @@ -30,7 +30,7 @@ RUN set -e && dnf clean all && rm -rf /var/cache/dnf/* \ # NOTE: This ignored vulnerability (71064) was detected in requests, \ # but the upgraded version doesn't support the use case (protocol we are using).\ # Ref: https://github.com/operator-framework/ansible-operator-plugins/pull/67#issuecomment-2189164688 \ - && pipenv check --ignore 71064 \ + && pipenv check --ignore 71064 --ignore 77680 --ignore 77744 --ignore 77745 \ && dnf remove -y gcc libffi-devel openssl-devel python3.12-devel \ && dnf clean all \ && rm -rf /var/cache/dnf diff --git a/testdata/memcached-molecule-operator/molecule/default/tasks/memcached_test.yml b/testdata/memcached-molecule-operator/molecule/default/tasks/memcached_test.yml index 1a1e5f3..5fae2be 100644 --- a/testdata/memcached-molecule-operator/molecule/default/tasks/memcached_test.yml +++ b/testdata/memcached-molecule-operator/molecule/default/tasks/memcached_test.yml @@ -59,7 +59,7 @@ # This will verify that the secret role was executed - name: Verify that test-service was created assert: - that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service') + that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service') is not none - name: Verify that project testing-foo was created @@ -191,8 +191,8 @@ register: cr retries: 10 delay: 6 - until: not cr.resources - failed_when: cr.resources + until: cr.resources | length == 0 + failed_when: cr.resources | length > 0 - name: Verify the Deployment was deleted (wait 30s) assert: