Skip to content
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

Jump to bottom

Added case for idp_discovery since default name is different than other types #244

Merged
merged 2 commits into from
Dec 16, 2020
Merged

Added case for idp_discovery since default name is different than other types #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e2ef4
Added case for idp_discovery since default name is different than oth…
ngoble-phdata Dec 16, 2020
9fb2412
Added test for idp discovery policy
ngoble-phdata Dec 16, 2020
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
4 changes: 4 additions & 0 deletions okta/data_source_okta_default_policy.go
View file
Open in desktop
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
View file
Open in desktop
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)
}