diff --git a/.github/workflows/zpa-test.yml b/.github/workflows/zpa-test.yml index f1d414c3..1c9c4ca0 100644 --- a/.github/workflows/zpa-test.yml +++ b/.github/workflows/zpa-test.yml @@ -49,7 +49,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 30 - command: poetry run make test:integration:zpa + command: poetry run ansible-playbook tests/integration/run_all_tests.yml env: ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }} ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }} @@ -93,7 +93,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 30 - command: poetry run make test:integration:zpa + command: poetry run ansible-playbook tests/integration/run_all_tests.yml env: ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }} ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }} @@ -139,7 +139,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 30 - command: poetry run make test:integration:zpa + command: poetry run ansible-playbook tests/integration/run_all_tests.yml env: ZPA_CLIENT_ID: ${{ secrets.ZPA_CLIENT_ID }} ZPA_CLIENT_SECRET: ${{ secrets.ZPA_CLIENT_SECRET }} diff --git a/tests/integration/targets/zpa_policy_access_app_protection_rule/tasks/main.yml b/tests/integration/targets/zpa_policy_access_app_protection_rule/tasks/main.yml index f3bfdc68..6317fed3 100644 --- a/tests/integration/targets/zpa_policy_access_app_protection_rule/tasks/main.yml +++ b/tests/integration/targets/zpa_policy_access_app_protection_rule/tasks/main.yml @@ -84,19 +84,16 @@ operator: "{{ operator }}" conditions: - operator: "AND" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "AND" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" rhs: "false" - operator: "AND" - negated: false operands: - object_type: "TRUSTED_NETWORK" lhs: "{{ network_id }}" @@ -123,19 +120,16 @@ operator: "{{ operator }}" conditions: - operator: "AND" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "AND" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" rhs: "false" - operator: "AND" - negated: false operands: - object_type: "TRUSTED_NETWORK" lhs: "{{ network_id }}" diff --git a/tests/integration/targets/zpa_policy_access_forwarding_rule/tasks/main.yml b/tests/integration/targets/zpa_policy_access_forwarding_rule/tasks/main.yml index d47b15bc..6015b78c 100644 --- a/tests/integration/targets/zpa_policy_access_forwarding_rule/tasks/main.yml +++ b/tests/integration/targets/zpa_policy_access_forwarding_rule/tasks/main.yml @@ -80,19 +80,16 @@ operator: "{{ operator }}" conditions: - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "{{ operator }}" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" rhs: "false" - operator: "{{ operator }}" - negated: false operands: - object_type: "TRUSTED_NETWORK" lhs: "{{ network_id }}" @@ -118,19 +115,16 @@ operator: "{{ operator }}" conditions: - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "{{ operator }}" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" rhs: "false" - operator: "{{ operator }}" - negated: false operands: - object_type: "TRUSTED_NETWORK" lhs: "{{ network_id }}" diff --git a/tests/integration/targets/zpa_policy_access_isolation_rule/tasks/main.yml b/tests/integration/targets/zpa_policy_access_isolation_rule/tasks/main.yml index 89ff1a94..d6c4f734 100644 --- a/tests/integration/targets/zpa_policy_access_isolation_rule/tasks/main.yml +++ b/tests/integration/targets/zpa_policy_access_isolation_rule/tasks/main.yml @@ -78,13 +78,11 @@ operator: "{{ operator }}" conditions: - operator: "OR" - negated: false operands: - object_type: "CLIENT_TYPE" lhs: "id" rhs: "zpn_client_type_exporter" - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios @@ -111,13 +109,11 @@ operator: "{{ operator }}" conditions: - operator: "OR" - negated: false operands: - object_type: "CLIENT_TYPE" lhs: "id" rhs: "zpn_client_type_exporter" - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios diff --git a/tests/integration/targets/zpa_policy_access_rule/tasks/main.yml b/tests/integration/targets/zpa_policy_access_rule/tasks/main.yml index 87318185..60c6f094 100644 --- a/tests/integration/targets/zpa_policy_access_rule/tasks/main.yml +++ b/tests/integration/targets/zpa_policy_access_rule/tasks/main.yml @@ -97,25 +97,21 @@ - "{{ server_group_id }}" conditions: - operator: "AND" - negated: false operands: - object_type: "COUNTRY_CODE" lhs: CA rhs: "true" - operator: "AND" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "AND" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" rhs: "false" - operator: "AND" - negated: false operands: - object_type: "TRUSTED_NETWORK" lhs: "{{ network_id }}" @@ -146,25 +142,21 @@ - "{{ server_group_id }}" conditions: - operator: "{{ operator }}" - negated: false operands: - object_type: "COUNTRY_CODE" lhs: CA rhs: "true" - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "{{ operator }}" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" rhs: "false" - operator: "{{ operator }}" - negated: false operands: - object_type: "TRUSTED_NETWORK" lhs: "{{ network_id }}" diff --git a/tests/integration/targets/zpa_policy_access_timeout_rule/tasks/main.yml b/tests/integration/targets/zpa_policy_access_timeout_rule/tasks/main.yml index eb793483..31a0522b 100644 --- a/tests/integration/targets/zpa_policy_access_timeout_rule/tasks/main.yml +++ b/tests/integration/targets/zpa_policy_access_timeout_rule/tasks/main.yml @@ -78,13 +78,11 @@ operator: "{{ operator }}" conditions: - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "{{ operator }}" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}" @@ -111,13 +109,11 @@ operator: "{{ operator }}" conditions: - operator: "{{ operator }}" - negated: false operands: - object_type: "PLATFORM" lhs: ios rhs: "true" - operator: "{{ operator }}" - negated: false operands: - object_type: "POSTURE" lhs: "{{ posture_udid }}"