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

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/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
}

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{
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),
}
}
}