Skip to content

Commit 643a541

Browse files
ohookinsohookins
committed
fix: don't set policy rule risk/risc if unset in resource
1 parent 1268db6 commit 643a541

4 files changed

Lines changed: 46 additions & 30 deletions

File tree

‎examples/resources/okta_policy_rule_signon/gh2419.tf‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,29 @@ resource "okta_policy_signon" "test_two" {
1717
}
1818

1919
resource "okta_policy_rule_signon" "test_risk_ONLY" {
20-
policy_id = "00ppe8c4f0jC1KpxX1d7"
21-
name = "test_policy_risk_ONLY"
22-
status = "ACTIVE"
23-
risk_level = "ANY"
20+
policy_id = "00ppe8c4f0jC1KpxX1d7"
21+
name = "test_policy_risk_ONLY"
22+
status = "ACTIVE"
23+
risk_level = "ANY"
2424
}
2525

2626
resource "okta_policy_rule_signon" "test_risc_ONLY" {
27-
policy_id = "00ppe8c4f0jC1KpxX1d7"
28-
name = "test_policy_risc_ONLY"
29-
status = "ACTIVE"
30-
risc_level = "MEDIUM"
31-
}
27+
policy_id = "00ppe8c4f0jC1KpxX1d7"
28+
name = "test_policy_risc_ONLY"
29+
status = "ACTIVE"
30+
risc_level = "MEDIUM"
31+
}
3232

3333
resource "okta_policy_rule_signon" "test_BOTH" {
34-
policy_id = "00ppe8c4f0jC1KpxX1d7"
35-
name = "test_policy_BOTH"
36-
status = "ACTIVE"
37-
risk_level = "LOW"
38-
risc_level = "HIGH"
34+
policy_id = "00ppe8c4f0jC1KpxX1d7"
35+
name = "test_policy_BOTH"
36+
status = "ACTIVE"
37+
risk_level = "LOW"
38+
risc_level = "HIGH"
3939
}
4040

41+
resource "okta_policy_rule_signon" "test_NEITHER" {
42+
policy_id = "00ppe8c4f0jC1KpxX1d7"
43+
name = "test_policy_NEITHER"
44+
status = "ACTIVE"
45+
}

‎examples/resources/okta_policy_rule_signon/gh2419_updated.tf‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
resource "okta_policy_rule_signon" "test_risk_ONLY" {
2-
policy_id = "00ppe8c4f0jC1KpxX1d7"
3-
name = "test_policy_risk_ONLY"
4-
status = "ACTIVE"
5-
risk_level = "MEDIUM"
2+
policy_id = "00ppe8c4f0jC1KpxX1d7"
3+
name = "test_policy_risk_ONLY"
4+
status = "ACTIVE"
5+
risk_level = "MEDIUM"
66
}
77

88
resource "okta_policy_rule_signon" "test_risc_ONLY" {
9-
policy_id = "00ppe8c4f0jC1KpxX1d7"
10-
name = "test_policy_risc_ONLY"
11-
status = "ACTIVE"
12-
risc_level = "HIGH"
13-
}
9+
policy_id = "00ppe8c4f0jC1KpxX1d7"
10+
name = "test_policy_risc_ONLY"
11+
status = "ACTIVE"
12+
risc_level = "HIGH"
13+
}
1414

1515
resource "okta_policy_rule_signon" "test_BOTH" {
16-
policy_id = "00ppe8c4f0jC1KpxX1d7"
17-
name = "test_policy_BOTH"
18-
status = "ACTIVE"
19-
risk_level = "MEDIUM"
20-
risc_level = "HIGH"
16+
policy_id = "00ppe8c4f0jC1KpxX1d7"
17+
name = "test_policy_BOTH"
18+
status = "ACTIVE"
19+
risk_level = "MEDIUM"
20+
risc_level = "HIGH"
21+
}
22+
23+
resource "okta_policy_rule_signon" "test_NEITHER" {
24+
policy_id = "00ppe8c4f0jC1KpxX1d7"
25+
name = "test_policy_NEITHER"
26+
status = "ACTIVE"
2127
}

