Merge pull request #1262 from okta/prep_3_35_0

prep 3.35.0 release
okta · Aug 26, 2022 · a08a6f0 · a08a6f0
2 parents 47fafaa + 0e6791e
commit a08a6f0
Show file tree

Hide file tree

Showing 123 changed files with 558 additions and 285 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## 3.35.0 (August 25, 2022)
+
+NEW - RESOURCES, DATA SOURCES, PROPERTIES, ATTRIBUTES, ENV VARS:
+
+* Adds customizable Timeouts to resources/data that rely on syncing users and groups to avoid context.DeadlineExceeded
+ [#1207](https://github.com/okta/terraform-provider-okta/pull/1207). Thanks, [@emanor-okta](https://github.com/emanor-okta)!
+  * [Terraform documentation: Resources - Retries and Customizable Timeouts](https://www.terraform.io/plugin/sdkv2/resources/retries-and-customizable-timeouts)
+  * Resources: `okta_app_auto_login`, `okta_app_basic_auth`, `okta_app_bookmark`, `okta_app_group_assignment`, `okta_app_oauth`, `okta_app_saml`, `okta_app_secure_password_store`, `okta_app_shared_credentials`, `okta_app_swa`
+
+BUG FIXES:
+
+* Correctly collect network zones in datasource `okta_network_zone` [#1239](https://github.com/okta/terraform-provider-okta/pull/1239). Thanks, [@natmariam](https://github.com/natmariam)!
+* Adding `CHROMEOS` to `os_type` in `platform_include` [#1261](https://github.com/okta/terraform-provider-okta/pull/1261). Thanks, [@monde](https://github.com/monde)!
+* Update okta-sdk-golang that correctly caches OAuth2 access tokens [#1262](https://github.com/okta/terraform-provider-okta/pull/1262). Thanks, [@monde](https://github.com/monde)!
+* Update role types validation on resource `okta_role_subscription` [#1265](https://github.com/okta/terraform-provider-okta/pull/1265). Thanks, [@monde](https://github.com/monde)!
+* Correct pagination to list all email templates on data source `okta_email_templates` [#1266](https://github.com/okta/terraform-provider-okta/pull/1266). Thanks, [@monde](https://github.com/monde)!
+
+PROJECT IMPROVEMENTS:
+
+* Show current version for provider config in documentation [#1256](https://github.com/okta/terraform-provider-okta/pull/1256). Thanks, [@ErelAdoni](https://github.com/ErelAdoni)!
+* Code clean up from go vet and format [#1264](https://github.com/okta/terraform-provider-okta/pull/1264). Thanks, [@monde](https://github.com/monde)!
+
 ## 3.34.0 (August 12, 2022)
 
 BUG FIXES:

diff --git a/okta/config.go b/okta/config.go
@@ -111,7 +111,7 @@ func (c *Config) loadAndValidate(ctx context.Context) error {
 		okta.WithRateLimitMaxBackOff(int64(c.maxWait)),
 		okta.WithRequestTimeout(int64(c.requestTimeout)),
 		okta.WithRateLimitMaxRetries(int32(c.retryCount)),
-		okta.WithUserAgentExtra("okta-terraform/3.34.0"),
+		okta.WithUserAgentExtra("okta-terraform/3.35.0"),
 	}
 
 	switch {

diff --git a/okta/data_source_okta_app.go b/okta/data_source_okta_app.go
@@ -90,6 +90,8 @@ func dataSourceAppRead(ctx context.Context, d *schema.ResourceData, m interface{
 		// which could result in multiple matches on the data source's "label"
 		// property.  We need to further inspect for an exact label match.
 		if filters.Label != "" {
+			// guard on nils, an app is always set
+			app = appList[0]
 			for i, _app := range appList {
 				if _app.Label == filters.Label {
 					app = appList[i]

diff --git a/okta/data_source_okta_app_group_assignments_test.go b/okta/data_source_okta_app_group_assignments_test.go
@@ -13,7 +13,8 @@ func TestAccOktaDataSourceAppGroupAssignments_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_app_oauth_test.go b/okta/data_source_okta_app_oauth_test.go
@@ -15,7 +15,8 @@ func TestAccOktaDataSourceAppOauth_read(t *testing.T) {
 	appCreate := buildTestAppOauth(ri)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_app_saml_metadata_test.go b/okta/data_source_okta_app_saml_metadata_test.go
@@ -14,9 +14,8 @@ func TestAccOktaDataSourceAppMetadataSaml_read(t *testing.T) {
 	resourceName := "data.okta_app_metadata_saml.test"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_app_saml_test.go b/okta/data_source_okta_app_saml_test.go
@@ -15,9 +15,8 @@ func TestAccOktaDataSourceAppSaml_read(t *testing.T) {
 	appCreate := buildTestAppSaml(ri)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_app_test.go b/okta/data_source_okta_app_test.go
@@ -15,9 +15,8 @@ func TestAccOktaDataSourceApp_read(t *testing.T) {
 	appCreate := buildTestApp(ri)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{
@@ -57,9 +56,8 @@ func TestAccOktaDataSourceAppLabelTest_read(t *testing.T) {
 	config := testLabelConfig(ri)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_app_user_assignments_test.go b/okta/data_source_okta_app_user_assignments_test.go
@@ -13,7 +13,8 @@ func TestAccOktaDataSourceAppUserAssignments_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_auth_server_claim_test.go b/okta/data_source_okta_auth_server_claim_test.go
@@ -15,9 +15,8 @@ func TestAccOktaDataSourceAuthServerClaim(t *testing.T) {
 	createUser := mgr.GetFixtures("datasource_create_auth_server.tf", ri, t)
 	resourceName := fmt.Sprintf("data.%s.test", authServerClaim)
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_auth_server_policy_test.go b/okta/data_source_okta_auth_server_policy_test.go
@@ -14,7 +14,8 @@ func TestAccOktaDataSourceAuthServerPolicy_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 	createServerWithPolicy := buildTestAuthServerWithPolicy(ri)
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_auth_server_scopes_test.go b/okta/data_source_okta_auth_server_scopes_test.go
@@ -13,7 +13,8 @@ func TestAccOktaDataSourceAuthServerScopes(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_auth_server_test.go b/okta/data_source_okta_auth_server_test.go
@@ -14,7 +14,8 @@ func TestAccOktaDataSourceAuthServer_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 	authServer := buildTestAuthServer(ri)
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_authenticator_test.go b/okta/data_source_okta_authenticator_test.go
@@ -16,9 +16,8 @@ func TestAccOktaDataSourceAuthenticator_read(t *testing.T) {
 	resourceName1 := fmt.Sprintf("data.%s.test_1", authenticator)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_brand_test.go b/okta/data_source_okta_brand_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaBrand_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_brands_test.go b/okta/data_source_okta_brands_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaBrands_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_default_policy_test.go b/okta/data_source_okta_default_policy_test.go
@@ -15,9 +15,8 @@ func TestAccOktaDataSourceDefaultPolicy_readPasswordPolicy(t *testing.T) {
 	config := testAccDataSourceDefaultPolicy(ri, sdk.PasswordPolicyType)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{
@@ -35,9 +34,8 @@ func TestAccOktaDataSourceDefaultPolicy_readIdpPolicy(t *testing.T) {
 	config := testAccDataSourceDefaultPolicy(ri, sdk.IdpDiscoveryType)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_email_customization_test.go b/okta/data_source_okta_email_customization_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaEmailCustomization_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_email_customizations_test.go b/okta/data_source_okta_email_customizations_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaEmailCustomizations_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_email_template_test.go b/okta/data_source_okta_email_template_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaEmailTemplate_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_email_templates_test.go b/okta/data_source_okta_email_templates_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaEmailTemplates_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_everyone_group_test.go b/okta/data_source_okta_everyone_group_test.go
@@ -14,9 +14,8 @@ func TestAccOktaDataSourceEveryoneGroup_read(t *testing.T) {
 	config := testAccDataSourceEveryoneGroupConfig(ri)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_group_test.go b/okta/data_source_okta_group_test.go
@@ -16,9 +16,8 @@ func TestAccOktaDataSourceGroup_read(t *testing.T) {
 	configInvalid := mgr.GetFixtures("datasource_not_found.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_groups_test.go b/okta/data_source_okta_groups_test.go
@@ -13,7 +13,8 @@ func TestAccOktaDataSourceGroups_read(t *testing.T) {
 	groups := mgr.GetFixtures("okta_groups.tf", ri, t)
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_idp_metadata_saml_test.go b/okta/data_source_okta_idp_metadata_saml_test.go
@@ -14,9 +14,8 @@ func TestAccOktaDataSourceIdpMetadataSaml_read(t *testing.T) {
 	resourceName := "data.okta_idp_metadata_saml.test"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_idp_oidc_test.go b/okta/data_source_okta_idp_oidc_test.go
@@ -13,7 +13,8 @@ func TestAccOktaDataSourceIdpOidc_read(t *testing.T) {
 	idpOidcConfig := mgr.GetFixtures("generic_oidc.tf", ri, t)
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_idp_saml_test.go b/okta/data_source_okta_idp_saml_test.go
@@ -15,9 +15,8 @@ func TestAccOktaDataSourceIdpSaml_read(t *testing.T) {
 	idpSaml := mgr.GetFixtures("basic.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_idp_social_test.go b/okta/data_source_okta_idp_social_test.go
@@ -13,9 +13,8 @@ func TestAccOktaDataSourceIdpSocial_read(t *testing.T) {
 	preConfig := mgr.GetFixtures("basic.tf", ri, t)
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_policy_test.go b/okta/data_source_okta_policy_test.go
@@ -12,9 +12,8 @@ func TestAccOktaDataSourcePolicy_read(t *testing.T) {
 	config := testAccDataSourcePolicyConfig()
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_theme_test.go b/okta/data_source_okta_theme_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaTheme_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/okta/data_source_okta_themes_test.go b/okta/data_source_okta_themes_test.go
@@ -13,7 +13,8 @@ func TestAccDataSourceOktaThemes_read(t *testing.T) {
 	config := mgr.GetFixtures("datasource.tf", ri, t)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
 		ProviderFactories: testAccProvidersFactories,
 		Steps: []resource.TestStep{
 			{