From f8a47429783d886caa9d65b14f8ab0b8ee04f57b Mon Sep 17 00:00:00 2001
From: Veera Adithya Dittakavi <veera.adithya.dittakavi@oracle.com>
Date: Mon, 25 May 2026 20:00:47 -0500
Subject: [PATCH 1/2] feat: auto configure sensitive fields

---
 config/provider.go        |   2 +-
 config/sensitives.go      |  55 ++++++++++++++++
 config/sensitives_test.go | 132 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 config/sensitives.go
 create mode 100644 config/sensitives_test.go

diff --git a/config/provider.go b/config/provider.go
index af9f3a99e..a38d8fc10 100644
--- a/config/provider.go
+++ b/config/provider.go
@@ -80,7 +80,7 @@ func newProvider(rootGroup string, register func(*ujconfig.Provider)) *ujconfig.
 			GroupKindOverrides(),
 			ExternalNameConfigurations(),
 			AutoExternalNameConfiguration(), // Automatic external name for unconfigured resources
-
+			AutoSensitiveFieldConfiguration(),
 		),
 		ujconfig.WithReferenceInjectors([]ujconfig.ReferenceInjector{
 			reference.NewInjector(modulePath),
diff --git a/config/sensitives.go b/config/sensitives.go
new file mode 100644
index 000000000..25495c8a4
--- /dev/null
+++ b/config/sensitives.go
@@ -0,0 +1,55 @@
+package config
+
+import (
+	"slices"
+	"strings"
+
+	ujconfig "github.com/crossplane/upjet/v2/pkg/config"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+var autoSensitiveNameKeywords = []string{
+	"secret",
+	"password",
+	"passphrase",
+	"credential",
+}
+
+var autoSensitiveExcludedNameKeywords = []string{
+	"_id",
+	"_ocid",
+	"_name",
+}
+
+// AutoSensitiveFieldConfiguration marks high-confidence computed-only string
+// outputs as sensitive so Upjet emits them as connection details.
+func AutoSensitiveFieldConfiguration() ujconfig.ResourceOption {
+	return func(r *ujconfig.Resource) {
+		if r == nil || r.TerraformResource == nil {
+			return
+		}
+		markAutoSensitiveFields(r.TerraformResource.Schema)
+	}
+}
+
+func markAutoSensitiveFields(fields map[string]*schema.Schema) {
+	for name, sch := range fields {
+		if sch == nil {
+			continue
+		}
+
+		if sch.Computed && !sch.Optional && !sch.Required && sch.Type == schema.TypeString {
+			name = strings.ToLower(name)
+			if slices.ContainsFunc(autoSensitiveNameKeywords, func(keyword string) bool {
+				return strings.Contains(name, keyword)
+			}) && !slices.ContainsFunc(autoSensitiveExcludedNameKeywords, func(keyword string) bool {
+				return strings.Contains(name, keyword)
+			}) {
+				sch.Sensitive = true
+			}
+		}
+		if nested, ok := sch.Elem.(*schema.Resource); ok {
+			markAutoSensitiveFields(nested.Schema)
+		}
+	}
+}
diff --git a/config/sensitives_test.go b/config/sensitives_test.go
new file mode 100644
index 000000000..7533e029c
--- /dev/null
+++ b/config/sensitives_test.go
@@ -0,0 +1,132 @@
+package config
+
+import (
+	"testing"
+
+	ujconfig "github.com/crossplane/upjet/v2/pkg/config"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func TestAutoSensitiveFieldConfiguration(t *testing.T) {
+	tests := map[string]struct {
+		fields        map[string]*schema.Schema
+		field         string
+		wantSensitive bool
+	}{
+		"marks computed-only secret_key": {
+			fields: map[string]*schema.Schema{
+				"secret_key": computedStringSchema(),
+			},
+			field:         "secret_key",
+			wantSensitive: true,
+		},
+		"marks computed-only access_token": {
+			fields: map[string]*schema.Schema{
+				"access_token": computedStringSchema(),
+			},
+			field:         "access_token",
+			wantSensitive: true,
+		},
+		"marks computed-only private_key": {
+			fields: map[string]*schema.Schema{
+				"private_key": computedStringSchema(),
+			},
+			field:         "private_key",
+			wantSensitive: true,
+		},
+		"does not mark required secret_key": {
+			fields: map[string]*schema.Schema{
+				"secret_key": {Type: schema.TypeString, Required: true},
+			},
+			field: "secret_key",
+		},
+		"does not mark optional secret_key": {
+			fields: map[string]*schema.Schema{
+				"secret_key": {Type: schema.TypeString, Optional: true},
+			},
+			field: "secret_key",
+		},
+		"does not mark optional computed secret_key": {
+			fields: map[string]*schema.Schema{
+				"secret_key": {Type: schema.TypeString, Optional: true, Computed: true},
+			},
+			field: "secret_key",
+		},
+		"does not mark secret_id": {
+			fields: map[string]*schema.Schema{
+				"secret_id": computedStringSchema(),
+			},
+			field: "secret_id",
+		},
+		"does not mark public_key": {
+			fields: map[string]*schema.Schema{
+				"public_key": computedStringSchema(),
+			},
+			field: "public_key",
+		},
+		"does not mark correlation_token": {
+			fields: map[string]*schema.Schema{
+				"correlation_token": computedStringSchema(),
+			},
+			field: "correlation_token",
+		},
+		"does not mark last accepted request token": {
+			fields: map[string]*schema.Schema{
+				"last_accepted_request_token": computedStringSchema(),
+			},
+			field: "last_accepted_request_token",
+		},
+		"does not mark is_secret": {
+			fields: map[string]*schema.Schema{
+				"is_secret": computedStringSchema(),
+			},
+			field: "is_secret",
+		},
+		"preserves already-sensitive fields": {
+			fields: map[string]*schema.Schema{
+				"opaque_value": {Type: schema.TypeString, Computed: true, Sensitive: true},
+			},
+			field:         "opaque_value",
+			wantSensitive: true,
+		},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			AutoSensitiveFieldConfiguration()(&ujconfig.Resource{
+				TerraformResource: &schema.Resource{Schema: tc.fields},
+			})
+
+			if got := tc.fields[tc.field].Sensitive; got != tc.wantSensitive {
+				t.Fatalf("Sensitive = %v, want %v", got, tc.wantSensitive)
+			}
+		})
+	}
+}
+
+func TestAutoSensitiveFieldConfigurationNestedSchema(t *testing.T) {
+	fields := map[string]*schema.Schema{
+		"nested": {
+			Type: schema.TypeList,
+			Elem: &schema.Resource{Schema: map[string]*schema.Schema{
+				"client_secret": computedStringSchema(),
+			}},
+		},
+	}
+
+	AutoSensitiveFieldConfiguration()(&ujconfig.Resource{
+		TerraformResource: &schema.Resource{Schema: fields},
+	})
+
+	nested := fields["nested"].Elem.(*schema.Resource)
+	if !nested.Schema["client_secret"].Sensitive {
+		t.Fatal("expected nested computed-only client_secret to be sensitive")
+	}
+}
+
+func computedStringSchema() *schema.Schema {
+	return &schema.Schema{
+		Type:     schema.TypeString,
+		Computed: true,
+	}
+}

From 83900b5498b55b832ea2e5261e72648383678238 Mon Sep 17 00:00:00 2001
From: Veera Adithya Dittakavi <veera.adithya.dittakavi@oracle.com>
Date: Tue, 26 May 2026 09:38:46 -0500
Subject: [PATCH 2/2] run: make generate

---
 .../v1alpha1/zz_generated.deepcopy.go         |   5 -
 .../zz_volumeattachment_terraformed.go        |   2 +-
 .../v1alpha1/zz_volumeattachment_types.go     |   3 -
 .../v1alpha1/zz_cluster_terraformed.go        |   2 +-
 .../v1alpha1/zz_cluster_types.go              |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |   5 -
 ...autonomouscontainerdatabase_terraformed.go |   2 +-
 .../zz_autonomouscontainerdatabase_types.go   |   3 -
 ...containerdatabaseaddstandby_terraformed.go |   2 +-
 ...nomouscontainerdatabaseaddstandby_types.go |   5 -
 .../zz_autonomousdatabase_terraformed.go      |   2 +-
 .../v1alpha1/zz_autonomousdatabase_types.go   |   2 -
 .../v1alpha1/zz_backup_terraformed.go         |   2 +-
 .../database/v1alpha1/zz_backup_types.go      |   3 -
 .../v1alpha1/zz_database_terraformed.go       |   2 +-
 .../database/v1alpha1/zz_database_types.go    |   2 -
 .../zz_databasesnapshotstandby_terraformed.go |   2 +-
 .../zz_databasesnapshotstandby_types.go       |   3 -
 .../zz_databaseupgrade_terraformed.go         |   2 +-
 .../v1alpha1/zz_databaseupgrade_types.go      |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         | 120 ------------------
 ...ementclouddbsystemdiscovery_terraformed.go |   2 +-
 ..._managementclouddbsystemdiscovery_types.go |   9 --
 ...ntexternaldbsystemconnector_terraformed.go |   2 +-
 ...nagementexternaldbsystemconnector_types.go |   6 -
 ...ntexternaldbsystemdiscovery_terraformed.go |   2 +-
 ...nagementexternaldbsystemdiscovery_types.go |  27 ----
 ...ernalmysqldatabaseconnector_terraformed.go |   2 +-
 ...entexternalmysqldatabaseconnector_types.go |   3 -
 ...z_managementmanageddatabase_terraformed.go |   2 +-
 .../zz_managementmanageddatabase_types.go     |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |   5 -
 .../v1alpha1/zz_targetdatabase_terraformed.go |   2 +-
 .../v1alpha1/zz_targetdatabase_types.go       |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |  10 --
 .../v1alpha1/zz_smtpcredential_terraformed.go |   2 +-
 .../v1alpha1/zz_smtpcredential_types.go       |   3 -
 .../v1alpha1/zz_uipassword_terraformed.go     |   2 +-
 .../identity/v1alpha1/zz_uipassword_types.go  |   3 -
 .../v1alpha1/zz_app_terraformed.go            |   2 +-
 .../identitydomains/v1alpha1/zz_app_types.go  |   6 -
 .../zz_customersecretkey_terraformed.go       |   2 +-
 .../v1alpha1/zz_customersecretkey_types.go    |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |  35 -----
 .../zz_myuserdbcredential_terraformed.go      |   2 +-
 .../v1alpha1/zz_myuserdbcredential_types.go   |   3 -
 .../zz_oauth2clientcredential_terraformed.go  |   2 +-
 .../zz_oauth2clientcredential_types.go        |   3 -
 .../v1alpha1/zz_smtpcredential_terraformed.go |   2 +-
 .../v1alpha1/zz_smtpcredential_types.go       |   3 -
 .../zz_userdbcredential_terraformed.go        |   2 +-
 .../v1alpha1/zz_userdbcredential_types.go     |   3 -
 .../ocvp/v1alpha1/zz_generated.deepcopy.go    |  15 ---
 .../ocvp/v1alpha1/zz_sddc_terraformed.go      |   2 +-
 apis/cluster/ocvp/v1alpha1/zz_sddc_types.go   |   9 --
 .../v1alpha1/zz_generated.deepcopy.go         |   5 -
 .../zz_volumeattachment_terraformed.go        |   2 +-
 .../v1alpha1/zz_volumeattachment_types.go     |   3 -
 .../v1alpha1/zz_cluster_terraformed.go        |   2 +-
 .../v1alpha1/zz_cluster_types.go              |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |   5 -
 ...autonomouscontainerdatabase_terraformed.go |   2 +-
 .../zz_autonomouscontainerdatabase_types.go   |   3 -
 ...containerdatabaseaddstandby_terraformed.go |   2 +-
 ...nomouscontainerdatabaseaddstandby_types.go |   5 -
 .../zz_autonomousdatabase_terraformed.go      |   2 +-
 .../v1alpha1/zz_autonomousdatabase_types.go   |   2 -
 .../v1alpha1/zz_backup_terraformed.go         |   2 +-
 .../database/v1alpha1/zz_backup_types.go      |   3 -
 .../v1alpha1/zz_database_terraformed.go       |   2 +-
 .../database/v1alpha1/zz_database_types.go    |   2 -
 .../zz_databasesnapshotstandby_terraformed.go |   2 +-
 .../zz_databasesnapshotstandby_types.go       |   3 -
 .../zz_databaseupgrade_terraformed.go         |   2 +-
 .../v1alpha1/zz_databaseupgrade_types.go      |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         | 120 ------------------
 ...ementclouddbsystemdiscovery_terraformed.go |   2 +-
 ..._managementclouddbsystemdiscovery_types.go |   9 --
 ...ntexternaldbsystemconnector_terraformed.go |   2 +-
 ...nagementexternaldbsystemconnector_types.go |   6 -
 ...ntexternaldbsystemdiscovery_terraformed.go |   2 +-
 ...nagementexternaldbsystemdiscovery_types.go |  27 ----
 ...ernalmysqldatabaseconnector_terraformed.go |   2 +-
 ...entexternalmysqldatabaseconnector_types.go |   3 -
 ...z_managementmanageddatabase_terraformed.go |   2 +-
 .../zz_managementmanageddatabase_types.go     |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |   5 -
 .../v1alpha1/zz_targetdatabase_terraformed.go |   2 +-
 .../v1alpha1/zz_targetdatabase_types.go       |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |  10 --
 .../v1alpha1/zz_smtpcredential_terraformed.go |   2 +-
 .../v1alpha1/zz_smtpcredential_types.go       |   3 -
 .../v1alpha1/zz_uipassword_terraformed.go     |   2 +-
 .../identity/v1alpha1/zz_uipassword_types.go  |   3 -
 .../v1alpha1/zz_app_terraformed.go            |   2 +-
 .../identitydomains/v1alpha1/zz_app_types.go  |   6 -
 .../zz_customersecretkey_terraformed.go       |   2 +-
 .../v1alpha1/zz_customersecretkey_types.go    |   3 -
 .../v1alpha1/zz_generated.deepcopy.go         |  35 -----
 .../zz_myuserdbcredential_terraformed.go      |   2 +-
 .../v1alpha1/zz_myuserdbcredential_types.go   |   3 -
 .../zz_oauth2clientcredential_terraformed.go  |   2 +-
 .../zz_oauth2clientcredential_types.go        |   3 -
 .../v1alpha1/zz_smtpcredential_terraformed.go |   2 +-
 .../v1alpha1/zz_smtpcredential_types.go       |   3 -
 .../zz_userdbcredential_terraformed.go        |   2 +-
 .../v1alpha1/zz_userdbcredential_types.go     |   3 -
 .../ocvp/v1alpha1/zz_generated.deepcopy.go    |  15 ---
 .../ocvp/v1alpha1/zz_sddc_terraformed.go      |   2 +-
 .../namespaced/ocvp/v1alpha1/zz_sddc_types.go |   9 --
 ...ge.oci.m.upbound.io_volumeattachments.yaml |   5 -
 ...rage.oci.upbound.io_volumeattachments.yaml |   5 -
 ...ainerengine.oci.m.upbound.io_clusters.yaml |   4 -
 ...ntainerengine.oci.upbound.io_clusters.yaml |   4 -
 ...tonomouscontainerdatabaseaddstandbies.yaml |   7 -
 ...bound.io_autonomouscontainerdatabases.yaml |   5 -
 ....oci.m.upbound.io_autonomousdatabases.yaml |   2 -
 .../database.oci.m.upbound.io_backups.yaml    |   4 -
 .../database.oci.m.upbound.io_databases.yaml  |   2 -
 ....upbound.io_databasesnapshotstandbies.yaml |   5 -
 ...ase.oci.m.upbound.io_databaseupgrades.yaml |   5 -
 ...io_managementclouddbsystemdiscoveries.yaml |  12 --
 ..._managementexternaldbsystemconnectors.yaml |   8 --
 ...managementexternaldbsystemdiscoveries.yaml |  38 ------
 ...gementexternalmysqldatabaseconnectors.yaml |   3 -
 ...upbound.io_managementmanageddatabases.yaml |   4 -
 ...tonomouscontainerdatabaseaddstandbies.yaml |   7 -
 ...bound.io_autonomouscontainerdatabases.yaml |   5 -
 ...se.oci.upbound.io_autonomousdatabases.yaml |   2 -
 .../crds/database.oci.upbound.io_backups.yaml |   4 -
 .../database.oci.upbound.io_databases.yaml    |   2 -
 ....upbound.io_databasesnapshotstandbies.yaml |   5 -
 ...abase.oci.upbound.io_databaseupgrades.yaml |   5 -
 ...io_managementclouddbsystemdiscoveries.yaml |  12 --
 ..._managementexternaldbsystemconnectors.yaml |   8 --
 ...managementexternaldbsystemdiscoveries.yaml |  38 ------
 ...gementexternalmysqldatabaseconnectors.yaml |   3 -
 ...upbound.io_managementmanageddatabases.yaml |   4 -
 ...safe.oci.m.upbound.io_targetdatabases.yaml |   4 -
 ...tasafe.oci.upbound.io_targetdatabases.yaml |   4 -
 ...tity.oci.m.upbound.io_smtpcredentials.yaml |   3 -
 ...identity.oci.m.upbound.io_uipasswords.yaml |   3 -
 ...entity.oci.upbound.io_smtpcredentials.yaml |   3 -
 .../identity.oci.upbound.io_uipasswords.yaml  |   3 -
 ...identitydomains.oci.m.upbound.io_apps.yaml |  10 --
 ...s.oci.m.upbound.io_customersecretkeys.yaml |   3 -
 ....oci.m.upbound.io_myuserdbcredentials.yaml |   4 -
 ....m.upbound.io_oauth2clientcredentials.yaml |   3 -
 ...ains.oci.m.upbound.io_smtpcredentials.yaml |   3 -
 ...ns.oci.m.upbound.io_userdbcredentials.yaml |   4 -
 .../identitydomains.oci.upbound.io_apps.yaml  |  10 --
 ...ins.oci.upbound.io_customersecretkeys.yaml |   3 -
 ...ns.oci.upbound.io_myuserdbcredentials.yaml |   4 -
 ...ci.upbound.io_oauth2clientcredentials.yaml |   3 -
 ...omains.oci.upbound.io_smtpcredentials.yaml |   3 -
 ...ains.oci.upbound.io_userdbcredentials.yaml |   4 -
 package/crds/ocvp.oci.m.upbound.io_sddcs.yaml |  18 ---
 package/crds/ocvp.oci.upbound.io_sddcs.yaml   |  18 ---
 158 files changed, 48 insertions(+), 984 deletions(-)

diff --git a/apis/cluster/blockstorage/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/blockstorage/v1alpha1/zz_generated.deepcopy.go
index 122c66f45..d75bceb3b 100644
--- a/apis/cluster/blockstorage/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/blockstorage/v1alpha1/zz_generated.deepcopy.go
@@ -2093,11 +2093,6 @@ func (in *VolumeAttachmentObservation) DeepCopyInto(out *VolumeAttachmentObserva
 		*out = new(string)
 		**out = **in
 	}
-	if in.ChapSecret != nil {
-		in, out := &in.ChapSecret, &out.ChapSecret
-		*out = new(string)
-		**out = **in
-	}
 	if in.ChapUsername != nil {
 		in, out := &in.ChapUsername, &out.ChapUsername
 		*out = new(string)
diff --git a/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go b/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go
index 7d20846f6..64dd5d6a1 100755
--- a/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go
+++ b/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go
@@ -21,7 +21,7 @@ func (mg *VolumeAttachment) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this VolumeAttachment
 func (tr *VolumeAttachment) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"chap_secret": "status.atProvider.chapSecret"}
 }
 
 // GetObservation of this VolumeAttachment
diff --git a/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_types.go b/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_types.go
index 4f7be4057..37826ec9d 100755
--- a/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_types.go
+++ b/apis/cluster/blockstorage/v1alpha1/zz_volumeattachment_types.go
@@ -105,9 +105,6 @@ type VolumeAttachmentObservation struct {
 	// The availability domain of an instance.  Example: Uocm:PHX-AD-1
 	AvailabilityDomain *string `json:"availabilityDomain,omitempty" tf:"availability_domain,omitempty"`
 
-	// The Challenge-Handshake-Authentication-Protocol (CHAP) secret valid for the associated CHAP user name. (Also called the "CHAP password".)
-	ChapSecret *string `json:"chapSecret,omitempty" tf:"chap_secret,omitempty"`
-
 	// The volume's system-generated Challenge-Handshake-Authentication-Protocol (CHAP) user name. See RFC 1994 for more on CHAP.  Example: ocid1.volume.oc1.phx.<unique_ID>
 	ChapUsername *string `json:"chapUsername,omitempty" tf:"chap_username,omitempty"`
 
diff --git a/apis/cluster/containerengine/v1alpha1/zz_cluster_terraformed.go b/apis/cluster/containerengine/v1alpha1/zz_cluster_terraformed.go
index c94219a86..518b929e2 100755
--- a/apis/cluster/containerengine/v1alpha1/zz_cluster_terraformed.go
+++ b/apis/cluster/containerengine/v1alpha1/zz_cluster_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Cluster) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Cluster
 func (tr *Cluster) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"metadata[*].time_credential_expiration": "status.atProvider.metadata[*].timeCredentialExpiration"}
 }
 
 // GetObservation of this Cluster
