diff --git a/stackit/internal/conversion/conversion.go b/stackit/internal/conversion/conversion.go index e18e9ce9..93281eea 100644 --- a/stackit/internal/conversion/conversion.go +++ b/stackit/internal/conversion/conversion.go @@ -57,3 +57,33 @@ func ToTerraformStringMap(ctx context.Context, m map[string]string) (basetypes.M 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 +} diff --git a/stackit/internal/core/core.go b/stackit/internal/core/core.go index ab4f93c1..e57b41d6 100644 --- a/stackit/internal/core/core.go +++ b/stackit/internal/core/core.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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)) 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 -} diff --git a/stackit/internal/services/argus/instance/resource.go b/stackit/internal/services/argus/instance/resource.go index d3b74837..532dd37d 100644 --- a/stackit/internal/services/argus/instance/resource.go +++ b/stackit/internal/services/argus/instance/resource.go @@ -19,6 +19,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/argus" "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/validate" ) @@ -515,8 +516,8 @@ func toCreatePayload(model *Model) (*argus.CreateInstancePayload, error) { pa[k] = elements[k].String() } return &argus.CreateInstancePayload{ - Name: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + Name: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), Parameter: &pa, }, nil } @@ -531,8 +532,8 @@ func toUpdatePayload(model *Model) (*argus.UpdateInstancePayload, error) { pa[k] = v.String() } return &argus.UpdateInstancePayload{ - Name: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + Name: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), Parameter: &pa, }, nil } diff --git a/stackit/internal/services/argus/scrapeconfig/resource.go b/stackit/internal/services/argus/scrapeconfig/resource.go index 4cab39d1..9272c0af 100644 --- a/stackit/internal/services/argus/scrapeconfig/resource.go +++ b/stackit/internal/services/argus/scrapeconfig/resource.go @@ -548,11 +548,11 @@ func toCreatePayload(ctx context.Context, model *Model) (*argus.CreateScrapeConf } sc := argus.CreateScrapeConfigPayload{ - JobName: core.StringValueToPointer(model.Name), - MetricsPath: core.StringValueToPointer(model.MetricsPath), - ScrapeInterval: core.StringValueToPointer(model.ScrapeInterval), - ScrapeTimeout: core.StringValueToPointer(model.ScrapeTimeout), - Scheme: core.StringValueToPointer(model.Scheme), + JobName: conversion.StringValueToPointer(model.Name), + MetricsPath: conversion.StringValueToPointer(model.MetricsPath), + ScrapeInterval: conversion.StringValueToPointer(model.ScrapeInterval), + ScrapeTimeout: conversion.StringValueToPointer(model.ScrapeTimeout), + Scheme: conversion.StringValueToPointer(model.Scheme), } setDefaultsCreateScrapeConfig(&sc, model) @@ -568,8 +568,8 @@ func toCreatePayload(ctx context.Context, model *Model) (*argus.CreateScrapeConf if model.BasicAuth != nil { if sc.BasicAuth == nil { sc.BasicAuth = &argus.CreateScrapeConfigPayloadBasicAuth{ - Username: core.StringValueToPointer(model.BasicAuth.Username), - Password: core.StringValueToPointer(model.BasicAuth.Password), + Username: conversion.StringValueToPointer(model.BasicAuth.Username), + Password: conversion.StringValueToPointer(model.BasicAuth.Password), } } } @@ -628,10 +628,10 @@ func toUpdatePayload(ctx context.Context, model *Model) (*argus.UpdateScrapeConf } sc := argus.UpdateScrapeConfigPayload{ - MetricsPath: core.StringValueToPointer(model.MetricsPath), - ScrapeInterval: core.StringValueToPointer(model.ScrapeInterval), - ScrapeTimeout: core.StringValueToPointer(model.ScrapeTimeout), - Scheme: core.StringValueToPointer(model.Scheme), + MetricsPath: conversion.StringValueToPointer(model.MetricsPath), + ScrapeInterval: conversion.StringValueToPointer(model.ScrapeInterval), + ScrapeTimeout: conversion.StringValueToPointer(model.ScrapeTimeout), + Scheme: conversion.StringValueToPointer(model.Scheme), } setDefaultsUpdateScrapeConfig(&sc, model) @@ -647,8 +647,8 @@ func toUpdatePayload(ctx context.Context, model *Model) (*argus.UpdateScrapeConf if model.BasicAuth != nil { if sc.BasicAuth == nil { sc.BasicAuth = &argus.CreateScrapeConfigPayloadBasicAuth{ - Username: core.StringValueToPointer(model.BasicAuth.Username), - Password: core.StringValueToPointer(model.BasicAuth.Password), + Username: conversion.StringValueToPointer(model.BasicAuth.Username), + Password: conversion.StringValueToPointer(model.BasicAuth.Password), } } } diff --git a/stackit/internal/services/dns/recordset/resource.go b/stackit/internal/services/dns/recordset/resource.go index 3977aa43..c33ac12a 100644 --- a/stackit/internal/services/dns/recordset/resource.go +++ b/stackit/internal/services/dns/recordset/resource.go @@ -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 } diff --git a/stackit/internal/services/dns/zone/resource.go b/stackit/internal/services/dns/zone/resource.go index 839460e8..202e0abf 100644 --- a/stackit/internal/services/dns/zone/resource.go +++ b/stackit/internal/services/dns/zone/resource.go @@ -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 } diff --git a/stackit/internal/services/loadbalancer/loadbalancer/resource.go b/stackit/internal/services/loadbalancer/loadbalancer/resource.go index 6ca9b4de..682b6b2b 100644 --- a/stackit/internal/services/loadbalancer/loadbalancer/resource.go +++ b/stackit/internal/services/loadbalancer/loadbalancer/resource.go @@ -29,6 +29,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" "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/validate" ) @@ -687,9 +688,9 @@ func toCreatePayload(ctx context.Context, model *Model) (*loadbalancer.CreateLoa } return &loadbalancer.CreateLoadBalancerPayload{ - ExternalAddress: core.StringValueToPointer(model.ExternalAddress), + ExternalAddress: conversion.StringValueToPointer(model.ExternalAddress), Listeners: listeners, - Name: core.StringValueToPointer(model.Name), + Name: conversion.StringValueToPointer(model.Name), Networks: networks, Options: options, TargetPools: targetPools, @@ -704,10 +705,10 @@ func toListenersPayload(model *Model) *[]loadbalancer.Listener { listeners := []loadbalancer.Listener{} for _, listener := range model.Listeners { listeners = append(listeners, loadbalancer.Listener{ - DisplayName: core.StringValueToPointer(listener.DisplayName), - Port: core.Int64ValueToPointer(listener.Port), - Protocol: core.StringValueToPointer(listener.Protocol), - TargetPool: core.StringValueToPointer(listener.TargetPool), + DisplayName: conversion.StringValueToPointer(listener.DisplayName), + Port: conversion.Int64ValueToPointer(listener.Port), + Protocol: conversion.StringValueToPointer(listener.Protocol), + TargetPool: conversion.StringValueToPointer(listener.TargetPool), }) } @@ -722,8 +723,8 @@ func toNetworksPayload(model *Model) *[]loadbalancer.Network { networks := []loadbalancer.Network{} for _, network := range model.Networks { networks = append(networks, loadbalancer.Network{ - NetworkId: core.StringValueToPointer(network.NetworkId), - Role: core.StringValueToPointer(network.Role), + NetworkId: conversion.StringValueToPointer(network.NetworkId), + Role: conversion.StringValueToPointer(network.Role), }) } @@ -751,7 +752,7 @@ func toOptionsPayload(ctx context.Context, model *Model) (*loadbalancer.LoadBala options := &loadbalancer.LoadBalancerOptions{ AccessControl: accessControl, - PrivateNetworkOnly: core.BoolValueToPointer(optionsModel.PrivateNetworkOnly), + PrivateNetworkOnly: conversion.BoolValueToPointer(optionsModel.PrivateNetworkOnly), } return options, nil @@ -776,8 +777,8 @@ func toTargetPoolsPayload(ctx context.Context, model *Model) (*[]loadbalancer.Ta targetPools = append(targetPools, loadbalancer.TargetPool{ ActiveHealthCheck: activeHealthCheck, - Name: core.StringValueToPointer(targetPool.Name), - TargetPort: core.Int64ValueToPointer(targetPool.TargetPort), + Name: conversion.StringValueToPointer(targetPool.Name), + TargetPort: conversion.Int64ValueToPointer(targetPool.TargetPort), Targets: targets, }) } @@ -799,8 +800,8 @@ func toTargetPoolUpdatePayload(ctx context.Context, targetPool *TargetPool) (*lo return &loadbalancer.UpdateTargetPoolPayload{ ActiveHealthCheck: activeHealthCheck, - Name: core.StringValueToPointer(targetPool.Name), - TargetPort: core.Int64ValueToPointer(targetPool.TargetPort), + Name: conversion.StringValueToPointer(targetPool.Name), + TargetPort: conversion.Int64ValueToPointer(targetPool.TargetPort), Targets: targets, }, nil } @@ -817,11 +818,11 @@ func toActiveHealthCheckPayload(ctx context.Context, targetPool *TargetPool) (*l } return &loadbalancer.ActiveHealthCheck{ - HealthyThreshold: core.Int64ValueToPointer(activeHealthCheckModel.HealthyThreshold), - Interval: core.StringValueToPointer(activeHealthCheckModel.Interval), - IntervalJitter: core.StringValueToPointer(activeHealthCheckModel.IntervalJitter), - Timeout: core.StringValueToPointer(activeHealthCheckModel.Timeout), - UnhealthyThreshold: core.Int64ValueToPointer(activeHealthCheckModel.UnhealthyThreshold), + HealthyThreshold: conversion.Int64ValueToPointer(activeHealthCheckModel.HealthyThreshold), + Interval: conversion.StringValueToPointer(activeHealthCheckModel.Interval), + IntervalJitter: conversion.StringValueToPointer(activeHealthCheckModel.IntervalJitter), + Timeout: conversion.StringValueToPointer(activeHealthCheckModel.Timeout), + UnhealthyThreshold: conversion.Int64ValueToPointer(activeHealthCheckModel.UnhealthyThreshold), }, nil } @@ -833,8 +834,8 @@ func toTargetsPayload(targetPool *TargetPool) *[]loadbalancer.Target { var targets []loadbalancer.Target for _, target := range targetPool.Targets { targets = append(targets, loadbalancer.Target{ - DisplayName: core.StringValueToPointer(target.DisplayName), - Ip: core.StringValueToPointer(target.Ip), + DisplayName: conversion.StringValueToPointer(target.DisplayName), + Ip: conversion.StringValueToPointer(target.Ip), }) } diff --git a/stackit/internal/services/logme/instance/resource.go b/stackit/internal/services/logme/instance/resource.go index 69385f75..9a32a65a 100644 --- a/stackit/internal/services/logme/instance/resource.go +++ b/stackit/internal/services/logme/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*logme.CreateIn } if parameters == nil { return &logme.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + InstanceName: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } payloadParams := &logme.InstanceParameters{} if parameters.SgwAcl.ValueString() != "" { - payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) + payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl) } return &logme.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), + InstanceName: conversion.StringValueToPointer(model.Name), Parameters: payloadParams, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } @@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*logme.UpdateIn if parameters == nil { return &logme.UpdateInstancePayload{ - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &logme.UpdateInstancePayload{ Parameters: &logme.InstanceParameters{ - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } diff --git a/stackit/internal/services/mariadb/instance/resource.go b/stackit/internal/services/mariadb/instance/resource.go index 0b32cdfa..dafc1617 100644 --- a/stackit/internal/services/mariadb/instance/resource.go +++ b/stackit/internal/services/mariadb/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*mariadb.Create } if parameters == nil { return &mariadb.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + InstanceName: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } payloadParams := &mariadb.InstanceParameters{} if parameters.SgwAcl.ValueString() != "" { - payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) + payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl) } return &mariadb.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), + InstanceName: conversion.StringValueToPointer(model.Name), Parameters: payloadParams, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } @@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*mariadb.Update if parameters == nil { return &mariadb.UpdateInstancePayload{ - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &mariadb.UpdateInstancePayload{ Parameters: &mariadb.InstanceParameters{ - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } diff --git a/stackit/internal/services/mongodbflex/instance/resource.go b/stackit/internal/services/mongodbflex/instance/resource.go index a17b439c..9ecaf1b9 100644 --- a/stackit/internal/services/mongodbflex/instance/resource.go +++ b/stackit/internal/services/mongodbflex/instance/resource.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -671,15 +672,15 @@ func toCreatePayload(model *Model, acl []string, flavor *flavorModel, storage *s Acl: &mongodbflex.InstanceAcl{ Items: &acl, }, - BackupSchedule: core.StringValueToPointer(model.BackupSchedule), - FlavorId: core.StringValueToPointer(flavor.Id), - Name: core.StringValueToPointer(model.Name), - Replicas: core.Int64ValueToPointer(model.Replicas), + BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule), + FlavorId: conversion.StringValueToPointer(flavor.Id), + Name: conversion.StringValueToPointer(model.Name), + Replicas: conversion.Int64ValueToPointer(model.Replicas), Storage: &mongodbflex.InstanceStorage{ - Class: core.StringValueToPointer(storage.Class), - Size: core.Int64ValueToPointer(storage.Size), + Class: conversion.StringValueToPointer(storage.Class), + Size: conversion.Int64ValueToPointer(storage.Size), }, - Version: core.StringValueToPointer(model.Version), + Version: conversion.StringValueToPointer(model.Version), Options: &payloadOptions, }, nil } @@ -710,15 +711,15 @@ func toUpdatePayload(model *Model, acl []string, flavor *flavorModel, storage *s Acl: &mongodbflex.InstanceAcl{ Items: &acl, }, - BackupSchedule: core.StringValueToPointer(model.BackupSchedule), - FlavorId: core.StringValueToPointer(flavor.Id), - Name: core.StringValueToPointer(model.Name), - Replicas: core.Int64ValueToPointer(model.Replicas), + BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule), + FlavorId: conversion.StringValueToPointer(flavor.Id), + Name: conversion.StringValueToPointer(model.Name), + Replicas: conversion.Int64ValueToPointer(model.Replicas), Storage: &mongodbflex.InstanceStorage{ - Class: core.StringValueToPointer(storage.Class), - Size: core.Int64ValueToPointer(storage.Size), + Class: conversion.StringValueToPointer(storage.Class), + Size: conversion.Int64ValueToPointer(storage.Size), }, - Version: core.StringValueToPointer(model.Version), + Version: conversion.StringValueToPointer(model.Version), Options: &payloadOptions, }, nil } @@ -734,11 +735,11 @@ func loadFlavorId(ctx context.Context, client mongoDBFlexClient, model *Model, f if flavor == nil { return fmt.Errorf("nil flavor") } - cpu := core.Int64ValueToPointer(flavor.CPU) + cpu := conversion.Int64ValueToPointer(flavor.CPU) if cpu == nil { return fmt.Errorf("nil CPU") } - ram := core.Int64ValueToPointer(flavor.RAM) + ram := conversion.Int64ValueToPointer(flavor.RAM) if ram == nil { return fmt.Errorf("nil RAM") } diff --git a/stackit/internal/services/mongodbflex/user/resource.go b/stackit/internal/services/mongodbflex/user/resource.go index 0aafc266..2ae8e2be 100644 --- a/stackit/internal/services/mongodbflex/user/resource.go +++ b/stackit/internal/services/mongodbflex/user/resource.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "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/validate" @@ -438,7 +439,7 @@ func toCreatePayload(model *Model, roles []string) (*mongodbflex.CreateUserPaylo return &mongodbflex.CreateUserPayload{ Roles: &roles, - Username: core.StringValueToPointer(model.Username), - Database: core.StringValueToPointer(model.Database), + Username: conversion.StringValueToPointer(model.Username), + Database: conversion.StringValueToPointer(model.Database), }, nil } diff --git a/stackit/internal/services/objectstorage/credential/resource.go b/stackit/internal/services/objectstorage/credential/resource.go index f27a9799..b6acaf15 100644 --- a/stackit/internal/services/objectstorage/credential/resource.go +++ b/stackit/internal/services/objectstorage/credential/resource.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "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/validate" @@ -328,7 +329,7 @@ func toCreatePayload(model *Model) (*objectstorage.CreateAccessKeyPayload, error return &objectstorage.CreateAccessKeyPayload{}, nil } - expirationTimestampValue := core.StringValueToPointer(model.ExpirationTimestamp) + expirationTimestampValue := conversion.StringValueToPointer(model.ExpirationTimestamp) if expirationTimestampValue == nil { return &objectstorage.CreateAccessKeyPayload{}, nil } diff --git a/stackit/internal/services/opensearch/instance/resource.go b/stackit/internal/services/opensearch/instance/resource.go index d4e8e897..91e1d21a 100644 --- a/stackit/internal/services/opensearch/instance/resource.go +++ b/stackit/internal/services/opensearch/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*opensearch.Cre } if parameters == nil { return &opensearch.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + InstanceName: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } payloadParams := &opensearch.InstanceParameters{} if parameters.SgwAcl.ValueString() != "" { - payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) + payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl) } return &opensearch.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), + InstanceName: conversion.StringValueToPointer(model.Name), Parameters: payloadParams, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } @@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*opensearch.Upd if parameters == nil { return &opensearch.UpdateInstancePayload{ - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &opensearch.UpdateInstancePayload{ Parameters: &opensearch.InstanceParameters{ - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } diff --git a/stackit/internal/services/postgresflex/instance/resource.go b/stackit/internal/services/postgresflex/instance/resource.go index d9ebc930..3396733d 100644 --- a/stackit/internal/services/postgresflex/instance/resource.go +++ b/stackit/internal/services/postgresflex/instance/resource.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -592,15 +593,15 @@ func toCreatePayload(model *Model, acl []string, flavor *flavorModel, storage *s Acl: &postgresflex.InstanceAcl{ Items: &acl, }, - BackupSchedule: core.StringValueToPointer(model.BackupSchedule), - FlavorId: core.StringValueToPointer(flavor.Id), - Name: core.StringValueToPointer(model.Name), - Replicas: core.Int64ValueToPointer(model.Replicas), + BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule), + FlavorId: conversion.StringValueToPointer(flavor.Id), + Name: conversion.StringValueToPointer(model.Name), + Replicas: conversion.Int64ValueToPointer(model.Replicas), Storage: &postgresflex.InstanceStorage{ - Class: core.StringValueToPointer(storage.Class), - Size: core.Int64ValueToPointer(storage.Size), + Class: conversion.StringValueToPointer(storage.Class), + Size: conversion.Int64ValueToPointer(storage.Size), }, - Version: core.StringValueToPointer(model.Version), + Version: conversion.StringValueToPointer(model.Version), }, nil } @@ -622,15 +623,15 @@ func toUpdatePayload(model *Model, acl []string, flavor *flavorModel, storage *s Acl: &postgresflex.InstanceAcl{ Items: &acl, }, - BackupSchedule: core.StringValueToPointer(model.BackupSchedule), - FlavorId: core.StringValueToPointer(flavor.Id), - Name: core.StringValueToPointer(model.Name), - Replicas: core.Int64ValueToPointer(model.Replicas), + BackupSchedule: conversion.StringValueToPointer(model.BackupSchedule), + FlavorId: conversion.StringValueToPointer(flavor.Id), + Name: conversion.StringValueToPointer(model.Name), + Replicas: conversion.Int64ValueToPointer(model.Replicas), Storage: &postgresflex.InstanceStorage{ - Class: core.StringValueToPointer(storage.Class), - Size: core.Int64ValueToPointer(storage.Size), + Class: conversion.StringValueToPointer(storage.Class), + Size: conversion.Int64ValueToPointer(storage.Size), }, - Version: core.StringValueToPointer(model.Version), + Version: conversion.StringValueToPointer(model.Version), }, nil } @@ -645,11 +646,11 @@ func loadFlavorId(ctx context.Context, client postgresFlexClient, model *Model, if flavor == nil { return fmt.Errorf("nil flavor") } - cpu := core.Int64ValueToPointer(flavor.CPU) + cpu := conversion.Int64ValueToPointer(flavor.CPU) if cpu == nil { return fmt.Errorf("nil CPU") } - ram := core.Int64ValueToPointer(flavor.RAM) + ram := conversion.Int64ValueToPointer(flavor.RAM) if ram == nil { return fmt.Errorf("nil RAM") } diff --git a/stackit/internal/services/postgresflex/user/resource.go b/stackit/internal/services/postgresflex/user/resource.go index aee3d503..12c7c140 100644 --- a/stackit/internal/services/postgresflex/user/resource.go +++ b/stackit/internal/services/postgresflex/user/resource.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "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/validate" @@ -435,6 +436,6 @@ func toCreatePayload(model *Model, roles []string) (*postgresflex.CreateUserPayl return &postgresflex.CreateUserPayload{ Roles: &roles, - Username: core.StringValueToPointer(model.Username), + Username: conversion.StringValueToPointer(model.Username), }, nil } diff --git a/stackit/internal/services/postgresql/instance/resource.go b/stackit/internal/services/postgresql/instance/resource.go index a9a0fbaf..7f9a52af 100644 --- a/stackit/internal/services/postgresql/instance/resource.go +++ b/stackit/internal/services/postgresql/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -330,21 +331,21 @@ func toCreatePayload(model *Model, parameters *parametersModel, parametersPlugin if parameters == nil { return &postgresql.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + InstanceName: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &postgresql.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), + InstanceName: conversion.StringValueToPointer(model.Name), Parameters: &postgresql.InstanceParameters{ - EnableMonitoring: core.BoolValueToPointer(parameters.EnableMonitoring), - MetricsFrequency: core.Int64ValueToPointer(parameters.MetricsFrequency), - MetricsPrefix: core.StringValueToPointer(parameters.MetricsPrefix), - MonitoringInstanceId: core.StringValueToPointer(parameters.MonitoringInstanceId), + EnableMonitoring: conversion.BoolValueToPointer(parameters.EnableMonitoring), + MetricsFrequency: conversion.Int64ValueToPointer(parameters.MetricsFrequency), + MetricsPrefix: conversion.StringValueToPointer(parameters.MetricsPrefix), + MonitoringInstanceId: conversion.StringValueToPointer(parameters.MonitoringInstanceId), Plugins: parametersPlugins, - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } @@ -469,19 +470,19 @@ func toUpdatePayload(model *Model, parameters *parametersModel, parametersPlugin if parameters == nil { return &postgresql.UpdateInstancePayload{ - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &postgresql.UpdateInstancePayload{ Parameters: &postgresql.InstanceParameters{ - EnableMonitoring: core.BoolValueToPointer(parameters.EnableMonitoring), - MetricsFrequency: core.Int64ValueToPointer(parameters.MetricsFrequency), - MetricsPrefix: core.StringValueToPointer(parameters.MetricsPrefix), - MonitoringInstanceId: core.StringValueToPointer(parameters.MonitoringInstanceId), + EnableMonitoring: conversion.BoolValueToPointer(parameters.EnableMonitoring), + MetricsFrequency: conversion.Int64ValueToPointer(parameters.MetricsFrequency), + MetricsPrefix: conversion.StringValueToPointer(parameters.MetricsPrefix), + MonitoringInstanceId: conversion.StringValueToPointer(parameters.MonitoringInstanceId), Plugins: parametersPlugins, - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } diff --git a/stackit/internal/services/rabbitmq/instance/resource.go b/stackit/internal/services/rabbitmq/instance/resource.go index 38ccb1d0..cc6e4157 100644 --- a/stackit/internal/services/rabbitmq/instance/resource.go +++ b/stackit/internal/services/rabbitmq/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*rabbitmq.Creat } if parameters == nil { return &rabbitmq.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + InstanceName: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } payloadParams := &rabbitmq.InstanceParameters{} if parameters.SgwAcl.ValueString() != "" { - payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) + payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl) } return &rabbitmq.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), + InstanceName: conversion.StringValueToPointer(model.Name), Parameters: payloadParams, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } @@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*rabbitmq.Updat if parameters == nil { return &rabbitmq.UpdateInstancePayload{ - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &rabbitmq.UpdateInstancePayload{ Parameters: &rabbitmq.InstanceParameters{ - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } diff --git a/stackit/internal/services/redis/instance/resource.go b/stackit/internal/services/redis/instance/resource.go index 46b6e282..cc1a021c 100644 --- a/stackit/internal/services/redis/instance/resource.go +++ b/stackit/internal/services/redis/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "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/validate" @@ -578,18 +579,18 @@ func toCreatePayload(model *Model, parameters *parametersModel) (*redis.CreateIn } if parameters == nil { return &redis.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), - PlanId: core.StringValueToPointer(model.PlanId), + InstanceName: conversion.StringValueToPointer(model.Name), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } payloadParams := &redis.InstanceParameters{} if parameters.SgwAcl.ValueString() != "" { - payloadParams.SgwAcl = core.StringValueToPointer(parameters.SgwAcl) + payloadParams.SgwAcl = conversion.StringValueToPointer(parameters.SgwAcl) } return &redis.CreateInstancePayload{ - InstanceName: core.StringValueToPointer(model.Name), + InstanceName: conversion.StringValueToPointer(model.Name), Parameters: payloadParams, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } @@ -600,14 +601,14 @@ func toUpdatePayload(model *Model, parameters *parametersModel) (*redis.UpdateIn if parameters == nil { return &redis.UpdateInstancePayload{ - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } return &redis.UpdateInstancePayload{ Parameters: &redis.InstanceParameters{ - SgwAcl: core.StringValueToPointer(parameters.SgwAcl), + SgwAcl: conversion.StringValueToPointer(parameters.SgwAcl), }, - PlanId: core.StringValueToPointer(model.PlanId), + PlanId: conversion.StringValueToPointer(model.PlanId), }, nil } diff --git a/stackit/internal/services/resourcemanager/project/resource.go b/stackit/internal/services/resourcemanager/project/resource.go index e572e74c..21930237 100644 --- a/stackit/internal/services/resourcemanager/project/resource.go +++ b/stackit/internal/services/resourcemanager/project/resource.go @@ -418,10 +418,10 @@ func toCreatePayload(model *Model, serviceAccountEmail string) (*resourcemanager } return &resourcemanager.CreateProjectPayload{ - ContainerParentId: core.StringValueToPointer(model.ContainerParentId), + ContainerParentId: conversion.StringValueToPointer(model.ContainerParentId), Labels: labels, Members: &members, - Name: core.StringValueToPointer(model.Name), + Name: conversion.StringValueToPointer(model.Name), }, nil } @@ -437,8 +437,8 @@ func toUpdatePayload(model *Model) (*resourcemanager.UpdateProjectPayload, error } return &resourcemanager.UpdateProjectPayload{ - ContainerParentId: core.StringValueToPointer(model.ContainerParentId), - Name: core.StringValueToPointer(model.Name), + ContainerParentId: conversion.StringValueToPointer(model.ContainerParentId), + Name: conversion.StringValueToPointer(model.Name), Labels: labels, }, nil } diff --git a/stackit/internal/services/secretsmanager/instance/resource.go b/stackit/internal/services/secretsmanager/instance/resource.go index 63b2a0a3..559b1894 100644 --- a/stackit/internal/services/secretsmanager/instance/resource.go +++ b/stackit/internal/services/secretsmanager/instance/resource.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "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/validate" @@ -417,7 +418,7 @@ func toCreatePayload(model *Model) (*secretsmanager.CreateInstancePayload, error return nil, fmt.Errorf("nil model") } return &secretsmanager.CreateInstancePayload{ - Name: core.StringValueToPointer(model.Name), + Name: conversion.StringValueToPointer(model.Name), }, nil } diff --git a/stackit/internal/services/secretsmanager/user/resource.go b/stackit/internal/services/secretsmanager/user/resource.go index baee4961..ad1bbb54 100644 --- a/stackit/internal/services/secretsmanager/user/resource.go +++ b/stackit/internal/services/secretsmanager/user/resource.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "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/validate" @@ -359,8 +360,8 @@ func toCreatePayload(model *Model) (*secretsmanager.CreateUserPayload, error) { return nil, fmt.Errorf("nil model") } return &secretsmanager.CreateUserPayload{ - Description: core.StringValueToPointer(model.Description), - Write: core.BoolValueToPointer(model.WriteEnabled), + Description: conversion.StringValueToPointer(model.Description), + Write: conversion.BoolValueToPointer(model.WriteEnabled), }, nil } @@ -369,7 +370,7 @@ func toUpdatePayload(model *Model) (*secretsmanager.UpdateUserPayload, error) { return nil, fmt.Errorf("nil model") } return &secretsmanager.UpdateUserPayload{ - Write: core.BoolValueToPointer(model.WriteEnabled), + Write: conversion.BoolValueToPointer(model.WriteEnabled), }, nil } diff --git a/stackit/internal/services/ske/cluster/resource.go b/stackit/internal/services/ske/cluster/resource.go index f68f2ea3..7e2049b7 100644 --- a/stackit/internal/services/ske/cluster/resource.go +++ b/stackit/internal/services/ske/cluster/resource.go @@ -674,9 +674,9 @@ func toNodepoolsPayload(ctx context.Context, m *Cluster) ([]ske.Nodepool, error) ts := []ske.Taint{} for _, v := range taintsModel { t := ske.Taint{ - Effect: core.StringValueToPointer(v.Effect), - Key: core.StringValueToPointer(v.Key), - Value: core.StringValueToPointer(v.Value), + Effect: conversion.StringValueToPointer(v.Effect), + Key: conversion.StringValueToPointer(v.Key), + Value: conversion.StringValueToPointer(v.Value), } ts = append(ts, t) } @@ -712,24 +712,24 @@ func toNodepoolsPayload(ctx context.Context, m *Cluster) ([]ske.Nodepool, error) } cn := ske.CRI{ - Name: core.StringValueToPointer(nodePool.CRI), + Name: conversion.StringValueToPointer(nodePool.CRI), } cnp := ske.Nodepool{ - Name: core.StringValueToPointer(nodePool.Name), - Minimum: core.Int64ValueToPointer(nodePool.Minimum), - Maximum: core.Int64ValueToPointer(nodePool.Maximum), - MaxSurge: core.Int64ValueToPointer(nodePool.MaxSurge), - MaxUnavailable: core.Int64ValueToPointer(nodePool.MaxUnavailable), + Name: conversion.StringValueToPointer(nodePool.Name), + Minimum: conversion.Int64ValueToPointer(nodePool.Minimum), + Maximum: conversion.Int64ValueToPointer(nodePool.Maximum), + MaxSurge: conversion.Int64ValueToPointer(nodePool.MaxSurge), + MaxUnavailable: conversion.Int64ValueToPointer(nodePool.MaxUnavailable), Machine: &ske.Machine{ - Type: core.StringValueToPointer(nodePool.MachineType), + Type: conversion.StringValueToPointer(nodePool.MachineType), Image: &ske.Image{ - Name: core.StringValueToPointer(nodePool.OSName), - Version: core.StringValueToPointer(nodePool.OSVersion), + Name: conversion.StringValueToPointer(nodePool.OSName), + Version: conversion.StringValueToPointer(nodePool.OSVersion), }, }, Volume: &ske.Volume{ - Type: core.StringValueToPointer(nodePool.VolumeType), - Size: core.Int64ValueToPointer(nodePool.VolumeSize), + Type: conversion.StringValueToPointer(nodePool.VolumeType), + Size: conversion.Int64ValueToPointer(nodePool.VolumeSize), }, Taints: &ts, Cri: &cn, @@ -755,8 +755,8 @@ func toHibernationsPayload(ctx context.Context, m *Cluster) (*ske.Hibernation, e scs := []ske.HibernationSchedule{} for _, h := range hibernation { sc := ske.HibernationSchedule{ - Start: core.StringValueToPointer(h.Start), - End: core.StringValueToPointer(h.End), + Start: conversion.StringValueToPointer(h.Start), + End: conversion.StringValueToPointer(h.End), } if !h.Timezone.IsNull() && !h.Timezone.IsUnknown() { tz := h.Timezone.ValueString() @@ -777,8 +777,8 @@ func toExtensionsPayload(ctx context.Context, m *Cluster) (*ske.Extension, error ex := &ske.Extension{} if m.Extensions.Argus != nil { ex.Argus = &ske.Argus{ - Enabled: core.BoolValueToPointer(m.Extensions.Argus.Enabled), - ArgusInstanceId: core.StringValueToPointer(m.Extensions.Argus.ArgusInstanceId), + Enabled: conversion.BoolValueToPointer(m.Extensions.Argus.Enabled), + ArgusInstanceId: conversion.StringValueToPointer(m.Extensions.Argus.ArgusInstanceId), } } 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()) } ex.Acl = &ske.ACL{ - Enabled: core.BoolValueToPointer(m.Extensions.ACL.Enabled), + Enabled: conversion.BoolValueToPointer(m.Extensions.ACL.Enabled), AllowedCidrs: &cidrs, } } @@ -824,8 +824,8 @@ func toMaintenancePayload(ctx context.Context, m *Cluster) (*ske.Maintenance, er return &ske.Maintenance{ AutoUpdate: &ske.MaintenanceAutoUpdate{ - KubernetesVersion: core.BoolValueToPointer(maintenance.EnableKubernetesVersionUpdates), - MachineImageVersion: core.BoolValueToPointer(maintenance.EnableMachineImageVersionUpdates), + KubernetesVersion: conversion.BoolValueToPointer(maintenance.EnableKubernetesVersionUpdates), + MachineImageVersion: conversion.BoolValueToPointer(maintenance.EnableMachineImageVersionUpdates), }, TimeWindow: &ske.TimeWindow{ 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) { - versionUsed, hasDeprecatedVersion, err := latestMatchingVersion(availableVersions, core.StringValueToPointer(m.KubernetesVersion)) + versionUsed, hasDeprecatedVersion, err := latestMatchingVersion(availableVersions, conversion.StringValueToPointer(m.KubernetesVersion)) if err != nil { return nil, false, fmt.Errorf("getting latest matching kubernetes version: %w", err) } k := &ske.Kubernetes{ Version: versionUsed, - AllowPrivilegedContainers: core.BoolValueToPointer(m.AllowPrivilegedContainers), + AllowPrivilegedContainers: conversion.BoolValueToPointer(m.AllowPrivilegedContainers), } return k, hasDeprecatedVersion, nil }