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

30
stackit/internal/conversion/conversion.go
View file

@ -57,3 +57,33 @@ func ToTerraformStringMap(ctx context.Context, m map[string]string) (basetypes.M
return res, nil return res, nil
} }
// StringValueToPointer converts basetypes.StringValue to a pointer to string.
// It returns nil if the value is null or unknown.
func StringValueToPointer(s basetypes.StringValue) *string {
if s.IsNull() || s.IsUnknown() {
return nil
}
value := s.ValueString()
return &value
}
// Int64ValueToPointer converts basetypes.Int64Value to a pointer to int64.
// It returns nil if the value is null or unknown.
func Int64ValueToPointer(s basetypes.Int64Value) *int64 {
if s.IsNull() || s.IsUnknown() {
return nil
}
value := s.ValueInt64()
return &value
}
// BoolValueToPointer converts basetypes.BoolValue to a pointer to bool.
// It returns nil if the value is null or unknown.
func BoolValueToPointer(s basetypes.BoolValue) *bool {
if s.IsNull() || s.IsUnknown() {
return nil
}
value := s.ValueBool()
return &value
}

31
stackit/internal/core/core.go
View file

@ -7,7 +7,6 @@ import (
"strings" "strings"
"github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
) )
@ -65,33 +64,3 @@ func LogAndAddWarning(ctx context.Context, diags *diag.Diagnostics, summary, det
tflog.Warn(ctx, fmt.Sprintf("%s | %s", summary, detail)) tflog.Warn(ctx, fmt.Sprintf("%s | %s", summary, detail))
diags.AddWarning(summary, detail) diags.AddWarning(summary, detail)
} }
// StringValueToPointer converts basetypes.StringValue to a pointer to string.
// It returns nil if the value is null or unknown.
func StringValueToPointer(s basetypes.StringValue) *string {
if s.IsNull() || s.IsUnknown() {
return nil
}
value := s.ValueString()
return &value
}
// Int64ValueToPointer converts basetypes.Int64Value to a pointer to int64.
// It returns nil if the value is null or unknown.
func Int64ValueToPointer(s basetypes.Int64Value) *int64 {
if s.IsNull() || s.IsUnknown() {
return nil
}
value := s.ValueInt64()
return &value
}
// BoolValueToPointer converts basetypes.BoolValue to a pointer to bool.
// It returns nil if the value is null or unknown.
func BoolValueToPointer(s basetypes.BoolValue) *bool {
if s.IsNull() || s.IsUnknown() {
return nil
}
value := s.ValueBool()
return &value
}

9
stackit/internal/services/argus/instance/resource.go
View file

@ -19,6 +19,7 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/argus" "github.com/stackitcloud/stackit-sdk-go/services/argus"
"github.com/stackitcloud/stackit-sdk-go/services/argus/wait" "github.com/stackitcloud/stackit-sdk-go/services/argus/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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
) )
@ -515,8 +516,8 @@ func toCreatePayload(model *Model) (*argus.CreateInstancePayload, error) {
pa[k] = elements[k].String() pa[k] = elements[k].String()
} }
return &argus.CreateInstancePayload{ return &argus.CreateInstancePayload{
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
Parameter: &pa, Parameter: &pa,
}, nil }, nil
} }
@ -531,8 +532,8 @@ func toUpdatePayload(model *Model) (*argus.UpdateInstancePayload, error) {
pa[k] = v.String() pa[k] = v.String()
} }
return &argus.UpdateInstancePayload{ return &argus.UpdateInstancePayload{
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
Parameter: &pa, Parameter: &pa,
}, nil }, nil
} }

26
stackit/internal/services/argus/scrapeconfig/resource.go
View file