diff --git a/apis/cluster/containerengine/v1alpha1/zz_cluster_types.go b/apis/cluster/containerengine/v1alpha1/zz_cluster_types.go
index 6ceb06a94..be04bdf25 100755
--- a/apis/cluster/containerengine/v1alpha1/zz_cluster_types.go
+++ b/apis/cluster/containerengine/v1alpha1/zz_cluster_types.go
@@ -514,9 +514,6 @@ type MetadataObservation struct {
 	// The time the cluster was created.
 	TimeCreated *string `json:"timeCreated,omitempty" tf:"time_created,omitempty"`
 
-	// The time until which the cluster credential is valid.
-	TimeCredentialExpiration *string `json:"timeCredentialExpiration,omitempty" tf:"time_credential_expiration,omitempty"`
-
 	// The time the cluster was deleted.
 	TimeDeleted *string `json:"timeDeleted,omitempty" tf:"time_deleted,omitempty"`
 
diff --git a/apis/cluster/containerengine/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/containerengine/v1alpha1/zz_generated.deepcopy.go
index 73a53651c..c6b11b970 100644
--- a/apis/cluster/containerengine/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/containerengine/v1alpha1/zz_generated.deepcopy.go
@@ -3190,11 +3190,6 @@ func (in *MetadataObservation) DeepCopyInto(out *MetadataObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.TimeCredentialExpiration != nil {
-		in, out := &in.TimeCredentialExpiration, &out.TimeCredentialExpiration
-		*out = new(string)
-		**out = **in
-	}
 	if in.TimeDeleted != nil {
 		in, out := &in.TimeDeleted, &out.TimeDeleted
 		*out = new(string)
diff --git a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go
index c33507a4b..4860d20d1 100755
--- a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *AutonomousContainerDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this AutonomousContainerDatabase
 func (tr *AutonomousContainerDatabase) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"backup_config[*].backup_destination_details[*].vpc_password": "backupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "encryption_key_location_details[*].hsm_password": "encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
+	return map[string]string{"associated_backup_configuration_details[*].vpc_password": "status.atProvider.associatedBackupConfigurationDetails[*].vpcPassword", "backup_config[*].backup_destination_details[*].vpc_password": "backupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "encryption_key_location_details[*].hsm_password": "encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
 }
 
 // GetObservation of this AutonomousContainerDatabase
diff --git a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_types.go b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_types.go
index b29d3971d..8d95378ad 100755
--- a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_types.go
+++ b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabase_types.go
@@ -48,9 +48,6 @@ type AssociatedBackupConfigurationDetailsObservation struct {
 	// (Updatable) Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// (Updatable) For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// (Updatable) For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go
index 9fc55c613..9b3e7b856 100755
--- a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go
@@ -21,7 +21,7 @@ func (mg *AutonomousContainerDatabaseAddStandby) GetTerraformResourceType() stri
 
 // GetConnectionDetailsMapping for this AutonomousContainerDatabaseAddStandby
 func (tr *AutonomousContainerDatabaseAddStandby) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
+	return map[string]string{"backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.backupConfig[*].backupDestinationDetails[*].vpcPassword", "encryption_key_location_details[*].hsm_password": "status.atProvider.encryptionKeyLocationDetails[*].hsmPassword", "peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
 }
 
 // GetObservation of this AutonomousContainerDatabaseAddStandby
diff --git a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go
index 46cac2932..7696f5572 100755
--- a/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go
+++ b/apis/cluster/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go
@@ -159,8 +159,6 @@ type AutonomousContainerDatabaseAddStandbyEncryptionKeyLocationDetailsObservatio
 	// The OCID of the backup destination.
 	AzureEncryptionKeyID *string `json:"azureEncryptionKeyId,omitempty" tf:"azure_encryption_key_id,omitempty"`
 
-	HSMPassword *string `json:"hsmPassword,omitempty" tf:"hsm_password,omitempty"`
-
 	// Use 'AWS' for creating a new database.
 	ProviderType *string `json:"providerType,omitempty" tf:"provider_type,omitempty"`
 }
@@ -758,9 +756,6 @@ type BackupConfigBackupDestinationDetailsObservation struct {
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/cluster/database/v1alpha1/zz_autonomousdatabase_terraformed.go b/apis/cluster/database/v1alpha1/zz_autonomousdatabase_terraformed.go
index 14ef2bbaa..6d54245bb 100755
--- a/apis/cluster/database/v1alpha1/zz_autonomousdatabase_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_autonomousdatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *AutonomousDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this AutonomousDatabase
 func (tr *AutonomousDatabase) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"admin_password": "adminPasswordSecretRef"}
+	return map[string]string{"admin_password": "adminPasswordSecretRef", "encryption_key_location_details[*].hsm_password": "status.atProvider.encryptionKeyLocationDetails[*].hsmPassword"}
 }
 
 // GetObservation of this AutonomousDatabase
diff --git a/apis/cluster/database/v1alpha1/zz_autonomousdatabase_types.go b/apis/cluster/database/v1alpha1/zz_autonomousdatabase_types.go
index c3b024ff7..31b0ab990 100755
--- a/apis/cluster/database/v1alpha1/zz_autonomousdatabase_types.go
+++ b/apis/cluster/database/v1alpha1/zz_autonomousdatabase_types.go
@@ -73,8 +73,6 @@ type AutonomousDatabaseEncryptionKeyLocationDetailsObservation struct {
 	// The OCID of the Autonomous AI Database.
 	AzureEncryptionKeyID *string `json:"azureEncryptionKeyId,omitempty" tf:"azure_encryption_key_id,omitempty"`
 
-	HSMPassword *string `json:"hsmPassword,omitempty" tf:"hsm_password,omitempty"`
-
 	// Use 'AWS' for creating a new database.
 	ProviderType *string `json:"providerType,omitempty" tf:"provider_type,omitempty"`
 }
diff --git a/apis/cluster/database/v1alpha1/zz_backup_terraformed.go b/apis/cluster/database/v1alpha1/zz_backup_terraformed.go
index 775029f8b..d988490a2 100755
--- a/apis/cluster/database/v1alpha1/zz_backup_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_backup_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Backup) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Backup
 func (tr *Backup) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"encryption_key_location_details[*].hsm_password": "status.atProvider.encryptionKeyLocationDetails[*].hsmPassword"}
 }
 
 // GetObservation of this Backup
diff --git a/apis/cluster/database/v1alpha1/zz_backup_types.go b/apis/cluster/database/v1alpha1/zz_backup_types.go
index 956c63000..0520eda24 100755
--- a/apis/cluster/database/v1alpha1/zz_backup_types.go
+++ b/apis/cluster/database/v1alpha1/zz_backup_types.go
@@ -27,9 +27,6 @@ type BackupEncryptionKeyLocationDetailsObservation struct {
 	// Provide the key OCID of a registered GCP key.
 	GoogleCloudProviderEncryptionKeyID *string `json:"googleCloudProviderEncryptionKeyId,omitempty" tf:"google_cloud_provider_encryption_key_id,omitempty"`
 
-	// Provide the HSM password as you would in RDBMS for External HSM.
-	HSMPassword *string `json:"hsmPassword,omitempty" tf:"hsm_password,omitempty"`
-
 	// Use 'EXTERNAL' for creating a new database or migrating a database key to an External HSM. Use 'AZURE' for creating a new database or migrating a database key to Azure. Use 'AWS' for creating a new database or migrating a database key to Aws. Use 'GCP' for creating a new database or migrating a database key to Gcp.
 	ProviderType *string `json:"providerType,omitempty" tf:"provider_type,omitempty"`
 }
diff --git a/apis/cluster/database/v1alpha1/zz_database_terraformed.go b/apis/cluster/database/v1alpha1/zz_database_terraformed.go
index 6f6e0745c..4aa6b9293 100755
--- a/apis/cluster/database/v1alpha1/zz_database_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_database_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Database) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Database
 func (tr *Database) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"database[*].admin_password": "database[*].adminPasswordSecretRef", "database[*].backup_tde_password": "database[*].backupTdePasswordSecretRef", "database[*].database_admin_password": "database[*].databaseAdminPasswordSecretRef", "database[*].db_backup_config[*].backup_destination_details[*].vpc_password": "database[*].dbBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "database[*].encryption_key_location_details[*].hsm_password": "database[*].encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_encryption_key_location_details[*].hsm_password": "database[*].sourceEncryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_tde_wallet_password": "database[*].sourceTdeWalletPasswordSecretRef", "database[*].tde_wallet_password": "database[*].tdeWalletPasswordSecretRef"}
+	return map[string]string{"database[*].admin_password": "database[*].adminPasswordSecretRef", "database[*].backup_tde_password": "database[*].backupTdePasswordSecretRef", "database[*].database_admin_password": "database[*].databaseAdminPasswordSecretRef", "database[*].db_backup_config[*].backup_destination_details[*].vpc_password": "database[*].dbBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "database[*].encryption_key_location_details[*].hsm_password": "database[*].encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_encryption_key_location_details[*].hsm_password": "database[*].sourceEncryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_tde_wallet_password": "database[*].sourceTdeWalletPasswordSecretRef", "database[*].tde_wallet_password": "database[*].tdeWalletPasswordSecretRef", "db_backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.dbBackupConfig[*].backupDestinationDetails[*].vpcPassword"}
 }
 
 // GetObservation of this Database
diff --git a/apis/cluster/database/v1alpha1/zz_database_types.go b/apis/cluster/database/v1alpha1/zz_database_types.go
index f429064e4..a6f68671c 100755
--- a/apis/cluster/database/v1alpha1/zz_database_types.go
+++ b/apis/cluster/database/v1alpha1/zz_database_types.go
@@ -283,8 +283,6 @@ type DatabaseDBBackupConfigBackupDestinationDetailsObservation struct {
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
 
diff --git a/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go b/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go
index a8604bac2..e6d894b5b 100755
--- a/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go
@@ -21,7 +21,7 @@ func (mg *DatabaseSnapshotStandby) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this DatabaseSnapshotStandby
 func (tr *DatabaseSnapshotStandby) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"database_admin_password": "databaseAdminPasswordSecretRef"}
+	return map[string]string{"database_admin_password": "databaseAdminPasswordSecretRef", "db_backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.dbBackupConfig[*].backupDestinationDetails[*].vpcPassword"}
 }
 
 // GetObservation of this DatabaseSnapshotStandby
diff --git a/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_types.go b/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_types.go
index d7c5ad524..91e78a770 100755
--- a/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_types.go
+++ b/apis/cluster/database/v1alpha1/zz_databasesnapshotstandby_types.go
@@ -85,9 +85,6 @@ type DatabaseSnapshotStandbyDBBackupConfigBackupDestinationDetailsObservation st
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/cluster/database/v1alpha1/zz_databaseupgrade_terraformed.go b/apis/cluster/database/v1alpha1/zz_databaseupgrade_terraformed.go
index 0fd9ff2f0..9985bdc95 100755
--- a/apis/cluster/database/v1alpha1/zz_databaseupgrade_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_databaseupgrade_terraformed.go
@@ -21,7 +21,7 @@ func (mg *DatabaseUpgrade) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this DatabaseUpgrade
 func (tr *DatabaseUpgrade) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"db_backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.dbBackupConfig[*].backupDestinationDetails[*].vpcPassword"}
 }
 
 // GetObservation of this DatabaseUpgrade
