stackit-dev-tools/terraform-provider-stackitprivatepreview
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move functions to conversion pkg (#123)

Browse source
This commit is contained in:
Vicente Pinto 2023-11-03 08:49:05 +00:00 • committed by GitHub
parent 71bf63cbc9
commit 03d0e28016
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 237 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

19
stackit/internal/services/dns/recordset/resource.go
View file

@ -21,6 +21,7 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/dns"
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
)
@ -451,16 +452,16 @@ func toCreatePayload(model *Model) (*dns.CreateRecordSetPayload, error) {
return nil, fmt.Errorf("expected record at index %d to be of type %T, got %T", i, types.String{}, record)
}
records = append(records, dns.RecordPayload{
Content: core.StringValueToPointer(recordString),
Content: conversion.StringValueToPointer(recordString),
})
}
return &dns.CreateRecordSetPayload{
Comment: core.StringValueToPointer(model.Comment),
Name: core.StringValueToPointer(model.Name),
Comment: conversion.StringValueToPointer(model.Comment),
Name: conversion.StringValueToPointer(model.Name),
Records: &records,
Ttl: core.Int64ValueToPointer(model.TTL),
Type: core.StringValueToPointer(model.Type),
Ttl: conversion.Int64ValueToPointer(model.TTL),
Type: conversion.StringValueToPointer(model.Type),
}, nil
}
@ -476,14 +477,14 @@ func toUpdatePayload(model *Model) (*dns.UpdateRecordSetPayload, error) {
return nil, fmt.Errorf("expected record at index %d to be of type %T, got %T", i, types.String{}, record)
}
records = append(records, dns.RecordPayload{
Content: core.StringValueToPointer(recordString),
Content: conversion.StringValueToPointer(recordString),
})
}
return &dns.UpdateRecordSetPayload{
Comment: core.StringValueToPointer(model.Comment),
Name: core.StringValueToPointer(model.Name),
Comment: conversion.StringValueToPointer(model.Comment),
Name: conversion.StringValueToPointer(model.Name),
Records: &records,
Ttl: core.Int64ValueToPointer(model.TTL),
Ttl: conversion.Int64ValueToPointer(model.TTL),
}, nil
}

43
stackit/internal/services/dns/zone/resource.go
View file

@ -24,6 +24,7 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/dns"
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
)
@ -556,18 +557,18 @@ func toCreatePayload(model *Model) (*dns.CreateZonePayload, error) {
modelPrimaries = append(modelPrimaries, primaryString.ValueString())
}
return &dns.CreateZonePayload{
Name: core.StringValueToPointer(model.Name),
DnsName: core.StringValueToPointer(model.DnsName),
ContactEmail: core.StringValueToPointer(model.ContactEmail),
Description: core.StringValueToPointer(model.Description),
Acl: core.StringValueToPointer(model.Acl),
Type: core.StringValueToPointer(model.Type),
DefaultTTL: core.Int64ValueToPointer(model.DefaultTTL),
ExpireTime: core.Int64ValueToPointer(model.ExpireTime),
RefreshTime: core.Int64ValueToPointer(model.RefreshTime),
RetryTime: core.Int64ValueToPointer(model.RetryTime),
NegativeCache: core.Int64ValueToPointer(model.NegativeCache),
IsReverseZone: core.BoolValueToPointer(model.IsReverseZone),
Name: conversion.StringValueToPointer(model.Name),
DnsName: conversion.StringValueToPointer(model.DnsName),
ContactEmail: conversion.StringValueToPointer(model.ContactEmail),
Description: conversion.StringValueToPointer(model.Description),
Acl: conversion.StringValueToPointer(model.Acl),
Type: conversion.StringValueToPointer(model.Type),
DefaultTTL: conversion.Int64ValueToPointer(model.DefaultTTL),
ExpireTime: conversion.Int64ValueToPointer(model.ExpireTime),
RefreshTime: conversion.Int64ValueToPointer(model.RefreshTime),
RetryTime: conversion.Int64ValueToPointer(model.RetryTime),
NegativeCache: conversion.Int64ValueToPointer(model.NegativeCache),
IsReverseZone: conversion.BoolValueToPointer(model.IsReverseZone),
Primaries: &modelPrimaries,
}, nil
}
@ -578,15 +579,15 @@ func toUpdatePayload(model *Model) (*dns.UpdateZonePayload, error) {
}
return &dns.UpdateZonePayload{
Name: core.StringValueToPointer(model.Name),
ContactEmail: core.StringValueToPointer(model.ContactEmail),
Description: core.StringValueToPointer(model.Description),
Acl: core.StringValueToPointer(model.Acl),
DefaultTTL: core.Int64ValueToPointer(model.DefaultTTL),
ExpireTime: core.Int64ValueToPointer(model.ExpireTime),
RefreshTime: core.Int64ValueToPointer(model.RefreshTime),
RetryTime: core.Int64ValueToPointer(model.RetryTime),
NegativeCache: core.Int64ValueToPointer(model.NegativeCache),
Name: conversion.StringValueToPointer(model.Name),
ContactEmail: conversion.StringValueToPointer(model.ContactEmail),
Description: conversion.StringValueToPointer(model.Description),
Acl: conversion.StringValueToPointer(model.Acl),
DefaultTTL: conversion.Int64ValueToPointer(model.DefaultTTL),
ExpireTime: conversion.Int64ValueToPointer(model.ExpireTime),
RefreshTime: conversion.Int64ValueToPointer(model.RefreshTime),
RetryTime: conversion.Int64ValueToPointer(model.RetryTime),
NegativeCache: conversion.Int64ValueToPointer(model.NegativeCache),
Primaries: nil, // API returns error if this field is set, even if nothing changes
}, nil
}