Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.5
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.19.0
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
go.uber.org/atomic v1.11.0
go.uber.org/mock v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,8 @@ github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5 h1:W57+XRa8wTLsi5CV9
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5/go.mod h1:lTWjW57eAq1bwfM6nsNinhoBr3MHFW/GaFasdAsYfDM=
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0 h1:DxrN85V738CRLynu6MULQHO+OXyYnkhVPgoZKULfFIs=
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0/go.mod h1:ClPE4TOM1FeaJiwTXvApq4gWaSgTLq6nU3PPHAIQDN4=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.5 h1:MZ5aTO2NQ1Jecmi67ByGskve5nKXHl91fE+z+vFjxt4=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.18.5/go.mod h1:CJLmdqWvJm5/3+lXPDKu8k4WXs2UG8euGoqQX5xE79k=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.19.0 h1:OcjYHjTsKLlOz8GF2owYdJK0cUqGGzjHRQLYUH0vMnQ=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.19.0/go.mod h1:jiPIzF8lcm5Dx0TkDK2CBgeRBHSRUqwyX+z/zqo1bes=
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI=
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k=
github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs=
Expand Down
10 changes: 5 additions & 5 deletions test/project-wrapper/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/authorization"
"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
"github.com/stackitcloud/stackit-sdk-go/services/serviceaccount"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/utils/ptr"
Expand Down Expand Up @@ -146,7 +146,7 @@ func createPortalProject(ctx context.Context, client *sdk.Client) (string, error
portalProject, err := client.CreateProject(
ctx,
os.Getenv("PORTAL_FOLDER_ID"),
&projectName,
projectName,
map[string]string{
"billingReference": os.Getenv("BILLING_REFERENCE"),
"scope": "PUBLIC",
Expand All @@ -159,10 +159,10 @@ func createPortalProject(ctx context.Context, client *sdk.Client) (string, error
if err != nil {
return "", err
}
if portalProject.ProjectId == nil {
if portalProject.ProjectId == "" {
return "", fmt.Errorf("error: no project ID found in new portal project '%s'", projectName)
}
return *portalProject.ProjectId, nil
return portalProject.ProjectId, nil
}

func assignRoleToServiceAccount(ctx context.Context, projectID string, email string, roles set.Set[string]) error {
Expand Down Expand Up @@ -271,7 +271,7 @@ func waitForProjectReadiness(ctx context.Context, client *sdk.Client, stackitPro
}
}

if *project.LifecycleState == resourcemanager.LIFECYCLESTATE_ACTIVE {
if project.LifecycleState == resourcemanager.LIFECYCLESTATE_ACTIVE {
log.Printf("Project '%s' is now active.\n", stackitProjectID)
return nil
}
Expand Down
18 changes: 9 additions & 9 deletions test/project-wrapper/sdk/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package sdk
import (
"context"

"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
resourcemanager "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager/v0api"
"k8s.io/utils/ptr"
)

Expand All @@ -25,36 +25,36 @@ func NewClient() (*Client, error) {
func (c *Client) CreateProject(
ctx context.Context,
organizationID string,
name *string,
name string,
labels map[string]string,
subject string,
) (*resourcemanager.Project, error) {
payload := resourcemanager.CreateProjectPayload{
Labels: ptr.To(labels),
Members: &[]resourcemanager.Member{
Members: []resourcemanager.Member{
{
Role: ptr.To("owner"),
Subject: &subject,
Role: "owner",
Subject: subject,
},
},
Name: name,
ContainerParentId: ptr.To(organizationID),
ContainerParentId: organizationID,
}
project, err := c.rmClient.CreateProject(ctx).CreateProjectPayload(payload).Execute()
project, err := c.rmClient.DefaultAPI.CreateProject(ctx).CreateProjectPayload(payload).Execute()
if err != nil {
return nil, err
}
return project, nil
}

func (c *Client) GetProject(ctx context.Context, projectID string) (*resourcemanager.GetProjectResponse, error) {
project, err := c.rmClient.GetProject(ctx, projectID).Execute()
project, err := c.rmClient.DefaultAPI.GetProject(ctx, projectID).Execute()
if err != nil {
return nil, err
}
return project, nil
}

func (c *Client) DeleteProject(ctx context.Context, projectID string) error {
return c.rmClient.DeleteProject(ctx, projectID).Execute()
return c.rmClient.DefaultAPI.DeleteProject(ctx, projectID).Execute()
}