@ -548,11 +548,11 @@ func toCreatePayload(ctx context.Context, model *Model) (*argus.CreateScrapeConf
} }
sc := argus.CreateScrapeConfigPayload{ sc := argus.CreateScrapeConfigPayload{
JobName: core.StringValueToPointer(model.Name), JobName: conversion.StringValueToPointer(model.Name),
MetricsPath: core.StringValueToPointer(model.MetricsPath), MetricsPath: conversion.StringValueToPointer(model.MetricsPath),
ScrapeInterval: core.StringValueToPointer(model.ScrapeInterval), ScrapeInterval: conversion.StringValueToPointer(model.ScrapeInterval),
ScrapeTimeout: core.StringValueToPointer(model.ScrapeTimeout), ScrapeTimeout: conversion.StringValueToPointer(model.ScrapeTimeout),
Scheme: core.StringValueToPointer(model.Scheme), Scheme: conversion.StringValueToPointer(model.Scheme),
} }
setDefaultsCreateScrapeConfig(&sc, model) setDefaultsCreateScrapeConfig(&sc, model)
@ -568,8 +568,8 @@ func toCreatePayload(ctx context.Context, model *Model) (*argus.CreateScrapeConf
if model.BasicAuth != nil { if model.BasicAuth != nil {
if sc.BasicAuth == nil { if sc.BasicAuth == nil {
sc.BasicAuth = &argus.CreateScrapeConfigPayloadBasicAuth{ sc.BasicAuth = &argus.CreateScrapeConfigPayloadBasicAuth{
Username: core.StringValueToPointer(model.BasicAuth.Username), Username: conversion.StringValueToPointer(model.BasicAuth.Username),
Password: core.StringValueToPointer(model.BasicAuth.Password), Password: conversion.StringValueToPointer(model.BasicAuth.Password),
} }
} }
} }
@ -628,10 +628,10 @@ func toUpdatePayload(ctx context.Context, model *Model) (*argus.UpdateScrapeConf
} }
sc := argus.UpdateScrapeConfigPayload{ sc := argus.UpdateScrapeConfigPayload{
MetricsPath: core.StringValueToPointer(model.MetricsPath), MetricsPath: conversion.StringValueToPointer(model.MetricsPath),
ScrapeInterval: core.StringValueToPointer(model.ScrapeInterval), ScrapeInterval: conversion.StringValueToPointer(model.ScrapeInterval),
ScrapeTimeout: core.StringValueToPointer(model.ScrapeTimeout), ScrapeTimeout: conversion.StringValueToPointer(model.ScrapeTimeout),
Scheme: core.StringValueToPointer(model.Scheme), Scheme: conversion.StringValueToPointer(model.Scheme),
} }
setDefaultsUpdateScrapeConfig(&sc, model) setDefaultsUpdateScrapeConfig(&sc, model)
@ -647,8 +647,8 @@ func toUpdatePayload(ctx context.Context, model *Model) (*argus.UpdateScrapeConf
if model.BasicAuth != nil { if model.BasicAuth != nil {
if sc.BasicAuth == nil { if sc.BasicAuth == nil {
sc.BasicAuth = &argus.CreateScrapeConfigPayloadBasicAuth{ sc.BasicAuth = &argus.CreateScrapeConfigPayloadBasicAuth{
Username: core.StringValueToPointer(model.BasicAuth.Username), Username: conversion.StringValueToPointer(model.BasicAuth.Username),
Password: core.StringValueToPointer(model.BasicAuth.Password), Password: conversion.StringValueToPointer(model.BasicAuth.Password),
} }
} }
} }

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/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/dns" "github.com/stackitcloud/stackit-sdk-go/services/dns"
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait" "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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "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) 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{ records = append(records, dns.RecordPayload{
Content: core.StringValueToPointer(recordString), Content: conversion.StringValueToPointer(recordString),
}) })
} }
return &dns.CreateRecordSetPayload{ return &dns.CreateRecordSetPayload{
Comment: core.StringValueToPointer(model.Comment), Comment: conversion.StringValueToPointer(model.Comment),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Records: &records, Records: &records,
Ttl: core.Int64ValueToPointer(model.TTL), Ttl: conversion.Int64ValueToPointer(model.TTL),
Type: core.StringValueToPointer(model.Type), Type: conversion.StringValueToPointer(model.Type),
}, nil }, 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) 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{ records = append(records, dns.RecordPayload{
Content: core.StringValueToPointer(recordString), Content: conversion.StringValueToPointer(recordString),
}) })
} }
return &dns.UpdateRecordSetPayload{ return &dns.UpdateRecordSetPayload{
Comment: core.StringValueToPointer(model.Comment), Comment: conversion.StringValueToPointer(model.Comment),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Records: &records, Records: &records,
Ttl: core.Int64ValueToPointer(model.TTL), Ttl: conversion.Int64ValueToPointer(model.TTL),
}, nil }, 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/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/dns" "github.com/stackitcloud/stackit-sdk-go/services/dns"
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait" "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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "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()) modelPrimaries = append(modelPrimaries, primaryString.ValueString())
} }
return &dns.CreateZonePayload{ return &dns.CreateZonePayload{
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
DnsName: core.StringValueToPointer(model.DnsName), DnsName: conversion.StringValueToPointer(model.DnsName),
ContactEmail: core.StringValueToPointer(model.ContactEmail), ContactEmail: conversion.StringValueToPointer(model.ContactEmail),
Description: core.StringValueToPointer(model.Description), Description: conversion.StringValueToPointer(model.Description),
Acl: core.StringValueToPointer(model.Acl), Acl: conversion.StringValueToPointer(model.Acl),
Type: core.StringValueToPointer(model.Type), Type: conversion.StringValueToPointer(model.Type),
DefaultTTL: core.Int64ValueToPointer(model.DefaultTTL), DefaultTTL: conversion.Int64ValueToPointer(model.DefaultTTL),
ExpireTime: core.Int64ValueToPointer(model.ExpireTime), ExpireTime: conversion.Int64ValueToPointer(model.ExpireTime),
RefreshTime: core.Int64ValueToPointer(model.RefreshTime), RefreshTime: conversion.Int64ValueToPointer(model.RefreshTime),
RetryTime: core.Int64ValueToPointer(model.RetryTime), RetryTime: conversion.Int64ValueToPointer(model.RetryTime),
NegativeCache: core.Int64ValueToPointer(model.NegativeCache), NegativeCache: conversion.Int64ValueToPointer(model.NegativeCache),
IsReverseZone: core.BoolValueToPointer(model.IsReverseZone), IsReverseZone: conversion.BoolValueToPointer(model.IsReverseZone),
Primaries: &modelPrimaries, Primaries: &modelPrimaries,
}, nil }, nil
} }
@ -578,15 +579,15 @@ func toUpdatePayload(model *Model) (*dns.UpdateZonePayload, error) {
} }
return &dns.UpdateZonePayload{ return &dns.UpdateZonePayload{
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
ContactEmail: core.StringValueToPointer(model.ContactEmail), ContactEmail: conversion.StringValueToPointer(model.ContactEmail),
Description: core.StringValueToPointer(model.Description), Description: conversion.StringValueToPointer(model.Description),
Acl: core.StringValueToPointer(model.Acl), Acl: conversion.StringValueToPointer(model.Acl),
DefaultTTL: core.Int64ValueToPointer(model.DefaultTTL), DefaultTTL: conversion.Int64ValueToPointer(model.DefaultTTL),
ExpireTime: core.Int64ValueToPointer(model.ExpireTime), ExpireTime: conversion.Int64ValueToPointer(model.ExpireTime),
RefreshTime: core.Int64ValueToPointer(model.RefreshTime), RefreshTime: conversion.Int64ValueToPointer(model.RefreshTime),
RetryTime: core.Int64ValueToPointer(model.RetryTime), RetryTime: conversion.Int64ValueToPointer(model.RetryTime),
NegativeCache: core.Int64ValueToPointer(model.NegativeCache), NegativeCache: conversion.Int64ValueToPointer(model.NegativeCache),
Primaries: nil, // API returns error if this field is set, even if nothing changes Primaries: nil, // API returns error if this field is set, even if nothing changes
}, nil }, nil
} }

