Skip to content

Commit

Permalink
Merge pull request #1648 from broswen/waitingroom-event-bugfix
Browse files Browse the repository at this point in the history
Waitingroom event bugfix
  • Loading branch information
jacobbednarz committed May 27, 2022
2 parents ce690e3 + 92e044f commit 33a9244
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .changelog/1648.txt
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_waiting_room_event: handle time pointer for nullable struct member
```
11 changes: 7 additions & 4 deletions internal/provider/resource_cloudflare_waiting_room_event.go
Expand Up @@ -42,9 +42,10 @@ func expandWaitingRoomEvent(d *schema.ResourceData) (cloudflare.WaitingRoomEvent
return cloudflare.WaitingRoomEvent{}, err
}

prequeueStartTime := time.Time{}
var prequeueStartTime *time.Time
if t, ok := d.GetOk("prequeue_start_time"); ok {
prequeueStartTime, err = time.Parse(time.RFC3339, t.(string))
prequeueStartTimeValue, err := time.Parse(time.RFC3339, t.(string))
prequeueStartTime = cloudflare.TimePtr(prequeueStartTimeValue)
if err != nil {
return cloudflare.WaitingRoomEvent{}, err
}
Expand All @@ -54,7 +55,7 @@ func expandWaitingRoomEvent(d *schema.ResourceData) (cloudflare.WaitingRoomEvent
Name: d.Get("name").(string),
EventStartTime: eventStartTime,
EventEndTime: eventEndTime,
PrequeueStartTime: &prequeueStartTime,
PrequeueStartTime: prequeueStartTime,
Description: d.Get("description").(string),
QueueingMethod: d.Get("queueing_method").(string),
ShuffleAtEventStart: d.Get("shuffle_at_event_start").(bool),
Expand Down Expand Up @@ -109,7 +110,7 @@ func resourceCloudflareWaitingRoomEventRead(ctx context.Context, d *schema.Resou
d.Set("event_end_time", waitingRoomEvent.EventEndTime.Format(time.RFC3339))
d.Set("session_duration", waitingRoomEvent.SessionDuration)

if !waitingRoomEvent.PrequeueStartTime.IsZero() {
if waitingRoomEvent.PrequeueStartTime != nil {
d.Set("prequeue_start_time", waitingRoomEvent.PrequeueStartTime.Format(time.RFC3339))
}

Expand Down Expand Up @@ -145,13 +146,15 @@ func resourceCloudflareWaitingRoomEventRead(ctx context.Context, d *schema.Resou

func resourceCloudflareWaitingRoomEventUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
client := meta.(*cloudflare.API)
waitingRoomEventID := d.Id()
waitingRoomID := d.Get("waiting_room_id").(string)
zoneID := d.Get("zone_id").(string)
waitingRoomEventName := d.Get("name").(string)
waitingRoomEvent, err := expandWaitingRoomEvent(d)
if err != nil {
return diag.FromErr(fmt.Errorf("error building waiting room event %q: %w", waitingRoomEventName, err))
}
waitingRoomEvent.ID = waitingRoomEventID

_, err = client.ChangeWaitingRoomEvent(ctx, zoneID, waitingRoomID, waitingRoomEvent)

Expand Down

0 comments on commit 33a9244

Please sign in to comment.