From ae9f4f45882d7aa807f8b127dbbe687efb311f67 Mon Sep 17 00:00:00 2001 From: Tom Goodsell <56050072+tgoodsell-tempus@users.noreply.github.com> Date: Mon, 11 Sep 2023 19:14:15 -0500 Subject: [PATCH] Revert "add EC test client and format terraform resources" This reverts commit 5e19adc59f9efda99247071234ebdb4f18915c2e. --- .../basic.tf | 6 +- .../updated.tf | 6 +- examples/okta_admin_role_targets/basic.tf | 18 +++--- examples/okta_admin_role_targets/updated.tf | 10 ++-- .../app_with_authentication_policy.tf | 2 +- examples/okta_app_bookmark/basic.tf | 4 +- .../okta_app_oauth/service_with_jwks_uri.tf | 10 ++-- examples/okta_app_saml/basic_inline_hook.tf | 4 +- .../preconfigured.tf | 22 +++---- .../preconfigured_updated.tf | 22 +++---- examples/okta_app_shared_credentials/basic.tf | 6 +- .../okta_app_shared_credentials/updated.tf | 6 +- .../basic_updated.tf | 60 +++++++++---------- .../okta_auth_server_policy/datasource.tf | 12 ++-- .../on_prem_provider_json.tf | 24 ++++---- .../okta_authenticator/security_question.tf | 10 ++-- .../security_question_updated.tf | 10 ++-- examples/okta_brand/import.tf | 8 +-- examples/okta_domain/datasource.tf | 2 +- examples/okta_domain_certificate/basic.tf | 4 +- examples/okta_email_customization/basic.tf | 26 ++++---- .../okta_email_customization/datasource.tf | 6 +- examples/okta_email_customization/updated.tf | 26 ++++---- .../okta_email_customizations/datasource.tf | 2 +- examples/okta_email_template/datasource.tf | 2 +- examples/okta_event_hook/basic.tf | 2 +- examples/okta_group/datasource.tf | 2 +- examples/okta_group_memberships/basic.tf | 2 +- .../okta_group_memberships/basic_removal.tf | 2 +- .../okta_group_memberships/basic_update.tf | 2 +- examples/okta_group_role/basic.tf | 8 +-- examples/okta_group_role/group_targets.tf | 8 +-- .../okta_group_role/group_targets_removed.tf | 8 +-- .../okta_group_role/group_targets_updated.tf | 8 +-- examples/okta_group_rule/datasource.tf | 4 +- examples/okta_groups/datasource.tf | 4 +- examples/okta_inline_hook/basic.tf | 12 ++-- examples/okta_link_value/basic.tf | 4 +- examples/okta_link_value/updated.tf | 4 +- .../okta_policy_password/basic_updated.tf | 2 +- .../okta_policy_password_default/basic.tf | 4 +- .../basic_updated.tf | 4 +- .../factor_sequence.tf | 2 +- examples/okta_resource_set/basic.tf | 4 +- examples/okta_resource_set/updated.tf | 4 +- examples/okta_user/datasource.tf | 4 +- examples/okta_user_admin_roles/basic.tf | 2 +- .../okta_user_admin_roles/basic_removal.tf | 2 +- .../okta_user_admin_roles/basic_update.tf | 2 +- examples/okta_user_group_memberships/basic.tf | 2 +- .../basic_removal.tf | 2 +- .../basic_update.tf | 2 +- examples/okta_users/datasource.tf | 4 +- 53 files changed, 209 insertions(+), 209 deletions(-) diff --git a/examples/okta_admin_role_custom_assignments/basic.tf b/examples/okta_admin_role_custom_assignments/basic.tf index 08c2c6b3b..aca96df0a 100644 --- a/examples/okta_admin_role_custom_assignments/basic.tf +++ b/examples/okta_admin_role_custom_assignments/basic.tf @@ -1,5 +1,5 @@ variable "hostname" { - type = string + type=string } locals { @@ -15,7 +15,7 @@ resource "okta_admin_role_custom" "test" { resource "okta_resource_set" "test" { label = "testAcc_replace_with_uuid" description = "testing, testing" - resources = [ + resources = [ format("%s/api/v1/users", local.org_url), format("%s/api/v1/apps/%s", local.org_url, okta_app_swa.test.id) ] @@ -24,7 +24,7 @@ resource "okta_resource_set" "test" { resource "okta_admin_role_custom_assignments" "test" { resource_set_id = okta_resource_set.test.id custom_role_id = okta_admin_role_custom.test.id - members = [ + members = [ format("%s/api/v1/users/%s", local.org_url, okta_user.test.id), format("%s/api/v1/groups/%s", local.org_url, okta_group.test.id) ] diff --git a/examples/okta_admin_role_custom_assignments/updated.tf b/examples/okta_admin_role_custom_assignments/updated.tf index ac6522f33..3bd3862c0 100644 --- a/examples/okta_admin_role_custom_assignments/updated.tf +++ b/examples/okta_admin_role_custom_assignments/updated.tf @@ -1,5 +1,5 @@ variable "hostname" { - type = string + type=string } locals { @@ -15,7 +15,7 @@ resource "okta_admin_role_custom" "test" { resource "okta_resource_set" "test" { label = "testAcc_replace_with_uuid" description = "testing, testing" - resources = [ + resources = [ format("%s/api/v1/users", local.org_url), format("%s/api/v1/apps/%s", local.org_url, okta_app_swa.test.id) ] @@ -24,7 +24,7 @@ resource "okta_resource_set" "test" { resource "okta_admin_role_custom_assignments" "test" { resource_set_id = okta_resource_set.test.id custom_role_id = okta_admin_role_custom.test.id - members = [ + members = [ format("%s/api/v1/users/%s", local.org_url, okta_user.test.id) ] } diff --git a/examples/okta_admin_role_targets/basic.tf b/examples/okta_admin_role_targets/basic.tf index 31069be40..22e20f457 100644 --- a/examples/okta_admin_role_targets/basic.tf +++ b/examples/okta_admin_role_targets/basic.tf @@ -1,12 +1,12 @@ resource "okta_user" "test" { - first_name = "TestAcc" - last_name = "blah" - login = "testAcc_replace_with_uuid@example.com" - email = "testAcc_replace_with_uuid@example.com" + first_name = "TestAcc" + last_name = "blah" + login = "testAcc_replace_with_uuid@example.com" + email = "testAcc_replace_with_uuid@example.com" } resource "okta_user_admin_roles" "test" { - user_id = okta_user.test.id + user_id = okta_user.test.id admin_roles = [ "APP_ADMIN", "GROUP_MEMBERSHIP_ADMIN" @@ -33,8 +33,8 @@ resource "okta_admin_role_targets" "test_app" { } resource "okta_admin_role_targets" "test_group" { - user_id = okta_user.test.id - role_type = "GROUP_MEMBERSHIP_ADMIN" - groups = [okta_group.test.id] - depends_on = [okta_user_admin_roles.test] + user_id = okta_user.test.id + 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 index 9b3f42e9e..973fea3d9 100644 --- a/examples/okta_admin_role_targets/updated.tf +++ b/examples/okta_admin_role_targets/updated.tf @@ -1,12 +1,12 @@ resource "okta_user" "test" { - first_name = "TestAcc" - last_name = "blah" - login = "testAcc_replace_with_uuid@example.com" - email = "testAcc_replace_with_uuid@example.com" + first_name = "TestAcc" + last_name = "blah" + login = "testAcc_replace_with_uuid@example.com" + email = "testAcc_replace_with_uuid@example.com" } resource "okta_user_admin_roles" "test" { - user_id = okta_user.test.id + user_id = okta_user.test.id admin_roles = [ "APP_ADMIN", "GROUP_MEMBERSHIP_ADMIN" diff --git a/examples/okta_app_bookmark/app_with_authentication_policy.tf b/examples/okta_app_bookmark/app_with_authentication_policy.tf index e771a8c14..edfc69d6b 100644 --- a/examples/okta_app_bookmark/app_with_authentication_policy.tf +++ b/examples/okta_app_bookmark/app_with_authentication_policy.tf @@ -6,7 +6,7 @@ data "okta_policy" "test" { resource "okta_app_signon_policy" "test" { name = "testAcc_Policy_replace_with_uuid" description = "Sign On Policy" - depends_on = [ + depends_on = [ data.okta_policy.test ] } diff --git a/examples/okta_app_bookmark/basic.tf b/examples/okta_app_bookmark/basic.tf index ab78d05ed..cab753444 100644 --- a/examples/okta_app_bookmark/basic.tf +++ b/examples/okta_app_bookmark/basic.tf @@ -1,4 +1,4 @@ resource "okta_app_bookmark" "test" { - label = "testAcc_replace_with_uuid" - url = "https://test.com" + label = "testAcc_replace_with_uuid" + url = "https://test.com" } diff --git a/examples/okta_app_oauth/service_with_jwks_uri.tf b/examples/okta_app_oauth/service_with_jwks_uri.tf index dfe3d57ac..7c96e9cc8 100644 --- a/examples/okta_app_oauth/service_with_jwks_uri.tf +++ b/examples/okta_app_oauth/service_with_jwks_uri.tf @@ -1,7 +1,7 @@ resource "okta_app_oauth" "test" { - label = "testAcc_replace_with_uuid" - type = "service" - response_types = ["token"] - grant_types = ["client_credentials"] - jwks_uri = "https://example.com" + label = "testAcc_replace_with_uuid" + type = "service" + response_types = ["token"] + grant_types = ["client_credentials"] + jwks_uri = "https://example.com" } diff --git a/examples/okta_app_saml/basic_inline_hook.tf b/examples/okta_app_saml/basic_inline_hook.tf index 41acaaaae..3cfe99918 100644 --- a/examples/okta_app_saml/basic_inline_hook.tf +++ b/examples/okta_app_saml/basic_inline_hook.tf @@ -10,7 +10,7 @@ resource "okta_inline_hook" "test" { uri = "https://example.com/test1" method = "POST" } - auth = { + auth = { key = "Authorization" type = "HEADER" value = "secret" @@ -31,7 +31,7 @@ resource "okta_app_saml" "test" { honor_force_authn = false authn_context_class_ref = "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" inline_hook_id = okta_inline_hook.test.id - depends_on = [ + depends_on = [ okta_inline_hook.test ] attribute_statements { diff --git a/examples/okta_app_saml_app_settings/preconfigured.tf b/examples/okta_app_saml_app_settings/preconfigured.tf index e17fda6ea..f8cf08221 100644 --- a/examples/okta_app_saml_app_settings/preconfigured.tf +++ b/examples/okta_app_saml_app_settings/preconfigured.tf @@ -5,17 +5,17 @@ resource "okta_app_saml" "test" { } resource "okta_app_saml_app_settings" "test" { - app_id = okta_app_saml.test.id + app_id = okta_app_saml.test.id settings = jsonencode( - { - "appFilter" : "okta", - "awsEnvironmentType" : "aws.amazon", - "groupFilter" : "aws_(?{{accountid}}\\\\d+)_(?{{role}}[a-zA-Z0-9+=,.@\\\\-_]+)", - "joinAllRoles" : false, - "loginURL" : "https://console.aws.amazon.com/ec2/home", - "roleValuePattern" : "arn:aws:iam::$${accountid}:saml-provider/OKTA,arn:aws:iam::$${accountid}:role/$${role}", - "sessionDuration" : 7600, - "useGroupMapping" : false - } + { + "appFilter" : "okta", + "awsEnvironmentType" : "aws.amazon", + "groupFilter" : "aws_(?{{accountid}}\\\\d+)_(?{{role}}[a-zA-Z0-9+=,.@\\\\-_]+)", + "joinAllRoles" : false, + "loginURL" : "https://console.aws.amazon.com/ec2/home", + "roleValuePattern" : "arn:aws:iam::$${accountid}:saml-provider/OKTA,arn:aws:iam::$${accountid}:role/$${role}", + "sessionDuration" : 7600, + "useGroupMapping" : false + } ) } diff --git a/examples/okta_app_saml_app_settings/preconfigured_updated.tf b/examples/okta_app_saml_app_settings/preconfigured_updated.tf index 5eea50a77..87e6eaa85 100644 --- a/examples/okta_app_saml_app_settings/preconfigured_updated.tf +++ b/examples/okta_app_saml_app_settings/preconfigured_updated.tf @@ -5,17 +5,17 @@ resource "okta_app_saml" "test" { } resource "okta_app_saml_app_settings" "test" { - app_id = okta_app_saml.test.id + app_id = okta_app_saml.test.id settings = jsonencode( - { - "appFilter" : "okta", - "awsEnvironmentType" : "aws.amazon", - "groupFilter" : "aws_(?{{accountid}}\\\\d+)_(?{{role}}[a-zA-Z0-9+=,.@\\\\-_]+)", - "joinAllRoles" : false, - "loginURL" : "https://console.aws.amazon.com/ec2/home", - "roleValuePattern" : "arn:aws:iam::$${accountid}:saml-provider/OKTA,arn:aws:iam::$${accountid}:role/$${role}", - "sessionDuration" : 3200, - "useGroupMapping" : false - } + { + "appFilter" : "okta", + "awsEnvironmentType" : "aws.amazon", + "groupFilter" : "aws_(?{{accountid}}\\\\d+)_(?{{role}}[a-zA-Z0-9+=,.@\\\\-_]+)", + "joinAllRoles" : false, + "loginURL" : "https://console.aws.amazon.com/ec2/home", + "roleValuePattern" : "arn:aws:iam::$${accountid}:saml-provider/OKTA,arn:aws:iam::$${accountid}:role/$${role}", + "sessionDuration" : 3200, + "useGroupMapping" : false + } ) } diff --git a/examples/okta_app_shared_credentials/basic.tf b/examples/okta_app_shared_credentials/basic.tf index e8cdc8e70..581f05d52 100644 --- a/examples/okta_app_shared_credentials/basic.tf +++ b/examples/okta_app_shared_credentials/basic.tf @@ -17,7 +17,7 @@ resource "okta_app_shared_credentials" "test" { // deprecated in OIE // https://developer.okta.com/docs/reference/api/apps/#accessibility-object // accessibility_login_redirect_url = "https://example.com/redirect_url_2" - auto_submit_toolbar = true - hide_ios = true - logo = "../examples/okta_app_basic_auth/terraform_icon.png" + auto_submit_toolbar = true + hide_ios = true + logo = "../examples/okta_app_basic_auth/terraform_icon.png" } diff --git a/examples/okta_app_shared_credentials/updated.tf b/examples/okta_app_shared_credentials/updated.tf index b020a0324..fc0aa6d66 100644 --- a/examples/okta_app_shared_credentials/updated.tf +++ b/examples/okta_app_shared_credentials/updated.tf @@ -17,7 +17,7 @@ resource "okta_app_shared_credentials" "test" { // deprecated in OIE // https://developer.okta.com/docs/reference/api/apps/#accessibility-object // accessibility_login_redirect_url = "https://example.com/redirect_url_2" - auto_submit_toolbar = true - hide_ios = true - logo = "../examples/okta_app_basic_auth/terraform_icon.png" + auto_submit_toolbar = true + hide_ios = true + logo = "../examples/okta_app_basic_auth/terraform_icon.png" } diff --git a/examples/okta_app_signon_policy_rule/basic_updated.tf b/examples/okta_app_signon_policy_rule/basic_updated.tf index b104ef961..ea4c8560b 100644 --- a/examples/okta_app_signon_policy_rule/basic_updated.tf +++ b/examples/okta_app_signon_policy_rule/basic_updated.tf @@ -60,33 +60,33 @@ data "okta_user_type" "default" { } resource "okta_policy_device_assurance_android" "test" { - name = "test" + name = "test" os_version = "12" - jailbreak = false + jailbreak = false } resource "okta_app_signon_policy_rule" "test" { - name = "testAcc_replace_with_uuid_updated" - policy_id = data.okta_app_signon_policy.test.id - access = "ALLOW" - custom_expression = "user.status == \"ACTIVE\"" - device_is_managed = false - device_is_registered = true - factor_mode = "2FA" - groups_excluded = [ + name = "testAcc_replace_with_uuid_updated" + policy_id = data.okta_app_signon_policy.test.id + access = "ALLOW" + custom_expression = "user.status == \"ACTIVE\"" + device_is_managed = false + device_is_registered = true + factor_mode = "2FA" + groups_excluded = [ okta_group.this[2].id, okta_group.this[3].id, okta_group.this[4].id ] - groups_included = [ + groups_included = [ okta_group.this[0].id, okta_group.this[1].id ] device_assurances_included = [ okta_policy_device_assurance_android.test.id ] - network_connection = "ZONE" - network_includes = [ + network_connection = "ZONE" + network_includes = [ okta_network_zone.test.id ] platform_include { @@ -101,18 +101,18 @@ resource "okta_app_signon_policy_rule" "test" { os_type = "MACOS" type = "DESKTOP" } - # FIXME Okta API for /api/v1/policies/{policyId}/rules/{ruleId} - # is not returning os_expression even when it has been set throwing off the TF state. - # platform_include { - # os_expression = ".*" - # os_type = "OTHER" - # type = "DESKTOP" - # } - # platform_include { - # os_expression = ".*" - # os_type = "OTHER" - # type = "MOBILE" - # } +# FIXME Okta API for /api/v1/policies/{policyId}/rules/{ruleId} +# is not returning os_expression even when it has been set throwing off the TF state. +# platform_include { +# os_expression = ".*" +# os_type = "OTHER" +# type = "DESKTOP" +# } +# platform_include { +# os_expression = ".*" +# os_type = "OTHER" +# type = "MOBILE" +# } platform_include { os_type = "WINDOWS" type = "DESKTOP" @@ -125,22 +125,22 @@ resource "okta_app_signon_policy_rule" "test" { re_authentication_frequency = "PT43800H" inactivity_period = "PT2H" type = "ASSURANCE" - user_types_excluded = [ + user_types_excluded = [ okta_user_type.test.id ] - user_types_included = [ + user_types_included = [ data.okta_user_type.default.id ] - users_excluded = [ + users_excluded = [ okta_user.test[2].id, okta_user.test[3].id, okta_user.test[4].id ] - users_included = [ + users_included = [ okta_user.test[0].id, okta_user.test[1].id ] - constraints = [ + constraints = [ jsonencode({ "knowledge" : { "reauthenticateIn" : "PT2H", diff --git a/examples/okta_auth_server_policy/datasource.tf b/examples/okta_auth_server_policy/datasource.tf index 5bc70eb8b..e9a82a87f 100644 --- a/examples/okta_auth_server_policy/datasource.tf +++ b/examples/okta_auth_server_policy/datasource.tf @@ -1,18 +1,18 @@ resource "okta_auth_server_policy" "test" { - status = "ACTIVE" - name = "test" - description = "test" - priority = 1 + status = "ACTIVE" + name = "test" + description = "test" + priority = 1 client_whitelist = [ "ALL_CLIENTS" ] - auth_server_id = okta_auth_server.test.id + auth_server_id = okta_auth_server.test.id } resource "okta_auth_server" "test" { name = "testAcc_replace_with_uuid" description = "test" - audiences = [ + audiences = [ "whatever.rise.zone" ] } diff --git a/examples/okta_authenticator/on_prem_provider_json.tf b/examples/okta_authenticator/on_prem_provider_json.tf index 8a1d6cd8d..5a8cd44d4 100644 --- a/examples/okta_authenticator/on_prem_provider_json.tf +++ b/examples/okta_authenticator/on_prem_provider_json.tf @@ -1,17 +1,17 @@ resource "okta_authenticator" "test" { name = "On-Prem MFA" - key = "onprem_mfa" + key = "onprem_mfa" provider_json = jsonencode( - { - "type" : "DEL_OATH", - "configuration" : { - "authPort" : 999, - "userNameTemplate" : { - "template" : "global.assign.userName.login" - }, - "hostName" : "localhost", - "sharedSecret" : "Sh4r3d s3cr3t" - } - } + { + "type": "DEL_OATH", + "configuration": { + "authPort": 999, + "userNameTemplate": { + "template": "global.assign.userName.login" + }, + "hostName": "localhost", + "sharedSecret": "Sh4r3d s3cr3t" + } + } ) } \ No newline at end of file diff --git a/examples/okta_authenticator/security_question.tf b/examples/okta_authenticator/security_question.tf index 869b7fad6..eefb7249a 100644 --- a/examples/okta_authenticator/security_question.tf +++ b/examples/okta_authenticator/security_question.tf @@ -1,9 +1,9 @@ resource "okta_authenticator" "test" { - name = "Security Question" - key = "security_question" + name = "Security Question" + key = "security_question" settings = jsonencode( - { - "allowedFor" : "recovery" - } + { + "allowedFor" : "recovery" + } ) } diff --git a/examples/okta_authenticator/security_question_updated.tf b/examples/okta_authenticator/security_question_updated.tf index f4a6b0a27..b7e12a27d 100644 --- a/examples/okta_authenticator/security_question_updated.tf +++ b/examples/okta_authenticator/security_question_updated.tf @@ -1,9 +1,9 @@ resource "okta_authenticator" "test" { - name = "Security Question" - key = "security_question" + name = "Security Question" + key = "security_question" settings = jsonencode( - { - "allowedFor" : "any" - } + { + "allowedFor" : "any" + } ) } \ No newline at end of file diff --git a/examples/okta_brand/import.tf b/examples/okta_brand/import.tf index 82ea6c696..ef4644cf2 100644 --- a/examples/okta_brand/import.tf +++ b/examples/okta_brand/import.tf @@ -7,9 +7,9 @@ resource "okta_brand" "example" { lifecycle { ignore_changes = [ - agree_to_custom_privacy_policy, - custom_privacy_policy_url, - remove_powered_by_okta - ] + agree_to_custom_privacy_policy, + custom_privacy_policy_url, + remove_powered_by_okta + ] } } diff --git a/examples/okta_domain/datasource.tf b/examples/okta_domain/datasource.tf index ce742b0af..082438b7d 100644 --- a/examples/okta_domain/datasource.tf +++ b/examples/okta_domain/datasource.tf @@ -1,5 +1,5 @@ resource "okta_domain" "test" { - name = "testAcc-replace_with_uuid.example.com" + name = "testAcc-replace_with_uuid.example.com" } data "okta_domain" "by-id" { diff --git a/examples/okta_domain_certificate/basic.tf b/examples/okta_domain_certificate/basic.tf index 17d273341..2c07c8630 100644 --- a/examples/okta_domain_certificate/basic.tf +++ b/examples/okta_domain_certificate/basic.tf @@ -4,8 +4,8 @@ resource "okta_domain" "test" { } resource "okta_domain_certificate" "test" { - domain_id = okta_domain.test.id - type = "PEM" + domain_id = okta_domain.test.id + type = "PEM" #certificate = file("cert.pem") certificate = <