Skip to content

Commit b8d6449

Browse files
nkonjetinkonjeti
committed
on call workaround
1 parent e2b29e5 commit b8d6449

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎datadog/fwprovider/resource_datadog_on_call_schedule.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,17 @@ func (r *onCallScheduleResource) Schema(_ context.Context, _ resource.SchemaRequ
151151
NestedObject: schema.NestedBlockObject{
152152
Attributes: map[string]schema.Attribute{
153153
"end_day": schema.StringAttribute{
154-
Optional: true,
155-
Validators: []validator.String{validators.NewEnumValidator[validator.String](datadogV2.NewLayerAttributesRestrictionsItemsEndDayFromValue)},
154+
Optional: true,
155+
// Validators: []validator.String{validators.NewEnumValidator[validator.String](datadogV2.Weekday)},
156156
Description: "The weekday when the restriction period ends (Monday through Sunday).",
157157
},
158158
"end_time": schema.StringAttribute{
159159
Optional: true,
160160
Description: "The time of day when the restriction ends (hh:mm:ss).",
161161
},
162162
"start_day": schema.StringAttribute{
163-
Optional: true,
164-
Validators: []validator.String{validators.NewEnumValidator[validator.String](datadogV2.NewLayerAttributesRestrictionsItemsStartDayFromValue)},
163+
Optional: true,
164+
// Validators: []validator.String{validators.NewEnumValidator[validator.String](datadogV2.Weekday)},
165165
Description: "The weekday when the restriction period starts (Monday through Sunday).",
166166
},
167167
"start_time": schema.StringAttribute{
@@ -493,11 +493,11 @@ func (r *onCallScheduleResource) buildOnCallScheduleRequestBody(ctx context.Cont
493493

494494
layersDDItem := datadogV2.NewScheduleCreateRequestDataAttributesLayersItems(
495495
effectiveDate,
496-
datadogV2.ScheduleCreateRequestDataAttributesLayersItemsInterval{
496+
datadogV2.LayerAttributesInterval{
497497
Days: layersTFItem.Interval.Days.ValueInt32Pointer(),
498498
Seconds: layersTFItem.Interval.Seconds.ValueInt64Pointer(),
499499
},
500-
[]datadogV2.ScheduleCreateRequestDataAttributesLayersItemsMembersItems{},
500+
[]datadogV2.ScheduleRequestDataAttributesLayersItemsMembersItems{},
501501
layersTFItem.Name.ValueString(),
502502
rotationStart,
503503
)
@@ -511,17 +511,17 @@ func (r *onCallScheduleResource) buildOnCallScheduleRequestBody(ctx context.Cont
511511
layersDDItem.SetEndDate(endDate)
512512
}
513513

514-
var members []datadogV2.ScheduleCreateRequestDataAttributesLayersItemsMembersItems
514+
var members []datadogV2.ScheduleRequestDataAttributesLayersItemsMembersItems
515515
for _, memberId := range layersTFItem.Users {
516-
membersDDItem := datadogV2.NewScheduleCreateRequestDataAttributesLayersItemsMembersItems()
516+
membersDDItem := datadogV2.NewScheduleRequestDataAttributesLayersItemsMembersItems()
517517

518518
if !memberId.IsNull() {
519519
userId := memberId.ValueString()
520520
if userId == "" {
521521
diags.AddError("user_id can't be empty, either set the user_id to a valid user, set the user_id to null or omit the field", "user_id can't be empty, either set the user_id to a valid user or to null")
522522
return nil, diags
523523
}
524-
membersDDItem.User = &datadogV2.ScheduleCreateRequestDataAttributesLayersItemsMembersItemsUser{
524+
membersDDItem.User = &datadogV2.ScheduleRequestDataAttributesLayersItemsMembersItemsUser{
525525
Id: &userId,
526526
}
527527
}
@@ -531,18 +531,18 @@ func (r *onCallScheduleResource) buildOnCallScheduleRequestBody(ctx context.Cont
531531
layersDDItem.SetMembers(members)
532532

533533
if layersTFItem.Restrictions != nil {
534-
var restrictions []datadogV2.ScheduleCreateRequestDataAttributesLayersItemsRestrictionsItems
534+
var restrictions []datadogV2.TimeRestriction
535535
for _, restrictionsTFItem := range layersTFItem.Restrictions {
536-
restrictionsDDItem := datadogV2.NewScheduleCreateRequestDataAttributesLayersItemsRestrictionsItems()
536+
restrictionsDDItem := datadogV2.NewTimeRestriction()
537537

538538
if !restrictionsTFItem.EndDay.IsNull() {
539-
restrictionsDDItem.SetEndDay(datadogV2.ScheduleCreateRequestDataAttributesLayersItemsRestrictionsItemsEndDay(restrictionsTFItem.EndDay.ValueString()))
539+
restrictionsDDItem.SetEndDay(datadogV2.Weekday(restrictionsTFItem.EndDay.ValueString()))
540540
}
541541
if !restrictionsTFItem.EndTime.IsNull() {
542542
restrictionsDDItem.SetEndTime(restrictionsTFItem.EndTime.ValueString())
543543
}
544544
if !restrictionsTFItem.StartDay.IsNull() {
545-
restrictionsDDItem.SetStartDay(datadogV2.ScheduleCreateRequestDataAttributesLayersItemsRestrictionsItemsStartDay(restrictionsTFItem.StartDay.ValueString()))
545+
restrictionsDDItem.SetStartDay(datadogV2.Weekday(restrictionsTFItem.StartDay.ValueString()))
546546
}
547547
if !restrictionsTFItem.StartTime.IsNull() {
548548
restrictionsDDItem.SetStartTime(restrictionsTFItem.StartTime.ValueString())
@@ -639,17 +639,17 @@ func (r *onCallScheduleResource) buildOnCallScheduleUpdateRequestBody(
639639
}
640640
layersDDItem.SetRotationStart(rotationStart)
641641

642-
var members []datadogV2.ScheduleUpdateRequestDataAttributesLayersItemsMembersItems
642+
var members []datadogV2.ScheduleRequestDataAttributesLayersItemsMembersItems
643643
for _, memberId := range layersTFItem.Users {
644-
membersDDItem := datadogV2.NewScheduleUpdateRequestDataAttributesLayersItemsMembersItems()
644+
membersDDItem := datadogV2.NewScheduleRequestDataAttributesLayersItemsMembersItems()
645645

646646
if !memberId.IsNull() {
647647
userId := memberId.ValueString()
648648
if userId == "" {
649649
diags.AddError("user_id can't be empty, either set the user_id to a valid user, set the user_id to null or omit the field", "user_id can't be empty, either set the user_id to a valid user or to null")
650650
return nil, diags
651651
}
652-
membersDDItem.User = &datadogV2.ScheduleUpdateRequestDataAttributesLayersItemsMembersItemsUser{
652+
membersDDItem.User = &datadogV2.ScheduleRequestDataAttributesLayersItemsMembersItemsUser{
653653
Id: &userId,
654654
}
655655
}
@@ -658,18 +658,18 @@ func (r *onCallScheduleResource) buildOnCallScheduleUpdateRequestBody(
658658
layersDDItem.SetMembers(members)
659659

660660
if layersTFItem.Restrictions != nil {
661-
var restrictions []datadogV2.ScheduleUpdateRequestDataAttributesLayersItemsRestrictionsItems
661+
var restrictions []datadogV2.TimeRestriction
662662
for _, restrictionsTFItem := range layersTFItem.Restrictions {
663-
restrictionsDDItem := datadogV2.NewScheduleUpdateRequestDataAttributesLayersItemsRestrictionsItems()
663+
restrictionsDDItem := datadogV2.NewTimeRestriction()
664664

665665
if !restrictionsTFItem.EndDay.IsNull() {
666-
restrictionsDDItem.SetEndDay(datadogV2.ScheduleUpdateRequestDataAttributesLayersItemsRestrictionsItemsEndDay(restrictionsTFItem.EndDay.ValueString()))
666+
restrictionsDDItem.SetEndDay(datadogV2.Weekday(restrictionsTFItem.EndDay.ValueString()))
667667
}
668668
if !restrictionsTFItem.EndTime.IsNull() {
669669
restrictionsDDItem.SetEndTime(restrictionsTFItem.EndTime.ValueString())
670670
}
671671
if !restrictionsTFItem.StartDay.IsNull() {
672-
restrictionsDDItem.SetStartDay(datadogV2.ScheduleUpdateRequestDataAttributesLayersItemsRestrictionsItemsStartDay(restrictionsTFItem.StartDay.ValueString()))
672+
restrictionsDDItem.SetStartDay(datadogV2.Weekday(restrictionsTFItem.StartDay.ValueString()))
673673
}
674674
if !restrictionsTFItem.StartTime.IsNull() {
675675
restrictionsDDItem.SetStartTime(restrictionsTFItem.StartTime.ValueString())
@@ -680,7 +680,7 @@ func (r *onCallScheduleResource) buildOnCallScheduleUpdateRequestBody(
680680
}
681681

682682
if layersTFItem.Interval != nil {
683-
var interval datadogV2.ScheduleUpdateRequestDataAttributesLayersItemsInterval
683+
var interval datadogV2.LayerAttributesInterval
684684

685685
if !layersTFItem.Interval.Days.IsNull() {
686686
interval.SetDays(layersTFItem.Interval.Days.ValueInt32())
@@ -711,17 +711,17 @@ func (r *onCallScheduleResource) buildOnCallScheduleUpdateRequestBody(
711711
func buildCreateRelationships(plannedTeams []string) *datadogV2.ScheduleCreateRequestDataRelationships {
712712
var relationships *datadogV2.ScheduleCreateRequestDataRelationships
713713

714-
teamRelationships := make([]datadogV2.ScheduleCreateRequestDataRelationshipsTeamsDataItems, len(plannedTeams))
714+
teamRelationships := make([]datadogV2.DataRelationshipsTeamsDataItems, len(plannedTeams))
715715

716716
for t, teamId := range plannedTeams {
717-
item := datadogV2.NewScheduleCreateRequestDataRelationshipsTeamsDataItemsWithDefaults()
717+
item := datadogV2.NewDataRelationshipsTeamsDataItemsWithDefaults()
718718
item.SetId(teamId)
719719
teamRelationships[t] = *item
720720
}
721721

722722
if len(teamRelationships) > 0 {
723723
relationships = &datadogV2.ScheduleCreateRequestDataRelationships{
724-
Teams: &datadogV2.ScheduleCreateRequestDataRelationshipsTeams{
724+
Teams: &datadogV2.DataRelationshipsTeams{
725725
Data: teamRelationships,
726726
},
727727
}
@@ -732,17 +732,17 @@ func buildCreateRelationships(plannedTeams []string) *datadogV2.ScheduleCreateRe
732732
func buildUpdateRelationships(plannedTeams []string) *datadogV2.ScheduleUpdateRequestDataRelationships {
733733
var relationships *datadogV2.ScheduleUpdateRequestDataRelationships
734734

735-
teamRelationships := make([]datadogV2.ScheduleUpdateRequestDataRelationshipsTeamsDataItems, len(plannedTeams))
735+
teamRelationships := make([]datadogV2.DataRelationshipsTeamsDataItems, len(plannedTeams))
736736

737737
for t, teamId := range plannedTeams {
738-
item := datadogV2.NewScheduleUpdateRequestDataRelationshipsTeamsDataItemsWithDefaults()
738+
item := datadogV2.NewDataRelationshipsTeamsDataItemsWithDefaults()
739739
item.SetId(teamId)
740740
teamRelationships[t] = *item
741741
}
742742

743743
if len(teamRelationships) > 0 {
744744
relationships = &datadogV2.ScheduleUpdateRequestDataRelationships{
745-
Teams: &datadogV2.ScheduleUpdateRequestDataRelationshipsTeams{
745+
Teams: &datadogV2.DataRelationshipsTeams{
746746
Data: teamRelationships,
747747
},
748748
}

0 commit comments

Comments
 (0)