Bug Fix - Populate user resource optional fields only if they arent empty

Aniket Limaye · sagarp337 · commit 86c6204cb820 · 2023-05-19T15:23:04.000-05:00
diff --git a/examples/identity_domains/api_key.tf b/examples/identity_domains/api_key.tf
@@ -46,7 +46,7 @@ resource "oci_identity_domains_api_key" "test_api_key" {
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:apikey"]
 
   #Optional
-  attribute_sets = []
+  attribute_sets = ["all"]
   attributes     = ""
   authorization  = var.api_key_authorization
   description    = var.api_key_description
@@ -68,6 +68,13 @@ resource "oci_identity_domains_api_key" "test_api_key" {
     #must be a user that exists
     value = oci_identity_domains_user.test_user.id
   }
+
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      urnietfparamsscimschemasoracleidcsextensionself_change_user
+    ]
+  }
 }
 
 data "oci_identity_domains_api_keys" "test_api_keys" {
diff --git a/examples/identity_domains/auth_token.tf b/examples/identity_domains/auth_token.tf
@@ -44,7 +44,7 @@ resource "oci_identity_domains_auth_token" "test_auth_token" {
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:authToken"]
 
   #Optional
-  attribute_sets = []
+  attribute_sets = ["all"]
   attributes     = ""
   authorization  = var.auth_token_authorization
   description    = var.auth_token_description
@@ -70,6 +70,14 @@ resource "oci_identity_domains_auth_token" "test_auth_token" {
     #must be a user that exists
     value = oci_identity_domains_user.test_user.id
   }
+
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      status,
+      urnietfparamsscimschemasoracleidcsextensionself_change_user
+    ]
+  }
 }
 
 data "oci_identity_domains_auth_tokens" "test_auth_tokens" {
diff --git a/examples/identity_domains/authentication_factor_settings.tf b/examples/identity_domains/authentication_factor_settings.tf
@@ -477,6 +477,9 @@ resource "oci_identity_domains_authentication_factor_setting" "test_authenticati
   }
   user_enrollment_disabled_factors = var.authentication_factor_setting_user_enrollment_disabled_factors
   yubico_otp_enabled               = var.authentication_factor_setting_yubico_otp_enabled
+  lifecycle {
+    ignore_changes = [schemas]
+  }
 }
 
 data "oci_identity_domains_authentication_factor_settings" "test_authentication_factor_settings" {
diff --git a/examples/identity_domains/customer_secret_key.tf b/examples/identity_domains/customer_secret_key.tf
@@ -48,7 +48,7 @@ resource "oci_identity_domains_customer_secret_key" "test_customer_secret_key" {
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:customerSecretKey"]
 
   #Optional
-  attribute_sets = []
+  attribute_sets = ["all"]
   attributes     = ""
   authorization  = var.customer_secret_key_authorization
   description    = var.customer_secret_key_description
@@ -75,6 +75,14 @@ resource "oci_identity_domains_customer_secret_key" "test_customer_secret_key" {
     #must be a user that exists
     value = oci_identity_domains_user.test_user.id
   }
+
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      status,
+      urnietfparamsscimschemasoracleidcsextensionself_change_user
+    ]
+  }
 }
 
 data "oci_identity_domains_customer_secret_keys" "test_customer_secret_keys" {
diff --git a/examples/identity_domains/dynamic_resource_group.tf b/examples/identity_domains/dynamic_resource_group.tf
@@ -66,7 +66,7 @@ resource "oci_identity_domains_dynamic_resource_group" "test_dynamic_resource_gr
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:DynamicResourceGroup"]
 
   #Optional
-  attribute_sets = []
+  attribute_sets = ["all"]
   attributes     = ""
   authorization  = var.dynamic_resource_group_authorization
   description    = var.dynamic_resource_group_description
@@ -94,6 +94,9 @@ resource "oci_identity_domains_dynamic_resource_group" "test_dynamic_resource_gr
       value = var.dynamic_resource_group_urnietfparamsscimschemasoracleidcsextension_oci_tags_freeform_tags_value
     }
   }