diff --git a/apis/cluster/database/v1alpha1/zz_databaseupgrade_types.go b/apis/cluster/database/v1alpha1/zz_databaseupgrade_types.go
index 57e888305..4a075621e 100755
--- a/apis/cluster/database/v1alpha1/zz_databaseupgrade_types.go
+++ b/apis/cluster/database/v1alpha1/zz_databaseupgrade_types.go
@@ -61,9 +61,6 @@ type DatabaseUpgradeDBBackupConfigBackupDestinationDetailsObservation struct {
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/cluster/database/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/database/v1alpha1/zz_generated.deepcopy.go
index 5338d7098..682395f84 100644
--- a/apis/cluster/database/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/database/v1alpha1/zz_generated.deepcopy.go
@@ -1757,11 +1757,6 @@ func (in *AssociatedBackupConfigurationDetailsObservation) DeepCopyInto(out *Ass
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -2363,11 +2358,6 @@ func (in *AutonomousContainerDatabaseAddStandbyEncryptionKeyLocationDetailsObser
 		*out = new(string)
 		**out = **in
 	}
-	if in.HSMPassword != nil {
-		in, out := &in.HSMPassword, &out.HSMPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.ProviderType != nil {
 		in, out := &in.ProviderType, &out.ProviderType
 		*out = new(string)
@@ -7022,11 +7012,6 @@ func (in *AutonomousDatabaseEncryptionKeyLocationDetailsObservation) DeepCopyInt
 		*out = new(string)
 		**out = **in
 	}
-	if in.HSMPassword != nil {
-		in, out := &in.HSMPassword, &out.HSMPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.ProviderType != nil {
 		in, out := &in.ProviderType, &out.ProviderType
 		*out = new(string)
@@ -14178,11 +14163,6 @@ func (in *BackupConfigBackupDestinationDetailsObservation) DeepCopyInto(out *Bac
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -15045,11 +15025,6 @@ func (in *BackupEncryptionKeyLocationDetailsObservation) DeepCopyInto(out *Backu
 		*out = new(string)
 		**out = **in
 	}
-	if in.HSMPassword != nil {
-		in, out := &in.HSMPassword, &out.HSMPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.ProviderType != nil {
 		in, out := &in.ProviderType, &out.ProviderType
 		*out = new(string)
@@ -21142,11 +21117,6 @@ func (in *ClusterInstancesConnectorConnectionInfoConnectionCredentialsObservatio
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -22071,21 +22041,11 @@ func (in *ConnectionInfoDatabaseCredentialInitParameters) DeepCopy() *Connection
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConnectionInfoDatabaseCredentialObservation) DeepCopyInto(out *ConnectionInfoDatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
@@ -22536,11 +22496,6 @@ func (in *ConnectorConnectionInfoConnectionCredentialsObservation) DeepCopyInto(
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -22687,21 +22642,11 @@ func (in *ConnectorConnectionInfoDatabaseCredentialInitParameters) DeepCopy() *C
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConnectorConnectionInfoDatabaseCredentialObservation) DeepCopyInto(out *ConnectorConnectionInfoDatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
@@ -28567,21 +28512,11 @@ func (in *DatabaseCredentialInitParameters) DeepCopy() *DatabaseCredentialInitPa
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DatabaseCredentialObservation) DeepCopyInto(out *DatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
@@ -28677,11 +28612,6 @@ func (in *DatabaseDBBackupConfigBackupDestinationDetailsObservation) DeepCopyInt
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -30417,11 +30347,6 @@ func (in *DatabaseSnapshotStandbyDBBackupConfigBackupDestinationDetailsObservati
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -31874,11 +31799,6 @@ func (in *DatabaseUpgradeDBBackupConfigBackupDestinationDetailsObservation) Deep
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -39662,11 +39582,6 @@ func (in *DbmgmtFeatureConfigsDatabaseConnectionDetailsConnectionCredentialsObse
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -40202,11 +40117,6 @@ func (in *DiscoveredComponentsConnectorConnectionInfoConnectionCredentialsObserv
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -41035,11 +40945,6 @@ func (in *DiscoveredComponentsPluggableDatabasesConnectorConnectionInfoConnectio
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -69806,11 +69711,6 @@ func (in *ManagementExternalDbSystemDiscoveryDiscoveredComponentsConnectorConnec
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -75246,11 +75146,6 @@ func (in *ManagementExternalMySqlDatabaseConnectorObservation) DeepCopyInto(out
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.ExternalDatabaseID != nil {
 		in, out := &in.ExternalDatabaseID, &out.ExternalDatabaseID
 		*out = new(string)
@@ -88526,11 +88421,6 @@ func (in *PluggableDatabasesConnectorConnectionInfoConnectionCredentialsObservat
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -88677,21 +88567,11 @@ func (in *PluggableDatabasesConnectorConnectionInfoDatabaseCredentialInitParamet
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PluggableDatabasesConnectorConnectionInfoDatabaseCredentialObservation) DeepCopyInto(out *PluggableDatabasesConnectorConnectionInfoDatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
diff --git a/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go b/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go
index 50cc0398b..38f461b4c 100755
--- a/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementCloudDbSystemDiscovery) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this ManagementCloudDbSystemDiscovery
 func (tr *ManagementCloudDbSystemDiscovery) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"discovered_components[*].cluster_instances[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType"}
 }
 
 // GetObservation of this ManagementCloudDbSystemDiscovery
diff --git a/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go b/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go
index 6265fef71..0a8acd47f 100755
--- a/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go
+++ b/apis/cluster/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go
@@ -84,9 +84,6 @@ type ConnectorConnectionInfoConnectionCredentialsObservation struct {
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -210,9 +207,6 @@ type DiscoveredComponentsConnectorConnectionInfoConnectionCredentialsObservation
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -760,9 +754,6 @@ type PluggableDatabasesConnectorConnectionInfoConnectionCredentialsObservation s
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
diff --git a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go
index 6eda51ecb..07acc936a 100755
--- a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementExternalDbSystemConnector) GetTerraformResourceType() string
 
 // GetConnectionDetailsMapping for this ManagementExternalDbSystemConnector
 func (tr *ManagementExternalDbSystemConnector) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"connection_info[*].database_credential[*].credential_type": "status.atProvider.connectionInfo[*].databaseCredential[*].credentialType", "connection_info[*].database_credential[*].password": "status.atProvider.connectionInfo[*].databaseCredential[*].password"}
 }
 
 // GetObservation of this ManagementExternalDbSystemConnector
diff --git a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go
index 3695705ec..424c45056 100755
--- a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go
+++ b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go
@@ -18,15 +18,9 @@ type DatabaseCredentialInitParameters struct {
 
 type DatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
diff --git a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go
index b79eb2f7c..934462a91 100755
--- a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementExternalDbSystemDiscovery) GetTerraformResourceType() string
 
 // GetConnectionDetailsMapping for this ManagementExternalDbSystemDiscovery
 func (tr *ManagementExternalDbSystemDiscovery) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"discovered_components[*].cluster_instances[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].cluster_instances[*].connector[*].connection_info[*].database_credential[*].credential_type": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].databaseCredential[*].credentialType", "discovered_components[*].cluster_instances[*].connector[*].connection_info[*].database_credential[*].password": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].databaseCredential[*].password", "discovered_components[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].connector[*].connection_info[*].database_credential[*].credential_type": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].databaseCredential[*].credentialType", "discovered_components[*].connector[*].connection_info[*].database_credential[*].password": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].databaseCredential[*].password", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].database_credential[*].credential_type": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].databaseCredential[*].credentialType", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].database_credential[*].password": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].databaseCredential[*].password"}
 }
 
 // GetObservation of this ManagementExternalDbSystemDiscovery
diff --git a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go
index 64e880aae..a9eb133b0 100755
--- a/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go
+++ b/apis/cluster/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go
@@ -21,9 +21,6 @@ type ClusterInstancesConnectorConnectionInfoConnectionCredentialsObservation str
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -123,15 +120,9 @@ type ConnectionInfoDatabaseCredentialInitParameters struct {
 
 type ConnectionInfoDatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
@@ -150,15 +141,9 @@ type ConnectorConnectionInfoDatabaseCredentialInitParameters struct {
 
 type ConnectorConnectionInfoDatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
@@ -291,9 +276,6 @@ type DiscoveredComponentsPluggableDatabasesConnectorConnectionInfoConnectionCred
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -417,9 +399,6 @@ type ManagementExternalDbSystemDiscoveryDiscoveredComponentsConnectorConnectionI
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -1183,15 +1162,9 @@ type PluggableDatabasesConnectorConnectionInfoDatabaseCredentialInitParameters s
 
 type PluggableDatabasesConnectorConnectionInfoDatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
diff --git a/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go b/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go
index d713ca02c..0f3cc2827 100755
--- a/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementExternalMySqlDatabaseConnector) GetTerraformResourceType() s
 
 // GetConnectionDetailsMapping for this ManagementExternalMySqlDatabaseConnector
 func (tr *ManagementExternalMySqlDatabaseConnector) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"credential_type": "status.atProvider.credentialType"}
 }
 
 // GetObservation of this ManagementExternalMySqlDatabaseConnector
diff --git a/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go b/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go
index b5ca1cc5e..73e1170e3 100755
--- a/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go
+++ b/apis/cluster/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go
@@ -186,9 +186,6 @@ type ManagementExternalMySqlDatabaseConnectorObservation struct {
 	// Connector Type.
 	ConnectorType *string `json:"connectorType,omitempty" tf:"connector_type,omitempty"`
 
-	// (Updatable) Type of the credential.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// (Updatable) OCID of MySQL Database resource.
 	ExternalDatabaseID *string `json:"externalDatabaseId,omitempty" tf:"external_database_id,omitempty"`
 
diff --git a/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_terraformed.go b/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_terraformed.go
index 2200b0134..bec75198d 100755
--- a/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_terraformed.go
+++ b/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementManagedDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this ManagementManagedDatabase
 func (tr *ManagementManagedDatabase) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"dbmgmt_feature_configs[*].database_connection_details[*].connection_credentials[*].credential_type": "status.atProvider.dbmgmtFeatureConfigs[*].databaseConnectionDetails[*].connectionCredentials[*].credentialType"}
 }
 
 // GetObservation of this ManagementManagedDatabase
diff --git a/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_types.go b/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_types.go
index d9e5b82d3..278784a72 100755
--- a/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_types.go
+++ b/apis/cluster/database/v1alpha1/zz_managementmanageddatabase_types.go
@@ -42,9 +42,6 @@ type DbmgmtFeatureConfigsDatabaseConnectionDetailsConnectionCredentialsObservati
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the database.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
diff --git a/apis/cluster/datasafe/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/datasafe/v1alpha1/zz_generated.deepcopy.go
index 51d22b106..b866626f0 100644
--- a/apis/cluster/datasafe/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/datasafe/v1alpha1/zz_generated.deepcopy.go
@@ -17335,11 +17335,6 @@ func (in *PeerTargetDatabasesTLSConfigObservation) DeepCopyInto(out *PeerTargetD
 		*out = new(string)
 		**out = **in
 	}
-	if in.StorePassword != nil {
-		in, out := &in.StorePassword, &out.StorePassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.TrustStoreContent != nil {
 		in, out := &in.TrustStoreContent, &out.TrustStoreContent
 		*out = new(string)
diff --git a/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_terraformed.go b/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_terraformed.go
index d5218d527..5fa757c9d 100755
--- a/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_terraformed.go
+++ b/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *TargetDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this TargetDatabase
 func (tr *TargetDatabase) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"credentials[*].password": "credentials[*].passwordSecretRef", "peer_target_database_details[*].tls_config[*].store_password": "peerTargetDatabaseDetails[*].tlsConfig[*].storePasswordSecretRef", "tls_config[*].store_password": "tlsConfig[*].storePasswordSecretRef"}
+	return map[string]string{"credentials[*].password": "credentials[*].passwordSecretRef", "peer_target_database_details[*].tls_config[*].store_password": "peerTargetDatabaseDetails[*].tlsConfig[*].storePasswordSecretRef", "peer_target_databases[*].tls_config[*].store_password": "status.atProvider.peerTargetDatabases[*].tlsConfig[*].storePassword", "tls_config[*].store_password": "tlsConfig[*].storePasswordSecretRef"}
 }
 
 // GetObservation of this TargetDatabase
diff --git a/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_types.go b/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_types.go
index d96ad8afa..1e9507959 100755
--- a/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_types.go
+++ b/apis/cluster/datasafe/v1alpha1/zz_targetdatabase_types.go
@@ -710,9 +710,6 @@ type PeerTargetDatabasesTLSConfigObservation struct {
 	// Status to represent whether the database connection is TLS enabled or not.
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 
-	// The password to read the trust store and key store files, if they are password protected.
-	StorePassword *string `json:"storePassword,omitempty" tf:"store_password,omitempty"`
-
 	// Base64 encoded string of trust store file content.
 	TrustStoreContent *string `json:"trustStoreContent,omitempty" tf:"trust_store_content,omitempty"`
 }
diff --git a/apis/cluster/identity/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/identity/v1alpha1/zz_generated.deepcopy.go
index cf5e25ad5..745827516 100644
--- a/apis/cluster/identity/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/identity/v1alpha1/zz_generated.deepcopy.go
@@ -4959,11 +4959,6 @@ func (in *SmtpCredentialObservation) DeepCopyInto(out *SmtpCredentialObservation
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.State != nil {
 		in, out := &in.State, &out.State
 		*out = new(string)
@@ -6133,11 +6128,6 @@ func (in *UiPasswordObservation) DeepCopyInto(out *UiPasswordObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.State != nil {
 		in, out := &in.State, &out.State
 		*out = new(string)
diff --git a/apis/cluster/identity/v1alpha1/zz_smtpcredential_terraformed.go b/apis/cluster/identity/v1alpha1/zz_smtpcredential_terraformed.go
index 19c3efe53..077125633 100755
--- a/apis/cluster/identity/v1alpha1/zz_smtpcredential_terraformed.go
+++ b/apis/cluster/identity/v1alpha1/zz_smtpcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *SmtpCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this SmtpCredential
 func (tr *SmtpCredential) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"password": "status.atProvider.password"}
 }
 
 // GetObservation of this SmtpCredential
diff --git a/apis/cluster/identity/v1alpha1/zz_smtpcredential_types.go b/apis/cluster/identity/v1alpha1/zz_smtpcredential_types.go
index 19cd6ac3b..3176b5deb 100755
--- a/apis/cluster/identity/v1alpha1/zz_smtpcredential_types.go
+++ b/apis/cluster/identity/v1alpha1/zz_smtpcredential_types.go
@@ -42,9 +42,6 @@ type SmtpCredentialObservation struct {
 	// The detailed status of INACTIVE lifecycleState.
 	InactiveState *string `json:"inactiveState,omitempty" tf:"inactive_state,omitempty"`
 
-	// The SMTP password.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The credential's current state.
 	State *string `json:"state,omitempty" tf:"state,omitempty"`
 
diff --git a/apis/cluster/identity/v1alpha1/zz_uipassword_terraformed.go b/apis/cluster/identity/v1alpha1/zz_uipassword_terraformed.go
index 9931e7148..7839a5e7e 100755
--- a/apis/cluster/identity/v1alpha1/zz_uipassword_terraformed.go
+++ b/apis/cluster/identity/v1alpha1/zz_uipassword_terraformed.go
@@ -21,7 +21,7 @@ func (mg *UiPassword) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this UiPassword
 func (tr *UiPassword) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"password": "status.atProvider.password"}
 }
 
 // GetObservation of this UiPassword
diff --git a/apis/cluster/identity/v1alpha1/zz_uipassword_types.go b/apis/cluster/identity/v1alpha1/zz_uipassword_types.go
index 0f682b343..1f766b1ec 100755
--- a/apis/cluster/identity/v1alpha1/zz_uipassword_types.go
+++ b/apis/cluster/identity/v1alpha1/zz_uipassword_types.go
@@ -34,9 +34,6 @@ type UiPasswordObservation struct {
 	// The detailed status of INACTIVE lifecycleState.
 	InactiveStatus *string `json:"inactiveStatus,omitempty" tf:"inactive_status,omitempty"`
 
-	// The user's password for the Console.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The password's current state.
 	State *string `json:"state,omitempty" tf:"state,omitempty"`
 
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_app_terraformed.go b/apis/cluster/identitydomains/v1alpha1/zz_app_terraformed.go
index 2fe8b22c9..d53e3cb70 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_app_terraformed.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_app_terraformed.go
@@ -21,7 +21,7 @@ func (mg *App) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this App
 func (tr *App) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"client_secret": "status.atProvider.clientSecret", "hashed_client_secret": "status.atProvider.hashedClientSecret"}
 }
 
 // GetObservation of this App
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_app_types.go b/apis/cluster/identitydomains/v1alpha1/zz_app_types.go
index a13031d46..fab5e5d5d 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_app_types.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_app_types.go
@@ -619,9 +619,6 @@ type AppObservation struct {
 	// (Updatable) Network Perimeters checking mode
 	ClientIPChecking *string `json:"clientIpChecking,omitempty" tf:"client_ip_checking,omitempty"`
 
-	// (Updatable) This value is the credential of this App, which this App supplies as a password when this App authenticates to the Oracle Public Cloud infrastructure. This value is also the client secret of this App when it acts as an OAuthClient.
-	ClientSecret *string `json:"clientSecret,omitempty" tf:"client_secret,omitempty"`
-
 	// (Updatable) Specifies the type of access that this App has when it acts as an OAuthClient.
 	ClientType *string `json:"clientType,omitempty" tf:"client_type,omitempty"`
 
@@ -668,9 +665,6 @@ type AppObservation struct {
 	// (Updatable) Grants assigned to the app
 	Grants []GrantsObservation `json:"grants,omitempty" tf:"grants,omitempty"`
 
-	// (Updatable) Hashed Client Secret. This hash-value is used to verify the 'clientSecret' credential of this App
-	HashedClientSecret *string `json:"hashedClientSecret,omitempty" tf:"hashed_client_secret,omitempty"`
-
 	// (Updatable) Home Page URL
 	HomePageURL *string `json:"homePageUrl,omitempty" tf:"home_page_url,omitempty"`
 
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go b/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go
index 045c35b58..fa81e09d1 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go
@@ -21,7 +21,7 @@ func (mg *CustomerSecretKey) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this CustomerSecretKey
 func (tr *CustomerSecretKey) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"secret_key": "status.atProvider.secretKey"}
 }
 
 // GetObservation of this CustomerSecretKey
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_types.go b/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_types.go
index f975ee0bf..eba412581 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_types.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_customersecretkey_types.go
@@ -192,9 +192,6 @@ type CustomerSecretKeyObservation struct {
 	// REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard "enterprise" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior.
 	Schemas []*string `json:"schemas,omitempty" tf:"schemas,omitempty"`
 
-	// (Updatable) The secret key.
-	SecretKey *string `json:"secretKey,omitempty" tf:"secret_key,omitempty"`
-
 	// The user's credential status.
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/identitydomains/v1alpha1/zz_generated.deepcopy.go
index 92869d601..688c9228f 100644
--- a/apis/cluster/identitydomains/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_generated.deepcopy.go
@@ -3080,11 +3080,6 @@ func (in *AppObservation) DeepCopyInto(out *AppObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.ClientSecret != nil {
-		in, out := &in.ClientSecret, &out.ClientSecret
-		*out = new(string)
-		**out = **in
-	}
 	if in.ClientType != nil {
 		in, out := &in.ClientType, &out.ClientType
 		*out = new(string)
@@ -3174,11 +3169,6 @@ func (in *AppObservation) DeepCopyInto(out *AppObservation) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.HashedClientSecret != nil {
-		in, out := &in.HashedClientSecret, &out.HashedClientSecret
-		*out = new(string)
-		**out = **in
-	}
 	if in.HomePageURL != nil {
 		in, out := &in.HomePageURL, &out.HomePageURL
 		*out = new(string)
@@ -16765,11 +16755,6 @@ func (in *CustomerSecretKeyObservation) DeepCopyInto(out *CustomerSecretKeyObser
 			}
 		}
 	}
-	if in.SecretKey != nil {
-		in, out := &in.SecretKey, &out.SecretKey
-		*out = new(string)
-		**out = **in
-	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
 		*out = new(string)
@@ -37639,11 +37624,6 @@ func (in *MyUserDbCredentialObservation) DeepCopyInto(out *MyUserDbCredentialObs
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.MixedDBPassword != nil {
-		in, out := &in.MixedDBPassword, &out.MixedDBPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.MixedSalt != nil {
 		in, out := &in.MixedSalt, &out.MixedSalt
 		*out = new(string)
@@ -40312,11 +40292,6 @@ func (in *Oauth2clientCredentialObservation) DeepCopyInto(out *Oauth2clientCrede
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.Secret != nil {
-		in, out := &in.Secret, &out.Secret
-		*out = new(string)
-		**out = **in
-	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
 		*out = new(string)
@@ -52358,11 +52333,6 @@ func (in *SmtpCredentialObservation) DeepCopyInto(out *SmtpCredentialObservation
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.ResourceTypeSchemaVersion != nil {
 		in, out := &in.ResourceTypeSchemaVersion, &out.ResourceTypeSchemaVersion
 		*out = new(string)
@@ -62532,11 +62502,6 @@ func (in *UserDbCredentialObservation) DeepCopyInto(out *UserDbCredentialObserva
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.MixedDBPassword != nil {
-		in, out := &in.MixedDBPassword, &out.MixedDBPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.MixedSalt != nil {
 		in, out := &in.MixedSalt, &out.MixedSalt
 		*out = new(string)
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go b/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go
index 482277b30..d17d1ddf0 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *MyUserDbCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this MyUserDbCredential
 func (tr *MyUserDbCredential) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"db_password": "dbPasswordSecretRef"}
+	return map[string]string{"db_password": "dbPasswordSecretRef", "mixed_db_password": "status.atProvider.mixedDbPassword"}
 }
 
 // GetObservation of this MyUserDbCredential
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_types.go b/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_types.go
index 4235c5518..75acc8b44 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_types.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_myuserdbcredential_types.go
@@ -168,9 +168,6 @@ type MyUserDbCredentialObservation struct {
 	// (Updatable) A complex attribute that contains resource metadata. All sub-attributes are OPTIONAL.
 	Meta []MyUserDbCredentialMetaObservation `json:"meta,omitempty" tf:"meta,omitempty"`
 
-	// (Updatable) The user's database password with mixed salt.
-	MixedDBPassword *string `json:"mixedDbPassword,omitempty" tf:"mixed_db_password,omitempty"`
-
 	// (Updatable) The mixed salt of the password.
 	MixedSalt *string `json:"mixedSalt,omitempty" tf:"mixed_salt,omitempty"`
 
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go b/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go
index d3976130c..995d75e9e 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Oauth2clientCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Oauth2clientCredential
 func (tr *Oauth2clientCredential) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"secret": "status.atProvider.secret"}
 }
 
 // GetObservation of this Oauth2clientCredential
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go b/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go
index a83debb0f..80f65cf56 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go
@@ -201,9 +201,6 @@ type Oauth2clientCredentialObservation struct {
 	// Scopes
 	Scopes []Oauth2clientCredentialScopesObservation `json:"scopes,omitempty" tf:"scopes,omitempty"`
 
-	// (Updatable) Secret
-	Secret *string `json:"secret,omitempty" tf:"secret,omitempty"`
-
 	// The user's credential status.
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go b/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go
index 6e1ea32a8..8172133e6 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *SmtpCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this SmtpCredential
 func (tr *SmtpCredential) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"password": "status.atProvider.password"}
 }
 
 // GetObservation of this SmtpCredential
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_types.go b/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_types.go
index 97f517a1d..66786d96e 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_types.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_smtpcredential_types.go
@@ -177,9 +177,6 @@ type SmtpCredentialObservation struct {
 	// The OCID of the SCIM resource that represents the User or App who created this Resource
 	Ocid *string `json:"ocid,omitempty" tf:"ocid,omitempty"`
 
-	// (Updatable) Password
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned.
 	ResourceTypeSchemaVersion *string `json:"resourceTypeSchemaVersion,omitempty" tf:"resource_type_schema_version,omitempty"`
 
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go b/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go
index 7e09d913d..d4408e4bb 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *UserDbCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this UserDbCredential
 func (tr *UserDbCredential) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"db_password": "dbPasswordSecretRef"}
+	return map[string]string{"db_password": "dbPasswordSecretRef", "mixed_db_password": "status.atProvider.mixedDbPassword"}
 }
 
 // GetObservation of this UserDbCredential
diff --git a/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_types.go b/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_types.go
index 4a33f6d86..627e9bf6b 100755
--- a/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_types.go
+++ b/apis/cluster/identitydomains/v1alpha1/zz_userdbcredential_types.go
@@ -183,9 +183,6 @@ type UserDbCredentialObservation struct {
 	// (Updatable) A complex attribute that contains resource metadata. All sub-attributes are OPTIONAL.
 	Meta []UserDbCredentialMetaObservation `json:"meta,omitempty" tf:"meta,omitempty"`
 
-	// (Updatable) The user's database password with mixed salt.
-	MixedDBPassword *string `json:"mixedDbPassword,omitempty" tf:"mixed_db_password,omitempty"`
-
 	// (Updatable) The mixed salt of the password.
 	MixedSalt *string `json:"mixedSalt,omitempty" tf:"mixed_salt,omitempty"`
 
diff --git a/apis/cluster/ocvp/v1alpha1/zz_generated.deepcopy.go b/apis/cluster/ocvp/v1alpha1/zz_generated.deepcopy.go
index fc7395023..531e8214d 100644
--- a/apis/cluster/ocvp/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/cluster/ocvp/v1alpha1/zz_generated.deepcopy.go
@@ -6216,11 +6216,6 @@ func (in *SddcObservation) DeepCopyInto(out *SddcObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.HcxInitialPassword != nil {
-		in, out := &in.HcxInitialPassword, &out.HcxInitialPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.HcxMode != nil {
 		in, out := &in.HcxMode, &out.HcxMode
 		*out = new(string)
@@ -6330,11 +6325,6 @@ func (in *SddcObservation) DeepCopyInto(out *SddcObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.NsxManagerInitialPassword != nil {
-		in, out := &in.NsxManagerInitialPassword, &out.NsxManagerInitialPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.NsxManagerPrivateIPID != nil {
 		in, out := &in.NsxManagerPrivateIPID, &out.NsxManagerPrivateIPID
 		*out = new(string)
@@ -6451,11 +6441,6 @@ func (in *SddcObservation) DeepCopyInto(out *SddcObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.VcenterInitialPassword != nil {
-		in, out := &in.VcenterInitialPassword, &out.VcenterInitialPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VcenterPrivateIPID != nil {
 		in, out := &in.VcenterPrivateIPID, &out.VcenterPrivateIPID
 		*out = new(string)
diff --git a/apis/cluster/ocvp/v1alpha1/zz_sddc_terraformed.go b/apis/cluster/ocvp/v1alpha1/zz_sddc_terraformed.go
index 0e693cc93..f7b046d75 100755
--- a/apis/cluster/ocvp/v1alpha1/zz_sddc_terraformed.go
+++ b/apis/cluster/ocvp/v1alpha1/zz_sddc_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Sddc) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Sddc
 func (tr *Sddc) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"hcx_initial_password": "status.atProvider.hcxInitialPassword", "nsx_manager_initial_password": "status.atProvider.nsxManagerInitialPassword", "vcenter_initial_password": "status.atProvider.vcenterInitialPassword"}
 }
 
 // GetObservation of this Sddc
diff --git a/apis/cluster/ocvp/v1alpha1/zz_sddc_types.go b/apis/cluster/ocvp/v1alpha1/zz_sddc_types.go
index 5afa465e3..151e2a8af 100755
--- a/apis/cluster/ocvp/v1alpha1/zz_sddc_types.go
+++ b/apis/cluster/ocvp/v1alpha1/zz_sddc_types.go
@@ -882,9 +882,6 @@ type SddcObservation struct {
 	// The FQDN for HCX Manager.  Example: hcx-my-sddc.sddc.us-phoenix-1.oraclecloud.com
 	HcxFqdn *string `json:"hcxFqdn,omitempty" tf:"hcx_fqdn,omitempty"`
 
-	// (Deprecated) The SDDC includes an administrator username and initial password for HCX Manager. Make sure to change this initial HCX Manager password to a different value. Deprecated. Please use the oci_ocvp_retrieve_password data source instead.
-	HcxInitialPassword *string `json:"hcxInitialPassword,omitempty" tf:"hcx_initial_password,omitempty"`
-
 	// HCX configuration of the SDDC.
 	HcxMode *string `json:"hcxMode,omitempty" tf:"hcx_mode,omitempty"`
 
@@ -948,9 +945,6 @@ type SddcObservation struct {
 	// The FQDN for NSX Manager.  Example: nsx-my-sddc.sddc.us-phoenix-1.oraclecloud.com
 	NsxManagerFqdn *string `json:"nsxManagerFqdn,omitempty" tf:"nsx_manager_fqdn,omitempty"`
 
-	// (Deprecated) The SDDC includes an administrator username and initial password for NSX Manager. Make sure to change this initial NSX Manager password to a different value. Deprecated. Please use the oci_ocvp_retrieve_password data source instead.
-	NsxManagerInitialPassword *string `json:"nsxManagerInitialPassword,omitempty" tf:"nsx_manager_initial_password,omitempty"`
-
 	// The OCID of the PrivateIp object that is the virtual IP (VIP) for NSX Manager. For information about PrivateIp objects, see the Core Services API.
 	NsxManagerPrivateIPID *string `json:"nsxManagerPrivateIpId,omitempty" tf:"nsx_manager_private_ip_id,omitempty"`
 
@@ -1009,9 +1003,6 @@ type SddcObservation struct {
 	// The FQDN for vCenter.  Example: vcenter-my-sddc.sddc.us-phoenix-1.oraclecloud.com
 	VcenterFqdn *string `json:"vcenterFqdn,omitempty" tf:"vcenter_fqdn,omitempty"`
 
-	// (Deprecated) The SDDC includes an administrator username and initial password for vCenter. Make sure to change this initial vCenter password to a different value. Deprecated. Please use the oci_ocvp_retrieve_password data source instead.
-	VcenterInitialPassword *string `json:"vcenterInitialPassword,omitempty" tf:"vcenter_initial_password,omitempty"`
-
 	// The OCID of the PrivateIp object that is the virtual IP (VIP) for vCenter. For information about PrivateIp objects, see the Core Services API.
 	VcenterPrivateIPID *string `json:"vcenterPrivateIpId,omitempty" tf:"vcenter_private_ip_id,omitempty"`
 
diff --git a/apis/namespaced/blockstorage/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/blockstorage/v1alpha1/zz_generated.deepcopy.go
index 423b5bd7a..2e2a9dd41 100644
--- a/apis/namespaced/blockstorage/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/blockstorage/v1alpha1/zz_generated.deepcopy.go
@@ -2093,11 +2093,6 @@ func (in *VolumeAttachmentObservation) DeepCopyInto(out *VolumeAttachmentObserva
 		*out = new(string)
 		**out = **in
 	}
-	if in.ChapSecret != nil {
-		in, out := &in.ChapSecret, &out.ChapSecret
-		*out = new(string)
-		**out = **in
-	}
 	if in.ChapUsername != nil {
 		in, out := &in.ChapUsername, &out.ChapUsername
 		*out = new(string)
diff --git a/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go b/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go
index 7d20846f6..64dd5d6a1 100755
--- a/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go
+++ b/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_terraformed.go
@@ -21,7 +21,7 @@ func (mg *VolumeAttachment) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this VolumeAttachment
 func (tr *VolumeAttachment) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"chap_secret": "status.atProvider.chapSecret"}
 }
 
 // GetObservation of this VolumeAttachment
diff --git a/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_types.go b/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_types.go
index e55806556..ff8349120 100755
--- a/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_types.go
+++ b/apis/namespaced/blockstorage/v1alpha1/zz_volumeattachment_types.go
@@ -106,9 +106,6 @@ type VolumeAttachmentObservation struct {
 	// The availability domain of an instance.  Example: Uocm:PHX-AD-1
 	AvailabilityDomain *string `json:"availabilityDomain,omitempty" tf:"availability_domain,omitempty"`
 
-	// The Challenge-Handshake-Authentication-Protocol (CHAP) secret valid for the associated CHAP user name. (Also called the "CHAP password".)
-	ChapSecret *string `json:"chapSecret,omitempty" tf:"chap_secret,omitempty"`
-
 	// The volume's system-generated Challenge-Handshake-Authentication-Protocol (CHAP) user name. See RFC 1994 for more on CHAP.  Example: ocid1.volume.oc1.phx.<unique_ID>
 	ChapUsername *string `json:"chapUsername,omitempty" tf:"chap_username,omitempty"`
 
diff --git a/apis/namespaced/containerengine/v1alpha1/zz_cluster_terraformed.go b/apis/namespaced/containerengine/v1alpha1/zz_cluster_terraformed.go
index c94219a86..518b929e2 100755
--- a/apis/namespaced/containerengine/v1alpha1/zz_cluster_terraformed.go
+++ b/apis/namespaced/containerengine/v1alpha1/zz_cluster_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Cluster) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Cluster
 func (tr *Cluster) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"metadata[*].time_credential_expiration": "status.atProvider.metadata[*].timeCredentialExpiration"}
 }
 
 // GetObservation of this Cluster
diff --git a/apis/namespaced/containerengine/v1alpha1/zz_cluster_types.go b/apis/namespaced/containerengine/v1alpha1/zz_cluster_types.go
index 7d0776186..54e05ba6b 100755
--- a/apis/namespaced/containerengine/v1alpha1/zz_cluster_types.go
+++ b/apis/namespaced/containerengine/v1alpha1/zz_cluster_types.go
@@ -515,9 +515,6 @@ type MetadataObservation struct {
 	// The time the cluster was created.
 	TimeCreated *string `json:"timeCreated,omitempty" tf:"time_created,omitempty"`
 
-	// The time until which the cluster credential is valid.
-	TimeCredentialExpiration *string `json:"timeCredentialExpiration,omitempty" tf:"time_credential_expiration,omitempty"`
-
 	// The time the cluster was deleted.
 	TimeDeleted *string `json:"timeDeleted,omitempty" tf:"time_deleted,omitempty"`
 
diff --git a/apis/namespaced/containerengine/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/containerengine/v1alpha1/zz_generated.deepcopy.go
index 64346ccb2..460275d61 100644
--- a/apis/namespaced/containerengine/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/containerengine/v1alpha1/zz_generated.deepcopy.go
@@ -3190,11 +3190,6 @@ func (in *MetadataObservation) DeepCopyInto(out *MetadataObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.TimeCredentialExpiration != nil {
-		in, out := &in.TimeCredentialExpiration, &out.TimeCredentialExpiration
-		*out = new(string)
-		**out = **in
-	}
 	if in.TimeDeleted != nil {
 		in, out := &in.TimeDeleted, &out.TimeDeleted
 		*out = new(string)
diff --git a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go
index c33507a4b..4860d20d1 100755
--- a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *AutonomousContainerDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this AutonomousContainerDatabase
 func (tr *AutonomousContainerDatabase) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"backup_config[*].backup_destination_details[*].vpc_password": "backupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "encryption_key_location_details[*].hsm_password": "encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
+	return map[string]string{"associated_backup_configuration_details[*].vpc_password": "status.atProvider.associatedBackupConfigurationDetails[*].vpcPassword", "backup_config[*].backup_destination_details[*].vpc_password": "backupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "encryption_key_location_details[*].hsm_password": "encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
 }
 
 // GetObservation of this AutonomousContainerDatabase
diff --git a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_types.go b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_types.go
index 8950e423c..cb5eb8b6e 100755
--- a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabase_types.go
@@ -49,9 +49,6 @@ type AssociatedBackupConfigurationDetailsObservation struct {
 	// (Updatable) Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// (Updatable) For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// (Updatable) For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go
index 9fc55c613..9b3e7b856 100755
--- a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_terraformed.go
@@ -21,7 +21,7 @@ func (mg *AutonomousContainerDatabaseAddStandby) GetTerraformResourceType() stri
 
 // GetConnectionDetailsMapping for this AutonomousContainerDatabaseAddStandby
 func (tr *AutonomousContainerDatabaseAddStandby) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
+	return map[string]string{"backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.backupConfig[*].backupDestinationDetails[*].vpcPassword", "encryption_key_location_details[*].hsm_password": "status.atProvider.encryptionKeyLocationDetails[*].hsmPassword", "peer_autonomous_container_database_backup_config[*].backup_destination_details[*].vpc_password": "peerAutonomousContainerDatabaseBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef"}
 }
 
 // GetObservation of this AutonomousContainerDatabaseAddStandby
diff --git a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go
index 32088798d..7ef5c2d65 100755
--- a/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_autonomouscontainerdatabaseaddstandby_types.go
@@ -160,8 +160,6 @@ type AutonomousContainerDatabaseAddStandbyEncryptionKeyLocationDetailsObservatio
 	// The OCID of the backup destination.
 	AzureEncryptionKeyID *string `json:"azureEncryptionKeyId,omitempty" tf:"azure_encryption_key_id,omitempty"`
 
-	HSMPassword *string `json:"hsmPassword,omitempty" tf:"hsm_password,omitempty"`
-
 	// Use 'AWS' for creating a new database.
 	ProviderType *string `json:"providerType,omitempty" tf:"provider_type,omitempty"`
 }
@@ -759,9 +757,6 @@ type BackupConfigBackupDestinationDetailsObservation struct {
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_terraformed.go b/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_terraformed.go
index 14ef2bbaa..6d54245bb 100755
--- a/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *AutonomousDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this AutonomousDatabase
 func (tr *AutonomousDatabase) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"admin_password": "adminPasswordSecretRef"}
+	return map[string]string{"admin_password": "adminPasswordSecretRef", "encryption_key_location_details[*].hsm_password": "status.atProvider.encryptionKeyLocationDetails[*].hsmPassword"}
 }
 
 // GetObservation of this AutonomousDatabase
diff --git a/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_types.go b/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_types.go
index 0a5fac67a..979c910e1 100755
--- a/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_autonomousdatabase_types.go
@@ -74,8 +74,6 @@ type AutonomousDatabaseEncryptionKeyLocationDetailsObservation struct {
 	// The OCID of the Autonomous AI Database.
 	AzureEncryptionKeyID *string `json:"azureEncryptionKeyId,omitempty" tf:"azure_encryption_key_id,omitempty"`
 
-	HSMPassword *string `json:"hsmPassword,omitempty" tf:"hsm_password,omitempty"`
-
 	// Use 'AWS' for creating a new database.
 	ProviderType *string `json:"providerType,omitempty" tf:"provider_type,omitempty"`
 }
diff --git a/apis/namespaced/database/v1alpha1/zz_backup_terraformed.go b/apis/namespaced/database/v1alpha1/zz_backup_terraformed.go
index 775029f8b..d988490a2 100755
--- a/apis/namespaced/database/v1alpha1/zz_backup_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_backup_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Backup) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Backup
 func (tr *Backup) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"encryption_key_location_details[*].hsm_password": "status.atProvider.encryptionKeyLocationDetails[*].hsmPassword"}
 }
 
 // GetObservation of this Backup
diff --git a/apis/namespaced/database/v1alpha1/zz_backup_types.go b/apis/namespaced/database/v1alpha1/zz_backup_types.go
index b8ba3d0d4..91df5c91d 100755
--- a/apis/namespaced/database/v1alpha1/zz_backup_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_backup_types.go
@@ -28,9 +28,6 @@ type BackupEncryptionKeyLocationDetailsObservation struct {
 	// Provide the key OCID of a registered GCP key.
 	GoogleCloudProviderEncryptionKeyID *string `json:"googleCloudProviderEncryptionKeyId,omitempty" tf:"google_cloud_provider_encryption_key_id,omitempty"`
 
-	// Provide the HSM password as you would in RDBMS for External HSM.
-	HSMPassword *string `json:"hsmPassword,omitempty" tf:"hsm_password,omitempty"`
-
 	// Use 'EXTERNAL' for creating a new database or migrating a database key to an External HSM. Use 'AZURE' for creating a new database or migrating a database key to Azure. Use 'AWS' for creating a new database or migrating a database key to Aws. Use 'GCP' for creating a new database or migrating a database key to Gcp.
 	ProviderType *string `json:"providerType,omitempty" tf:"provider_type,omitempty"`
 }
diff --git a/apis/namespaced/database/v1alpha1/zz_database_terraformed.go b/apis/namespaced/database/v1alpha1/zz_database_terraformed.go
index 6f6e0745c..4aa6b9293 100755
--- a/apis/namespaced/database/v1alpha1/zz_database_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_database_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Database) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Database
 func (tr *Database) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"database[*].admin_password": "database[*].adminPasswordSecretRef", "database[*].backup_tde_password": "database[*].backupTdePasswordSecretRef", "database[*].database_admin_password": "database[*].databaseAdminPasswordSecretRef", "database[*].db_backup_config[*].backup_destination_details[*].vpc_password": "database[*].dbBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "database[*].encryption_key_location_details[*].hsm_password": "database[*].encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_encryption_key_location_details[*].hsm_password": "database[*].sourceEncryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_tde_wallet_password": "database[*].sourceTdeWalletPasswordSecretRef", "database[*].tde_wallet_password": "database[*].tdeWalletPasswordSecretRef"}
+	return map[string]string{"database[*].admin_password": "database[*].adminPasswordSecretRef", "database[*].backup_tde_password": "database[*].backupTdePasswordSecretRef", "database[*].database_admin_password": "database[*].databaseAdminPasswordSecretRef", "database[*].db_backup_config[*].backup_destination_details[*].vpc_password": "database[*].dbBackupConfig[*].backupDestinationDetails[*].vpcPasswordSecretRef", "database[*].encryption_key_location_details[*].hsm_password": "database[*].encryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_encryption_key_location_details[*].hsm_password": "database[*].sourceEncryptionKeyLocationDetails[*].hsmPasswordSecretRef", "database[*].source_tde_wallet_password": "database[*].sourceTdeWalletPasswordSecretRef", "database[*].tde_wallet_password": "database[*].tdeWalletPasswordSecretRef", "db_backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.dbBackupConfig[*].backupDestinationDetails[*].vpcPassword"}
 }
 
 // GetObservation of this Database
diff --git a/apis/namespaced/database/v1alpha1/zz_database_types.go b/apis/namespaced/database/v1alpha1/zz_database_types.go
index 9bf6867a3..3d91b62f5 100755
--- a/apis/namespaced/database/v1alpha1/zz_database_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_database_types.go
@@ -284,8 +284,6 @@ type DatabaseDBBackupConfigBackupDestinationDetailsObservation struct {
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
 
diff --git a/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go b/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go
index a8604bac2..e6d894b5b 100755
--- a/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_terraformed.go
@@ -21,7 +21,7 @@ func (mg *DatabaseSnapshotStandby) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this DatabaseSnapshotStandby
 func (tr *DatabaseSnapshotStandby) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"database_admin_password": "databaseAdminPasswordSecretRef"}
+	return map[string]string{"database_admin_password": "databaseAdminPasswordSecretRef", "db_backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.dbBackupConfig[*].backupDestinationDetails[*].vpcPassword"}
 }
 
 // GetObservation of this DatabaseSnapshotStandby
diff --git a/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_types.go b/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_types.go
index 51b5651ac..af3e90217 100755
--- a/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_databasesnapshotstandby_types.go
@@ -86,9 +86,6 @@ type DatabaseSnapshotStandbyDBBackupConfigBackupDestinationDetailsObservation st
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/namespaced/database/v1alpha1/zz_databaseupgrade_terraformed.go b/apis/namespaced/database/v1alpha1/zz_databaseupgrade_terraformed.go
index 0fd9ff2f0..9985bdc95 100755
--- a/apis/namespaced/database/v1alpha1/zz_databaseupgrade_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_databaseupgrade_terraformed.go
@@ -21,7 +21,7 @@ func (mg *DatabaseUpgrade) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this DatabaseUpgrade
 func (tr *DatabaseUpgrade) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"db_backup_config[*].backup_destination_details[*].vpc_password": "status.atProvider.dbBackupConfig[*].backupDestinationDetails[*].vpcPassword"}
 }
 
 // GetObservation of this DatabaseUpgrade
diff --git a/apis/namespaced/database/v1alpha1/zz_databaseupgrade_types.go b/apis/namespaced/database/v1alpha1/zz_databaseupgrade_types.go
index a7137fc76..e7f539626 100755
--- a/apis/namespaced/database/v1alpha1/zz_databaseupgrade_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_databaseupgrade_types.go
@@ -62,9 +62,6 @@ type DatabaseUpgradeDBBackupConfigBackupDestinationDetailsObservation struct {
 	// Type of the database backup destination.
 	Type *string `json:"type,omitempty" tf:"type,omitempty"`
 
-	// For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
-	VPCPassword *string `json:"vpcPassword,omitempty" tf:"vpc_password,omitempty"`
-
 	// For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	VPCUser *string `json:"vpcUser,omitempty" tf:"vpc_user,omitempty"`
 }
diff --git a/apis/namespaced/database/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/database/v1alpha1/zz_generated.deepcopy.go
index aa9e260b5..fcc4d3892 100644
--- a/apis/namespaced/database/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/database/v1alpha1/zz_generated.deepcopy.go
@@ -1757,11 +1757,6 @@ func (in *AssociatedBackupConfigurationDetailsObservation) DeepCopyInto(out *Ass
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -2363,11 +2358,6 @@ func (in *AutonomousContainerDatabaseAddStandbyEncryptionKeyLocationDetailsObser
 		*out = new(string)
 		**out = **in
 	}
-	if in.HSMPassword != nil {
-		in, out := &in.HSMPassword, &out.HSMPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.ProviderType != nil {
 		in, out := &in.ProviderType, &out.ProviderType
 		*out = new(string)
@@ -7022,11 +7012,6 @@ func (in *AutonomousDatabaseEncryptionKeyLocationDetailsObservation) DeepCopyInt
 		*out = new(string)
 		**out = **in
 	}
-	if in.HSMPassword != nil {
-		in, out := &in.HSMPassword, &out.HSMPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.ProviderType != nil {
 		in, out := &in.ProviderType, &out.ProviderType
 		*out = new(string)
@@ -14178,11 +14163,6 @@ func (in *BackupConfigBackupDestinationDetailsObservation) DeepCopyInto(out *Bac
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -15045,11 +15025,6 @@ func (in *BackupEncryptionKeyLocationDetailsObservation) DeepCopyInto(out *Backu
 		*out = new(string)
 		**out = **in
 	}
-	if in.HSMPassword != nil {
-		in, out := &in.HSMPassword, &out.HSMPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.ProviderType != nil {
 		in, out := &in.ProviderType, &out.ProviderType
 		*out = new(string)
@@ -21142,11 +21117,6 @@ func (in *ClusterInstancesConnectorConnectionInfoConnectionCredentialsObservatio
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -22071,21 +22041,11 @@ func (in *ConnectionInfoDatabaseCredentialInitParameters) DeepCopy() *Connection
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConnectionInfoDatabaseCredentialObservation) DeepCopyInto(out *ConnectionInfoDatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
@@ -22536,11 +22496,6 @@ func (in *ConnectorConnectionInfoConnectionCredentialsObservation) DeepCopyInto(
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -22687,21 +22642,11 @@ func (in *ConnectorConnectionInfoDatabaseCredentialInitParameters) DeepCopy() *C
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConnectorConnectionInfoDatabaseCredentialObservation) DeepCopyInto(out *ConnectorConnectionInfoDatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
@@ -28567,21 +28512,11 @@ func (in *DatabaseCredentialInitParameters) DeepCopy() *DatabaseCredentialInitPa
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DatabaseCredentialObservation) DeepCopyInto(out *DatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
@@ -28677,11 +28612,6 @@ func (in *DatabaseDBBackupConfigBackupDestinationDetailsObservation) DeepCopyInt
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -30417,11 +30347,6 @@ func (in *DatabaseSnapshotStandbyDBBackupConfigBackupDestinationDetailsObservati
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -31874,11 +31799,6 @@ func (in *DatabaseUpgradeDBBackupConfigBackupDestinationDetailsObservation) Deep
 		*out = new(string)
 		**out = **in
 	}
-	if in.VPCPassword != nil {
-		in, out := &in.VPCPassword, &out.VPCPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VPCUser != nil {
 		in, out := &in.VPCUser, &out.VPCUser
 		*out = new(string)
@@ -39662,11 +39582,6 @@ func (in *DbmgmtFeatureConfigsDatabaseConnectionDetailsConnectionCredentialsObse
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -40202,11 +40117,6 @@ func (in *DiscoveredComponentsConnectorConnectionInfoConnectionCredentialsObserv
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -41035,11 +40945,6 @@ func (in *DiscoveredComponentsPluggableDatabasesConnectorConnectionInfoConnectio
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -69806,11 +69711,6 @@ func (in *ManagementExternalDbSystemDiscoveryDiscoveredComponentsConnectorConnec
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -75246,11 +75146,6 @@ func (in *ManagementExternalMySqlDatabaseConnectorObservation) DeepCopyInto(out
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.ExternalDatabaseID != nil {
 		in, out := &in.ExternalDatabaseID, &out.ExternalDatabaseID
 		*out = new(string)
@@ -88526,11 +88421,6 @@ func (in *PluggableDatabasesConnectorConnectionInfoConnectionCredentialsObservat
 		*out = new(string)
 		**out = **in
 	}
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
@@ -88677,21 +88567,11 @@ func (in *PluggableDatabasesConnectorConnectionInfoDatabaseCredentialInitParamet
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PluggableDatabasesConnectorConnectionInfoDatabaseCredentialObservation) DeepCopyInto(out *PluggableDatabasesConnectorConnectionInfoDatabaseCredentialObservation) {
 	*out = *in
-	if in.CredentialType != nil {
-		in, out := &in.CredentialType, &out.CredentialType
-		*out = new(string)
-		**out = **in
-	}
 	if in.NamedCredentialID != nil {
 		in, out := &in.NamedCredentialID, &out.NamedCredentialID
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.PasswordSecretID != nil {
 		in, out := &in.PasswordSecretID, &out.PasswordSecretID
 		*out = new(string)
diff --git a/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go b/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go
index 50cc0398b..38f461b4c 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementCloudDbSystemDiscovery) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this ManagementCloudDbSystemDiscovery
 func (tr *ManagementCloudDbSystemDiscovery) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"discovered_components[*].cluster_instances[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType"}
 }
 
 // GetObservation of this ManagementCloudDbSystemDiscovery
diff --git a/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go b/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go
index cae655e83..f253c8284 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementclouddbsystemdiscovery_types.go
@@ -85,9 +85,6 @@ type ConnectorConnectionInfoConnectionCredentialsObservation struct {
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -211,9 +208,6 @@ type DiscoveredComponentsConnectorConnectionInfoConnectionCredentialsObservation
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -761,9 +755,6 @@ type PluggableDatabasesConnectorConnectionInfoConnectionCredentialsObservation s
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
diff --git a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go
index 6eda51ecb..07acc936a 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementExternalDbSystemConnector) GetTerraformResourceType() string
 
 // GetConnectionDetailsMapping for this ManagementExternalDbSystemConnector
 func (tr *ManagementExternalDbSystemConnector) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"connection_info[*].database_credential[*].credential_type": "status.atProvider.connectionInfo[*].databaseCredential[*].credentialType", "connection_info[*].database_credential[*].password": "status.atProvider.connectionInfo[*].databaseCredential[*].password"}
 }
 
 // GetObservation of this ManagementExternalDbSystemConnector
diff --git a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go
index fce9811f6..ce05b4b87 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemconnector_types.go
@@ -19,15 +19,9 @@ type DatabaseCredentialInitParameters struct {
 
 type DatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
diff --git a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go
index b79eb2f7c..934462a91 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementExternalDbSystemDiscovery) GetTerraformResourceType() string
 
 // GetConnectionDetailsMapping for this ManagementExternalDbSystemDiscovery
 func (tr *ManagementExternalDbSystemDiscovery) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"discovered_components[*].cluster_instances[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].cluster_instances[*].connector[*].connection_info[*].database_credential[*].credential_type": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].databaseCredential[*].credentialType", "discovered_components[*].cluster_instances[*].connector[*].connection_info[*].database_credential[*].password": "status.atProvider.discoveredComponents[*].clusterInstances[*].connector[*].connectionInfo[*].databaseCredential[*].password", "discovered_components[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].connector[*].connection_info[*].database_credential[*].credential_type": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].databaseCredential[*].credentialType", "discovered_components[*].connector[*].connection_info[*].database_credential[*].password": "status.atProvider.discoveredComponents[*].connector[*].connectionInfo[*].databaseCredential[*].password", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].connection_credentials[*].credential_type": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].connectionCredentials[*].credentialType", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].database_credential[*].credential_type": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].databaseCredential[*].credentialType", "discovered_components[*].pluggable_databases[*].connector[*].connection_info[*].database_credential[*].password": "status.atProvider.discoveredComponents[*].pluggableDatabases[*].connector[*].connectionInfo[*].databaseCredential[*].password"}
 }
 
 // GetObservation of this ManagementExternalDbSystemDiscovery
diff --git a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go
index 7bdba18ab..7afd276df 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementexternaldbsystemdiscovery_types.go
@@ -22,9 +22,6 @@ type ClusterInstancesConnectorConnectionInfoConnectionCredentialsObservation str
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -124,15 +121,9 @@ type ConnectionInfoDatabaseCredentialInitParameters struct {
 
 type ConnectionInfoDatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
@@ -151,15 +142,9 @@ type ConnectorConnectionInfoDatabaseCredentialInitParameters struct {
 
 type ConnectorConnectionInfoDatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
@@ -292,9 +277,6 @@ type DiscoveredComponentsPluggableDatabasesConnectorConnectionInfoConnectionCred
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -418,9 +400,6 @@ type ManagementExternalDbSystemDiscoveryDiscoveredComponentsConnectorConnectionI
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
@@ -1184,15 +1163,9 @@ type PluggableDatabasesConnectorConnectionInfoDatabaseCredentialInitParameters s
 
 type PluggableDatabasesConnectorConnectionInfoDatabaseCredentialObservation struct {
 
-	// The type of credential used to connect to the ASM instance.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
-	// The database user's password encoded using BASE64 scheme.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The OCID of the secret containing the user password.
 	PasswordSecretID *string `json:"passwordSecretId,omitempty" tf:"password_secret_id,omitempty"`
 
diff --git a/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go b/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go
index d713ca02c..0f3cc2827 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementExternalMySqlDatabaseConnector) GetTerraformResourceType() s
 
 // GetConnectionDetailsMapping for this ManagementExternalMySqlDatabaseConnector
 func (tr *ManagementExternalMySqlDatabaseConnector) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"credential_type": "status.atProvider.credentialType"}
 }
 
 // GetObservation of this ManagementExternalMySqlDatabaseConnector
diff --git a/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go b/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go
index 06ef3e3b7..8c800386e 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementexternalmysqldatabaseconnector_types.go
@@ -187,9 +187,6 @@ type ManagementExternalMySqlDatabaseConnectorObservation struct {
 	// Connector Type.
 	ConnectorType *string `json:"connectorType,omitempty" tf:"connector_type,omitempty"`
 
-	// (Updatable) Type of the credential.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// (Updatable) OCID of MySQL Database resource.
 	ExternalDatabaseID *string `json:"externalDatabaseId,omitempty" tf:"external_database_id,omitempty"`
 
diff --git a/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_terraformed.go b/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_terraformed.go
index 2200b0134..bec75198d 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_terraformed.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *ManagementManagedDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this ManagementManagedDatabase
 func (tr *ManagementManagedDatabase) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"dbmgmt_feature_configs[*].database_connection_details[*].connection_credentials[*].credential_type": "status.atProvider.dbmgmtFeatureConfigs[*].databaseConnectionDetails[*].connectionCredentials[*].credentialType"}
 }
 
 // GetObservation of this ManagementManagedDatabase
diff --git a/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_types.go b/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_types.go
index 7b7349a61..f33c0c12a 100755
--- a/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_types.go
+++ b/apis/namespaced/database/v1alpha1/zz_managementmanageddatabase_types.go
@@ -43,9 +43,6 @@ type DbmgmtFeatureConfigsDatabaseConnectionDetailsConnectionCredentialsObservati
 	// The name of the credential information that used to connect to the DB system resource. The name should be in "x.y" format, where the length of "x" has a maximum of 64 characters, and length of "y" has a maximum of 199 characters. The name strings can contain letters, numbers and the underscore character only. Other characters are not valid, except for the "." character that separates the "x" and "y" portions of the name. IMPORTANT - The name must be unique within the Oracle Cloud Infrastructure region the credential is being created in. If you specify a name that duplicates the name of another credential within the same Oracle Cloud Infrastructure region, you may overwrite or corrupt the credential that is already using the name.
 	CredentialName *string `json:"credentialName,omitempty" tf:"credential_name,omitempty"`
 
-	// The type of credential used to connect to the database.
-	CredentialType *string `json:"credentialType,omitempty" tf:"credential_type,omitempty"`
-
 	// The OCID of the Named Credential where the database password metadata is stored.
 	NamedCredentialID *string `json:"namedCredentialId,omitempty" tf:"named_credential_id,omitempty"`
 
diff --git a/apis/namespaced/datasafe/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/datasafe/v1alpha1/zz_generated.deepcopy.go
index 57ab94cf1..ab0b31c40 100644
--- a/apis/namespaced/datasafe/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/datasafe/v1alpha1/zz_generated.deepcopy.go
@@ -17335,11 +17335,6 @@ func (in *PeerTargetDatabasesTLSConfigObservation) DeepCopyInto(out *PeerTargetD
 		*out = new(string)
 		**out = **in
 	}
-	if in.StorePassword != nil {
-		in, out := &in.StorePassword, &out.StorePassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.TrustStoreContent != nil {
 		in, out := &in.TrustStoreContent, &out.TrustStoreContent
 		*out = new(string)
diff --git a/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_terraformed.go b/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_terraformed.go
index d5218d527..5fa757c9d 100755
--- a/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_terraformed.go
+++ b/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_terraformed.go
@@ -21,7 +21,7 @@ func (mg *TargetDatabase) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this TargetDatabase
 func (tr *TargetDatabase) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"credentials[*].password": "credentials[*].passwordSecretRef", "peer_target_database_details[*].tls_config[*].store_password": "peerTargetDatabaseDetails[*].tlsConfig[*].storePasswordSecretRef", "tls_config[*].store_password": "tlsConfig[*].storePasswordSecretRef"}
+	return map[string]string{"credentials[*].password": "credentials[*].passwordSecretRef", "peer_target_database_details[*].tls_config[*].store_password": "peerTargetDatabaseDetails[*].tlsConfig[*].storePasswordSecretRef", "peer_target_databases[*].tls_config[*].store_password": "status.atProvider.peerTargetDatabases[*].tlsConfig[*].storePassword", "tls_config[*].store_password": "tlsConfig[*].storePasswordSecretRef"}
 }
 
 // GetObservation of this TargetDatabase
diff --git a/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_types.go b/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_types.go
index d73a67d29..5805bcf31 100755
--- a/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_types.go
+++ b/apis/namespaced/datasafe/v1alpha1/zz_targetdatabase_types.go
@@ -711,9 +711,6 @@ type PeerTargetDatabasesTLSConfigObservation struct {
 	// Status to represent whether the database connection is TLS enabled or not.
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 
-	// The password to read the trust store and key store files, if they are password protected.
-	StorePassword *string `json:"storePassword,omitempty" tf:"store_password,omitempty"`
-
 	// Base64 encoded string of trust store file content.
 	TrustStoreContent *string `json:"trustStoreContent,omitempty" tf:"trust_store_content,omitempty"`
 }
diff --git a/apis/namespaced/identity/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/identity/v1alpha1/zz_generated.deepcopy.go
index eb627c46d..6904bc50a 100644
--- a/apis/namespaced/identity/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/identity/v1alpha1/zz_generated.deepcopy.go
@@ -4959,11 +4959,6 @@ func (in *SmtpCredentialObservation) DeepCopyInto(out *SmtpCredentialObservation
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.State != nil {
 		in, out := &in.State, &out.State
 		*out = new(string)
@@ -6133,11 +6128,6 @@ func (in *UiPasswordObservation) DeepCopyInto(out *UiPasswordObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.State != nil {
 		in, out := &in.State, &out.State
 		*out = new(string)
diff --git a/apis/namespaced/identity/v1alpha1/zz_smtpcredential_terraformed.go b/apis/namespaced/identity/v1alpha1/zz_smtpcredential_terraformed.go
index 19c3efe53..077125633 100755
--- a/apis/namespaced/identity/v1alpha1/zz_smtpcredential_terraformed.go
+++ b/apis/namespaced/identity/v1alpha1/zz_smtpcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *SmtpCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this SmtpCredential
 func (tr *SmtpCredential) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"password": "status.atProvider.password"}
 }
 
 // GetObservation of this SmtpCredential
diff --git a/apis/namespaced/identity/v1alpha1/zz_smtpcredential_types.go b/apis/namespaced/identity/v1alpha1/zz_smtpcredential_types.go
index 925db8501..494018230 100755
--- a/apis/namespaced/identity/v1alpha1/zz_smtpcredential_types.go
+++ b/apis/namespaced/identity/v1alpha1/zz_smtpcredential_types.go
@@ -43,9 +43,6 @@ type SmtpCredentialObservation struct {
 	// The detailed status of INACTIVE lifecycleState.
 	InactiveState *string `json:"inactiveState,omitempty" tf:"inactive_state,omitempty"`
 
-	// The SMTP password.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The credential's current state.
 	State *string `json:"state,omitempty" tf:"state,omitempty"`
 
diff --git a/apis/namespaced/identity/v1alpha1/zz_uipassword_terraformed.go b/apis/namespaced/identity/v1alpha1/zz_uipassword_terraformed.go
index 9931e7148..7839a5e7e 100755
--- a/apis/namespaced/identity/v1alpha1/zz_uipassword_terraformed.go
+++ b/apis/namespaced/identity/v1alpha1/zz_uipassword_terraformed.go
@@ -21,7 +21,7 @@ func (mg *UiPassword) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this UiPassword
 func (tr *UiPassword) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"password": "status.atProvider.password"}
 }
 
 // GetObservation of this UiPassword
diff --git a/apis/namespaced/identity/v1alpha1/zz_uipassword_types.go b/apis/namespaced/identity/v1alpha1/zz_uipassword_types.go
index dc0e0917a..37456b4eb 100755
--- a/apis/namespaced/identity/v1alpha1/zz_uipassword_types.go
+++ b/apis/namespaced/identity/v1alpha1/zz_uipassword_types.go
@@ -35,9 +35,6 @@ type UiPasswordObservation struct {
 	// The detailed status of INACTIVE lifecycleState.
 	InactiveStatus *string `json:"inactiveStatus,omitempty" tf:"inactive_status,omitempty"`
 
-	// The user's password for the Console.
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// The password's current state.
 	State *string `json:"state,omitempty" tf:"state,omitempty"`
 
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_app_terraformed.go b/apis/namespaced/identitydomains/v1alpha1/zz_app_terraformed.go
index 2fe8b22c9..d53e3cb70 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_app_terraformed.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_app_terraformed.go
@@ -21,7 +21,7 @@ func (mg *App) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this App
 func (tr *App) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"client_secret": "status.atProvider.clientSecret", "hashed_client_secret": "status.atProvider.hashedClientSecret"}
 }
 
 // GetObservation of this App
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_app_types.go b/apis/namespaced/identitydomains/v1alpha1/zz_app_types.go
index 1533af561..aac9e27f7 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_app_types.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_app_types.go
@@ -620,9 +620,6 @@ type AppObservation struct {
 	// (Updatable) Network Perimeters checking mode
 	ClientIPChecking *string `json:"clientIpChecking,omitempty" tf:"client_ip_checking,omitempty"`
 
-	// (Updatable) This value is the credential of this App, which this App supplies as a password when this App authenticates to the Oracle Public Cloud infrastructure. This value is also the client secret of this App when it acts as an OAuthClient.
-	ClientSecret *string `json:"clientSecret,omitempty" tf:"client_secret,omitempty"`
-
 	// (Updatable) Specifies the type of access that this App has when it acts as an OAuthClient.
 	ClientType *string `json:"clientType,omitempty" tf:"client_type,omitempty"`
 
@@ -669,9 +666,6 @@ type AppObservation struct {
 	// (Updatable) Grants assigned to the app
 	Grants []GrantsObservation `json:"grants,omitempty" tf:"grants,omitempty"`
 
-	// (Updatable) Hashed Client Secret. This hash-value is used to verify the 'clientSecret' credential of this App
-	HashedClientSecret *string `json:"hashedClientSecret,omitempty" tf:"hashed_client_secret,omitempty"`
-
 	// (Updatable) Home Page URL
 	HomePageURL *string `json:"homePageUrl,omitempty" tf:"home_page_url,omitempty"`
 
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go b/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go
index 045c35b58..fa81e09d1 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_terraformed.go
@@ -21,7 +21,7 @@ func (mg *CustomerSecretKey) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this CustomerSecretKey
 func (tr *CustomerSecretKey) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"secret_key": "status.atProvider.secretKey"}
 }
 
 // GetObservation of this CustomerSecretKey
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_types.go b/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_types.go
index 63e0c4372..0acd6cd58 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_types.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_customersecretkey_types.go
@@ -193,9 +193,6 @@ type CustomerSecretKeyObservation struct {
 	// REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard "enterprise" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior.
 	Schemas []*string `json:"schemas,omitempty" tf:"schemas,omitempty"`
 
-	// (Updatable) The secret key.
-	SecretKey *string `json:"secretKey,omitempty" tf:"secret_key,omitempty"`
-
 	// The user's credential status.
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/identitydomains/v1alpha1/zz_generated.deepcopy.go
index 2ada40d51..aae53ac49 100644
--- a/apis/namespaced/identitydomains/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_generated.deepcopy.go
@@ -3080,11 +3080,6 @@ func (in *AppObservation) DeepCopyInto(out *AppObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.ClientSecret != nil {
-		in, out := &in.ClientSecret, &out.ClientSecret
-		*out = new(string)
-		**out = **in
-	}
 	if in.ClientType != nil {
 		in, out := &in.ClientType, &out.ClientType
 		*out = new(string)
@@ -3174,11 +3169,6 @@ func (in *AppObservation) DeepCopyInto(out *AppObservation) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.HashedClientSecret != nil {
-		in, out := &in.HashedClientSecret, &out.HashedClientSecret
-		*out = new(string)
-		**out = **in
-	}
 	if in.HomePageURL != nil {
 		in, out := &in.HomePageURL, &out.HomePageURL
 		*out = new(string)
@@ -16765,11 +16755,6 @@ func (in *CustomerSecretKeyObservation) DeepCopyInto(out *CustomerSecretKeyObser
 			}
 		}
 	}
-	if in.SecretKey != nil {
-		in, out := &in.SecretKey, &out.SecretKey
-		*out = new(string)
-		**out = **in
-	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
 		*out = new(string)
@@ -37639,11 +37624,6 @@ func (in *MyUserDbCredentialObservation) DeepCopyInto(out *MyUserDbCredentialObs
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.MixedDBPassword != nil {
-		in, out := &in.MixedDBPassword, &out.MixedDBPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.MixedSalt != nil {
 		in, out := &in.MixedSalt, &out.MixedSalt
 		*out = new(string)
@@ -40312,11 +40292,6 @@ func (in *Oauth2clientCredentialObservation) DeepCopyInto(out *Oauth2clientCrede
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.Secret != nil {
-		in, out := &in.Secret, &out.Secret
-		*out = new(string)
-		**out = **in
-	}
 	if in.Status != nil {
 		in, out := &in.Status, &out.Status
 		*out = new(string)
@@ -52358,11 +52333,6 @@ func (in *SmtpCredentialObservation) DeepCopyInto(out *SmtpCredentialObservation
 		*out = new(string)
 		**out = **in
 	}
-	if in.Password != nil {
-		in, out := &in.Password, &out.Password
-		*out = new(string)
-		**out = **in
-	}
 	if in.ResourceTypeSchemaVersion != nil {
 		in, out := &in.ResourceTypeSchemaVersion, &out.ResourceTypeSchemaVersion
 		*out = new(string)
@@ -62532,11 +62502,6 @@ func (in *UserDbCredentialObservation) DeepCopyInto(out *UserDbCredentialObserva
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.MixedDBPassword != nil {
-		in, out := &in.MixedDBPassword, &out.MixedDBPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.MixedSalt != nil {
 		in, out := &in.MixedSalt, &out.MixedSalt
 		*out = new(string)
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go b/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go
index 482277b30..d17d1ddf0 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *MyUserDbCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this MyUserDbCredential
 func (tr *MyUserDbCredential) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"db_password": "dbPasswordSecretRef"}
+	return map[string]string{"db_password": "dbPasswordSecretRef", "mixed_db_password": "status.atProvider.mixedDbPassword"}
 }
 
 // GetObservation of this MyUserDbCredential
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_types.go b/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_types.go
index aaab61f0a..caf2d3170 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_types.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_myuserdbcredential_types.go
@@ -169,9 +169,6 @@ type MyUserDbCredentialObservation struct {
 	// (Updatable) A complex attribute that contains resource metadata. All sub-attributes are OPTIONAL.
 	Meta []MyUserDbCredentialMetaObservation `json:"meta,omitempty" tf:"meta,omitempty"`
 
-	// (Updatable) The user's database password with mixed salt.
-	MixedDBPassword *string `json:"mixedDbPassword,omitempty" tf:"mixed_db_password,omitempty"`
-
 	// (Updatable) The mixed salt of the password.
 	MixedSalt *string `json:"mixedSalt,omitempty" tf:"mixed_salt,omitempty"`
 
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go b/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go
index d3976130c..995d75e9e 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Oauth2clientCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Oauth2clientCredential
 func (tr *Oauth2clientCredential) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"secret": "status.atProvider.secret"}
 }
 
 // GetObservation of this Oauth2clientCredential
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go b/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go
index de9b8dd0c..06ae2476c 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_oauth2clientcredential_types.go
@@ -202,9 +202,6 @@ type Oauth2clientCredentialObservation struct {
 	// Scopes
 	Scopes []Oauth2clientCredentialScopesObservation `json:"scopes,omitempty" tf:"scopes,omitempty"`
 
-	// (Updatable) Secret
-	Secret *string `json:"secret,omitempty" tf:"secret,omitempty"`
-
 	// The user's credential status.
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go b/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go
index 6e1ea32a8..8172133e6 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *SmtpCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this SmtpCredential
 func (tr *SmtpCredential) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"password": "status.atProvider.password"}
 }
 
 // GetObservation of this SmtpCredential
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_types.go b/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_types.go
index 2e817d6cf..276fffe69 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_types.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_smtpcredential_types.go
@@ -178,9 +178,6 @@ type SmtpCredentialObservation struct {
 	// The OCID of the SCIM resource that represents the User or App who created this Resource
 	Ocid *string `json:"ocid,omitempty" tf:"ocid,omitempty"`
 
-	// (Updatable) Password
-	Password *string `json:"password,omitempty" tf:"password,omitempty"`
-
 	// An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned.
 	ResourceTypeSchemaVersion *string `json:"resourceTypeSchemaVersion,omitempty" tf:"resource_type_schema_version,omitempty"`
 
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go b/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go
index 7e09d913d..d4408e4bb 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_terraformed.go
@@ -21,7 +21,7 @@ func (mg *UserDbCredential) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this UserDbCredential
 func (tr *UserDbCredential) GetConnectionDetailsMapping() map[string]string {
-	return map[string]string{"db_password": "dbPasswordSecretRef"}
+	return map[string]string{"db_password": "dbPasswordSecretRef", "mixed_db_password": "status.atProvider.mixedDbPassword"}
 }
 
 // GetObservation of this UserDbCredential
diff --git a/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_types.go b/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_types.go
index e481e36ec..32c845159 100755
--- a/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_types.go
+++ b/apis/namespaced/identitydomains/v1alpha1/zz_userdbcredential_types.go
@@ -184,9 +184,6 @@ type UserDbCredentialObservation struct {
 	// (Updatable) A complex attribute that contains resource metadata. All sub-attributes are OPTIONAL.
 	Meta []UserDbCredentialMetaObservation `json:"meta,omitempty" tf:"meta,omitempty"`
 
-	// (Updatable) The user's database password with mixed salt.
-	MixedDBPassword *string `json:"mixedDbPassword,omitempty" tf:"mixed_db_password,omitempty"`
-
 	// (Updatable) The mixed salt of the password.
 	MixedSalt *string `json:"mixedSalt,omitempty" tf:"mixed_salt,omitempty"`
 
diff --git a/apis/namespaced/ocvp/v1alpha1/zz_generated.deepcopy.go b/apis/namespaced/ocvp/v1alpha1/zz_generated.deepcopy.go
index 8b93bf1a5..b248f2e7e 100644
--- a/apis/namespaced/ocvp/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/namespaced/ocvp/v1alpha1/zz_generated.deepcopy.go
@@ -6216,11 +6216,6 @@ func (in *SddcObservation) DeepCopyInto(out *SddcObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.HcxInitialPassword != nil {
-		in, out := &in.HcxInitialPassword, &out.HcxInitialPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.HcxMode != nil {
 		in, out := &in.HcxMode, &out.HcxMode
 		*out = new(string)
@@ -6330,11 +6325,6 @@ func (in *SddcObservation) DeepCopyInto(out *SddcObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.NsxManagerInitialPassword != nil {
-		in, out := &in.NsxManagerInitialPassword, &out.NsxManagerInitialPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.NsxManagerPrivateIPID != nil {
 		in, out := &in.NsxManagerPrivateIPID, &out.NsxManagerPrivateIPID
 		*out = new(string)
@@ -6451,11 +6441,6 @@ func (in *SddcObservation) DeepCopyInto(out *SddcObservation) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.VcenterInitialPassword != nil {
-		in, out := &in.VcenterInitialPassword, &out.VcenterInitialPassword
-		*out = new(string)
-		**out = **in
-	}
 	if in.VcenterPrivateIPID != nil {
 		in, out := &in.VcenterPrivateIPID, &out.VcenterPrivateIPID
 		*out = new(string)
diff --git a/apis/namespaced/ocvp/v1alpha1/zz_sddc_terraformed.go b/apis/namespaced/ocvp/v1alpha1/zz_sddc_terraformed.go
index 0e693cc93..f7b046d75 100755
--- a/apis/namespaced/ocvp/v1alpha1/zz_sddc_terraformed.go
+++ b/apis/namespaced/ocvp/v1alpha1/zz_sddc_terraformed.go
@@ -21,7 +21,7 @@ func (mg *Sddc) GetTerraformResourceType() string {
 
 // GetConnectionDetailsMapping for this Sddc
 func (tr *Sddc) GetConnectionDetailsMapping() map[string]string {
-	return nil
+	return map[string]string{"hcx_initial_password": "status.atProvider.hcxInitialPassword", "nsx_manager_initial_password": "status.atProvider.nsxManagerInitialPassword", "vcenter_initial_password": "status.atProvider.vcenterInitialPassword"}
 }
 
 // GetObservation of this Sddc
diff --git a/apis/namespaced/ocvp/v1alpha1/zz_sddc_types.go b/apis/namespaced/ocvp/v1alpha1/zz_sddc_types.go
index bc4c514d5..e8bbd9429 100755
--- a/apis/namespaced/ocvp/v1alpha1/zz_sddc_types.go
+++ b/apis/namespaced/ocvp/v1alpha1/zz_sddc_types.go
@@ -883,9 +883,6 @@ type SddcObservation struct {
 	// The FQDN for HCX Manager.  Example: hcx-my-sddc.sddc.us-phoenix-1.oraclecloud.com
 	HcxFqdn *string `json:"hcxFqdn,omitempty" tf:"hcx_fqdn,omitempty"`
 
-	// (Deprecated) The SDDC includes an administrator username and initial password for HCX Manager. Make sure to change this initial HCX Manager password to a different value. Deprecated. Please use the oci_ocvp_retrieve_password data source instead.
-	HcxInitialPassword *string `json:"hcxInitialPassword,omitempty" tf:"hcx_initial_password,omitempty"`
-
 	// HCX configuration of the SDDC.
 	HcxMode *string `json:"hcxMode,omitempty" tf:"hcx_mode,omitempty"`
 
@@ -949,9 +946,6 @@ type SddcObservation struct {
 	// The FQDN for NSX Manager.  Example: nsx-my-sddc.sddc.us-phoenix-1.oraclecloud.com
 	NsxManagerFqdn *string `json:"nsxManagerFqdn,omitempty" tf:"nsx_manager_fqdn,omitempty"`
 
-	// (Deprecated) The SDDC includes an administrator username and initial password for NSX Manager. Make sure to change this initial NSX Manager password to a different value. Deprecated. Please use the oci_ocvp_retrieve_password data source instead.
-	NsxManagerInitialPassword *string `json:"nsxManagerInitialPassword,omitempty" tf:"nsx_manager_initial_password,omitempty"`
-
 	// The OCID of the PrivateIp object that is the virtual IP (VIP) for NSX Manager. For information about PrivateIp objects, see the Core Services API.
 	NsxManagerPrivateIPID *string `json:"nsxManagerPrivateIpId,omitempty" tf:"nsx_manager_private_ip_id,omitempty"`
 
@@ -1010,9 +1004,6 @@ type SddcObservation struct {
 	// The FQDN for vCenter.  Example: vcenter-my-sddc.sddc.us-phoenix-1.oraclecloud.com
 	VcenterFqdn *string `json:"vcenterFqdn,omitempty" tf:"vcenter_fqdn,omitempty"`
 
-	// (Deprecated) The SDDC includes an administrator username and initial password for vCenter. Make sure to change this initial vCenter password to a different value. Deprecated. Please use the oci_ocvp_retrieve_password data source instead.
-	VcenterInitialPassword *string `json:"vcenterInitialPassword,omitempty" tf:"vcenter_initial_password,omitempty"`
-
 	// The OCID of the PrivateIp object that is the virtual IP (VIP) for vCenter. For information about PrivateIp objects, see the Core Services API.
 	VcenterPrivateIPID *string `json:"vcenterPrivateIpId,omitempty" tf:"vcenter_private_ip_id,omitempty"`
 
diff --git a/package/crds/blockstorage.oci.m.upbound.io_volumeattachments.yaml b/package/crds/blockstorage.oci.m.upbound.io_volumeattachments.yaml
index 6e74e2f95..2d879210a 100644
--- a/package/crds/blockstorage.oci.m.upbound.io_volumeattachments.yaml
+++ b/package/crds/blockstorage.oci.m.upbound.io_volumeattachments.yaml
@@ -747,11 +747,6 @@ spec:
                     description: 'The availability domain of an instance.  Example:
                       Uocm:PHX-AD-1'
                     type: string
-                  chapSecret:
-                    description: The Challenge-Handshake-Authentication-Protocol (CHAP)
-                      secret valid for the associated CHAP user name. (Also called
-                      the "CHAP password".)
-                    type: string
                   chapUsername:
                     description: 'The volume''s system-generated Challenge-Handshake-Authentication-Protocol
                       (CHAP) user name. See RFC 1994 for more on CHAP.  Example: ocid1.volume.oc1.phx.<unique_ID>'
diff --git a/package/crds/blockstorage.oci.upbound.io_volumeattachments.yaml b/package/crds/blockstorage.oci.upbound.io_volumeattachments.yaml
index bbffbbaae..d0d82437e 100644
--- a/package/crds/blockstorage.oci.upbound.io_volumeattachments.yaml
+++ b/package/crds/blockstorage.oci.upbound.io_volumeattachments.yaml
@@ -753,11 +753,6 @@ spec:
                     description: 'The availability domain of an instance.  Example:
                       Uocm:PHX-AD-1'
                     type: string
-                  chapSecret:
-                    description: The Challenge-Handshake-Authentication-Protocol (CHAP)
-                      secret valid for the associated CHAP user name. (Also called
-                      the "CHAP password".)
-                    type: string
                   chapUsername:
                     description: 'The volume''s system-generated Challenge-Handshake-Authentication-Protocol
                       (CHAP) user name. See RFC 1994 for more on CHAP.  Example: ocid1.volume.oc1.phx.<unique_ID>'
diff --git a/package/crds/containerengine.oci.m.upbound.io_clusters.yaml b/package/crds/containerengine.oci.m.upbound.io_clusters.yaml
index fbd5a6ca1..169f03427 100644
--- a/package/crds/containerengine.oci.m.upbound.io_clusters.yaml
+++ b/package/crds/containerengine.oci.m.upbound.io_clusters.yaml
@@ -2087,10 +2087,6 @@ spec:
                         timeCreated:
                           description: The time the cluster was created.
                           type: string
-                        timeCredentialExpiration:
-                          description: The time until which the cluster credential
-                            is valid.
-                          type: string
                         timeDeleted:
                           description: The time the cluster was deleted.
                           type: string
diff --git a/package/crds/containerengine.oci.upbound.io_clusters.yaml b/package/crds/containerengine.oci.upbound.io_clusters.yaml
index 123d25593..32a34e082 100644
--- a/package/crds/containerengine.oci.upbound.io_clusters.yaml
+++ b/package/crds/containerengine.oci.upbound.io_clusters.yaml
@@ -2045,10 +2045,6 @@ spec:
                         timeCreated:
                           description: The time the cluster was created.
                           type: string
-                        timeCredentialExpiration:
-                          description: The time until which the cluster credential
-                            is valid.
-                          type: string
                         timeDeleted:
                           description: The time the cluster was deleted.
                           type: string
diff --git a/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml b/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml
index b400c7798..9792e223c 100644
--- a/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml
+++ b/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml
@@ -1267,11 +1267,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                description: For a RECOVERY_APPLIANCE backup destination,
-                                  the password for the VPC user that is used to access
-                                  the Recovery Appliance.
-                                type: string
                               vpcUser:
                                 description: For a RECOVERY_APPLIANCE backup destination,
                                   the Virtual Private Catalog (VPC) user that is used
@@ -1516,8 +1511,6 @@ spec:
                         azureEncryptionKeyId:
                           description: The OCID of the backup destination.
                           type: string
-                        hsmPassword:
-                          type: string
                         providerType:
                           description: Use 'AWS' for creating a new database.
                           type: string
diff --git a/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabases.yaml b/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabases.yaml
index e61e71c40..04dd33509 100644
--- a/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabases.yaml
+++ b/package/crds/database.oci.m.upbound.io_autonomouscontainerdatabases.yaml
@@ -3490,11 +3490,6 @@ spec:
                         type:
                           description: (Updatable) Type of the database backup destination.
                           type: string
-                        vpcPassword:
-                          description: (Updatable) For a RECOVERY_APPLIANCE backup
-                            destination, the password for the VPC user that is used
-                            to access the Recovery Appliance.
-                          type: string
                         vpcUser:
                           description: (Updatable) For a RECOVERY_APPLIANCE backup
                             destination, the Virtual Private Catalog (VPC) user that
diff --git a/package/crds/database.oci.m.upbound.io_autonomousdatabases.yaml b/package/crds/database.oci.m.upbound.io_autonomousdatabases.yaml
index bcf795fed..e6894d3cd 100644
--- a/package/crds/database.oci.m.upbound.io_autonomousdatabases.yaml
+++ b/package/crds/database.oci.m.upbound.io_autonomousdatabases.yaml
@@ -4220,8 +4220,6 @@ spec:
                         azureEncryptionKeyId:
                           description: The OCID of the Autonomous AI Database.
                           type: string
-                        hsmPassword:
-                          type: string
                         providerType:
                           description: Use 'AWS' for creating a new database.
                           type: string
diff --git a/package/crds/database.oci.m.upbound.io_backups.yaml b/package/crds/database.oci.m.upbound.io_backups.yaml
index bf263cfbd..8fd865915 100644
--- a/package/crds/database.oci.m.upbound.io_backups.yaml
+++ b/package/crds/database.oci.m.upbound.io_backups.yaml
@@ -367,10 +367,6 @@ spec:
                         googleCloudProviderEncryptionKeyId:
                           description: Provide the key OCID of a registered GCP key.
                           type: string
-                        hsmPassword:
-                          description: Provide the HSM password as you would in RDBMS
-                            for External HSM.
-                          type: string
                         providerType:
                           description: Use 'EXTERNAL' for creating a new database
                             or migrating a database key to an External HSM. Use 'AZURE'
diff --git a/package/crds/database.oci.m.upbound.io_databases.yaml b/package/crds/database.oci.m.upbound.io_databases.yaml
index 5dccecede..db113ab53 100644
--- a/package/crds/database.oci.m.upbound.io_databases.yaml
+++ b/package/crds/database.oci.m.upbound.io_databases.yaml
@@ -3846,8 +3846,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                type: string
                               vpcUser:
                                 type: string
                             type: object
diff --git a/package/crds/database.oci.m.upbound.io_databasesnapshotstandbies.yaml b/package/crds/database.oci.m.upbound.io_databasesnapshotstandbies.yaml
index d5725ffde..1478bd3ba 100644
--- a/package/crds/database.oci.m.upbound.io_databasesnapshotstandbies.yaml
+++ b/package/crds/database.oci.m.upbound.io_databasesnapshotstandbies.yaml
@@ -538,11 +538,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                description: For a RECOVERY_APPLIANCE backup destination,
-                                  the password for the VPC user that is used to access
-                                  the Recovery Appliance.
-                                type: string
                               vpcUser:
                                 description: For a RECOVERY_APPLIANCE backup destination,
                                   the Virtual Private Catalog (VPC) user that is used
diff --git a/package/crds/database.oci.m.upbound.io_databaseupgrades.yaml b/package/crds/database.oci.m.upbound.io_databaseupgrades.yaml
index cd0543914..2d589a4c3 100644
--- a/package/crds/database.oci.m.upbound.io_databaseupgrades.yaml
+++ b/package/crds/database.oci.m.upbound.io_databaseupgrades.yaml
@@ -768,11 +768,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                description: For a RECOVERY_APPLIANCE backup destination,
-                                  the password for the VPC user that is used to access
-                                  the Recovery Appliance.
-                                type: string
                               vpcUser:
                                 description: For a RECOVERY_APPLIANCE backup destination,
                                   the Virtual Private Catalog (VPC) user that is used
diff --git a/package/crds/database.oci.m.upbound.io_managementclouddbsystemdiscoveries.yaml b/package/crds/database.oci.m.upbound.io_managementclouddbsystemdiscoveries.yaml
index bd90d5791..565e865c7 100644
--- a/package/crds/database.oci.m.upbound.io_managementclouddbsystemdiscoveries.yaml
+++ b/package/crds/database.oci.m.upbound.io_managementclouddbsystemdiscoveries.yaml
@@ -984,10 +984,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
@@ -1139,10 +1135,6 @@ spec:
                                               the credential that is already using
                                               the name.
                                             type: string
-                                          credentialType:
-                                            description: The type of credential used
-                                              to connect to the ASM instance.
-                                            type: string
                                           namedCredentialId:
                                             description: The OCID of the Named Credential
                                               where the database password metadata
@@ -1458,10 +1450,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
diff --git a/package/crds/database.oci.m.upbound.io_managementexternaldbsystemconnectors.yaml b/package/crds/database.oci.m.upbound.io_managementexternaldbsystemconnectors.yaml
index abd671260..3c1599e6f 100644
--- a/package/crds/database.oci.m.upbound.io_managementexternaldbsystemconnectors.yaml
+++ b/package/crds/database.oci.m.upbound.io_managementexternaldbsystemconnectors.yaml
@@ -631,18 +631,10 @@ spec:
                             perform tablespace administration tasks.
                           items:
                             properties:
-                              credentialType:
-                                description: The type of credential used to connect
-                                  to the ASM instance.
-                                type: string
                               namedCredentialId:
                                 description: The OCID of the Named Credential where
                                   the database password metadata is stored.
                                 type: string
-                              password:
-                                description: The database user's password encoded
-                                  using BASE64 scheme.
-                                type: string
                               passwordSecretId:
                                 description: The OCID of the secret containing the
                                   user password.
diff --git a/package/crds/database.oci.m.upbound.io_managementexternaldbsystemdiscoveries.yaml b/package/crds/database.oci.m.upbound.io_managementexternaldbsystemdiscoveries.yaml
index 6708dc506..00e6018d1 100644
--- a/package/crds/database.oci.m.upbound.io_managementexternaldbsystemdiscoveries.yaml
+++ b/package/crds/database.oci.m.upbound.io_managementexternaldbsystemdiscoveries.yaml
@@ -945,10 +945,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
@@ -1008,20 +1004,11 @@ spec:
                                               administration tasks.
                                             items:
                                               properties:
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
                                                     password metadata is stored.
                                                   type: string
-                                                password:
-                                                  description: The database user's
-                                                    password encoded using BASE64
-                                                    scheme.
-                                                  type: string
                                                 passwordSecretId:
                                                   description: The OCID of the secret
                                                     containing the user password.
@@ -1134,10 +1121,6 @@ spec:
                                               the credential that is already using
                                               the name.
                                             type: string
-                                          credentialType:
-                                            description: The type of credential used
-                                              to connect to the ASM instance.
-                                            type: string
                                           namedCredentialId:
                                             description: The OCID of the Named Credential
                                               where the database password metadata
@@ -1196,19 +1179,11 @@ spec:
                                         tasks.
                                       items:
                                         properties:
-                                          credentialType:
-                                            description: The type of credential used
-                                              to connect to the ASM instance.
-                                            type: string
                                           namedCredentialId:
                                             description: The OCID of the Named Credential
                                               where the database password metadata
                                               is stored.
                                             type: string
-                                          password:
-                                            description: The database user's password
-                                              encoded using BASE64 scheme.
-                                            type: string
                                           passwordSecretId:
                                             description: The OCID of the secret containing
                                               the user password.
@@ -1481,10 +1456,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
@@ -1544,20 +1515,11 @@ spec:
                                               administration tasks.
                                             items:
                                               properties:
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
                                                     password metadata is stored.
                                                   type: string
-                                                password:
-                                                  description: The database user's
-                                                    password encoded using BASE64
-                                                    scheme.
-                                                  type: string
                                                 passwordSecretId:
                                                   description: The OCID of the secret
                                                     containing the user password.
diff --git a/package/crds/database.oci.m.upbound.io_managementexternalmysqldatabaseconnectors.yaml b/package/crds/database.oci.m.upbound.io_managementexternalmysqldatabaseconnectors.yaml
index c9f8144d2..a56c94f44 100644
--- a/package/crds/database.oci.m.upbound.io_managementexternalmysqldatabaseconnectors.yaml
+++ b/package/crds/database.oci.m.upbound.io_managementexternalmysqldatabaseconnectors.yaml
@@ -791,9 +791,6 @@ spec:
                   connectorType:
                     description: Connector Type.
                     type: string
-                  credentialType:
-                    description: (Updatable) Type of the credential.
-                    type: string
                   externalDatabaseId:
                     description: (Updatable) OCID of MySQL Database resource.
                     type: string
diff --git a/package/crds/database.oci.m.upbound.io_managementmanageddatabases.yaml b/package/crds/database.oci.m.upbound.io_managementmanageddatabases.yaml
index e3cef6c18..9cdf9bc0b 100644
--- a/package/crds/database.oci.m.upbound.io_managementmanageddatabases.yaml
+++ b/package/crds/database.oci.m.upbound.io_managementmanageddatabases.yaml
@@ -432,10 +432,6 @@ spec:
                                         or corrupt the credential that is already
                                         using the name.
                                       type: string
-                                    credentialType:
-                                      description: The type of credential used to
-                                        connect to the database.
-                                      type: string
                                     namedCredentialId:
                                       description: The OCID of the Named Credential
                                         where the database password metadata is stored.
diff --git a/package/crds/database.oci.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml b/package/crds/database.oci.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml
index 449870486..054f91d57 100644
--- a/package/crds/database.oci.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml
+++ b/package/crds/database.oci.upbound.io_autonomouscontainerdatabaseaddstandbies.yaml
@@ -1259,11 +1259,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                description: For a RECOVERY_APPLIANCE backup destination,
-                                  the password for the VPC user that is used to access
-                                  the Recovery Appliance.
-                                type: string
                               vpcUser:
                                 description: For a RECOVERY_APPLIANCE backup destination,
                                   the Virtual Private Catalog (VPC) user that is used
@@ -1508,8 +1503,6 @@ spec:
                         azureEncryptionKeyId:
                           description: The OCID of the backup destination.
                           type: string
-                        hsmPassword:
-                          type: string
                         providerType:
                           description: Use 'AWS' for creating a new database.
                           type: string
diff --git a/package/crds/database.oci.upbound.io_autonomouscontainerdatabases.yaml b/package/crds/database.oci.upbound.io_autonomouscontainerdatabases.yaml
index 3b7ff100c..b65e27d13 100644
--- a/package/crds/database.oci.upbound.io_autonomouscontainerdatabases.yaml
+++ b/package/crds/database.oci.upbound.io_autonomouscontainerdatabases.yaml
@@ -3394,11 +3394,6 @@ spec:
                         type:
                           description: (Updatable) Type of the database backup destination.
                           type: string
-                        vpcPassword:
-                          description: (Updatable) For a RECOVERY_APPLIANCE backup
-                            destination, the password for the VPC user that is used
-                            to access the Recovery Appliance.
-                          type: string
                         vpcUser:
                           description: (Updatable) For a RECOVERY_APPLIANCE backup
                             destination, the Virtual Private Catalog (VPC) user that
diff --git a/package/crds/database.oci.upbound.io_autonomousdatabases.yaml b/package/crds/database.oci.upbound.io_autonomousdatabases.yaml
index e191ab7fb..2bf574294 100644
--- a/package/crds/database.oci.upbound.io_autonomousdatabases.yaml
+++ b/package/crds/database.oci.upbound.io_autonomousdatabases.yaml
@@ -4128,8 +4128,6 @@ spec:
                         azureEncryptionKeyId:
                           description: The OCID of the Autonomous AI Database.
                           type: string
-                        hsmPassword:
-                          type: string
                         providerType:
                           description: Use 'AWS' for creating a new database.
                           type: string
diff --git a/package/crds/database.oci.upbound.io_backups.yaml b/package/crds/database.oci.upbound.io_backups.yaml
index 06e25accd..d93506432 100644
--- a/package/crds/database.oci.upbound.io_backups.yaml
+++ b/package/crds/database.oci.upbound.io_backups.yaml
@@ -397,10 +397,6 @@ spec:
                         googleCloudProviderEncryptionKeyId:
                           description: Provide the key OCID of a registered GCP key.
                           type: string
-                        hsmPassword:
-                          description: Provide the HSM password as you would in RDBMS
-                            for External HSM.
-                          type: string
                         providerType:
                           description: Use 'EXTERNAL' for creating a new database
                             or migrating a database key to an External HSM. Use 'AZURE'
diff --git a/package/crds/database.oci.upbound.io_databases.yaml b/package/crds/database.oci.upbound.io_databases.yaml
index 667e71a0e..0d51c0ac4 100644
--- a/package/crds/database.oci.upbound.io_databases.yaml
+++ b/package/crds/database.oci.upbound.io_databases.yaml
@@ -3808,8 +3808,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                type: string
                               vpcUser:
                                 type: string
                             type: object
diff --git a/package/crds/database.oci.upbound.io_databasesnapshotstandbies.yaml b/package/crds/database.oci.upbound.io_databasesnapshotstandbies.yaml
index 309c40db9..24270479f 100644
--- a/package/crds/database.oci.upbound.io_databasesnapshotstandbies.yaml
+++ b/package/crds/database.oci.upbound.io_databasesnapshotstandbies.yaml
@@ -578,11 +578,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                description: For a RECOVERY_APPLIANCE backup destination,
-                                  the password for the VPC user that is used to access
-                                  the Recovery Appliance.
-                                type: string
                               vpcUser:
                                 description: For a RECOVERY_APPLIANCE backup destination,
                                   the Virtual Private Catalog (VPC) user that is used
diff --git a/package/crds/database.oci.upbound.io_databaseupgrades.yaml b/package/crds/database.oci.upbound.io_databaseupgrades.yaml
index a4642f611..647ec94b0 100644
--- a/package/crds/database.oci.upbound.io_databaseupgrades.yaml
+++ b/package/crds/database.oci.upbound.io_databaseupgrades.yaml
@@ -786,11 +786,6 @@ spec:
                               type:
                                 description: Type of the database backup destination.
                                 type: string
-                              vpcPassword:
-                                description: For a RECOVERY_APPLIANCE backup destination,
-                                  the password for the VPC user that is used to access
-                                  the Recovery Appliance.
-                                type: string
                               vpcUser:
                                 description: For a RECOVERY_APPLIANCE backup destination,
                                   the Virtual Private Catalog (VPC) user that is used
diff --git a/package/crds/database.oci.upbound.io_managementclouddbsystemdiscoveries.yaml b/package/crds/database.oci.upbound.io_managementclouddbsystemdiscoveries.yaml
index da1ef213c..8e3cc965d 100644
--- a/package/crds/database.oci.upbound.io_managementclouddbsystemdiscoveries.yaml
+++ b/package/crds/database.oci.upbound.io_managementclouddbsystemdiscoveries.yaml
@@ -1002,10 +1002,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
@@ -1157,10 +1153,6 @@ spec:
                                               the credential that is already using
                                               the name.
                                             type: string
-                                          credentialType:
-                                            description: The type of credential used
-                                              to connect to the ASM instance.
-                                            type: string
                                           namedCredentialId:
                                             description: The OCID of the Named Credential
                                               where the database password metadata
@@ -1476,10 +1468,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
diff --git a/package/crds/database.oci.upbound.io_managementexternaldbsystemconnectors.yaml b/package/crds/database.oci.upbound.io_managementexternaldbsystemconnectors.yaml
index f53f5132e..892e70bff 100644
--- a/package/crds/database.oci.upbound.io_managementexternaldbsystemconnectors.yaml
+++ b/package/crds/database.oci.upbound.io_managementexternaldbsystemconnectors.yaml
@@ -661,18 +661,10 @@ spec:
                             perform tablespace administration tasks.
                           items:
                             properties:
-                              credentialType:
-                                description: The type of credential used to connect
-                                  to the ASM instance.
-                                type: string
                               namedCredentialId:
                                 description: The OCID of the Named Credential where
                                   the database password metadata is stored.
                                 type: string
-                              password:
-                                description: The database user's password encoded
-                                  using BASE64 scheme.
-                                type: string
                               passwordSecretId:
                                 description: The OCID of the secret containing the
                                   user password.
diff --git a/package/crds/database.oci.upbound.io_managementexternaldbsystemdiscoveries.yaml b/package/crds/database.oci.upbound.io_managementexternaldbsystemdiscoveries.yaml
index db80e1717..a8d688aa3 100644
--- a/package/crds/database.oci.upbound.io_managementexternaldbsystemdiscoveries.yaml
+++ b/package/crds/database.oci.upbound.io_managementexternaldbsystemdiscoveries.yaml
@@ -963,10 +963,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
@@ -1026,20 +1022,11 @@ spec:
                                               administration tasks.
                                             items:
                                               properties:
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
                                                     password metadata is stored.
                                                   type: string
-                                                password:
-                                                  description: The database user's
-                                                    password encoded using BASE64
-                                                    scheme.
-                                                  type: string
                                                 passwordSecretId:
                                                   description: The OCID of the secret
                                                     containing the user password.
@@ -1152,10 +1139,6 @@ spec:
                                               the credential that is already using
                                               the name.
                                             type: string
-                                          credentialType:
-                                            description: The type of credential used
-                                              to connect to the ASM instance.
-                                            type: string
                                           namedCredentialId:
                                             description: The OCID of the Named Credential
                                               where the database password metadata
@@ -1214,19 +1197,11 @@ spec:
                                         tasks.
                                       items:
                                         properties:
-                                          credentialType:
-                                            description: The type of credential used
-                                              to connect to the ASM instance.
-                                            type: string
                                           namedCredentialId:
                                             description: The OCID of the Named Credential
                                               where the database password metadata
                                               is stored.
                                             type: string
-                                          password:
-                                            description: The database user's password
-                                              encoded using BASE64 scheme.
-                                            type: string
                                           passwordSecretId:
                                             description: The OCID of the secret containing
                                               the user password.
@@ -1499,10 +1474,6 @@ spec:
                                                     the credential that is already
                                                     using the name.
                                                   type: string
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
@@ -1562,20 +1533,11 @@ spec:
                                               administration tasks.
                                             items:
                                               properties:
-                                                credentialType:
-                                                  description: The type of credential
-                                                    used to connect to the ASM instance.
-                                                  type: string
                                                 namedCredentialId:
                                                   description: The OCID of the Named
                                                     Credential where the database
                                                     password metadata is stored.
                                                   type: string
-                                                password:
-                                                  description: The database user's
-                                                    password encoded using BASE64
-                                                    scheme.
-                                                  type: string
                                                 passwordSecretId:
                                                   description: The OCID of the secret
                                                     containing the user password.
diff --git a/package/crds/database.oci.upbound.io_managementexternalmysqldatabaseconnectors.yaml b/package/crds/database.oci.upbound.io_managementexternalmysqldatabaseconnectors.yaml
index 192030ed6..0ccac4df3 100644
--- a/package/crds/database.oci.upbound.io_managementexternalmysqldatabaseconnectors.yaml
+++ b/package/crds/database.oci.upbound.io_managementexternalmysqldatabaseconnectors.yaml
@@ -797,9 +797,6 @@ spec:
                   connectorType:
                     description: Connector Type.
                     type: string
-                  credentialType:
-                    description: (Updatable) Type of the credential.
-                    type: string
                   externalDatabaseId:
                     description: (Updatable) OCID of MySQL Database resource.
                     type: string
diff --git a/package/crds/database.oci.upbound.io_managementmanageddatabases.yaml b/package/crds/database.oci.upbound.io_managementmanageddatabases.yaml
index f69b440d5..b0e6234fe 100644
--- a/package/crds/database.oci.upbound.io_managementmanageddatabases.yaml
+++ b/package/crds/database.oci.upbound.io_managementmanageddatabases.yaml
@@ -462,10 +462,6 @@ spec:
                                         or corrupt the credential that is already
                                         using the name.
                                       type: string
-                                    credentialType:
-                                      description: The type of credential used to
-                                        connect to the database.
-                                      type: string
                                     namedCredentialId:
                                       description: The OCID of the Named Credential
                                         where the database password metadata is stored.
diff --git a/package/crds/datasafe.oci.m.upbound.io_targetdatabases.yaml b/package/crds/datasafe.oci.m.upbound.io_targetdatabases.yaml
index 259a1b0f2..6a1b8d8d8 100644
--- a/package/crds/datasafe.oci.m.upbound.io_targetdatabases.yaml
+++ b/package/crds/datasafe.oci.m.upbound.io_targetdatabases.yaml
@@ -3313,10 +3313,6 @@ spec:
                                 description: Status to represent whether the database
                                   connection is TLS enabled or not.
                                 type: string
-                              storePassword:
-                                description: The password to read the trust store
-                                  and key store files, if they are password protected.
-                                type: string
                               trustStoreContent:
                                 description: Base64 encoded string of trust store
                                   file content.
diff --git a/package/crds/datasafe.oci.upbound.io_targetdatabases.yaml b/package/crds/datasafe.oci.upbound.io_targetdatabases.yaml
index 3a50d4ae3..02e1dd581 100644
--- a/package/crds/datasafe.oci.upbound.io_targetdatabases.yaml
+++ b/package/crds/datasafe.oci.upbound.io_targetdatabases.yaml
@@ -3217,10 +3217,6 @@ spec:
                                 description: Status to represent whether the database
                                   connection is TLS enabled or not.
                                 type: string
-                              storePassword:
-                                description: The password to read the trust store
-                                  and key store files, if they are password protected.
-                                type: string
                               trustStoreContent:
                                 description: Base64 encoded string of trust store
                                   file content.
diff --git a/package/crds/identity.oci.m.upbound.io_smtpcredentials.yaml b/package/crds/identity.oci.m.upbound.io_smtpcredentials.yaml
index ab7c5fa9d..673025c91 100644
--- a/package/crds/identity.oci.m.upbound.io_smtpcredentials.yaml
+++ b/package/crds/identity.oci.m.upbound.io_smtpcredentials.yaml
@@ -331,9 +331,6 @@ spec:
                   inactiveState:
                     description: The detailed status of INACTIVE lifecycleState.
                     type: string
-                  password:
-                    description: The SMTP password.
-                    type: string
                   state:
                     description: The credential's current state.
                     type: string
diff --git a/package/crds/identity.oci.m.upbound.io_uipasswords.yaml b/package/crds/identity.oci.m.upbound.io_uipasswords.yaml
index a83163d90..ee5b8aa9c 100644
--- a/package/crds/identity.oci.m.upbound.io_uipasswords.yaml
+++ b/package/crds/identity.oci.m.upbound.io_uipasswords.yaml
@@ -310,9 +310,6 @@ spec:
                   inactiveStatus:
                     description: The detailed status of INACTIVE lifecycleState.
                     type: string
-                  password:
-                    description: The user's password for the Console.
-                    type: string
                   state:
                     description: The password's current state.
                     type: string
diff --git a/package/crds/identity.oci.upbound.io_smtpcredentials.yaml b/package/crds/identity.oci.upbound.io_smtpcredentials.yaml
index d8e7a2bd0..e4c346a1c 100644
--- a/package/crds/identity.oci.upbound.io_smtpcredentials.yaml
+++ b/package/crds/identity.oci.upbound.io_smtpcredentials.yaml
@@ -361,9 +361,6 @@ spec:
                   inactiveState:
                     description: The detailed status of INACTIVE lifecycleState.
                     type: string
-                  password:
-                    description: The SMTP password.
-                    type: string
                   state:
                     description: The credential's current state.
                     type: string
diff --git a/package/crds/identity.oci.upbound.io_uipasswords.yaml b/package/crds/identity.oci.upbound.io_uipasswords.yaml
index 0ebcc00eb..58c727375 100644
--- a/package/crds/identity.oci.upbound.io_uipasswords.yaml
+++ b/package/crds/identity.oci.upbound.io_uipasswords.yaml
@@ -340,9 +340,6 @@ spec:
                   inactiveStatus:
                     description: The detailed status of INACTIVE lifecycleState.
                     type: string
-                  password:
-                    description: The user's password for the Console.
-                    type: string
                   state:
                     description: The password's current state.
                     type: string
diff --git a/package/crds/identitydomains.oci.m.upbound.io_apps.yaml b/package/crds/identitydomains.oci.m.upbound.io_apps.yaml
index 5c4b50b1d..1aaec229f 100644
--- a/package/crds/identitydomains.oci.m.upbound.io_apps.yaml
+++ b/package/crds/identitydomains.oci.m.upbound.io_apps.yaml
@@ -3258,12 +3258,6 @@ spec:
                   clientIpChecking:
                     description: (Updatable) Network Perimeters checking mode
                     type: string
-                  clientSecret:
-                    description: (Updatable) This value is the credential of this
-                      App, which this App supplies as a password when this App authenticates
-                      to the Oracle Public Cloud infrastructure. This value is also
-                      the client secret of this App when it acts as an OAuthClient.
-                    type: string
                   clientType:
                     description: (Updatable) Specifies the type of access that this
                       App has when it acts as an OAuthClient.
@@ -3414,10 +3408,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  hashedClientSecret:
-                    description: (Updatable) Hashed Client Secret. This hash-value
-                      is used to verify the 'clientSecret' credential of this App
-                    type: string
                   homePageUrl:
                     description: (Updatable) Home Page URL
                     type: string
diff --git a/package/crds/identitydomains.oci.m.upbound.io_customersecretkeys.yaml b/package/crds/identitydomains.oci.m.upbound.io_customersecretkeys.yaml
index 7db540b4c..65e03dd85 100644
--- a/package/crds/identitydomains.oci.m.upbound.io_customersecretkeys.yaml
+++ b/package/crds/identitydomains.oci.m.upbound.io_customersecretkeys.yaml
@@ -881,9 +881,6 @@ spec:
                     items:
                       type: string
                     type: array
-                  secretKey:
-                    description: (Updatable) The secret key.
-                    type: string
                   status:
                     description: The user's credential status.
                     type: string
diff --git a/package/crds/identitydomains.oci.m.upbound.io_myuserdbcredentials.yaml b/package/crds/identitydomains.oci.m.upbound.io_myuserdbcredentials.yaml
index fb980119e..e92747c28 100644
--- a/package/crds/identitydomains.oci.m.upbound.io_myuserdbcredentials.yaml
+++ b/package/crds/identitydomains.oci.m.upbound.io_myuserdbcredentials.yaml
@@ -460,10 +460,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  mixedDbPassword:
-                    description: (Updatable) The user's database password with mixed
-                      salt.
-                    type: string
                   mixedSalt:
                     description: (Updatable) The mixed salt of the password.
                     type: string
diff --git a/package/crds/identitydomains.oci.m.upbound.io_oauth2clientcredentials.yaml b/package/crds/identitydomains.oci.m.upbound.io_oauth2clientcredentials.yaml
index bbb45ff20..3002fea21 100644
--- a/package/crds/identitydomains.oci.m.upbound.io_oauth2clientcredentials.yaml
+++ b/package/crds/identitydomains.oci.m.upbound.io_oauth2clientcredentials.yaml
@@ -932,9 +932,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  secret:
-                    description: (Updatable) Secret
-                    type: string
                   status:
                     description: The user's credential status.
                     type: string
diff --git a/package/crds/identitydomains.oci.m.upbound.io_smtpcredentials.yaml b/package/crds/identitydomains.oci.m.upbound.io_smtpcredentials.yaml
index 5d53d311c..2c6feca37 100644
--- a/package/crds/identitydomains.oci.m.upbound.io_smtpcredentials.yaml
+++ b/package/crds/identitydomains.oci.m.upbound.io_smtpcredentials.yaml
@@ -846,9 +846,6 @@ spec:
                     description: The OCID of the SCIM resource that represents the
                       User or App who created this Resource
                     type: string
-                  password:
-                    description: (Updatable) Password
-                    type: string
                   resourceTypeSchemaVersion:
                     description: An endpoint-specific schema version number to use
                       in the Request. Allowed version values are Earliest Version
diff --git a/package/crds/identitydomains.oci.m.upbound.io_userdbcredentials.yaml b/package/crds/identitydomains.oci.m.upbound.io_userdbcredentials.yaml
index 580e32052..f416bc4f9 100644
--- a/package/crds/identitydomains.oci.m.upbound.io_userdbcredentials.yaml
+++ b/package/crds/identitydomains.oci.m.upbound.io_userdbcredentials.yaml
@@ -879,10 +879,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  mixedDbPassword:
-                    description: (Updatable) The user's database password with mixed
-                      salt.
-                    type: string
                   mixedSalt:
                     description: (Updatable) The mixed salt of the password.
                     type: string
diff --git a/package/crds/identitydomains.oci.upbound.io_apps.yaml b/package/crds/identitydomains.oci.upbound.io_apps.yaml
index 675d93ac5..34e15034f 100644
--- a/package/crds/identitydomains.oci.upbound.io_apps.yaml
+++ b/package/crds/identitydomains.oci.upbound.io_apps.yaml
@@ -3300,12 +3300,6 @@ spec:
                   clientIpChecking:
                     description: (Updatable) Network Perimeters checking mode
                     type: string
-                  clientSecret:
-                    description: (Updatable) This value is the credential of this
-                      App, which this App supplies as a password when this App authenticates
-                      to the Oracle Public Cloud infrastructure. This value is also
-                      the client secret of this App when it acts as an OAuthClient.
-                    type: string
                   clientType:
                     description: (Updatable) Specifies the type of access that this
                       App has when it acts as an OAuthClient.
@@ -3456,10 +3450,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  hashedClientSecret:
-                    description: (Updatable) Hashed Client Secret. This hash-value
-                      is used to verify the 'clientSecret' credential of this App
-                    type: string
                   homePageUrl:
                     description: (Updatable) Home Page URL
                     type: string
diff --git a/package/crds/identitydomains.oci.upbound.io_customersecretkeys.yaml b/package/crds/identitydomains.oci.upbound.io_customersecretkeys.yaml
index bd786d34c..5d9e9be64 100644
--- a/package/crds/identitydomains.oci.upbound.io_customersecretkeys.yaml
+++ b/package/crds/identitydomains.oci.upbound.io_customersecretkeys.yaml
@@ -899,9 +899,6 @@ spec:
                     items:
                       type: string
                     type: array
-                  secretKey:
-                    description: (Updatable) The secret key.
-                    type: string
                   status:
                     description: The user's credential status.
                     type: string
diff --git a/package/crds/identitydomains.oci.upbound.io_myuserdbcredentials.yaml b/package/crds/identitydomains.oci.upbound.io_myuserdbcredentials.yaml
index 566d22e55..72770af76 100644
--- a/package/crds/identitydomains.oci.upbound.io_myuserdbcredentials.yaml
+++ b/package/crds/identitydomains.oci.upbound.io_myuserdbcredentials.yaml
@@ -512,10 +512,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  mixedDbPassword:
-                    description: (Updatable) The user's database password with mixed
-                      salt.
-                    type: string
                   mixedSalt:
                     description: (Updatable) The mixed salt of the password.
                     type: string
diff --git a/package/crds/identitydomains.oci.upbound.io_oauth2clientcredentials.yaml b/package/crds/identitydomains.oci.upbound.io_oauth2clientcredentials.yaml
index f6c1424ec..0900129d3 100644
--- a/package/crds/identitydomains.oci.upbound.io_oauth2clientcredentials.yaml
+++ b/package/crds/identitydomains.oci.upbound.io_oauth2clientcredentials.yaml
@@ -950,9 +950,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  secret:
-                    description: (Updatable) Secret
-                    type: string
                   status:
                     description: The user's credential status.
                     type: string
diff --git a/package/crds/identitydomains.oci.upbound.io_smtpcredentials.yaml b/package/crds/identitydomains.oci.upbound.io_smtpcredentials.yaml
index d21b2f1b6..8dafc7481 100644
--- a/package/crds/identitydomains.oci.upbound.io_smtpcredentials.yaml
+++ b/package/crds/identitydomains.oci.upbound.io_smtpcredentials.yaml
@@ -864,9 +864,6 @@ spec:
                     description: The OCID of the SCIM resource that represents the
                       User or App who created this Resource
                     type: string
-                  password:
-                    description: (Updatable) Password
-                    type: string
                   resourceTypeSchemaVersion:
                     description: An endpoint-specific schema version number to use
                       in the Request. Allowed version values are Earliest Version
diff --git a/package/crds/identitydomains.oci.upbound.io_userdbcredentials.yaml b/package/crds/identitydomains.oci.upbound.io_userdbcredentials.yaml
index 1d2563c94..a8120496f 100644
--- a/package/crds/identitydomains.oci.upbound.io_userdbcredentials.yaml
+++ b/package/crds/identitydomains.oci.upbound.io_userdbcredentials.yaml
@@ -907,10 +907,6 @@ spec:
                           type: string
                       type: object
                     type: array
-                  mixedDbPassword:
-                    description: (Updatable) The user's database password with mixed
-                      salt.
-                    type: string
                   mixedSalt:
                     description: (Updatable) The mixed salt of the password.
                     type: string
diff --git a/package/crds/ocvp.oci.m.upbound.io_sddcs.yaml b/package/crds/ocvp.oci.m.upbound.io_sddcs.yaml
index 490ad1bba..5113986cf 100644
--- a/package/crds/ocvp.oci.m.upbound.io_sddcs.yaml
+++ b/package/crds/ocvp.oci.m.upbound.io_sddcs.yaml
@@ -3335,12 +3335,6 @@ spec:
                   hcxFqdn:
                     description: 'The FQDN for HCX Manager.  Example: hcx-my-sddc.sddc.us-phoenix-1.oraclecloud.com'
                     type: string
-                  hcxInitialPassword:
-                    description: (Deprecated) The SDDC includes an administrator username
-                      and initial password for HCX Manager. Make sure to change this
-                      initial HCX Manager password to a different value. Deprecated.
-                      Please use the oci_ocvp_retrieve_password data source instead.
-                    type: string
                   hcxMode:
                     description: HCX configuration of the SDDC.
                     type: string
@@ -3634,12 +3628,6 @@ spec:
                   nsxManagerFqdn:
                     description: 'The FQDN for NSX Manager.  Example: nsx-my-sddc.sddc.us-phoenix-1.oraclecloud.com'
                     type: string
-                  nsxManagerInitialPassword:
-                    description: (Deprecated) The SDDC includes an administrator username
-                      and initial password for NSX Manager. Make sure to change this
-                      initial NSX Manager password to a different value. Deprecated.
-                      Please use the oci_ocvp_retrieve_password data source instead.
-                    type: string
                   nsxManagerPrivateIpId:
                     description: The OCID of the PrivateIp object that is the virtual
                       IP (VIP) for NSX Manager. For information about PrivateIp objects,
@@ -3750,12 +3738,6 @@ spec:
                   vcenterFqdn:
                     description: 'The FQDN for vCenter.  Example: vcenter-my-sddc.sddc.us-phoenix-1.oraclecloud.com'
                     type: string
-                  vcenterInitialPassword:
-                    description: (Deprecated) The SDDC includes an administrator username
-                      and initial password for vCenter. Make sure to change this initial
-                      vCenter password to a different value. Deprecated. Please use
-                      the oci_ocvp_retrieve_password data source instead.
-                    type: string
                   vcenterPrivateIpId:
                     description: The OCID of the PrivateIp object that is the virtual
                       IP (VIP) for vCenter. For information about PrivateIp objects,
diff --git a/package/crds/ocvp.oci.upbound.io_sddcs.yaml b/package/crds/ocvp.oci.upbound.io_sddcs.yaml
index 6bd7db1e7..66c4aabbe 100644
--- a/package/crds/ocvp.oci.upbound.io_sddcs.yaml
+++ b/package/crds/ocvp.oci.upbound.io_sddcs.yaml
@@ -3187,12 +3187,6 @@ spec:
                   hcxFqdn:
                     description: 'The FQDN for HCX Manager.  Example: hcx-my-sddc.sddc.us-phoenix-1.oraclecloud.com'
                     type: string
-                  hcxInitialPassword:
-                    description: (Deprecated) The SDDC includes an administrator username
-                      and initial password for HCX Manager. Make sure to change this
-                      initial HCX Manager password to a different value. Deprecated.
-                      Please use the oci_ocvp_retrieve_password data source instead.
-                    type: string
                   hcxMode:
                     description: HCX configuration of the SDDC.
                     type: string
@@ -3486,12 +3480,6 @@ spec:
                   nsxManagerFqdn:
                     description: 'The FQDN for NSX Manager.  Example: nsx-my-sddc.sddc.us-phoenix-1.oraclecloud.com'
                     type: string
-                  nsxManagerInitialPassword:
-                    description: (Deprecated) The SDDC includes an administrator username
-                      and initial password for NSX Manager. Make sure to change this
-                      initial NSX Manager password to a different value. Deprecated.
-                      Please use the oci_ocvp_retrieve_password data source instead.
-                    type: string
                   nsxManagerPrivateIpId:
                     description: The OCID of the PrivateIp object that is the virtual
                       IP (VIP) for NSX Manager. For information about PrivateIp objects,
@@ -3602,12 +3590,6 @@ spec:
                   vcenterFqdn:
                     description: 'The FQDN for vCenter.  Example: vcenter-my-sddc.sddc.us-phoenix-1.oraclecloud.com'
                     type: string
-                  vcenterInitialPassword:
-                    description: (Deprecated) The SDDC includes an administrator username
-                      and initial password for vCenter. Make sure to change this initial
-                      vCenter password to a different value. Deprecated. Please use
-                      the oci_ocvp_retrieve_password data source instead.
-                    type: string
                   vcenterPrivateIpId:
                     description: The OCID of the PrivateIp object that is the virtual
                       IP (VIP) for vCenter. For information about PrivateIp objects,