Skip to content

fix(main): Update flaky subject mapping tests #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 7, 2025
Merged

fix(main): Update flaky subject mapping tests #694

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8058303
add retries to flaky test.
c-r33d Nov 6, 2025
b8e7a30
break after status is success.
c-r33d Nov 6, 2025
07bb1bb
comment out flaky test.
c-r33d Nov 6, 2025
176f23a
do not have unmapped
c-r33d Nov 7, 2025
a3d4b61
fix.
c-r33d Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions e2e/subject-mapping.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@ setup_file() {
export HOST='--host http://localhost:8080'

# Create two namespaced values to be used in other tests
NS_NAME="subject-mappings.net"
export NS_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes namespaces create -n "$NS_NAME" --json | jq -r '.id')
ATTR_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes create --namespace "$NS_ID" --name attr1 --rule ANY_OF --json | jq -r '.id')
# Names prefixed with SM to avoid conflicts across tests when running in parallel
export SM_VAL1_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes values create --attribute-id "$ATTR_ID" --value val1 --json | jq -r '.id')
export SM_VAL2_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes values create --attribute-id "$ATTR_ID" --value value2 --json | jq -r '.id')
NS_NAME="subject-mappings.net"
export NS_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes namespaces create -n "$NS_NAME" --json | jq -r '.id')
ATTR_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes create --namespace "$NS_ID" --name attr1 --rule ANY_OF --json | jq -r '.id')
# Names prefixed with SM to avoid conflicts across tests when running in parallel
export SM_VAL1_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes values create --attribute-id "$ATTR_ID" --value val1 --json | jq -r '.id')
export SM_VAL2_ID=$(./otdfctl $HOST $WITH_CREDS policy attributes values create --attribute-id "$ATTR_ID" --value value2 --json | jq -r '.id')

export SCS_1='[{"condition_groups":[{"conditions":[{"operator":1,"subject_external_values":["ShinyThing"],"subject_external_selector_value":".team.name"},{"operator":2,"subject_external_values":["marketing"],"subject_external_selector_value":".org.name"}],"boolean_operator":1}]}]'
export SCS_2='[{"condition_groups":[{"conditions":[{"operator":2,"subject_external_values":["CoolTool","RadService"],"subject_external_selector_value":".team.name"},{"operator":1,"subject_external_values":["sales"],"subject_external_selector_value":".org.name"}],"boolean_operator":2}]}]'

# Pre-create SCS used by Get/Update tests to avoid eventual-consistency flakes
export SCS_2_ID=$(./otdfctl $HOST $WITH_CREDS policy scs create -s "$SCS_2" --json | jq -r '.id')

export ACTION_READ_NAME='read'
export ACTION_READ_ID=$(./otdfctl $HOST $WITH_CREDS policy actions get --name "$ACTION_READ_NAME" --json | jq -r '.id')
export ACTION_CREATE_NAME='create'
Expand Down Expand Up @@ -98,30 +95,39 @@ teardown_file() {
}

@test "Get subject mapping" {
run ./otdfctl $HOST $WITH_CREDS policy sm create -a "$SM_VAL2_ID" --action "custom_sm_action_test" --subject-condition-set-id "$SCS_2_ID" --json
run ./otdfctl $HOST $WITH_CREDS policy sm create -a "$SM_VAL2_ID" --action "custom_sm_action_test" --subject-condition-set-new "$SCS_1" --json
assert_success
created=$(echo "$output" | jq -r '.id')
scs_1_id=$(echo "$output" | jq -r '.subject_condition_set.id')
assert_not_equal "$created" "null"
assert_not_equal "$created" ""
assert_not_equal "$scs_1_id" "null"
assert_not_equal "$scs_1_id" ""

# table
run_otdfctl_sm get --id "$created"
assert_success
assert_line --regexp "Id.*$created"
assert_line --regexp "Attribute Value: Id.*$SM_VAL2_ID"
assert_line --regexp "Attribute Value: Value.*value2"
assert_line --regexp "Subject Condition Set: Id.*$SCS_2_ID"
assert_line --regexp "Subject Condition Set: Id.*$scs_1_id"

# json
run_otdfctl_sm get --id "$created" --json
assert_success
[ "$(echo $output | jq -r '.id')" = "$created" ]
[ "$(echo $output | jq -r '.attribute_value.id')" = "$SM_VAL2_ID" ]
[ "$(echo $output | jq -r '.subject_condition_set.id')" = "$SCS_2_ID" ]
[ "$(echo $output | jq -r '.subject_condition_set.id')" = "$scs_1_id" ]
[ "$(echo $output | jq -r '.actions[0].name')" = "custom_sm_action_test" ]
}

@test "Update a subject mapping" {
run ./otdfctl $HOST $WITH_CREDS policy sm create -a "$SM_VAL1_ID" --action "$ACTION_READ_NAME" --subject-condition-set-new "$SCS_2" --json
assert_success
scs_to_update_with_id=$(echo "$output" | jq -r '.subject_condition_set.id')
assert_not_equal "$scs_to_update_with_id" "null"
assert_not_equal "$scs_to_update_with_id" ""

run ./otdfctl $HOST $WITH_CREDS policy sm create -a "$SM_VAL1_ID" --action "$ACTION_READ_NAME" --subject-condition-set-new "$SCS_1" --json
assert_success
created=$(echo "$output" | jq -r '.id')
Expand All @@ -136,12 +142,10 @@ teardown_file() {
[ "$(echo $output | jq -r '.actions[0].id')" = "$ACTION_CREATE_ID" ]

# reassign the SCS being mapped to
run_otdfctl_sm update --id "$created" --subject-condition-set-id "$SCS_2_ID" --json
assert_success
[ "$(echo $output | jq -r '.id')" = "$created" ]
[ "$(echo $output | jq -r '.subject_condition_set.id')" = "$SCS_2_ID" ]
# Add debug log for DSPX-1873
echo "$output" >&2
run_otdfctl_sm update --id "$created" --subject-condition-set-id "$scs_to_update_with_id" --json
assert_success
assert_equal "$(echo $output | jq -r '.id')" "$created"
assert_equal "$(echo $output | jq -r '.subject_condition_set.id')" "$scs_to_update_with_id"
}

@test "List subject mappings" {
Expand Down
Loading