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

fix(deps): update stackit sdk modules (#402)

Browse source 
* fix(deps): update stackit sdk modules

* update code with SDK breaking changes

---------

Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>
Co-authored-by: Diogo Ferrão <diogo.ferrao@freiheit.com>
This commit is contained in:
stackit-pipeline 2024-06-19 12:47:39 +02:00 • committed by GitHub
parent e8e81f887c
commit be3e660ac3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stackit/internal/services/resourcemanager/project/datasource.go
View file

@ -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")
}

6
stackit/internal/services/resourcemanager/project/resource.go
View file

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

14
stackit/internal/services/resourcemanager/project/resource_test.go
View file

@ -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"),