Merge branch 'ww-volume-snapshot-faraway-replica' into Prepare-for-1.…

…0.0-release # Conflicts: # pkg/provider/data_source_fareplica.go
EnterpriseDB · Aug 6, 2024 · b578270 · b578270
2 parents 9191806 + ab5be95
commit b578270
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 17 deletions.
diff --git a/docs/data-sources/faraway_replica.md b/docs/data-sources/faraway_replica.md
@@ -56,14 +56,6 @@ output "csp_auth" {
   value = coalesce(data.biganimal_faraway_replica.this.csp_auth, false)
 }
 
-output "deleted_at" {
-  value = data.biganimal_faraway_replica.this.deleted_at
-}
-
-output "expired_at" {
-  value = data.biganimal_faraway_replica.this.expired_at
-}
-
 output "instance_type" {
   value = data.biganimal_faraway_replica.this.instance_type
 }
@@ -111,6 +103,10 @@ output "resizing_pvc" {
 output "storage" {
   value = data.biganimal_faraway_replica.this.storage
 }
+
+output "volume_snapshot_backup" {
+  value = data.biganimal_faraway_replica.this.volume_snapshot_backup
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -154,6 +150,7 @@ output "storage" {
 - `source_cluster_id` (String) Source cluster ID.
 - `storage` (Attributes) Storage. (see [below for nested schema](#nestedatt--storage))
 - `transparent_data_encryption_action` (String) Transparent data encryption action.
+- `volume_snapshot_backup` (Boolean) Enable to take a snapshot of the volume.
 
 <a id="nestedatt--allowed_ip_ranges"></a>
 ### Nested Schema for `allowed_ip_ranges`

diff --git a/docs/resources/faraway_replica.md b/docs/resources/faraway_replica.md
@@ -65,6 +65,8 @@ resource "biganimal_cluster" "single_node_cluster" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
 
 output "password" {
@@ -119,6 +121,8 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
 ```
 
@@ -145,6 +149,7 @@ resource "biganimal_faraway_replica" "faraway_replica" {
 - `service_account_ids` (Set of String) A Google Cloud Service Account is used for logs. If you leave this blank, then you will be unable to access log details for this cluster. Required when cluster is deployed on BigAnimal's cloud account.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `transparent_data_encryption` (Attributes) Transparent Data Encryption (TDE) key (see [below for nested schema](#nestedatt--transparent_data_encryption))
+- `volume_snapshot_backup` (Boolean) Enable to take a snapshot of the volume.
 
 ### Read-Only
 

diff --git a/examples/data-sources/biganimal_faraway_replica/data-source.tf b/examples/data-sources/biganimal_faraway_replica/data-source.tf
@@ -41,14 +41,6 @@ output "csp_auth" {
   value = coalesce(data.biganimal_faraway_replica.this.csp_auth, false)
 }
 
-output "deleted_at" {
-  value = data.biganimal_faraway_replica.this.deleted_at
-}
-
-output "expired_at" {
-  value = data.biganimal_faraway_replica.this.expired_at
-}
-
 output "instance_type" {
   value = data.biganimal_faraway_replica.this.instance_type
 }
@@ -96,3 +88,7 @@ output "resizing_pvc" {
 output "storage" {
   value = data.biganimal_faraway_replica.this.storage
 }
+
+output "volume_snapshot_backup" {
+  value = data.biganimal_faraway_replica.this.volume_snapshot_backup
+}
diff --git a/examples/resources/biganimal_faraway_replica/aws/resource.tf b/examples/resources/biganimal_faraway_replica/aws/resource.tf
@@ -75,4 +75,6 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
diff --git a/examples/resources/biganimal_faraway_replica/azure/resource.tf b/examples/resources/biganimal_faraway_replica/azure/resource.tf
@@ -76,4 +76,6 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
diff --git a/examples/resources/biganimal_faraway_replica/cluster_and_faraway_replica/resource.tf b/examples/resources/biganimal_faraway_replica/cluster_and_faraway_replica/resource.tf
@@ -53,6 +53,8 @@ resource "biganimal_cluster" "single_node_cluster" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
 
 output "password" {
@@ -107,4 +109,6 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
diff --git a/examples/resources/biganimal_faraway_replica/gcp/resource.tf b/examples/resources/biganimal_faraway_replica/gcp/resource.tf
@@ -79,4 +79,6 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   # transparent_data_encryption = {
   #   key_id = <example_value>
   # }
+
+  volume_snapshot_backup = false
 }
diff --git a/pkg/provider/data_source_fareplica.go b/pkg/provider/data_source_fareplica.go
@@ -224,10 +224,13 @@ func (c *FAReplicaData) Schema(ctx context.Context, req datasource.SchemaRequest
 				Description: "Cloud provider. For example, \"aws\", \"azure\", \"gcp\" or \"bah:aws\", \"bah:gcp\".",
 				Computed:    true,
 			},
+			"volume_snapshot_backup": schema.BoolAttribute{
+				MarkdownDescription: "Enable to take a snapshot of the volume.",
+				Computed:            true,
+			},
 			"transparent_data_encryption": schema.SingleNestedAttribute{
 				MarkdownDescription: "Transparent Data Encryption (TDE) key",
 				Optional:            true,
-
 				Attributes: map[string]schema.Attribute{
 					"key_id": schema.StringAttribute{
 						MarkdownDescription: "Transparent Data Encryption (TDE) key ID.",

diff --git a/pkg/provider/resource_fareplica.go b/pkg/provider/resource_fareplica.go
@@ -61,6 +61,7 @@ type FAReplicaResourceModel struct {
 	TransparentDataEncryption       *TransparentDataEncryptionModel   `tfsdk:"transparent_data_encryption"`
 	PgIdentity                      types.String                      `tfsdk:"pg_identity"`
 	TransparentDataEncryptionAction types.String                      `tfsdk:"transparent_data_encryption_action"`
+	VolumeSnapshot                  types.Bool                        `tfsdk:"volume_snapshot_backup"`
 
 	Timeouts timeouts.Value `tfsdk:"timeouts"`
 }
@@ -381,6 +382,11 @@ func (r *FAReplicaResource) Schema(ctx context.Context, req resource.SchemaReque
 				Computed:            true,
 				PlanModifiers:       []planmodifier.String{plan_modifier.CustomTDEAction()},
 			},
+			"volume_snapshot_backup": schema.BoolAttribute{
+				MarkdownDescription: "Enable to take a snapshot of the volume.",
+				Optional:            true,
+				PlanModifiers:       []planmodifier.Bool{boolplanmodifier.UseStateForUnknown()},
+			},
 		},
 	}
 }
@@ -594,6 +600,7 @@ func readFAReplica(ctx context.Context, client *api.ClusterClient, fAReplicaReso
 	fAReplicaResourceModel.CloudProvider = types.StringValue(responseCluster.Provider.CloudProviderId)
 	fAReplicaResourceModel.PgVersion = types.StringValue(responseCluster.PgVersion.PgVersionId)
 	fAReplicaResourceModel.PgType = types.StringValue(responseCluster.PgType.PgTypeId)
+	fAReplicaResourceModel.VolumeSnapshot = types.BoolPointerValue(responseCluster.VolumeSnapshot)
 
 	// pgConfig. If tf resource pg config elem matches with api response pg config elem then add the elem to tf resource pg config
 	newPgConfig := []PgConfigResourceModel{}