‎okta/services/idaas/resource_okta_policy_rule_sign_on.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,6 @@ func buildSignOnPolicyRule(d *schema.ResourceData) sdk.SdkPolicyRule {
311311
template.Conditions.RiskScore = &sdk.RiskScorePolicyRuleCondition{Level: riskLevel.(string)}
312312
} else if riscLevelExists {
313313
template.Conditions.RiskScore = &sdk.RiskScorePolicyRuleCondition{Level: riscLevel.(string)}
314-
} else {
315-
template.Conditions.RiskScore = &sdk.RiskScorePolicyRuleCondition{Level: "ANY"}
316314
}
317315

318316
template.Actions = sdk.SdkPolicyRuleActions{

‎okta/services/idaas/resource_okta_policy_rule_sign_on_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func TestAccResourceOktaPolicyRuleSignon_GH2419(t *testing.T) {
3636
resourceName := fmt.Sprintf("%s.test_risk_ONLY", resources.OktaIDaaSPolicyRuleSignOn)
3737
resourceName2 := fmt.Sprintf("%s.test_risc_ONLY", resources.OktaIDaaSPolicyRuleSignOn)
3838
resourceName3 := fmt.Sprintf("%s.test_BOTH", resources.OktaIDaaSPolicyRuleSignOn)
39+
resourceName4 := fmt.Sprintf("%s.test_NEITHER", resources.OktaIDaaSPolicyRuleSignOn)
3940

4041
acctest.OktaResourceTest(t, resource.TestCase{
4142
PreCheck: acctest.AccPreCheck(t),
@@ -49,10 +50,13 @@ func TestAccResourceOktaPolicyRuleSignon_GH2419(t *testing.T) {
4950
resource.TestCheckResourceAttr(resourceName, "status", idaas.StatusActive),
5051
resource.TestCheckResourceAttr(resourceName2, "status", idaas.StatusActive),
5152
resource.TestCheckResourceAttr(resourceName3, "status", idaas.StatusActive),
53+
resource.TestCheckResourceAttr(resourceName4, "status", idaas.StatusActive),
5254
resource.TestCheckResourceAttr(resourceName, "risk_level", "ANY"),
5355
resource.TestCheckResourceAttr(resourceName2, "risc_level", "MEDIUM"),
5456
resource.TestCheckResourceAttr(resourceName3, "risk_level", "LOW"),
5557
resource.TestCheckResourceAttr(resourceName3, "risc_level", "HIGH"),
58+
resource.TestCheckResourceAttr(resourceName4, "risc_level", ""),
59+
resource.TestCheckResourceAttr(resourceName4, "risk_level", ""),
5660
),
5761
},
5862
{
@@ -61,10 +65,13 @@ func TestAccResourceOktaPolicyRuleSignon_GH2419(t *testing.T) {
6165
resource.TestCheckResourceAttr(resourceName, "status", idaas.StatusActive),
6266
resource.TestCheckResourceAttr(resourceName2, "status", idaas.StatusActive),
6367
resource.TestCheckResourceAttr(resourceName3, "status", idaas.StatusActive),
68+
resource.TestCheckResourceAttr(resourceName4, "status", idaas.StatusActive),
6469
resource.TestCheckResourceAttr(resourceName, "risk_level", "MEDIUM"),
6570
resource.TestCheckResourceAttr(resourceName2, "risc_level", "HIGH"),
6671
resource.TestCheckResourceAttr(resourceName3, "risk_level", "MEDIUM"),
6772
resource.TestCheckResourceAttr(resourceName3, "risc_level", "HIGH"),
73+
resource.TestCheckResourceAttr(resourceName4, "risk_level", ""),
74+
resource.TestCheckResourceAttr(resourceName4, "risc_level", ""),
6875
),
6976
},
7077
},

0 commit comments

Comments
 (0)