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

Update SDK dependencies (#100)

Browse source 
* Update dependencies

* Fix tests

* Fix field assignment

* Update field assignment

* Remove unused functions

---------

Co-authored-by: Henrique Santos <henrique.santos@freiheit.com>
This commit is contained in:
Henrique Santos 2023-10-24 14:54:04 +01:00 • committed by GitHub
parent 9937717104
commit c3618f2b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 249 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -663,10 +663,10 @@ func toNodepoolsPayload(ctx context.Context, m *Cluster) []ske.Nodepool {
}
cnp := ske.Nodepool{
Name: nodePool.Name.ValueStringPointer(),
Minimum: conversion.ToPtrInt32(nodePool.Minimum),
Maximum: conversion.ToPtrInt32(nodePool.Maximum),
MaxSurge: conversion.ToPtrInt32(nodePool.MaxSurge),
MaxUnavailable: conversion.ToPtrInt32(nodePool.MaxUnavailable),
Minimum: nodePool.Minimum.ValueInt64Pointer(),
Maximum: nodePool.Maximum.ValueInt64Pointer(),
MaxSurge: nodePool.MaxSurge.ValueInt64Pointer(),
MaxUnavailable: nodePool.MaxUnavailable.ValueInt64Pointer(),
Machine: &ske.Machine{
Type: nodePool.MachineType.ValueStringPointer(),
Image: &ske.Image{
@ -676,7 +676,7 @@ func toNodepoolsPayload(ctx context.Context, m *Cluster) []ske.Nodepool {
},
Volume: &ske.Volume{
Type: nodePool.VolumeType.ValueStringPointer(),
Size: conversion.ToPtrInt32(nodePool.VolumeSize),
Size: nodePool.VolumeSize.ValueInt64Pointer(),
},
Taints: &ts,
Cri: &cn,
@ -837,12 +837,12 @@ func mapFields(ctx context.Context, cl *ske.ClusterResponse, m *Cluster) error {
MachineType: types.StringPointerValue(np.Machine.Type),
OSName: maimna,
OSVersion: maimver,
Minimum: conversion.ToTypeInt64(np.Minimum),
Maximum: conversion.ToTypeInt64(np.Maximum),
MaxSurge: conversion.ToTypeInt64(np.MaxSurge),
MaxUnavailable: conversion.ToTypeInt64(np.MaxUnavailable),
Minimum: types.Int64PointerValue(np.Minimum),
Maximum: types.Int64PointerValue(np.Maximum),
MaxSurge: types.Int64PointerValue(np.MaxSurge),
MaxUnavailable: types.Int64PointerValue(np.MaxUnavailable),
VolumeType: vt,
VolumeSize: conversion.ToTypeInt64(np.Volume.Size),
VolumeSize: types.Int64PointerValue(np.Volume.Size),
Labels: types.MapNull(types.StringType),
Taints: nil,
CRI: crin,

8
stackit/internal/services/ske/cluster/resource_test.go
View file

@ -90,10 +90,10 @@ func TestMapFields(t *testing.T) {
},
Type: utils.Ptr("B"),
},
MaxSurge: utils.Ptr(int32(3)),
MaxSurge: utils.Ptr(int64(3)),
MaxUnavailable: nil,
Maximum: utils.Ptr(int32(5)),
Minimum: utils.Ptr(int32(1)),
Maximum: utils.Ptr(int64(5)),
Minimum: utils.Ptr(int64(1)),
Name: utils.Ptr("node"),
Taints: &[]ske.Taint{
{
@ -103,7 +103,7 @@ func TestMapFields(t *testing.T) {
},
},
Volume: &ske.Volume{
Size: utils.Ptr(int32(3)),
Size: utils.Ptr(int64(3)),
Type: utils.Ptr("type"),
},
},