Skip to content

Commit

Permalink
Merge pull request #244 from nickerzb/idp_discovery_2
Browse files Browse the repository at this point in the history
Added case for idp_discovery since default name is different than other types
  • Loading branch information
bogdanprodan-okta committed Dec 16, 2020
2 parents 9868de7 + 9fb2412 commit 20e6c0d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
4 changes: 4 additions & 0 deletions okta/data_source_okta_default_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,9 @@ func dataSourceDefaultPolicies() *schema.Resource {
}

func dataSourceDefaultPolicyRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
policyType := d.Get("type").(string)
if policyType == sdk.IdpDiscoveryType {
return setPolicyByName(ctx, d, m, "Idp Discovery Policy")
}
return setPolicyByName(ctx, d, m, "Default Policy")
}
28 changes: 24 additions & 4 deletions okta/data_source_okta_default_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/oktadeveloper/terraform-provider-okta/sdk"
)

func TestAccOktaDataSourceDefaultPolicy_read(t *testing.T) {
func TestAccOktaDataSourceDefaultPolicy_readPasswordPolicy(t *testing.T) {
ri := acctest.RandInt()
config := testAccDataSourceDefaultPolicyConfig(ri)
config := testAccDataSourceDefaultPolicy(ri, sdk.PasswordPolicyType)

resource.Test(t, resource.TestCase{
PreCheck: func() {
Expand All @@ -30,10 +30,30 @@ func TestAccOktaDataSourceDefaultPolicy_read(t *testing.T) {
})
}

func testAccDataSourceDefaultPolicyConfig(rInt int) string {
func TestAccOktaDataSourceDefaultPolicy_readIdpPolicy(t *testing.T) {
ri := acctest.RandInt()
config := testAccDataSourceDefaultPolicy(ri, sdk.IdpDiscoveryType)

resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
},
ProviderFactories: testAccProvidersFactories,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.okta_default_policy.default-"+strconv.Itoa(ri), "id"),
),
},
},
})
}

func testAccDataSourceDefaultPolicy(rInt int, policy string) string {
return fmt.Sprintf(`
data "okta_default_policy" "default-%d" {
type = "%s"
}
`, rInt, sdk.PasswordPolicyType)
`, rInt, policy)
}

0 comments on commit 20e6c0d

Please sign in to comment.