+  lifecycle {
+    ignore_changes = [schemas]
+  }
 }
 
 data "oci_identity_domains_dynamic_resource_groups" "test_dynamic_resource_groups" {
diff --git a/examples/identity_domains/group.tf b/examples/identity_domains/group.tf
@@ -129,7 +129,7 @@ resource "oci_identity_domains_group" "test_group" {
   schemas       = ["urn:ietf:params:scim:schemas:core:2.0:Group"]
 
   #Optional
-  attribute_sets = []
+  attribute_sets = ["all"]
   attributes     = ""
   authorization  = var.group_authorization
   external_id    = "externalId"
@@ -196,6 +196,9 @@ resource "oci_identity_domains_group" "test_group" {
     #Optional
     requestable = var.group_urnietfparamsscimschemasoracleidcsextensionrequestable_group_requestable
   }
+  lifecycle {
+    ignore_changes = [schemas]
+  }
 }
 
 data "oci_identity_domains_groups" "test_groups" {
diff --git a/examples/identity_domains/identity_domain.tf b/examples/identity_domains/identity_domain.tf
@@ -6,3 +6,12 @@ variable "identity_domain_id" {
 data "oci_identity_domain" "test_domain" {
   domain_id = var.identity_domain_id
 }
+
+
+variable "identity_domain_id_for_my_endpoint" {
+  default = ""
+}
+
+data "oci_identity_domain" "test_domain_for_my_endpoint" {
+  domain_id = var.identity_domain_id_for_my_endpoint
+}
diff --git a/examples/identity_domains/identity_provider.tf b/examples/identity_domains/identity_provider.tf
@@ -335,7 +335,7 @@ resource "oci_identity_domains_identity_provider" "test_identity_provider" {
 
   #Optional
   assertion_attribute   = var.identity_provider_assertion_attribute
-  attribute_sets        = []
+  attribute_sets        = ["all"]
   attributes            = ""
   authn_request_binding = var.identity_provider_authn_request_binding
   authorization         = var.identity_provider_authorization
@@ -447,6 +447,9 @@ resource "oci_identity_domains_identity_provider" "test_identity_provider" {
   }
   user_mapping_method          = var.identity_provider_user_mapping_method
   user_mapping_store_attribute = var.identity_provider_user_mapping_store_attribute
+  lifecycle {
+    ignore_changes = [schemas]
+  }
 }
 
 data "oci_identity_domains_identity_providers" "test_identity_providers" {
diff --git a/examples/identity_domains/kmsi_setting.tf b/examples/identity_domains/kmsi_setting.tf
@@ -57,7 +57,7 @@ resource "oci_identity_domains_kmsi_setting" "test_kmsi_setting" {
   schemas         = ["urn:ietf:params:scim:schemas:oracle:idcs:KmsiSettings"]
 
   #Optional
-  attribute_sets             = []
+  attribute_sets             = ["all"]
   attributes                 = ""
   authorization              = var.kmsi_setting_authorization
   external_id                = "externalId"
diff --git a/examples/identity_domains/my_api_key.tf b/examples/identity_domains/my_api_key.tf
@@ -49,7 +49,7 @@ variable "my_api_key_user_value" {
 
 resource "oci_identity_domains_my_api_key" "test_my_api_key" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   key           = var.my_api_key_key
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:apikey"]
 
@@ -73,11 +73,17 @@ resource "oci_identity_domains_my_api_key" "test_my_api_key" {
   }
   */
 
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      tags
+    ]
+  }
 }
 
 data "oci_identity_domains_my_api_keys" "test_my_api_keys" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_api_key_count  = var.my_api_key_my_api_key_count
diff --git a/examples/identity_domains/my_auth_token.tf b/examples/identity_domains/my_auth_token.tf
@@ -48,7 +48,7 @@ variable "my_auth_token_user_value" {
 
 resource "oci_identity_domains_my_auth_token" "test_my_auth_token" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:authToken"]
 
   #Optional
@@ -72,11 +72,20 @@ resource "oci_identity_domains_my_auth_token" "test_my_auth_token" {
     value = var.my_auth_token_user_value
   }
   */
+
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      // my* resource will not return non-default fields
+      tags,
+      status
+    ]
+  }
 }
 
 data "oci_identity_domains_my_auth_tokens" "test_my_auth_tokens" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_auth_token_count  = var.my_auth_token_my_auth_token_count
diff --git a/examples/identity_domains/my_customer_secret_key.tf b/examples/identity_domains/my_customer_secret_key.tf
@@ -56,7 +56,7 @@ variable "my_customer_secret_key_user_value" {
 
 resource "oci_identity_domains_my_customer_secret_key" "test_my_customer_secret_key" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:customerSecretKey"]
 
   #Optional
@@ -80,11 +80,19 @@ resource "oci_identity_domains_my_customer_secret_key" "test_my_customer_secret_
     value = var.my_customer_secret_key_user_value
   }
   */
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      // my* resource will not return non-default fields
+      tags,
+      status
+    ]
+  }
 }
 
 data "oci_identity_domains_my_customer_secret_keys" "test_my_customer_secret_keys" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_customer_secret_key_count  = var.my_customer_secret_key_my_customer_secret_key_count