41
stackit/internal/services/loadbalancer/loadbalancer/resource.go
View file

@ -29,6 +29,7 @@ import (
"github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/wait" "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
) )
@ -687,9 +688,9 @@ func toCreatePayload(ctx context.Context, model *Model) (*loadbalancer.CreateLoa
} }
return &loadbalancer.CreateLoadBalancerPayload{ return &loadbalancer.CreateLoadBalancerPayload{
ExternalAddress: core.StringValueToPointer(model.ExternalAddress), ExternalAddress: conversion.StringValueToPointer(model.ExternalAddress),
Listeners: listeners, Listeners: listeners,
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Networks: networks, Networks: networks,
Options: options, Options: options,
TargetPools: targetPools, TargetPools: targetPools,
@ -704,10 +705,10 @@ func toListenersPayload(model *Model) *[]loadbalancer.Listener {
listeners := []loadbalancer.Listener{} listeners := []loadbalancer.Listener{}
for _, listener := range model.Listeners { for _, listener := range model.Listeners {
listeners = append(listeners, loadbalancer.Listener{ listeners = append(listeners, loadbalancer.Listener{
DisplayName: core.StringValueToPointer(listener.DisplayName), DisplayName: conversion.StringValueToPointer(listener.DisplayName),
Port: core.Int64ValueToPointer(listener.Port), Port: conversion.Int64ValueToPointer(listener.Port),
Protocol: core.StringValueToPointer(listener.Protocol), Protocol: conversion.StringValueToPointer(listener.Protocol),
TargetPool: core.StringValueToPointer(listener.TargetPool), TargetPool: conversion.StringValueToPointer(listener.TargetPool),
}) })
} }
@ -722,8 +723,8 @@ func toNetworksPayload(model *Model) *[]loadbalancer.Network {
networks := []loadbalancer.Network{} networks := []loadbalancer.Network{}
for _, network := range model.Networks { for _, network := range model.Networks {
networks = append(networks, loadbalancer.Network{ networks = append(networks, loadbalancer.Network{
NetworkId: core.StringValueToPointer(network.NetworkId), NetworkId: conversion.StringValueToPointer(network.NetworkId),
Role: core.StringValueToPointer(network.Role), Role: conversion.StringValueToPointer(network.Role),
}) })
} }
@ -751,7 +752,7 @@ func toOptionsPayload(ctx context.Context, model *Model) (*loadbalancer.LoadBala
options := &loadbalancer.LoadBalancerOptions{ options := &loadbalancer.LoadBalancerOptions{
AccessControl: accessControl, AccessControl: accessControl,
PrivateNetworkOnly: core.BoolValueToPointer(optionsModel.PrivateNetworkOnly), PrivateNetworkOnly: conversion.BoolValueToPointer(optionsModel.PrivateNetworkOnly),
} }
return options, nil return options, nil
@ -776,8 +777,8 @@ func toTargetPoolsPayload(ctx context.Context, model *Model) (*[]loadbalancer.Ta
targetPools = append(targetPools, loadbalancer.TargetPool{ targetPools = append(targetPools, loadbalancer.TargetPool{
ActiveHealthCheck: activeHealthCheck, ActiveHealthCheck: activeHealthCheck,
Name: core.StringValueToPointer(targetPool.Name), Name: conversion.StringValueToPointer(targetPool.Name),
TargetPort: core.Int64ValueToPointer(targetPool.TargetPort), TargetPort: conversion.Int64ValueToPointer(targetPool.TargetPort),
Targets: targets, Targets: targets,
}) })
} }
@ -799,8 +800,8 @@ func toTargetPoolUpdatePayload(ctx context.Context, targetPool *TargetPool) (*lo
return &loadbalancer.UpdateTargetPoolPayload{ return &loadbalancer.UpdateTargetPoolPayload{
ActiveHealthCheck: activeHealthCheck, ActiveHealthCheck: activeHealthCheck,
Name: core.StringValueToPointer(targetPool.Name), Name: conversion.StringValueToPointer(targetPool.Name),
TargetPort: core.Int64ValueToPointer(targetPool.TargetPort), TargetPort: conversion.Int64ValueToPointer(targetPool.TargetPort),
Targets: targets, Targets: targets,
}, nil }, nil
} }
@ -817,11 +818,11 @@ func toActiveHealthCheckPayload(ctx context.Context, targetPool *TargetPool) (*l
} }
return &loadbalancer.ActiveHealthCheck{ return &loadbalancer.ActiveHealthCheck{
HealthyThreshold: core.Int64ValueToPointer(activeHealthCheckModel.HealthyThreshold), HealthyThreshold: conversion.Int64ValueToPointer(activeHealthCheckModel.HealthyThreshold),
Interval: core.StringValueToPointer(activeHealthCheckModel.Interval), Interval: conversion.StringValueToPointer(activeHealthCheckModel.Interval),
IntervalJitter: core.StringValueToPointer(activeHealthCheckModel.IntervalJitter), IntervalJitter: conversion.StringValueToPointer(activeHealthCheckModel.IntervalJitter),
Timeout: core.StringValueToPointer(activeHealthCheckModel.Timeout), Timeout: conversion.StringValueToPointer(activeHealthCheckModel.Timeout),
UnhealthyThreshold: core.Int64ValueToPointer(activeHealthCheckModel.UnhealthyThreshold), UnhealthyThreshold: conversion.Int64ValueToPointer(activeHealthCheckModel.UnhealthyThreshold),
}, nil }, nil
} }
@ -833,8 +834,8 @@ func toTargetsPayload(targetPool *TargetPool) *[]loadbalancer.Target {
var targets []loadbalancer.Target var targets []loadbalancer.Target
for _, target := range targetPool.Targets { for _, target := range targetPool.Targets {
targets = append(targets, loadbalancer.Target{ targets = append(targets, loadbalancer.Target{
DisplayName: core.StringValueToPointer(target.DisplayName), DisplayName: conversion.StringValueToPointer(target.DisplayName),
Ip: core.StringValueToPointer(target.Ip), Ip: conversion.StringValueToPointer(target.Ip),
}) })
} }

17
stackit/internal/services/logme/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*logme.CreateIn
} }
if parameters == nil { if parameters == nil {
return &logme.CreateInstancePayload{ return &logme.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
payloadParams := &logme.InstanceParameters{} payloadParams := &logme.InstanceParameters{}
if parameters.SgwAcl.ValueString() != "" { if parameters.SgwAcl.ValueString() != "" {
payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl)
} }
return &logme.CreateInstancePayload{ return &logme.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
Parameters: payloadParams, Parameters: payloadParams,
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*logme.UpdateIn
if parameters == nil { if parameters == nil {
return &logme.UpdateInstancePayload{ return &logme.UpdateInstancePayload{
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &logme.UpdateInstancePayload{ return &logme.UpdateInstancePayload{
Parameters: &logme.InstanceParameters{ Parameters: &logme.InstanceParameters{
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }

17
stackit/internal/services/mariadb/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*mariadb.Create
} }
if parameters == nil { if parameters == nil {
return &mariadb.CreateInstancePayload{ return &mariadb.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
payloadParams := &mariadb.InstanceParameters{} payloadParams := &mariadb.InstanceParameters{}
if parameters.SgwAcl.ValueString() != "" { if parameters.SgwAcl.ValueString() != "" {
payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl)
} }
return &mariadb.CreateInstancePayload{ return &mariadb.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
Parameters: payloadParams, Parameters: payloadParams,
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*mariadb.Update
if parameters == nil { if parameters == nil {
return &mariadb.UpdateInstancePayload{ return &mariadb.UpdateInstancePayload{
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &mariadb.UpdateInstancePayload{ return &mariadb.UpdateInstancePayload{
Parameters: &mariadb.InstanceParameters{ Parameters: &mariadb.InstanceParameters{
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }

33
stackit/internal/services/mongodbflex/instance/resource.go
View file

@ -13,6 +13,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -671,15 +672,15 @@ func toCreatePayload(model *Model, acl []string, flavor *flavorModel, storage *s
Acl: &mongodbflex.InstanceAcl{ Acl: &mongodbflex.InstanceAcl{
Items: &acl, Items: &acl,
}, },
BackupSchedule: core.StringValueToPointer(model.BackupSchedule), BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
FlavorId: core.StringValueToPointer(flavor.Id), FlavorId: conversion.StringValueToPointer(flavor.Id),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Replicas: core.Int64ValueToPointer(model.Replicas), Replicas: conversion.Int64ValueToPointer(model.Replicas),
Storage: &mongodbflex.InstanceStorage{ Storage: &mongodbflex.InstanceStorage{
Class: core.StringValueToPointer(storage.Class), Class: conversion.StringValueToPointer(storage.Class),
Size: core.Int64ValueToPointer(storage.Size), Size: conversion.Int64ValueToPointer(storage.Size),
}, },
Version: core.StringValueToPointer(model.Version), Version: conversion.StringValueToPointer(model.Version),
Options: &payloadOptions, Options: &payloadOptions,
}, nil }, nil
} }
@ -710,15 +711,15 @@ func toUpdatePayload(model *Model, acl []string, flavor *flavorModel, storage *s
Acl: &mongodbflex.InstanceAcl{ Acl: &mongodbflex.InstanceAcl{
Items: &acl, Items: &acl,
}, },
BackupSchedule: core.StringValueToPointer(model.BackupSchedule), BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
FlavorId: core.StringValueToPointer(flavor.Id), FlavorId: conversion.StringValueToPointer(flavor.Id),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Replicas: core.Int64ValueToPointer(model.Replicas), Replicas: conversion.Int64ValueToPointer(model.Replicas),
Storage: &mongodbflex.InstanceStorage{ Storage: &mongodbflex.InstanceStorage{
Class: core.StringValueToPointer(storage.Class), Class: conversion.StringValueToPointer(storage.Class),
Size: core.Int64ValueToPointer(storage.Size), Size: conversion.Int64ValueToPointer(storage.Size),
}, },
Version: core.StringValueToPointer(model.Version), Version: conversion.StringValueToPointer(model.Version),
Options: &payloadOptions, Options: &payloadOptions,
}, nil }, nil
} }
@ -734,11 +735,11 @@ func loadFlavorId(ctx context.Context, client mongoDBFlexClient, model *Model, f
if flavor == nil { if flavor == nil {
return fmt.Errorf("nil flavor") return fmt.Errorf("nil flavor")
} }
cpu := core.Int64ValueToPointer(flavor.CPU) cpu := conversion.Int64ValueToPointer(flavor.CPU)
if cpu == nil { if cpu == nil {
return fmt.Errorf("nil CPU") return fmt.Errorf("nil CPU")
} }
ram := core.Int64ValueToPointer(flavor.RAM) ram := conversion.Int64ValueToPointer(flavor.RAM)
if ram == nil { if ram == nil {
return fmt.Errorf("nil RAM") return fmt.Errorf("nil RAM")
} }

5
stackit/internal/services/mongodbflex/user/resource.go
View file

@ -9,6 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -438,7 +439,7 @@ func toCreatePayload(model *Model, roles []string) (*mongodbflex.CreateUserPaylo
return &mongodbflex.CreateUserPayload{ return &mongodbflex.CreateUserPayload{
Roles: &roles, Roles: &roles,
Username: core.StringValueToPointer(model.Username), Username: conversion.StringValueToPointer(model.Username),
Database: core.StringValueToPointer(model.Database), Database: conversion.StringValueToPointer(model.Database),
}, nil }, nil
} }

3
stackit/internal/services/objectstorage/credential/resource.go
View file

@ -8,6 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -328,7 +329,7 @@ func toCreatePayload(model *Model) (*objectstorage.CreateAccessKeyPayload, error
return &objectstorage.CreateAccessKeyPayload{}, nil return &objectstorage.CreateAccessKeyPayload{}, nil
} }
expirationTimestampValue := core.StringValueToPointer(model.ExpirationTimestamp) expirationTimestampValue := conversion.StringValueToPointer(model.ExpirationTimestamp)
if expirationTimestampValue == nil { if expirationTimestampValue == nil {
return &objectstorage.CreateAccessKeyPayload{}, nil return &objectstorage.CreateAccessKeyPayload{}, nil
} }

17
stackit/internal/services/opensearch/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*opensearch.Cre
} }
if parameters == nil { if parameters == nil {
return &opensearch.CreateInstancePayload{ return &opensearch.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
payloadParams := &opensearch.InstanceParameters{} payloadParams := &opensearch.InstanceParameters{}
if parameters.SgwAcl.ValueString() != "" { if parameters.SgwAcl.ValueString() != "" {
payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl)
} }
return &opensearch.CreateInstancePayload{ return &opensearch.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
Parameters: payloadParams, Parameters: payloadParams,
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*opensearch.Upd
if parameters == nil { if parameters == nil {
return &opensearch.UpdateInstancePayload{ return &opensearch.UpdateInstancePayload{
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &opensearch.UpdateInstancePayload{ return &opensearch.UpdateInstancePayload{
Parameters: &opensearch.InstanceParameters{ Parameters: &opensearch.InstanceParameters{
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }

33
stackit/internal/services/postgresflex/instance/resource.go
View file

@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -592,15 +593,15 @@ func toCreatePayload(model *Model, acl []string, flavor *flavorModel, storage *s
Acl: &postgresflex.InstanceAcl{ Acl: &postgresflex.InstanceAcl{
Items: &acl, Items: &acl,
}, },
BackupSchedule: core.StringValueToPointer(model.BackupSchedule), BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
FlavorId: core.StringValueToPointer(flavor.Id), FlavorId: conversion.StringValueToPointer(flavor.Id),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Replicas: core.Int64ValueToPointer(model.Replicas), Replicas: conversion.Int64ValueToPointer(model.Replicas),
Storage: &postgresflex.InstanceStorage{ Storage: &postgresflex.InstanceStorage{
Class: core.StringValueToPointer(storage.Class), Class: conversion.StringValueToPointer(storage.Class),
Size: core.Int64ValueToPointer(storage.Size), Size: conversion.Int64ValueToPointer(storage.Size),
}, },
Version: core.StringValueToPointer(model.Version), Version: conversion.StringValueToPointer(model.Version),
}, nil }, nil
} }
@ -622,15 +623,15 @@ func toUpdatePayload(model *Model, acl []string, flavor *flavorModel, storage *s
Acl: &postgresflex.InstanceAcl{ Acl: &postgresflex.InstanceAcl{
Items: &acl, Items: &acl,
}, },
BackupSchedule: core.StringValueToPointer(model.BackupSchedule), BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule),
FlavorId: core.StringValueToPointer(flavor.Id), FlavorId: conversion.StringValueToPointer(flavor.Id),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Replicas: core.Int64ValueToPointer(model.Replicas), Replicas: conversion.Int64ValueToPointer(model.Replicas),
Storage: &postgresflex.InstanceStorage{ Storage: &postgresflex.InstanceStorage{
Class: core.StringValueToPointer(storage.Class), Class: conversion.StringValueToPointer(storage.Class),
Size: core.Int64ValueToPointer(storage.Size), Size: conversion.Int64ValueToPointer(storage.Size),
}, },
Version: core.StringValueToPointer(model.Version), Version: conversion.StringValueToPointer(model.Version),
}, nil }, nil
} }
@ -645,11 +646,11 @@ func loadFlavorId(ctx context.Context, client postgresFlexClient, model *Model,
if flavor == nil { if flavor == nil {
return fmt.Errorf("nil flavor") return fmt.Errorf("nil flavor")
} }
cpu := core.Int64ValueToPointer(flavor.CPU) cpu := conversion.Int64ValueToPointer(flavor.CPU)
if cpu == nil { if cpu == nil {
return fmt.Errorf("nil CPU") return fmt.Errorf("nil CPU")
} }
ram := core.Int64ValueToPointer(flavor.RAM) ram := conversion.Int64ValueToPointer(flavor.RAM)
if ram == nil { if ram == nil {
return fmt.Errorf("nil RAM") return fmt.Errorf("nil RAM")
} }

3
stackit/internal/services/postgresflex/user/resource.go
View file

@ -9,6 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -435,6 +436,6 @@ func toCreatePayload(model *Model, roles []string) (*postgresflex.CreateUserPayl
return &postgresflex.CreateUserPayload{ return &postgresflex.CreateUserPayload{
Roles: &roles, Roles: &roles,
Username: core.StringValueToPointer(model.Username), Username: conversion.StringValueToPointer(model.Username),
}, nil }, nil
} }

33
stackit/internal/services/postgresql/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -330,21 +331,21 @@ func toCreatePayload(model *Model, parameters *parametersModel, parametersPlugin
if parameters == nil { if parameters == nil {
return &postgresql.CreateInstancePayload{ return &postgresql.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &postgresql.CreateInstancePayload{ return &postgresql.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
Parameters: &postgresql.InstanceParameters{ Parameters: &postgresql.InstanceParameters{
EnableMonitoring: core.BoolValueToPointer(parameters.EnableMonitoring), EnableMonitoring: conversion.BoolValueToPointer(parameters.EnableMonitoring),
MetricsFrequency: core.Int64ValueToPointer(parameters.MetricsFrequency), MetricsFrequency: conversion.Int64ValueToPointer(parameters.MetricsFrequency),
MetricsPrefix: core.StringValueToPointer(parameters.MetricsPrefix), MetricsPrefix: conversion.StringValueToPointer(parameters.MetricsPrefix),
MonitoringInstanceId: core.StringValueToPointer(parameters.MonitoringInstanceId), MonitoringInstanceId: conversion.StringValueToPointer(parameters.MonitoringInstanceId),
Plugins: parametersPlugins, Plugins: parametersPlugins,
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
@ -469,19 +470,19 @@ func toUpdatePayload(model *Model, parameters *parametersModel, parametersPlugin
if parameters == nil { if parameters == nil {
return &postgresql.UpdateInstancePayload{ return &postgresql.UpdateInstancePayload{
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &postgresql.UpdateInstancePayload{ return &postgresql.UpdateInstancePayload{
Parameters: &postgresql.InstanceParameters{ Parameters: &postgresql.InstanceParameters{
EnableMonitoring: core.BoolValueToPointer(parameters.EnableMonitoring), EnableMonitoring: conversion.BoolValueToPointer(parameters.EnableMonitoring),
MetricsFrequency: core.Int64ValueToPointer(parameters.MetricsFrequency), MetricsFrequency: conversion.Int64ValueToPointer(parameters.MetricsFrequency),
MetricsPrefix: core.StringValueToPointer(parameters.MetricsPrefix), MetricsPrefix: conversion.StringValueToPointer(parameters.MetricsPrefix),
MonitoringInstanceId: core.StringValueToPointer(parameters.MonitoringInstanceId), MonitoringInstanceId: conversion.StringValueToPointer(parameters.MonitoringInstanceId),
Plugins: parametersPlugins, Plugins: parametersPlugins,
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }

17
stackit/internal/services/rabbitmq/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*rabbitmq.Creat
} }
if parameters == nil { if parameters == nil {
return &rabbitmq.CreateInstancePayload{ return &rabbitmq.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
payloadParams := &rabbitmq.InstanceParameters{} payloadParams := &rabbitmq.InstanceParameters{}
if parameters.SgwAcl.ValueString() != "" { if parameters.SgwAcl.ValueString() != "" {
payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl)
} }
return &rabbitmq.CreateInstancePayload{ return &rabbitmq.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
Parameters: payloadParams, Parameters: payloadParams,
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*rabbitmq.Updat
if parameters == nil { if parameters == nil {
return &rabbitmq.UpdateInstancePayload{ return &rabbitmq.UpdateInstancePayload{
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &rabbitmq.UpdateInstancePayload{ return &rabbitmq.UpdateInstancePayload{
Parameters: &rabbitmq.InstanceParameters{ Parameters: &rabbitmq.InstanceParameters{
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }

17
stackit/internal/services/redis/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*redis.CreateIn
} }
if parameters == nil { if parameters == nil {
return &redis.CreateInstancePayload{ return &redis.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
payloadParams := &redis.InstanceParameters{} payloadParams := &redis.InstanceParameters{}
if parameters.SgwAcl.ValueString() != "" { if parameters.SgwAcl.ValueString() != "" {
payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl)
} }
return &redis.CreateInstancePayload{ return &redis.CreateInstancePayload{
InstanceName: core.StringValueToPointer(model.Name), InstanceName: conversion.StringValueToPointer(model.Name),
Parameters: payloadParams, Parameters: payloadParams,
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*redis.UpdateIn
if parameters == nil { if parameters == nil {
return &redis.UpdateInstancePayload{ return &redis.UpdateInstancePayload{
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }
return &redis.UpdateInstancePayload{ return &redis.UpdateInstancePayload{
Parameters: &redis.InstanceParameters{ Parameters: &redis.InstanceParameters{
SgwAcl: core.StringValueToPointer(parameters.SgwAcl), SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl),
}, },
PlanId: core.StringValueToPointer(model.PlanId), PlanId: conversion.StringValueToPointer(model.PlanId),
}, nil }, nil
} }

8
stackit/internal/services/resourcemanager/project/resource.go
View file

@ -418,10 +418,10 @@ func toCreatePayload(model *Model, serviceAccountEmail string) (*resourcemanager
} }
return &resourcemanager.CreateProjectPayload{ return &resourcemanager.CreateProjectPayload{
ContainerParentId: core.StringValueToPointer(model.ContainerParentId), ContainerParentId: conversion.StringValueToPointer(model.ContainerParentId),
Labels: labels, Labels: labels,
Members: &members, Members: &members,
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
}, nil }, nil
} }
@ -437,8 +437,8 @@ func toUpdatePayload(model *Model) (*resourcemanager.UpdateProjectPayload, error
} }
return &resourcemanager.UpdateProjectPayload{ return &resourcemanager.UpdateProjectPayload{
ContainerParentId: core.StringValueToPointer(model.ContainerParentId), ContainerParentId: conversion.StringValueToPointer(model.ContainerParentId),
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
Labels: labels, Labels: labels,
}, nil }, nil
} }

3
stackit/internal/services/secretsmanager/instance/resource.go
View file

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/attr"
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -417,7 +418,7 @@ func toCreatePayload(model *Model) (*secretsmanager.CreateInstancePayload, error
return nil, fmt.Errorf("nil model") return nil, fmt.Errorf("nil model")
} }
return &secretsmanager.CreateInstancePayload{ return &secretsmanager.CreateInstancePayload{
Name: core.StringValueToPointer(model.Name), Name: conversion.StringValueToPointer(model.Name),
}, nil }, nil
} }

7
stackit/internal/services/secretsmanager/user/resource.go
View file

@ -7,6 +7,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-log/tflog"
"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/core"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate"
@ -359,8 +360,8 @@ func toCreatePayload(model *Model) (*secretsmanager.CreateUserPayload, error) {
return nil, fmt.Errorf("nil model") return nil, fmt.Errorf("nil model")
} }
return &secretsmanager.CreateUserPayload{ return &secretsmanager.CreateUserPayload{
Description: core.StringValueToPointer(model.Description), Description: conversion.StringValueToPointer(model.Description),
Write: core.BoolValueToPointer(model.WriteEnabled), Write: conversion.BoolValueToPointer(model.WriteEnabled),
}, nil }, nil
} }
@ -369,7 +370,7 @@ func toUpdatePayload(model *Model) (*secretsmanager.UpdateUserPayload, error) {
return nil, fmt.Errorf("nil model") return nil, fmt.Errorf("nil model")
} }
return &secretsmanager.UpdateUserPayload{ return &secretsmanager.UpdateUserPayload{
Write: core.BoolValueToPointer(model.WriteEnabled), Write: conversion.BoolValueToPointer(model.WriteEnabled),
}, nil }, nil
} }

46
stackit/internal/services/ske/cluster/resource.go
View file

@ -674,9 +674,9 @@ func toNodepoolsPayload(ctx context.Context, m *Cluster) ([]ske.Nodepool, error)
ts := []ske.Taint{} ts := []ske.Taint{}
for _, v := range taintsModel { for _, v := range taintsModel {
t := ske.Taint{ t := ske.Taint{
Effect: core.StringValueToPointer(v.Effect), Effect: conversion.StringValueToPointer(v.Effect),
Key: core.StringValueToPointer(v.Key), Key: conversion.StringValueToPointer(v.Key),
Value: core.StringValueToPointer(v.Value), Value: conversion.StringValueToPointer(v.Value),
} }
ts = append(ts, t) ts = append(ts, t)
} }
@ -712,24 +712,24 @@ func toNodepoolsPayload(ctx context.Context, m *Cluster) ([]ske.Nodepool, error)
} }
cn := ske.CRI{ cn := ske.CRI{
Name: core.StringValueToPointer(nodePool.CRI), Name: conversion.StringValueToPointer(nodePool.CRI),
} }
cnp := ske.Nodepool{ cnp := ske.Nodepool{
Name: core.StringValueToPointer(nodePool.Name), Name: conversion.StringValueToPointer(nodePool.Name),
Minimum: core.Int64ValueToPointer(nodePool.Minimum), Minimum: conversion.Int64ValueToPointer(nodePool.Minimum),
Maximum: core.Int64ValueToPointer(nodePool.Maximum), Maximum: conversion.Int64ValueToPointer(nodePool.Maximum),
MaxSurge: core.Int64ValueToPointer(nodePool.MaxSurge), MaxSurge: conversion.Int64ValueToPointer(nodePool.MaxSurge),
MaxUnavailable: core.Int64ValueToPointer(nodePool.MaxUnavailable), MaxUnavailable: conversion.Int64ValueToPointer(nodePool.MaxUnavailable),
Machine: &ske.Machine{ Machine: &ske.Machine{
Type: core.StringValueToPointer(nodePool.MachineType), Type: conversion.StringValueToPointer(nodePool.MachineType),
Image: &ske.Image{ Image: &ske.Image{
Name: core.StringValueToPointer(nodePool.OSName), Name: conversion.StringValueToPointer(nodePool.OSName),
Version: core.StringValueToPointer(nodePool.OSVersion), Version: conversion.StringValueToPointer(nodePool.OSVersion),
}, },
}, },
Volume: &ske.Volume{ Volume: &ske.Volume{
Type: core.StringValueToPointer(nodePool.VolumeType), Type: conversion.StringValueToPointer(nodePool.VolumeType),
Size: core.Int64ValueToPointer(nodePool.VolumeSize), Size: conversion.Int64ValueToPointer(nodePool.VolumeSize),
}, },
Taints: &ts, Taints: &ts,
Cri: &cn, Cri: &cn,
@ -755,8 +755,8 @@ func toHibernationsPayload(ctx context.Context, m *Cluster) (*ske.Hibernation, e
scs := []ske.HibernationSchedule{} scs := []ske.HibernationSchedule{}
for _, h := range hibernation { for _, h := range hibernation {
sc := ske.HibernationSchedule{ sc := ske.HibernationSchedule{
Start: core.StringValueToPointer(h.Start), Start: conversion.StringValueToPointer(h.Start),
End: core.StringValueToPointer(h.End), End: conversion.StringValueToPointer(h.End),
} }
if !h.Timezone.IsNull() && !h.Timezone.IsUnknown() { if !h.Timezone.IsNull() && !h.Timezone.IsUnknown() {
tz := h.Timezone.ValueString() tz := h.Timezone.ValueString()
@ -777,8 +777,8 @@ func toExtensionsPayload(ctx context.Context, m *Cluster) (*ske.Extension, error
ex := &ske.Extension{} ex := &ske.Extension{}
if m.Extensions.Argus != nil { if m.Extensions.Argus != nil {
ex.Argus = &ske.Argus{ ex.Argus = &ske.Argus{
Enabled: core.BoolValueToPointer(m.Extensions.Argus.Enabled), Enabled: conversion.BoolValueToPointer(m.Extensions.Argus.Enabled),
ArgusInstanceId: core.StringValueToPointer(m.Extensions.Argus.ArgusInstanceId), ArgusInstanceId: conversion.StringValueToPointer(m.Extensions.Argus.ArgusInstanceId),
} }
} }
if m.Extensions.ACL != nil { if m.Extensions.ACL != nil {
@ -788,7 +788,7 @@ func toExtensionsPayload(ctx context.Context, m *Cluster) (*ske.Extension, error
return nil, fmt.Errorf("error in extension object converion %v", diags.Errors()) return nil, fmt.Errorf("error in extension object converion %v", diags.Errors())
} }
ex.Acl = &ske.ACL{ ex.Acl = &ske.ACL{
Enabled: core.BoolValueToPointer(m.Extensions.ACL.Enabled), Enabled: conversion.BoolValueToPointer(m.Extensions.ACL.Enabled),
AllowedCidrs: &cidrs, AllowedCidrs: &cidrs,
} }
} }
@ -824,8 +824,8 @@ func toMaintenancePayload(ctx context.Context, m *Cluster) (*ske.Maintenance, er
return &ske.Maintenance{ return &ske.Maintenance{
AutoUpdate: &ske.MaintenanceAutoUpdate{ AutoUpdate: &ske.MaintenanceAutoUpdate{
KubernetesVersion: core.BoolValueToPointer(maintenance.EnableKubernetesVersionUpdates), KubernetesVersion: conversion.BoolValueToPointer(maintenance.EnableKubernetesVersionUpdates),
MachineImageVersion: core.BoolValueToPointer(maintenance.EnableMachineImageVersionUpdates), MachineImageVersion: conversion.BoolValueToPointer(maintenance.EnableMachineImageVersionUpdates),
}, },
TimeWindow: &ske.TimeWindow{ TimeWindow: &ske.TimeWindow{
Start: timeWindowStart, Start: timeWindowStart,
@ -1135,14 +1135,14 @@ func mapExtensions(cl *ske.ClusterResponse, m *Cluster) {
} }
func toKubernetesPayload(m *Cluster, availableVersions []ske.KubernetesVersion) (kubernetesPayload *ske.Kubernetes, hasDeprecatedVersion bool, err error) { func toKubernetesPayload(m *Cluster, availableVersions []ske.KubernetesVersion) (kubernetesPayload *ske.Kubernetes, hasDeprecatedVersion bool, err error) {
versionUsed, hasDeprecatedVersion, err := latestMatchingVersion(availableVersions, core.StringValueToPointer(m.KubernetesVersion)) versionUsed, hasDeprecatedVersion, err := latestMatchingVersion(availableVersions, conversion.StringValueToPointer(m.KubernetesVersion))
if err != nil { if err != nil {
return nil, false, fmt.Errorf("getting latest matching kubernetes version: %w", err) return nil, false, fmt.Errorf("getting latest matching kubernetes version: %w", err)
} }
k := &ske.Kubernetes{ k := &ske.Kubernetes{
Version: versionUsed, Version: versionUsed,
AllowPrivilegedContainers: core.BoolValueToPointer(m.AllowPrivilegedContainers), AllowPrivilegedContainers: conversion.BoolValueToPointer(m.AllowPrivilegedContainers),
} }
return k, hasDeprecatedVersion, nil return k, hasDeprecatedVersion, nil
} }