fix: backup schedule time

examples/resources/biganimal_analytics_cluster/aws/resource.tf

@@ -54,7 +54,8 @@ resource "biganimal_analytics_cluster" "analytics_cluster" {
   ]
 
   backup_retention_period = "30d"
-  csp_auth                = false
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
+  csp_auth = false
 
   instance_type = "aws:m6id.12xlarge"
   password      = resource.random_password.password.result

examples/resources/biganimal_cluster/ha/resource.tf

@@ -44,6 +44,7 @@ resource "biganimal_cluster" "ha_cluster" {
   ]
 
   backup_retention_period = "6d"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
   cluster_architecture = {
     id    = "ha"
     nodes = 3

examples/resources/biganimal_cluster/single_node/aws/resource.tf

@@ -44,6 +44,7 @@ resource "biganimal_cluster" "single_node_cluster" {
   ]
 
   backup_retention_period = "6d"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
   cluster_architecture = {
     id    = "single"
     nodes = 1

examples/resources/biganimal_cluster/single_node/azure/resource.tf

@@ -44,6 +44,7 @@ resource "biganimal_cluster" "single_node_cluster" {
   ]
 
   backup_retention_period = "6d"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
   cluster_architecture = {
     id    = "single"
     nodes = 1

examples/resources/biganimal_cluster/single_node/gcp/resource.tf

@@ -44,6 +44,7 @@ resource "biganimal_cluster" "single_node_cluster" {
   ]
 
   backup_retention_period = "6d"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
   cluster_architecture = {
     id    = "single"
     nodes = 1

examples/resources/biganimal_faraway_replica/aws/resource.tf

@@ -43,8 +43,9 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   ]
 
   backup_retention_period = "8d"
-  csp_auth                = false
-  instance_type           = "aws:c6i.large"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
+  csp_auth      = false
+  instance_type = "aws:c6i.large"
 
   // only following pg_config parameters are configurable for faraway replica
   // max_connections, max_locks_per_transaction, max_prepared_transactions, max_wal_senders, max_worker_processes.

examples/resources/biganimal_faraway_replica/azure/resource.tf

@@ -43,8 +43,9 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   ]
 
   backup_retention_period = "8d"
-  csp_auth                = false
-  instance_type           = "azure:Standard_D2s_v3"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
+  csp_auth      = false
+  instance_type = "azure:Standard_D2s_v3"
 
   // only following pg_config parameters are configurable for faraway replica
   // max_connections, max_locks_per_transaction, max_prepared_transactions, max_wal_senders, max_worker_processes.

examples/resources/biganimal_faraway_replica/cluster_and_faraway_replica/resource.tf

@@ -79,8 +79,9 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   ]
 
   backup_retention_period = "8d"
-  csp_auth                = false
-  instance_type           = "azure:Standard_D2s_v3"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
+  csp_auth      = false
+  instance_type = "azure:Standard_D2s_v3"
 
   // only following pg_config parameters are configurable for faraway replica
   // max_connections, max_locks_per_transaction, max_prepared_transactions, max_wal_senders, max_worker_processes.

examples/resources/biganimal_faraway_replica/gcp/resource.tf

@@ -43,8 +43,9 @@ resource "biganimal_faraway_replica" "faraway_replica" {
   ]
 
   backup_retention_period = "8d"
-  csp_auth                = false
-  instance_type           = "gcp:e2-highcpu-4"
+  #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
+  csp_auth      = false
+  instance_type = "gcp:e2-highcpu-4"
 
   // only following pg_config parameters are configurable for faraway replica
   // max_connections, max_locks_per_transaction, max_prepared_transactions, max_wal_senders, max_worker_processes.

examples/resources/biganimal_pgd/aws/data_group/resource.tf

@@ -54,6 +54,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3

examples/resources/biganimal_pgd/aws/data_groups_with_witness_group/resource.tf

@@ -54,6 +54,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3
@@ -111,6 +112,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3

examples/resources/biganimal_pgd/azure/data_group/resource.tf

@@ -54,6 +54,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3

examples/resources/biganimal_pgd/azure/data_groups_with_witness_group/resource.tf

@@ -54,6 +54,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3
@@ -111,6 +112,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3

examples/resources/biganimal_pgd/gcp/data_group/resource.tf

@@ -54,6 +54,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3

examples/resources/biganimal_pgd/gcp/data_groups_with_witness_group/resource.tf

@@ -54,6 +54,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3
@@ -115,6 +116,7 @@ resource "biganimal_pgd" "pgd_cluster" {
         },
       ]
       backup_retention_period = "6d"