diff --git a/examples/identity_domains/my_device.tf b/examples/identity_domains/my_device.tf
@@ -20,7 +20,7 @@ variable "my_device_start_index" {
 
 data "oci_identity_domains_my_devices" "test_my_devices" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_device_count  = var.my_device_my_device_count
diff --git a/examples/identity_domains/my_group.tf b/examples/identity_domains/my_group.tf
@@ -20,7 +20,7 @@ variable "my_group_start_index" {
 
 data "oci_identity_domains_my_groups" "test_my_groups" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_group_count  = var.my_group_my_group_count
diff --git a/examples/identity_domains/my_oauth2client_credential.tf b/examples/identity_domains/my_oauth2client_credential.tf
@@ -64,7 +64,7 @@ variable "my_oauth2client_credential_user_value" {
 
 resource "oci_identity_domains_my_oauth2client_credential" "test_my_oauth2client_credential" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   name          = var.my_oauth2client_credential_name
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:oauth2ClientCredential"]
   scopes {
@@ -94,11 +94,19 @@ resource "oci_identity_domains_my_oauth2client_credential" "test_my_oauth2client
     value = var.my_oauth2client_credential_user_value
   }
   */
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      // my* resource will not return non-default fields
+      tags,
+      status
+    ]
+  }
 }
 
 data "oci_identity_domains_my_oauth2client_credentials" "test_my_oauth2client_credentials" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_oauth2client_credential_count  = var.my_oauth2client_credential_my_oauth2client_credential_count
diff --git a/examples/identity_domains/my_smtp_credential.tf b/examples/identity_domains/my_smtp_credential.tf
@@ -48,7 +48,7 @@ variable "my_smtp_credential_user_value" {
 
 resource "oci_identity_domains_my_smtp_credential" "test_my_smtp_credential" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:smtpCredential"]
 
   #Optional
@@ -71,11 +71,19 @@ resource "oci_identity_domains_my_smtp_credential" "test_my_smtp_credential" {
     value = var.my_smtp_credential_user_value
   }
   */
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      // my* resource will not return non-default fields
+      tags,
+      status
+    ]
+  }
 }
 
 data "oci_identity_domains_my_smtp_credentials" "test_my_smtp_credentials" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_smtp_credential_count  = var.my_smtp_credential_my_smtp_credential_count
diff --git a/examples/identity_domains/my_support_account.tf b/examples/identity_domains/my_support_account.tf
@@ -49,7 +49,7 @@ variable "my_support_account_user_value" {
 
 resource "oci_identity_domains_my_support_account" "test_my_support_account" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:supportAccount"]
   token         = var.my_support_account_token
 
@@ -71,12 +71,19 @@ resource "oci_identity_domains_my_support_account" "test_my_support_account" {
     value   = var.my_support_account_user_value
   }
   */
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      // my* resource will not return non-default fields
+      tags
+    ]
+  }
 
 }
 
 data "oci_identity_domains_my_support_accounts" "test_my_support_accounts" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_support_account_count  = var.my_support_account_my_support_account_count
