Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Waitingroom event bugfix #1648

Merged
merged 8 commits into from May 27, 2022
Merged

Waitingroom event bugfix #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ab8bc5
use time pointer and set ID on expansion
broswen May 11, 2022
f816651
Merge branch 'cloudflare:master' into waitingroom-event-bugfix
broswen May 13, 2022
0356833
use time pointer and set ID on expansion
broswen May 11, 2022
2dbc23b
Merge branch 'waitingroom-event-bugfix' of https://github.com/broswen…
broswen May 26, 2022
e7e97ce
fix prequeueStartTime pointer
broswen May 26, 2022
5d14fdc
add changelog
broswen May 26, 2022
95acaf2
set waitingroom event id from resourcedata
broswen May 27, 2022
92e044f
check if PrequeueStartTime is nil
broswen May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1648.txt
View file
Open in desktop
@@ -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
View file
Open in desktop
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))
jacobbednarz marked this conversation as resolved.
Show resolved Hide resolved
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