diff --git a/go.mod b/go.mod index 9ed0d20f..36a37602 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/redis v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 - github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 + github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0 golang.org/x/mod v0.17.0 ) diff --git a/go.sum b/go.sum index c67839b4..a436a6cb 100644 --- a/go.sum +++ b/go.sum @@ -176,8 +176,8 @@ github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 h1:7AIvLk github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0/go.mod h1:p16qz/pAW8b1gEhqMpIgJfutRPeDPqQLlbVGyCo3f8o= github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 h1:pJBG455kmtbQFpCxcBfBK8wOuEnmsMv3h90LFcdj3q0= github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0/go.mod h1:LX0Mcyr7/QP77zf7e05fHCJO38RMuTxr7nEDUDZ3oPQ= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 h1:7iTzdiglvJmKMaHlr4JUPvNOmA730rAniry74cnZ8zI= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0 h1:trrJuRMzgXu6fiiMZiUx6+A1FNKEFhA1vGq5cr5Qn3U= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/stackit/internal/services/ske/cluster/resource.go b/stackit/internal/services/ske/cluster/resource.go index 6dde9392..73097c49 100644 --- a/stackit/internal/services/ske/cluster/resource.go +++ b/stackit/internal/services/ske/cluster/resource.go @@ -1207,7 +1207,7 @@ func toMaintenancePayload(ctx context.Context, m *Model) (*ske.Maintenance, erro }, nil } -func toNetworkPayload(ctx context.Context, m *Model) (*ske.V1Network, error) { +func toNetworkPayload(ctx context.Context, m *Model) (*ske.Network, error) { if m.Network.IsNull() || m.Network.IsUnknown() { return nil, nil } @@ -1218,7 +1218,7 @@ func toNetworkPayload(ctx context.Context, m *Model) (*ske.V1Network, error) { return nil, fmt.Errorf("converting network object: %v", diags.Errors()) } - return &ske.V1Network{ + return &ske.Network{ Id: conversion.StringValueToPointer(network.ID), }, nil } @@ -1489,7 +1489,7 @@ func mapNetwork(cl *ske.Cluster, m *Model) error { // If the network field is not provided, the SKE API returns an empty object. // If we parse that object into the terraform model, it will produce an inconsistent result after apply error - emptyNetwork := &ske.V1Network{} + emptyNetwork := &ske.Network{} if *cl.Network == *emptyNetwork && m.Network.IsNull() { if m.Network.Attributes() == nil { m.Network = types.ObjectNull(networkTypes) diff --git a/stackit/internal/services/ske/cluster/resource_test.go b/stackit/internal/services/ske/cluster/resource_test.go index 0ce83f86..c9002dcb 100644 --- a/stackit/internal/services/ske/cluster/resource_test.go +++ b/stackit/internal/services/ske/cluster/resource_test.go @@ -93,7 +93,7 @@ func TestMapFields(t *testing.T) { End: utils.Ptr("0010-11-12T13:14:15Z"), }, }, - Network: &ske.V1Network{ + Network: &ske.Network{ Id: utils.Ptr("nid"), }, Name: utils.Ptr("name"), @@ -235,7 +235,7 @@ func TestMapFields(t *testing.T) { types.ObjectNull(extensionsTypes), &ske.Cluster{ Name: utils.Ptr("name"), - Network: &ske.V1Network{}, + Network: &ske.Network{}, }, Model{ Id: types.StringValue("pid,name"), @@ -1970,7 +1970,7 @@ func TestToNetworkPayload(t *testing.T) { tests := []struct { description string model *Model - expected *ske.V1Network + expected *ske.Network isValid bool }{ { @@ -1982,7 +1982,7 @@ func TestToNetworkPayload(t *testing.T) { "id": types.StringValue("nid"), }), }, - &ske.V1Network{ + &ske.Network{ Id: utils.Ptr("nid"), }, true, @@ -1996,7 +1996,7 @@ func TestToNetworkPayload(t *testing.T) { "id": types.StringNull(), }), }, - &ske.V1Network{}, + &ske.Network{}, true, }, {