From 27646b997a1b44b5a550203c1f8999d888ed9775 Mon Sep 17 00:00:00 2001 From: roneli <38083777+roneli@users.noreply.github.com> Date: Sun, 18 Jul 2021 11:52:32 +0300 Subject: [PATCH 1/5] missing cq_ids --- resources/ec2_images.go | 2 +- resources/efs_filesystems.go | 6 ++-- resources/eks_clusters.go | 29 ++--------------- resources/rds_clusters.go | 61 +++++++++++++++++------------------- 4 files changed, 36 insertions(+), 62 deletions(-) diff --git a/resources/ec2_images.go b/resources/ec2_images.go index 225c1c5a5..98baf3835 100644 --- a/resources/ec2_images.go +++ b/resources/ec2_images.go @@ -175,7 +175,7 @@ func Ec2Images() *schema.Table { Resolver: fetchEc2ImageBlockDeviceMappings, Columns: []schema.Column{ { - Name: "image_id", + Name: "image_cq_id", Description: "Unique CloudQuery ID of aws_ec2_images table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, diff --git a/resources/efs_filesystems.go b/resources/efs_filesystems.go index 77a174b05..0b478b6a5 100644 --- a/resources/efs_filesystems.go +++ b/resources/efs_filesystems.go @@ -18,6 +18,7 @@ func EfsFilesystems() *schema.Table { Multiplex: client.AccountRegionMultiplex, IgnoreError: client.IgnoreAccessDeniedServiceDisabled, DeleteFilter: client.DeleteAccountRegionFilter, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}}, Columns: []schema.Column{ { Name: "account_id", @@ -42,9 +43,10 @@ func EfsFilesystems() *schema.Table { Type: schema.TypeString, }, { - Name: "file_system_id", + Name: "id", Description: "The ID of the file system, assigned by Amazon EFS.", Type: schema.TypeString, + Resolver: schema.PathResolver("FileSystemId"), }, { Name: "life_cycle_state", @@ -79,7 +81,7 @@ func EfsFilesystems() *schema.Table { Resolver: schema.PathResolver("SizeInBytes.Timestamp"), }, { - Name: "size_in_bytes_value_in_i_a", + Name: "size_in_bytes_value_in_ia", Description: "The latest known metered size (in bytes) of data stored in the Infrequent Access storage class.", Type: schema.TypeBigInt, Resolver: schema.PathResolver("SizeInBytes.ValueInIA"), diff --git a/resources/eks_clusters.go b/resources/eks_clusters.go index b342dee8d..505e6e3de 100644 --- a/resources/eks_clusters.go +++ b/resources/eks_clusters.go @@ -17,6 +17,7 @@ func EksClusters() *schema.Table { Multiplex: client.AccountRegionMultiplex, IgnoreError: client.IgnoreAccessDeniedServiceDisabled, DeleteFilter: client.DeleteAccountRegionFilter, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}}, Columns: []schema.Column{ { Name: "account_id", @@ -148,7 +149,7 @@ func EksClusters() *schema.Table { Resolver: fetchEksClusterEncryptionConfigs, Columns: []schema.Column{ { - Name: "cluster_id", + Name: "cluster_cq_id", Description: "Unique CloudQuery ID of aws_eks_clusters table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, @@ -172,31 +173,7 @@ func EksClusters() *schema.Table { Resolver: fetchEksClusterLoggings, Columns: []schema.Column{ { - Name: "cluster_id", - Description: "Unique CloudQuery ID of aws_eks_clusters table (FK)", - Type: schema.TypeUUID, - Resolver: schema.ParentIdResolver, - }, - { - Name: "enabled", - Description: "If a log type is enabled, that log type exports its control plane logs to CloudWatch Logs.", - Type: schema.TypeBool, - }, - { - Name: "types", - Description: "The available cluster control plane log types.", - Type: schema.TypeStringArray, - Resolver: resolveEksClusterLoggingTypes, - }, - }, - }, - { - Name: "aws_eks_cluster_loggings", - Description: "An object representing the enabled or disabled Kubernetes control plane logs for your cluster.", - Resolver: fetchEksClusterLoggings, - Columns: []schema.Column{ - { - Name: "cluster_id", + Name: "cluster_cq_id", Description: "Unique CloudQuery ID of aws_eks_clusters table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, diff --git a/resources/rds_clusters.go b/resources/rds_clusters.go index 02452dc12..3e00af3dd 100644 --- a/resources/rds_clusters.go +++ b/resources/rds_clusters.go @@ -19,6 +19,7 @@ func RdsClusters() *schema.Table { Multiplex: client.AccountRegionMultiplex, IgnoreError: client.IgnoreAccessDeniedServiceDisabled, DeleteFilter: client.DeleteAccountRegionFilter, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}}, Columns: []schema.Column{ { Name: "account_id", @@ -130,6 +131,12 @@ func RdsClusters() *schema.Table { Type: schema.TypeString, Resolver: schema.PathResolver("DBClusterParameterGroup"), }, + { + Name: "db_cluster_group_memberships", + Description: "Provides the map of option group memberships for this DB cluster.", + Type: schema.TypeString, + Resolver: resolveRdsClusterDbClusterOptionGroupMemberships, + }, { Name: "db_subnet_group", Description: "Specifies information on the subnet group associated with the DB cluster, including the name, description, and subnets in the subnet group.", @@ -142,9 +149,10 @@ func RdsClusters() *schema.Table { Type: schema.TypeString, }, { - Name: "db_cluster_resource_id", + Name: "id", Description: "The AWS Region-unique, immutable identifier for the DB cluster", Type: schema.TypeString, + Resolver: schema.PathResolver("DbClusterResourceId"), }, { Name: "deletion_protection", @@ -356,9 +364,10 @@ func RdsClusters() *schema.Table { Name: "aws_rds_cluster_associated_roles", Description: "Describes an AWS Identity and Access Management (IAM) role that is associated with a DB cluster. ", Resolver: fetchRdsClusterAssociatedRoles, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"cluster_cq_id", "role_arn"}}, Columns: []schema.Column{ { - Name: "cluster_id", + Name: "cluster_cq_id", Description: "Unique CloudQuery ID of aws_rds_clusters table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, @@ -384,9 +393,10 @@ func RdsClusters() *schema.Table { Name: "aws_rds_cluster_db_cluster_members", Description: "Contains information about an instance that is part of a DB cluster. ", Resolver: fetchRdsClusterDbClusterMembers, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"cluster_cq_id", "db_instance_identifier"}}, Columns: []schema.Column{ { - Name: "cluster_id", + Name: "cluster_cq_id", Description: "Unique CloudQuery ID of aws_rds_clusters table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, @@ -415,37 +425,14 @@ func RdsClusters() *schema.Table { }, }, }, - { - Name: "aws_rds_cluster_db_cluster_option_group_memberships", - Description: "Contains status information for a DB cluster option group. ", - Resolver: fetchRdsClusterDbClusterOptionGroupMemberships, - Columns: []schema.Column{ - { - Name: "cluster_id", - Description: "Unique CloudQuery ID of aws_rds_clusters table (FK)", - Type: schema.TypeUUID, - Resolver: schema.ParentIdResolver, - }, - { - Name: "db_cluster_option_group_name", - Description: "Specifies the name of the DB cluster option group.", - Type: schema.TypeString, - Resolver: schema.PathResolver("DBClusterOptionGroupName"), - }, - { - Name: "status", - Description: "Specifies the status of the DB cluster option group.", - Type: schema.TypeString, - }, - }, - }, { Name: "aws_rds_cluster_domain_memberships", Description: "An Active Directory Domain membership record associated with the DB instance or cluster. ", Resolver: fetchRdsClusterDomainMemberships, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"cluster_cq_id", "domain"}}, Columns: []schema.Column{ { - Name: "cluster_id", + Name: "cluster_cq_id", Description: "Unique CloudQuery ID of aws_rds_clusters table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, @@ -478,9 +465,10 @@ func RdsClusters() *schema.Table { Name: "aws_rds_cluster_vpc_security_groups", Description: "This data type is used as a response element for queries on VPC security group membership. ", Resolver: fetchRdsClusterVpcSecurityGroups, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"cluster_cq_id", "vpc_security_group_id"}}, Columns: []schema.Column{ { - Name: "cluster_id", + Name: "cluster_cq_id", Description: "Unique CloudQuery ID of aws_rds_clusters table (FK)", Type: schema.TypeUUID, Resolver: schema.ParentIdResolver, @@ -547,14 +535,21 @@ func fetchRdsClusterDbClusterMembers(ctx context.Context, meta schema.ClientMeta res <- cluster.DBClusterMembers return nil } -func fetchRdsClusterDbClusterOptionGroupMemberships(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { - cluster, ok := parent.Item.(types.DBCluster) +func resolveRdsClusterDbClusterOptionGroupMemberships(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { + cluster, ok := resource.Item.(types.DBCluster) if !ok { return fmt.Errorf("not db cluster") } - res <- cluster.DBClusterOptionGroupMemberships - return nil + if cluster.DBClusterOptionGroupMemberships == nil { + return nil + } + memberships := make(map[string]interface{}, len(cluster.DBClusterOptionGroupMemberships)) + for _, m := range cluster.DBClusterOptionGroupMemberships { + memberships[*m.DBClusterOptionGroupName] = m.Status + } + return resource.Set(c.Name, memberships) } + func fetchRdsClusterDomainMemberships(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan interface{}) error { cluster, ok := parent.Item.(types.DBCluster) if !ok { From 291e049a7ac0e9914ce43d8cae48aefc82d2d565 Mon Sep 17 00:00:00 2001 From: roneli <38083777+roneli@users.noreply.github.com> Date: Sun, 18 Jul 2021 11:52:52 +0300 Subject: [PATCH 2/5] Fix lint --- resources/efs_filesystems.go | 4 ++-- resources/eks_clusters.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/efs_filesystems.go b/resources/efs_filesystems.go index 0b478b6a5..225fb6cd0 100644 --- a/resources/efs_filesystems.go +++ b/resources/efs_filesystems.go @@ -18,7 +18,7 @@ func EfsFilesystems() *schema.Table { Multiplex: client.AccountRegionMultiplex, IgnoreError: client.IgnoreAccessDeniedServiceDisabled, DeleteFilter: client.DeleteAccountRegionFilter, - Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}}, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"account_id", "id"}}, Columns: []schema.Column{ { Name: "account_id", @@ -46,7 +46,7 @@ func EfsFilesystems() *schema.Table { Name: "id", Description: "The ID of the file system, assigned by Amazon EFS.", Type: schema.TypeString, - Resolver: schema.PathResolver("FileSystemId"), + Resolver: schema.PathResolver("FileSystemId"), }, { Name: "life_cycle_state", diff --git a/resources/eks_clusters.go b/resources/eks_clusters.go index 505e6e3de..2902e07f9 100644 --- a/resources/eks_clusters.go +++ b/resources/eks_clusters.go @@ -17,7 +17,7 @@ func EksClusters() *schema.Table { Multiplex: client.AccountRegionMultiplex, IgnoreError: client.IgnoreAccessDeniedServiceDisabled, DeleteFilter: client.DeleteAccountRegionFilter, - Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}}, + Options: schema.TableCreationOptions{PrimaryKeys: []string{"arn"}}, Columns: []schema.Column{ { Name: "account_id", From e2c6ba6548f885e51b330c0ff6ffc28276faf896 Mon Sep 17 00:00:00 2001 From: roneli <38083777+roneli@users.noreply.github.com> Date: Sun, 18 Jul 2021 11:59:09 +0300 Subject: [PATCH 3/5] TypeJson --- resources/rds_clusters.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/rds_clusters.go b/resources/rds_clusters.go index 3e00af3dd..9e6fdd2d3 100644 --- a/resources/rds_clusters.go +++ b/resources/rds_clusters.go @@ -134,7 +134,7 @@ func RdsClusters() *schema.Table { { Name: "db_cluster_group_memberships", Description: "Provides the map of option group memberships for this DB cluster.", - Type: schema.TypeString, + Type: schema.TypeJSON, Resolver: resolveRdsClusterDbClusterOptionGroupMemberships, }, { From 1370efe046ca97f7df2f9c0d7d1fa446507f5cd7 Mon Sep 17 00:00:00 2001 From: roneli <38083777+roneli@users.noreply.github.com> Date: Sun, 18 Jul 2021 11:59:43 +0300 Subject: [PATCH 4/5] name change --- resources/rds_clusters.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/rds_clusters.go b/resources/rds_clusters.go index 9e6fdd2d3..1b26f928d 100644 --- a/resources/rds_clusters.go +++ b/resources/rds_clusters.go @@ -132,7 +132,7 @@ func RdsClusters() *schema.Table { Resolver: schema.PathResolver("DBClusterParameterGroup"), }, { - Name: "db_cluster_group_memberships", + Name: "db_cluster_option_group_memberships", Description: "Provides the map of option group memberships for this DB cluster.", Type: schema.TypeJSON, Resolver: resolveRdsClusterDbClusterOptionGroupMemberships, From b7a79d6f467983c2c64a6528e05e55dc6c434e12 Mon Sep 17 00:00:00 2001 From: roneli <38083777+roneli@users.noreply.github.com> Date: Sun, 18 Jul 2021 12:00:38 +0300 Subject: [PATCH 5/5] Update docs --- docs/tables/aws_ec2_image_block_device_mappings.md | 2 +- docs/tables/aws_efs_filesystems.md | 4 ++-- docs/tables/aws_eks_cluster_encryption_configs.md | 2 +- docs/tables/aws_eks_cluster_loggings.md | 2 +- docs/tables/aws_rds_cluster_associated_roles.md | 2 +- docs/tables/aws_rds_cluster_db_cluster_members.md | 2 +- ...ws_rds_cluster_db_cluster_option_group_memberships.md | 9 --------- docs/tables/aws_rds_cluster_domain_memberships.md | 2 +- docs/tables/aws_rds_cluster_vpc_security_groups.md | 2 +- docs/tables/aws_rds_clusters.md | 3 ++- 10 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 docs/tables/aws_rds_cluster_db_cluster_option_group_memberships.md diff --git a/docs/tables/aws_ec2_image_block_device_mappings.md b/docs/tables/aws_ec2_image_block_device_mappings.md index 4e6d960ae..d656bd67f 100644 --- a/docs/tables/aws_ec2_image_block_device_mappings.md +++ b/docs/tables/aws_ec2_image_block_device_mappings.md @@ -4,7 +4,7 @@ Describes a block device mapping. ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|image_id|uuid|Unique CloudQuery ID of aws_ec2_images table (FK)| +|image_cq_id|uuid|Unique CloudQuery ID of aws_ec2_images table (FK)| |device_name|text|The device name (for example, /dev/sdh or xvdh).| |ebs_delete_on_termination|boolean|Indicates whether the EBS volume is deleted on instance termination.| |ebs_encrypted|boolean|Indicates whether the encryption state of an EBS volume is changed while being restored from a backing snapshot.| diff --git a/docs/tables/aws_efs_filesystems.md b/docs/tables/aws_efs_filesystems.md index b0c15b095..ed3b1db46 100644 --- a/docs/tables/aws_efs_filesystems.md +++ b/docs/tables/aws_efs_filesystems.md @@ -8,14 +8,14 @@ A description of the file system. |region|text|The AWS Region of the resource.| |creation_time|timestamp without time zone|The time that the file system was created, in seconds (since 1970-01-01T00:00:00Z).| |creation_token|text|The opaque string specified in the request.| -|file_system_id|text|The ID of the file system, assigned by Amazon EFS.| +|id|text|The ID of the file system, assigned by Amazon EFS.| |life_cycle_state|text|The lifecycle phase of the file system.| |number_of_mount_targets|integer|The current number of mount targets that the file system has.| |owner_id|text|The AWS account that created the file system.| |performance_mode|text|The performance mode of the file system.| |size_in_bytes_value|bigint|The latest known metered size (in bytes) of data stored in the file system.| |size_in_bytes_timestamp|timestamp without time zone|The time at which the size of data, returned in the Value field, was determined.| -|size_in_bytes_value_in_i_a|bigint|The latest known metered size (in bytes) of data stored in the Infrequent Access storage class.| +|size_in_bytes_value_in_ia|bigint|The latest known metered size (in bytes) of data stored in the Infrequent Access storage class.| |size_in_bytes_value_in_standard|bigint|The latest known metered size (in bytes) of data stored in the Standard storage class.| |tags|jsonb|The tags associated with the file system, presented as an array of Tag objects.| |availability_zone_id|text|The unique and consistent identifier of the Availability Zone in which the file system's One Zone storage classes exist.| diff --git a/docs/tables/aws_eks_cluster_encryption_configs.md b/docs/tables/aws_eks_cluster_encryption_configs.md index 09693b17b..bcb940852 100644 --- a/docs/tables/aws_eks_cluster_encryption_configs.md +++ b/docs/tables/aws_eks_cluster_encryption_configs.md @@ -4,6 +4,6 @@ The encryption configuration for the cluster. ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_eks_clusters table (FK)| +|cluster_cq_id|uuid|Unique CloudQuery ID of aws_eks_clusters table (FK)| |provider_key_arn|text|Amazon Resource Name (ARN) or alias of the customer master key (CMK).| |resources|text[]|Specifies the resources to be encrypted.| diff --git a/docs/tables/aws_eks_cluster_loggings.md b/docs/tables/aws_eks_cluster_loggings.md index 8116dc92d..987c4187b 100644 --- a/docs/tables/aws_eks_cluster_loggings.md +++ b/docs/tables/aws_eks_cluster_loggings.md @@ -4,6 +4,6 @@ An object representing the enabled or disabled Kubernetes control plane logs for ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_eks_clusters table (FK)| +|cluster_cq_id|uuid|Unique CloudQuery ID of aws_eks_clusters table (FK)| |enabled|boolean|If a log type is enabled, that log type exports its control plane logs to CloudWatch Logs.| |types|text[]|The available cluster control plane log types.| diff --git a/docs/tables/aws_rds_cluster_associated_roles.md b/docs/tables/aws_rds_cluster_associated_roles.md index a59793acc..a925cdece 100644 --- a/docs/tables/aws_rds_cluster_associated_roles.md +++ b/docs/tables/aws_rds_cluster_associated_roles.md @@ -4,7 +4,7 @@ Describes an AWS Identity and Access Management (IAM) role that is associated wi ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| +|cluster_cq_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| |feature_name|text|The name of the feature associated with the AWS Identity and Access Management (IAM) role| |role_arn|text|The Amazon Resource Name (ARN) of the IAM role that is associated with the DB cluster.| |status|text|Describes the state of association between the IAM role and the DB cluster| diff --git a/docs/tables/aws_rds_cluster_db_cluster_members.md b/docs/tables/aws_rds_cluster_db_cluster_members.md index e899e2f12..e0aa6a976 100644 --- a/docs/tables/aws_rds_cluster_db_cluster_members.md +++ b/docs/tables/aws_rds_cluster_db_cluster_members.md @@ -4,7 +4,7 @@ Contains information about an instance that is part of a DB cluster. ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| +|cluster_cq_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| |db_cluster_parameter_group_status|text|Specifies the status of the DB cluster parameter group for this member of the DB cluster.| |db_instance_identifier|text|Specifies the instance identifier for this member of the DB cluster.| |is_cluster_writer|boolean|Value that is true if the cluster member is the primary instance for the DB cluster and false otherwise.| diff --git a/docs/tables/aws_rds_cluster_db_cluster_option_group_memberships.md b/docs/tables/aws_rds_cluster_db_cluster_option_group_memberships.md deleted file mode 100644 index 827554318..000000000 --- a/docs/tables/aws_rds_cluster_db_cluster_option_group_memberships.md +++ /dev/null @@ -1,9 +0,0 @@ - -# Table: aws_rds_cluster_db_cluster_option_group_memberships -Contains status information for a DB cluster option group. -## Columns -| Name | Type | Description | -| ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| -|db_cluster_option_group_name|text|Specifies the name of the DB cluster option group.| -|status|text|Specifies the status of the DB cluster option group.| diff --git a/docs/tables/aws_rds_cluster_domain_memberships.md b/docs/tables/aws_rds_cluster_domain_memberships.md index 6e1af8165..ae8a50cbb 100644 --- a/docs/tables/aws_rds_cluster_domain_memberships.md +++ b/docs/tables/aws_rds_cluster_domain_memberships.md @@ -4,7 +4,7 @@ An Active Directory Domain membership record associated with the DB instance or ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| +|cluster_cq_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| |domain|text|The identifier of the Active Directory Domain.| |fqdn|text|The fully qualified domain name of the Active Directory Domain.| |iam_role_name|text|The name of the IAM role to be used when making API calls to the Directory Service.| diff --git a/docs/tables/aws_rds_cluster_vpc_security_groups.md b/docs/tables/aws_rds_cluster_vpc_security_groups.md index 13906e295..a0ccf78f7 100644 --- a/docs/tables/aws_rds_cluster_vpc_security_groups.md +++ b/docs/tables/aws_rds_cluster_vpc_security_groups.md @@ -4,6 +4,6 @@ This data type is used as a response element for queries on VPC security group m ## Columns | Name | Type | Description | | ------------- | ------------- | ----- | -|cluster_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| +|cluster_cq_id|uuid|Unique CloudQuery ID of aws_rds_clusters table (FK)| |status|text|The status of the VPC security group.| |vpc_security_group_id|text|The name of the VPC security group.| diff --git a/docs/tables/aws_rds_clusters.md b/docs/tables/aws_rds_clusters.md index 1c141e631..a0d9aac0f 100644 --- a/docs/tables/aws_rds_clusters.md +++ b/docs/tables/aws_rds_clusters.md @@ -25,9 +25,10 @@ Contains the details of an Amazon Aurora DB cluster |db_cluster_arn|text|The Amazon Resource Name (ARN) for the DB cluster.| |db_cluster_identifier|text|Contains a user-supplied DB cluster identifier| |db_cluster_parameter_group|text|Specifies the name of the DB cluster parameter group for the DB cluster.| +|db_cluster_option_group_memberships|jsonb|Provides the map of option group memberships for this DB cluster.| |db_subnet_group|text|Specifies information on the subnet group associated with the DB cluster, including the name, description, and subnets in the subnet group.| |database_name|text|Contains the name of the initial database of this DB cluster that was provided at create time, if one was specified when the DB cluster was created| -|db_cluster_resource_id|text|The AWS Region-unique, immutable identifier for the DB cluster| +|id|text|The AWS Region-unique, immutable identifier for the DB cluster| |deletion_protection|boolean|Indicates if the DB cluster has deletion protection enabled| |earliest_backtrack_time|timestamp without time zone|The earliest time to which a DB cluster can be backtracked.| |earliest_restorable_time|timestamp without time zone|The earliest time to which a database can be restored with point-in-time restore.|