Skip to content

Commit 975428f

Browse files
committed
use time only for everything
1 parent d1587b1 commit 975428f

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

internal/services/recoveryservices/backup_policy_vm_resource.go

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"regexp"
1212
"time"
1313

14-
"github.com/Azure/go-autorest/autorest/date"
1514
"github.com/hashicorp/go-azure-helpers/lang/pointer"
1615
"github.com/hashicorp/go-azure-helpers/lang/response"
1716
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
@@ -115,12 +114,7 @@ func resourceBackupProtectionPolicyVMCreate(d *pluginsdk.ResourceData, meta inte
115114

116115
// getting this ready now because its shared between *everything*, time is... complicated for this resource
117116
timeOfDay := fmt.Sprintf("%s:00Z", d.Get("backup.0.time").(string))
118-
dateOfDay, err := time.Parse(time.RFC3339, fmt.Sprintf("%sT%s", time.Now().Format("2006-01-02"), timeOfDay))
119-
if err != nil {
120-
return fmt.Errorf("generating time from %q for %s: %+v", timeOfDay, id, err)
121-
}
122-
times := append(make([]string, 0), date.Time{Time: dateOfDay}.String())
123-
formattedTimeOfDay := append(make([]string, 0), timeOfDay)
117+
times := append(make([]string, 0), timeOfDay)
124118

125119
existing, err := client.Get(ctx, id)
126120
if err != nil {
@@ -151,10 +145,10 @@ func resourceBackupProtectionPolicyVMCreate(d *pluginsdk.ResourceData, meta inte
151145
TieringPolicy: expandBackupProtectionPolicyVMTieringPolicy(d.Get("tiering_policy").([]interface{})),
152146
InstantRPDetails: expandBackupProtectionPolicyVMResourceGroup(d),
153147
RetentionPolicy: &protectionpolicies.LongTermRetentionPolicy{ // SimpleRetentionPolicy only has duration property ¯\_(ツ)_/¯
154-
DailySchedule: expandBackupProtectionPolicyVMRetentionDaily(d, formattedTimeOfDay),
155-
WeeklySchedule: expandBackupProtectionPolicyVMRetentionWeekly(d, formattedTimeOfDay),
156-
MonthlySchedule: expandBackupProtectionPolicyVMRetentionMonthly(d, formattedTimeOfDay),
157-
YearlySchedule: expandBackupProtectionPolicyVMRetentionYearly(d, formattedTimeOfDay),
148+
DailySchedule: expandBackupProtectionPolicyVMRetentionDaily(d, times),
149+
WeeklySchedule: expandBackupProtectionPolicyVMRetentionWeekly(d, times),
150+
MonthlySchedule: expandBackupProtectionPolicyVMRetentionMonthly(d, times),
151+
YearlySchedule: expandBackupProtectionPolicyVMRetentionYearly(d, times),
158152
},
159153
}
160154

@@ -291,12 +285,7 @@ func resourceBackupProtectionPolicyVMUpdate(d *pluginsdk.ResourceData, meta inte
291285

292286
// getting this ready now because its shared between *everything*, time is... complicated for this resource
293287
timeOfDay := fmt.Sprintf("%s:00Z", d.Get("backup.0.time").(string))
294-
dateOfDay, err := time.Parse(time.RFC3339, fmt.Sprintf("%sT%s", time.Now().Format("2006-01-02"), timeOfDay))
295-
if err != nil {
296-
return fmt.Errorf("generating time from %q for %s: %+v", timeOfDay, id, err)
297-
}
298-
times := append(make([]string, 0), date.Time{Time: dateOfDay}.String())
299-
formattedTimeOfDay := append(make([]string, 0), timeOfDay)
288+
times := append(make([]string, 0), timeOfDay)
300289

301290
// Less than 7 daily backups is no longer supported for create/update
302291
if d.HasChange("retention_daily.0.count") && (d.Get("retention_daily.0.count").(int) > 1 && d.Get("retention_daily.0.count").(int) < 7) {
@@ -362,7 +351,7 @@ func resourceBackupProtectionPolicyVMUpdate(d *pluginsdk.ResourceData, meta inte
362351
properties.RetentionPolicy = &protectionpolicies.LongTermRetentionPolicy{}
363352
}
364353

365-
retentionPolicy.DailySchedule = expandBackupProtectionPolicyVMRetentionDaily(d, formattedTimeOfDay)
354+
retentionPolicy.DailySchedule = expandBackupProtectionPolicyVMRetentionDaily(d, times)
366355
properties.RetentionPolicy = retentionPolicy
367356
}
368357

@@ -375,7 +364,7 @@ func resourceBackupProtectionPolicyVMUpdate(d *pluginsdk.ResourceData, meta inte
375364
properties.RetentionPolicy = &protectionpolicies.LongTermRetentionPolicy{}
376365
}
377366

378-
retentionPolicy.WeeklySchedule = expandBackupProtectionPolicyVMRetentionWeekly(d, formattedTimeOfDay)
367+
retentionPolicy.WeeklySchedule = expandBackupProtectionPolicyVMRetentionWeekly(d, times)
379368
properties.RetentionPolicy = retentionPolicy
380369
}
381370

@@ -388,7 +377,7 @@ func resourceBackupProtectionPolicyVMUpdate(d *pluginsdk.ResourceData, meta inte
388377
properties.RetentionPolicy = &protectionpolicies.LongTermRetentionPolicy{}
389378
}
390379

391-
retentionPolicy.MonthlySchedule = expandBackupProtectionPolicyVMRetentionMonthly(d, formattedTimeOfDay)
380+
retentionPolicy.MonthlySchedule = expandBackupProtectionPolicyVMRetentionMonthly(d, times)
392381
properties.RetentionPolicy = retentionPolicy
393382
}
394383

@@ -401,7 +390,7 @@ func resourceBackupProtectionPolicyVMUpdate(d *pluginsdk.ResourceData, meta inte
401390
properties.RetentionPolicy = &protectionpolicies.LongTermRetentionPolicy{}
402391
}
403392

404-
retentionPolicy.YearlySchedule = expandBackupProtectionPolicyVMRetentionYearly(d, formattedTimeOfDay)
393+
retentionPolicy.YearlySchedule = expandBackupProtectionPolicyVMRetentionYearly(d, times)
405394
properties.RetentionPolicy = retentionPolicy
406395
}
407396

0 commit comments

Comments
 (0)