okta · MikeMondragon-okta · Aug 11, 2023 · Jul 19, 2023 · Aug 2, 2023 · Aug 11, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## 4.2.0 (August 11, 2023)
+
+### NEW - RESOURCES, DATA SOURCES, PROPERTIES, ATTRIBUTES, ENV VARS:
+
+* New device assurance resources [#1659](https://github.com/okta/terraform-provider-okta/pull/1659). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
+  - `okta_device_assurance_policy_android`
+  - `okta_device_assurance_policy_chromeos`
+  - `okta_device_assurance_policy_ios`
+  - `okta_device_assurance_policy_macos`
+  - `okta_device_assurance_policy_windows`
+
+* Add constraints argument for webauthn to resource `okta_policy_mfa` [#1663](https://github.com/okta/terraform-provider-okta/pull/1663). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
+* `jwks_uri` argument for resource `okta_app_oauth` [#1648](https://github.com/okta/terraform-provider-okta/pull/1648). Thanks, [@virgofx](https://github.com/virgofx)!
+
+### IMPROVEMENTS
+
+* Data Source `okta_group`'s `name` and `id` arguments are optional and computed [#1665](https://github.com/okta/terraform-provider-okta/pull/1665). Thanks, [@MatthewJohn_1643](https://github.com/MatthewJohn_1643)!
+* Improve backoff with proper context [#1658](https://github.com/okta/terraform-provider-okta/pull/1658). Thanks, [@monde](https://github.com/monde)!
+* Correct obsolete documentation; document PKCS#1 and PKCS#8 private key usage in provider config and oauth apps [#1666](https://github.com/okta/terraform-provider-okta/pull/1666). Thanks, [@monde](https://github.com/monde)!
+
+### BUG FIXES
+
+* Fix `okta_app_oauth`'s `groups_claim` can be ignored on imports [#1638](https://github.com/okta/terraform-provider-okta/pull/1638). Thanks, [@monde](https://github.com/monde)!
+
 ## 4.1.0 (June 30, 2023)
 
 ### NEW - RESOURCES, DATA SOURCES, PROPERTIES, ATTRIBUTES, ENV VARS:
@@ -11,7 +35,7 @@
 * Flexible `okta_brand` data source and resource with `default` ID; Improve `okta_auth_server_default` [#1570](https://github.com/okta/terraform-provider-okta/pull/1570). Thanks, [@monde](https://github.com/monde)!
 * Show appropriate terraform logo for light and dark themes in README [#1574](https://github.com/okta/terraform-provider-okta/pull/1574). Thanks, [@thekbb](https://github.com/thekbb)!
 * Update the description for the `platform_include` block of `app_signon_policy_rule` to outline requirement for the `os_expression` argument to be set when `os_type` is set to `OTHER` [#1600](https://github.com/okta/terraform-provider-okta/pull/1600). Thanks, [@achuchulev](https://github.com/achuchulev)!
-* Update okta documentation [#1614](https://github.com/okta/terraform-provider-okta/pull/1614). Thanks, [@duytiennguyen-okta](https://github.com/ duytiennguyen-okta)!
+* Update okta documentation [#1614](https://github.com/okta/terraform-provider-okta/pull/1614). Thanks, [@duytiennguyen-okta](https://github.com/duytiennguyen-okta)!
 * Fix doc typo [#1611](https://github.com/okta/terraform-provider-okta/pull/1611). Thanks, [@monde](https://github.com/monde)!
 
 ## 4.0.3 (June 26, 2023)

diff --git a/GNUmakefile b/GNUmakefile
@@ -43,14 +43,14 @@ clean-all:
 
 sweep:
 	@echo "WARNING: This will destroy infrastructure. Use only in development accounts."
-	go test $(TEST) -v -sweep=$(SWEEP) $(SWEEPARGS)
+	go test $(TEST) -sweep=$(SWEEP) $(SWEEPARGS)
 
 test:
 	echo $(TEST) | \
 		xargs -t -n4 go test $(TESTARGS) $(TEST_FILTER) -timeout=30s -parallel=4
 
 testacc:
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) $(TEST_FILTER) -timeout 120m
+	TF_ACC=1 go test $(TEST) $(TESTARGS) $(TEST_FILTER) -timeout 120m
 
 test-play-vcr-acc:
 	OKTA_VCR_TF_ACC=play TF_ACC=1 go test -tags unit -mod=readonly -test.v -timeout 120m ./okta

diff --git a/examples/okta_admin_role_targets/basic.tf b/examples/okta_admin_role_targets/basic.tf
@@ -1,11 +1,18 @@
 resource "okta_user" "test" {
-  admin_roles = ["APP_ADMIN", "GROUP_MEMBERSHIP_ADMIN", "HELP_DESK_ADMIN"]
   first_name  = "TestAcc"
   last_name   = "blah"
   login       = "[email protected]"
   email       = "[email protected]"
 }
 
+resource "okta_user_admin_roles" "test" {
+  user_id     = okta_user.test.id
+  admin_roles = [
+    "APP_ADMIN",
+    "GROUP_MEMBERSHIP_ADMIN"
+  ]
+}
+
 resource "okta_app_swa" "test" {
   label          = "testAcc_replace_with_uuid"
   button_field   = "btn-login"
@@ -21,12 +28,13 @@ resource "okta_group" "test" {
 
 resource "okta_admin_role_targets" "test_app" {
   user_id   = okta_user.test.id
-  role_type = tolist(okta_user.test.admin_roles)[0]
+  role_type = "APP_ADMIN"
   apps      = [format("%s.%s", okta_app_swa.test.name, okta_app_swa.test.id)]
 }
 
 resource "okta_admin_role_targets" "test_group" {
   user_id   = okta_user.test.id
-  role_type = tolist(okta_user.test.admin_roles)[1]
+  role_type = "GROUP_MEMBERSHIP_ADMIN"
   groups    = [okta_group.test.id]
+  depends_on = [ okta_user_admin_roles.test ]
 }
diff --git a/examples/okta_admin_role_targets/updated.tf b/examples/okta_admin_role_targets/updated.tf
@@ -1,11 +1,18 @@
 resource "okta_user" "test" {
-  admin_roles = ["APP_ADMIN", "GROUP_MEMBERSHIP_ADMIN", "HELP_DESK_ADMIN"]
   first_name  = "TestAcc"
   last_name   = "blah"
   login       = "[email protected]"
   email       = "[email protected]"
 }
 
+resource "okta_user_admin_roles" "test" {
+  user_id     = okta_user.test.id
+  admin_roles = [
+    "APP_ADMIN",
+    "GROUP_MEMBERSHIP_ADMIN"
+  ]
+}
+
 resource "okta_app_swa" "test" {
   label          = "testAcc_replace_with_uuid"
   button_field   = "btn-login"
@@ -26,12 +33,12 @@ resource "okta_group" "test_2" {
 
 resource "okta_admin_role_targets" "test_app" {
   user_id   = okta_user.test.id
-  role_type = tolist(okta_user.test.admin_roles)[0]
+  role_type = "APP_ADMIN"
   apps      = ["oidc_client", "facebook"]
 }
 
 resource "okta_admin_role_targets" "test_group" {
   user_id   = okta_user.test.id
-  role_type = tolist(okta_user.test.admin_roles)[1]
+  role_type = "GROUP_MEMBERSHIP_ADMIN"
   groups    = [okta_group.test.id, okta_group.test_2.id]
 }
diff --git a/examples/okta_app_group_assignment/basic.tf b/examples/okta_app_group_assignment/basic.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test" {
@@ -41,4 +37,4 @@ resource "okta_app_group_assignment" "test3" {
   priority = 3
 
   depends_on = [okta_app_group_assignment.test.0, okta_app_group_assignment.test.1]
-}
+}
diff --git a/examples/okta_app_group_assignment/force_new_update.tf b/examples/okta_app_group_assignment/force_new_update.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test2" {

diff --git a/examples/okta_app_group_assignment/retain_assignment.tf b/examples/okta_app_group_assignment/retain_assignment.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test" {

diff --git a/examples/okta_app_group_assignment/retain_assignment_destroy.tf b/examples/okta_app_group_assignment/retain_assignment_destroy.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test" {

diff --git a/examples/okta_app_group_assignment/updated.tf b/examples/okta_app_group_assignment/updated.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test" {
@@ -41,4 +37,4 @@ resource "okta_app_group_assignment" "test3" {
   priority = 4
 
   depends_on = [okta_app_group_assignment.test.0, okta_app_group_assignment.test.1]
-}
+}
diff --git a/examples/okta_app_group_assignments/basic.tf b/examples/okta_app_group_assignments/basic.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test1" {

diff --git a/examples/okta_app_group_assignments/datasource.tf b/examples/okta_app_group_assignments/datasource.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test1" {

diff --git a/examples/okta_app_group_assignments/updated.tf b/examples/okta_app_group_assignments/updated.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_group" "test1" {

diff --git a/examples/okta_app_signon_policy_rule/basic_updated.tf b/examples/okta_app_signon_policy_rule/basic_updated.tf
@@ -52,6 +52,7 @@ resource "okta_network_zone" "test" {
   type     = "IP"
   gateways = ["1.2.3.4/24", "2.3.4.5-2.3.4.15"]
   proxies  = ["2.2.3.4/24", "3.3.4.5-3.3.4.15"]
+  status   = "ACTIVE"
 }
 
 data "okta_user_type" "default" {

diff --git a/examples/okta_app_user/basic.tf b/examples/okta_app_user/basic.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_user" "test" {

diff --git a/examples/okta_app_user/basic_profile.tf b/examples/okta_app_user/basic_profile.tf
@@ -8,10 +8,6 @@ resource "okta_app_saml" "test" {
     "domain": "articulate"
   }
 JSON
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_user" "test" {

diff --git a/examples/okta_app_user/retain.tf b/examples/okta_app_user/retain.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_user" "test" {

diff --git a/examples/okta_app_user/retain_destroy.tf b/examples/okta_app_user/retain_destroy.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_user" "test" {

diff --git a/examples/okta_app_user/update.tf b/examples/okta_app_user/update.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_user" "test" {

diff --git a/examples/okta_app_user_assignments/datasource.tf b/examples/okta_app_user_assignments/datasource.tf
@@ -5,10 +5,6 @@ resource "okta_app_oauth" "test" {
   redirect_uris  = ["http://d.com/"]
   response_types = ["code", "token", "id_token"]
   issuer_mode    = "ORG_URL"
-
-  lifecycle {
-    ignore_changes = [users, groups]
-  }
 }
 
 resource "okta_user" "test" {

diff --git a/examples/okta_domain/basic.tf b/examples/okta_domain/basic.tf
@@ -1,3 +1,3 @@
 resource "okta_domain" "test" {
-  name   = "example.com"
+  name   = "testAcc-replace_with_uuid.example.com"
 }
diff --git a/examples/okta_domain/datasource.tf b/examples/okta_domain/datasource.tf
@@ -1,13 +1,13 @@
 resource "okta_domain" "test" {
-  name   = "www.example.com"
+  name   = "testAcc-replace_with_uuid.example.com"
 }
 
 data "okta_domain" "by-id" {
   domain_id_or_name = okta_domain.test.id
 }
 
 data "okta_domain" "by-name" {
-  domain_id_or_name = "www.example.com"
+  domain_id_or_name = "testAcc-replace_with_uuid.example.com"
 
   depends_on = [
     okta_domain.test

diff --git a/examples/okta_domain_certificate/basic.tf b/examples/okta_domain_certificate/basic.tf
@@ -1,5 +1,5 @@
 resource "okta_domain" "test" {
-  name   = "example.com"
+  name   = "testAcc-replace_with_uuid.example.com"
   verify = false
 }
 

diff --git a/examples/okta_email_domain/basic.tf b/examples/okta_email_domain/basic.tf
@@ -3,7 +3,7 @@ data "okta_brands" "test" {
 
 resource "okta_email_domain" "test" {
   brand_id     = tolist(data.okta_brands.test.brands)[0].id
-  domain       = "example.com"
+  domain       = "testAcc-replace_with_uuid.example.com"
   display_name = "test"
   user_name    = "fff"
 }
diff --git a/examples/okta_group/datasource.tf b/examples/okta_group/datasource.tf
@@ -3,7 +3,23 @@ resource "okta_group" "test" {
   description = "testing, testing"
 }
 
+resource "okta_user" "test" {
+  first_name = "TestAcc"
+  last_name  = "Jones"
+  login      = "[email protected]"
+  email      = "[email protected]"
+}
+
+resource "okta_user_group_memberships" "test" {
+  user_id = okta_user.test.id
+  groups = [
+    okta_group.test.id,
+  ]
+}
+
 data "okta_group" "test" {
   include_users = true
   name          = okta_group.test.name
-}
+
+  depends_on = [ okta_user_group_memberships.test ]
+}
diff --git a/examples/okta_group_memberships/basic.tf b/examples/okta_group_memberships/basic.tf
@@ -1,9 +1,6 @@
 resource "okta_group" "test" {
   name        = "testAcc_replace_with_uuid"
   description = "testing, testing"
-  lifecycle {
-    ignore_changes = [users]
-  }
 }
 
 resource "okta_user" "test1" {

diff --git a/examples/okta_group_memberships/basic_removal.tf b/examples/okta_group_memberships/basic_removal.tf
@@ -1,9 +1,6 @@
 resource "okta_group" "test" {
   name        = "testAcc_replace_with_uuid"
   description = "testing, testing"
-  lifecycle {
-    ignore_changes = [users]
-  }
 }
 
 resource "okta_user" "test1" {

diff --git a/examples/okta_group_memberships/basic_update.tf b/examples/okta_group_memberships/basic_update.tf
@@ -1,9 +1,6 @@
 resource "okta_group" "test" {
   name        = "testAcc_replace_with_uuid"
   description = "testing, testing"
-  lifecycle {
-    ignore_changes = [users]
-  }
 }
 
 resource "okta_user" "test1" {