From be3e660ac39386f95d5bc79009cb2145b7cda44e Mon Sep 17 00:00:00 2001 From: stackit-pipeline <142982727+stackit-pipeline@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:47:39 +0200 Subject: [PATCH] fix(deps): update stackit sdk modules (#402) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(deps): update stackit sdk modules * update code with SDK breaking changes --------- Co-authored-by: Renovate Bot Co-authored-by: Diogo Ferrão --- go.mod | 6 +++--- go.sum | 12 ++++++------ .../services/resourcemanager/project/datasource.go | 2 +- .../services/resourcemanager/project/resource.go | 6 +++--- .../resourcemanager/project/resource_test.go | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index ea07adf6..651a745c 100644 --- a/go.mod +++ b/go.mod @@ -15,17 +15,17 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0 github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0 - github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0 + github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0 github.com/stackitcloud/stackit-sdk-go/services/logme v0.15.0 github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 - github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.9.0 + github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0 github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1 github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0 github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0 - github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 + github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0 diff --git a/go.sum b/go.sum index 6ba8c269..bcd48dc0 100644 --- a/go.sum +++ b/go.sum @@ -152,16 +152,16 @@ github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 h1:QIZfs6nJ/l2pOweH1 github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0/go.mod h1:MdZcRbs19s2NLeJmSLSoqTzm9IPIQhE1ZEMpo9gePq0= github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0 h1:W6Zxyq487RpWfEIb6GL7tGTt5SsBzxHPeYTzmB11GtY= github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0/go.mod h1:XtJA9FMK/yJ0dj4HtRAogmZPRUsZiFcuwUSfHYNASjo= -github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0 h1:LAteZO46XmqTsmPw0QV8n8WiGM205pxrcqHqWznNmyY= -github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0/go.mod h1:wsO3+vXe1XiKLeCIctWAptaHQZ07Un7kmLTQ+drbj7w= +github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0 h1:W7tyIIIXgAilHpALRyrW3CrtQ2UAGZBjAG+P4tcK+QQ= +github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0/go.mod h1:wsO3+vXe1XiKLeCIctWAptaHQZ07Un7kmLTQ+drbj7w= github.com/stackitcloud/stackit-sdk-go/services/logme v0.15.0 h1:7gii3PZshOesHPCYlPycilXglk28imITIqjewySZwZ4= github.com/stackitcloud/stackit-sdk-go/services/logme v0.15.0/go.mod h1:bj9cn1treNSxKTRCEmESwqfENN8vCYn60HUnEA0P83c= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0 h1:eYYyVUTS9Gjovg3z9+r6ctvsm1p1J4fHLa5QJbWHi0A= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0/go.mod h1:kPetkX9hNm9HkRyiKQL/tlgdi8frZdMP8afg0mEvQ9s= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 h1:FaJYVfha+atvPfFIf3h3+BFjOjeux9OBHukG1J98kq0= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0/go.mod h1:iFerEzGmkg6R13ldFUyHUWHm0ac9cS4ftTDLhP0k/dU= -github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.9.0 h1:rWgy4/eCIgyA2dUuc4a30pldmS6taQDwiLqoeZmyeP8= -github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.9.0/go.mod h1:dkVMJI88eJ3Xs0ZV15r4tUpgitUGJXcvrX3RL4Zq2bQ= +github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0 h1:tn1MD1nu+gYEbT3lslRI6BrapKwuvHv5Wi2Zw9uVPPc= +github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0/go.mod h1:dkVMJI88eJ3Xs0ZV15r4tUpgitUGJXcvrX3RL4Zq2bQ= github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 h1:zkhm0r0OZ5NbHJFrm+7B+h11QL0bNLC53nzXhqCaLWo= github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0/go.mod h1:ZecMIf9oYj2DGZqWh93l97WdVaRdLl+tW5Fq3YKGwBM= github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.14.0 h1:PZAqXd8TVyTZo8qty4bM2sSoLlLG+Nc9tcpxbQhO+GY= @@ -172,8 +172,8 @@ github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0 h1:Q7JxjVwb+9ug github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0/go.mod h1:eSgnPBknTJh7t+jVKN+xzeAh+Cg1USOlH3QCyfvG20g= github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0 h1:/S+LOl94FqGk5Qdi5ehsiSCh6cCPEYJDctNOD0c2dmw= github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE= -github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 h1:7AIvLkB7JZ5lYKtYLwI0rgJ0185hwQC1PFiUrjcinDM= -github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0/go.mod h1:p16qz/pAW8b1gEhqMpIgJfutRPeDPqQLlbVGyCo3f8o= +github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0 h1:qCbvGqdG9saRB++UlhXt5ieCCDCITROqL5K2nm38efU= +github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.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.16.0 h1:trrJuRMzgXu6fiiMZiUx6+A1FNKEFhA1vGq5cr5Qn3U= diff --git a/stackit/internal/services/resourcemanager/project/datasource.go b/stackit/internal/services/resourcemanager/project/datasource.go index d12d05f9..2fda5c76 100644 --- a/stackit/internal/services/resourcemanager/project/datasource.go +++ b/stackit/internal/services/resourcemanager/project/datasource.go @@ -206,7 +206,7 @@ func (d *projectDataSource) Read(ctx context.Context, req datasource.ReadRequest tflog.Info(ctx, "Resource Manager project read") } -func mapDataFields(ctx context.Context, projectResp *resourcemanager.ProjectResponseWithParents, model *ModelData) (err error) { +func mapDataFields(ctx context.Context, projectResp *resourcemanager.GetProjectResponse, model *ModelData) (err error) { if projectResp == nil { return fmt.Errorf("response input is nil") } diff --git a/stackit/internal/services/resourcemanager/project/resource.go b/stackit/internal/services/resourcemanager/project/resource.go index 42baf07a..68febc61 100644 --- a/stackit/internal/services/resourcemanager/project/resource.go +++ b/stackit/internal/services/resourcemanager/project/resource.go @@ -369,7 +369,7 @@ func (r *projectResource) ImportState(ctx context.Context, req resource.ImportSt tflog.Info(ctx, "Resource Manager Project state imported") } -func mapFields(ctx context.Context, projectResp *resourcemanager.ProjectResponseWithParents, model *Model) (err error) { +func mapFields(ctx context.Context, projectResp *resourcemanager.GetProjectResponse, model *Model) (err error) { if projectResp == nil { return fmt.Errorf("response input is nil") } @@ -431,7 +431,7 @@ func toCreatePayload(model *Model, serviceAccountEmail string) (*resourcemanager owner := projectOwner serviceAccountSubject := serviceAccountEmail - members := []resourcemanager.ProjectMember{ + members := []resourcemanager.Member{ { Subject: &serviceAccountSubject, Role: &owner, @@ -441,7 +441,7 @@ func toCreatePayload(model *Model, serviceAccountEmail string) (*resourcemanager ownerSubject := model.OwnerEmail.ValueString() if ownerSubject != "" && ownerSubject != serviceAccountSubject { members = append(members, - resourcemanager.ProjectMember{ + resourcemanager.Member{ Subject: &ownerSubject, Role: &owner, }) diff --git a/stackit/internal/services/resourcemanager/project/resource_test.go b/stackit/internal/services/resourcemanager/project/resource_test.go index 2910a54e..52c088fb 100644 --- a/stackit/internal/services/resourcemanager/project/resource_test.go +++ b/stackit/internal/services/resourcemanager/project/resource_test.go @@ -17,7 +17,7 @@ func TestMapFields(t *testing.T) { tests := []struct { description string uuidContainerParentId bool - input *resourcemanager.ProjectResponseWithParents + input *resourcemanager.GetProjectResponse expected Model expectedLabels *map[string]string isValid bool @@ -25,7 +25,7 @@ func TestMapFields(t *testing.T) { { "default_ok", false, - &resourcemanager.ProjectResponseWithParents{ + &resourcemanager.GetProjectResponse{ ContainerId: utils.Ptr("cid"), ProjectId: utils.Ptr("pid"), }, @@ -42,7 +42,7 @@ func TestMapFields(t *testing.T) { { "container_parent_id_ok", false, - &resourcemanager.ProjectResponseWithParents{ + &resourcemanager.GetProjectResponse{ ContainerId: utils.Ptr("cid"), ProjectId: utils.Ptr("pid"), Labels: &map[string]string{ @@ -71,7 +71,7 @@ func TestMapFields(t *testing.T) { { "uuid_parent_id_ok", true, - &resourcemanager.ProjectResponseWithParents{ + &resourcemanager.GetProjectResponse{ ContainerId: utils.Ptr("cid"), ProjectId: utils.Ptr("pid"), Labels: &map[string]string{ @@ -108,7 +108,7 @@ func TestMapFields(t *testing.T) { { "no_resource_id", false, - &resourcemanager.ProjectResponseWithParents{}, + &resourcemanager.GetProjectResponse{}, Model{}, nil, false, @@ -166,7 +166,7 @@ func TestToCreatePayload(t *testing.T) { &resourcemanager.CreateProjectPayload{ ContainerParentId: nil, Labels: nil, - Members: &[]resourcemanager.ProjectMember{ + Members: &[]resourcemanager.Member{ { Role: utils.Ptr(projectOwner), Subject: utils.Ptr("service_account_email"), @@ -193,7 +193,7 @@ func TestToCreatePayload(t *testing.T) { "label1": "1", "label2": "2", }, - Members: &[]resourcemanager.ProjectMember{ + Members: &[]resourcemanager.Member{ { Role: utils.Ptr(projectOwner), Subject: utils.Ptr("service_account_email"),