+      #  backup_schedule_time = "0 5 1 * * *" //24 hour format cron expression e.g. "0 5 1 * * *" is 01:05
       cluster_architecture = {
         cluster_architecture_id = "pgd"
         nodes                   = 3

pkg/models/cluster.go

@@ -186,7 +186,7 @@ type Cluster struct {
 	EncryptionKeyIdReq         *string                      `json:"keyId,omitempty"`
 	EncryptionKeyResp          *EncryptionKey               `json:"encryptionKey,omitempty"`
 	PgIdentity                 *string                      `json:"pgIdentity,omitempty"`
-	BackupSchedule             *commonApi.BackupSchedule    `json:"backupSchedule,omitempty"`
+	BackupScheduleTime         *string                      `json:"scheduleBackup,omitempty"`
 }
 
 // IsHealthy checks to see if the cluster has the right condition 'biganimal.com/deployed'

pkg/models/pgd/api/data_group.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"github.com/EnterpriseDB/terraform-provider-biganimal/pkg/models"
-	commonApi "github.com/EnterpriseDB/terraform-provider-biganimal/pkg/models/common/api"
 )
 
 type DataGroup struct {
@@ -33,5 +32,5 @@ type DataGroup struct {
 	PeAllowedPrincipalIds *[]string                 `json:"peAllowedPrincipalIds,omitempty"`
 	RoConnectionUri       *string                   `json:"roConnectionUri,omitempty"`
 	ReadOnlyConnections   *bool                     `json:"readOnlyConnections,omitempty"`
-	BackupSchedule        *commonApi.BackupSchedule `json:"backupSchedule,omitempty"`
+	BackupScheduleTime    *string                   `json:"scheduleBackup,omitempty"`
 }

pkg/models/pgd/terraform/data_group.go

@@ -2,37 +2,36 @@ package terraform
 
 import (
 	"github.com/EnterpriseDB/terraform-provider-biganimal/pkg/models"
-	commonTerraform "github.com/EnterpriseDB/terraform-provider-biganimal/pkg/models/common/terraform"
 	"github.com/EnterpriseDB/terraform-provider-biganimal/pkg/models/pgd/api"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 type DataGroup struct {
-	GroupId               types.String                    `tfsdk:"group_id"`
-	AllowedIpRanges       types.Set                       `tfsdk:"allowed_ip_ranges"`
-	BackupRetentionPeriod *string                         `tfsdk:"backup_retention_period"`
-	ClusterArchitecture   *ClusterArchitecture            `tfsdk:"cluster_architecture"`
-	ClusterName           types.String                    `tfsdk:"cluster_name"`
-	ClusterType           types.String                    `tfsdk:"cluster_type"`
-	Connection            types.String                    `tfsdk:"connection_uri"`
-	CreatedAt             types.String                    `tfsdk:"created_at"`
-	CspAuth               *bool                           `tfsdk:"csp_auth"`
-	InstanceType          *api.InstanceType               `tfsdk:"instance_type"`
-	LogsUrl               types.String                    `tfsdk:"logs_url"`
-	MetricsUrl            types.String                    `tfsdk:"metrics_url"`
-	PgConfig              *[]models.KeyValue              `tfsdk:"pg_config"`
-	PgType                *api.PgType                     `tfsdk:"pg_type"`
-	PgVersion             *api.PgVersion                  `tfsdk:"pg_version"`
-	Phase                 types.String                    `tfsdk:"phase"`
-	PrivateNetworking     *bool                           `tfsdk:"private_networking"`
-	Provider              *api.CloudProvider              `tfsdk:"cloud_provider"`
-	Region                *api.Region                     `tfsdk:"region"`
-	ResizingPvc           types.Set                       `tfsdk:"resizing_pvc"`
-	Storage               *Storage                        `tfsdk:"storage"`
-	MaintenanceWindow     *models.MaintenanceWindow       `tfsdk:"maintenance_window"`
-	ServiceAccountIds     types.Set                       `tfsdk:"service_account_ids"`
-	PeAllowedPrincipalIds types.Set                       `tfsdk:"pe_allowed_principal_ids"`
-	RoConnectionUri       types.String                    `tfsdk:"ro_connection_uri"`
-	ReadOnlyConnections   *bool                           `tfsdk:"read_only_connections"`
-	BackupSchedule        *commonTerraform.BackupSchedule `tfsdk:"backup_schedule"`
+	GroupId               types.String              `tfsdk:"group_id"`
+	AllowedIpRanges       types.Set                 `tfsdk:"allowed_ip_ranges"`
+	BackupRetentionPeriod *string                   `tfsdk:"backup_retention_period"`
+	ClusterArchitecture   *ClusterArchitecture      `tfsdk:"cluster_architecture"`
+	ClusterName           types.String              `tfsdk:"cluster_name"`
+	ClusterType           types.String              `tfsdk:"cluster_type"`
+	Connection            types.String              `tfsdk:"connection_uri"`
+	CreatedAt             types.String              `tfsdk:"created_at"`
+	CspAuth               *bool                     `tfsdk:"csp_auth"`
+	InstanceType          *api.InstanceType         `tfsdk:"instance_type"`
+	LogsUrl               types.String              `tfsdk:"logs_url"`
+	MetricsUrl            types.String              `tfsdk:"metrics_url"`
+	PgConfig              *[]models.KeyValue        `tfsdk:"pg_config"`
+	PgType                *api.PgType               `tfsdk:"pg_type"`
+	PgVersion             *api.PgVersion            `tfsdk:"pg_version"`
+	Phase                 types.String              `tfsdk:"phase"`
+	PrivateNetworking     *bool                     `tfsdk:"private_networking"`
+	Provider              *api.CloudProvider        `tfsdk:"cloud_provider"`
+	Region                *api.Region               `tfsdk:"region"`
+	ResizingPvc           types.Set                 `tfsdk:"resizing_pvc"`
+	Storage               *Storage                  `tfsdk:"storage"`
+	MaintenanceWindow     *models.MaintenanceWindow `tfsdk:"maintenance_window"`
+	ServiceAccountIds     types.Set                 `tfsdk:"service_account_ids"`
+	PeAllowedPrincipalIds types.Set                 `tfsdk:"pe_allowed_principal_ids"`
+	RoConnectionUri       types.String              `tfsdk:"ro_connection_uri"`
+	ReadOnlyConnections   *bool                     `tfsdk:"read_only_connections"`
+	BackupScheduleTime    types.String              `tfsdk:"backup_schedule_time"`
 }

pkg/provider/common.go

@@ -8,26 +8,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 )
 
-var WeekdaysNumber = map[string]float64{
-	"monday":    1.0,
-	"tuesday":   2.0,
-	"wednesday": 3.0,
-	"thursday":  4.0,
-	"friday":    5.0,
-	"saturday":  6.0,
-	"sunday":    0.0,
-}
-
-var WeekdaysName = map[float64]string{
-	1.0: "Monday",
-	2.0: "Tuesday",
-	3.0: "Wednesday",
-	4.0: "Thursday",
-	5.0: "Friday",
-	6.0: "Saturday",
-	0.0: "Sunday",
-}
-
 // build tag assign terraform resource as, using api response as input
 func buildTFRsrcAssignTagsAs(tfRsrcTagsOut *[]commonTerraform.Tag, apiRespTags []commonApi.Tag) {
 	*tfRsrcTagsOut = []commonTerraform.Tag{}
@@ -53,17 +33,8 @@ func buildAPIReqAssignTags(tfRsrcTags []commonTerraform.Tag) []commonApi.Tag {
 	return tags
 }
 
-var resourceBackupSchedule = schema.SingleNestedAttribute{
-	Description: "Backup schedule.",
-	Optional:    true,
-	Attributes: map[string]schema.Attribute{
-		"start_day": schema.StringAttribute{
-			Description: "Backup schedule start day.",
-			Required:    true,
-		},
-		"start_time": schema.StringAttribute{
-			Description: "Backup schedule start time.",
-			Required:    true,
-		},
-	},
+var ResourceBackupScheduleTime = schema.StringAttribute{
+	MarkdownDescription: "Backup schedule time in 24 hour format.",
+	Optional:            true,
+	Computed:            true,
 }

pkg/provider/resource_analytics_cluster.go

@@ -60,7 +60,7 @@ type analyticsClusterResourceModel struct {
 	PeAllowedPrincipalIds      types.Set                          `tfsdk:"pe_allowed_principal_ids"`
 	Pause                      types.Bool                         `tfsdk:"pause"`
 	Tags                       []commonTerraform.Tag              `tfsdk:"tags"`
-	BackupSchedule             *commonTerraform.BackupSchedule    `tfsdk:"backup_schedule"`
+	BackupScheduleTime         types.String                       `tfsdk:"backup_schedule_time"`
 
 	Timeouts timeouts.Value `tfsdk:"timeouts"`
 }
@@ -302,7 +302,7 @@ func (r *analyticsClusterResource) Schema(ctx context.Context, req resource.Sche
 					plan_modifier.CustomAssignTags(),
 				},
 			},
-			"backup_schedule": resourceBackupSchedule,
+			"backup_schedule_time": ResourceBackupScheduleTime,
 		},
 	}
 }