diff --git a/examples/identity_domains/my_trusted_user_agent.tf b/examples/identity_domains/my_trusted_user_agent.tf
@@ -20,7 +20,7 @@ variable "my_trusted_user_agent_start_index" {
 
 data "oci_identity_domains_my_trusted_user_agents" "test_my_trusted_user_agents" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_trusted_user_agent_count  = var.my_trusted_user_agent_my_trusted_user_agent_count
diff --git a/examples/identity_domains/my_user_db_credential.tf b/examples/identity_domains/my_user_db_credential.tf
@@ -53,7 +53,7 @@ variable "my_user_db_credential_user_value" {
 resource "oci_identity_domains_my_user_db_credential" "test_my_user_db_credential" {
   #Required
   db_password   = var.my_user_db_credential_db_password
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
   schemas       = ["urn:ietf:params:scim:schemas:oracle:idcs:UserDbCredentials"]
 
   #Optional
@@ -77,11 +77,20 @@ resource "oci_identity_domains_my_user_db_credential" "test_my_user_db_credentia
     ocid = var.my_user_db_credential_user_ocid
   }
   */
+  lifecycle {
+    ignore_changes = [
+      // ignore fields that will never be returned
+      // my* resource will not return non-default fields
+      tags,
+      status,
+      db_password
+    ]
+  }
 }
 
 data "oci_identity_domains_my_user_db_credentials" "test_my_user_db_credentials" {
   #Required
-  idcs_endpoint = data.oci_identity_domain.test_domain.url
+  idcs_endpoint = data.oci_identity_domain.test_domain_for_my_endpoint.url
 
   #Optional
   my_user_db_credential_count  = var.my_user_db_credential_my_user_db_credential_count
diff --git a/examples/identity_domains/oauth2client_credential.tf b/examples/identity_domains/oauth2client_credential.tf
diff --git a/examples/identity_domains/password_policy.tf b/examples/identity_domains/password_policy.tf
diff --git a/examples/identity_domains/smtp_credential.tf b/examples/identity_domains/smtp_credential.tf
diff --git a/examples/identity_domains/user.tf b/examples/identity_domains/user.tf
diff --git a/examples/identity_domains/user_db_credential.tf b/examples/identity_domains/user_db_credential.tf
diff --git a/internal/integrationtest/identity_domains_user_test.go b/internal/integrationtest/identity_domains_user_test.go
diff --git a/internal/service/identity_domains/identity_domains_user_resource.go b/internal/service/identity_domains/identity_domains_user_resource.go
diff --git a/internal/service/identity_domains/identity_domains_util.go b/internal/service/identity_domains/identity_domains_util.go

Original file line number	Diff line number	Diff line change
`@@ -477,6 +477,9 @@ resource "oci_identity_domains_authentication_factor_setting" "test_authenticati`
`477`	`477`	`}`
`478`	`478`	`user_enrollment_disabled_factors = var.authentication_factor_setting_user_enrollment_disabled_factors`
`479`	`479`	`yubico_otp_enabled = var.authentication_factor_setting_yubico_otp_enabled`
	`480`	`+ lifecycle {`
	`481`	`+ ignore_changes = [schemas]`
	`482`	`+ }`
`480`	`483`	`}`
`481`	`484`
`482`	`485`	`data "oci_identity_domains_authentication_factor_settings" "test_authentication_factor_settings" {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ resource "oci_identity_domains_dynamic_resource_group" "test_dynamic_resource_gr`
`66`	`66`	`schemas = ["urn:ietf:params:scim:schemas:oracle:idcs:DynamicResourceGroup"]`
`67`	`67`
`68`	`68`	`#Optional`
`69`		`- attribute_sets = []`
	`69`	`+ attribute_sets = ["all"]`
`70`	`70`	`attributes = ""`
`71`	`71`	`authorization = var.dynamic_resource_group_authorization`
`72`	`72`	`description = var.dynamic_resource_group_description`
`@@ -94,6 +94,9 @@ resource "oci_identity_domains_dynamic_resource_group" "test_dynamic_resource_gr`
`94`	`94`	`value = var.dynamic_resource_group_urnietfparamsscimschemasoracleidcsextension_oci_tags_freeform_tags_value`
`95`	`95`	`}`
`96`	`96`	`}`
	`97`	`+ lifecycle {`
	`98`	`+ ignore_changes = [schemas]`
	`99`	`+ }`
`97`	`100`	`}`
`98`	`101`
`99`	`102`	`data "oci_identity_domains_dynamic_resource_groups" "test_dynamic_resource_groups" {`