@@ -408,6 +408,7 @@ func generateAnalyticsClusterModelCreate(ctx context.Context, client *api.Cluste
 		CSPAuth:               clusterResource.CspAuth.ValueBoolPointer(),
 		PrivateNetworking:     clusterResource.PrivateNetworking.ValueBoolPointer(),
 		BackupRetentionPeriod: clusterResource.BackupRetentionPeriod.ValueStringPointer(),
+		BackupScheduleTime:    clusterResource.BackupScheduleTime.ValueStringPointer(),
 	}
 
 	cluster.ClusterId = nil
@@ -480,13 +481,6 @@ func generateAnalyticsClusterModelCreate(ctx context.Context, client *api.Cluste
 
 	cluster.Tags = buildAPIReqAssignTags(clusterResource.Tags)
 
-	if clusterResource.BackupSchedule != nil {
-		cluster.BackupSchedule = &commonApi.BackupSchedule{
-			StartDay:  utils.ToPointer(WeekdaysNumber[clusterResource.BackupSchedule.StartDay.ValueString()]),
-			StartTime: clusterResource.BackupSchedule.StartTime.ValueStringPointer(),
-		}
-	}
-
 	return cluster, nil
 }
 
@@ -514,6 +508,7 @@ func readAnalyticsCluster(ctx context.Context, client *api.ClusterClient, tfClus
 	tfClusterResource.LogsUrl = responseCluster.LogsUrl
 	tfClusterResource.MetricsUrl = responseCluster.MetricsUrl
 	tfClusterResource.BackupRetentionPeriod = types.StringPointerValue(responseCluster.BackupRetentionPeriod)
+	tfClusterResource.BackupScheduleTime = types.StringPointerValue(responseCluster.BackupScheduleTime)
 	tfClusterResource.PgVersion = types.StringValue(responseCluster.PgVersion.PgVersionId)
 	tfClusterResource.PgType = types.StringValue(responseCluster.PgType.PgTypeId)
 	tfClusterResource.PrivateNetworking = types.BoolPointerValue(responseCluster.PrivateNetworking)
@@ -555,13 +550,6 @@ func readAnalyticsCluster(ctx context.Context, client *api.ClusterClient, tfClus
 
 	buildTFRsrcAssignTagsAs(&tfClusterResource.Tags, responseCluster.Tags)
 
-	if responseCluster.BackupSchedule != nil {
-		tfClusterResource.BackupSchedule = &commonTerraform.BackupSchedule{
-			StartDay:  types.StringValue(WeekdaysName[*responseCluster.BackupSchedule.StartDay]),
-			StartTime: types.StringPointerValue(responseCluster.BackupSchedule.StartTime),
-		}
-	}
-
 	return nil
 }