Skip to content

feat: adapt object storage to new regional api #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bahkauv70 merged 5 commits into from
Feb 4, 2025
Merged

feat: adapt object storage to new regional api #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abcf88b
feat: adapt object storage to new regional api
bahkauv70 Feb 3, 2025
220f98b
feat: updated generated apis for region enhancements
bahkauv70 Feb 3, 2025
32702ce
fix: revert generated code back to original version
bahkauv70 Feb 4, 2025
573b3ec
fix: remove premature deprecation mark
bahkauv70 Feb 4, 2025
eed1bc1
fix: remove unneeded go.work.sum and add it to .gitignore
bahkauv70 Feb 4, 2025
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ bin/
## IDE
*.idea/
*.vscode/

go.work.sum
6 changes: 2 additions & 4 deletions examples/objectstorage/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ module github.com/stackitcloud/stackit-sdk-go/examples/objectstorage

go 1.18

require (
github.com/stackitcloud/stackit-sdk-go/core v0.15.1
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.11.1
)
require github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.11.1

require (
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/stackitcloud/stackit-sdk-go/core v0.15.1 // indirect
)
10 changes: 4 additions & 6 deletions examples/objectstorage/objectstorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,31 @@ import (
"fmt"
"os"

"github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/objectstorage"
)

func main() {
// Specify the project ID
projectId := "PROJECT_ID"
region := "eu01"

// Create a new API client, that uses default authentication and configuration
objectStorageClient, err := objectstorage.NewAPIClient(
config.WithRegion("eu01"),
)
objectStorageClient, err := objectstorage.NewAPIClient()
if err != nil {
fmt.Fprintf(os.Stderr, "Creating API client: %v\n", err)
os.Exit(1)
}

// Get the object storage buckets for your project
getBucketsResp, err := objectStorageClient.ListBuckets(context.Background(), projectId).Execute()
getBucketsResp, err := objectStorageClient.ListBuckets(context.Background(), projectId, region).Execute()
if err != nil {
fmt.Fprintf(os.Stderr, "Error when calling `GetBuckets`: %v\n", err)
} else {
fmt.Printf("Number of buckets: %v\n", len(*getBucketsResp.Buckets))
}

// Create an object storage bucket
createBucketResp, err := objectStorageClient.CreateBucket(context.Background(), projectId, "example-bucket").Execute()
createBucketResp, err := objectStorageClient.CreateBucket(context.Background(), projectId, region, "example-bucket").Execute()
if err != nil {
fmt.Fprintf(os.Stderr, "Error when calling `CreateBucket`: %v\n", err)
} else {
Expand Down
10 changes: 5 additions & 5 deletions services/objectstorage/wait/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (

// Interface needed for tests
type APIClientBucketInterface interface {
GetBucketExecute(ctx context.Context, projectId string, bucketName string) (*objectstorage.GetBucketResponse, error)
GetBucketExecute(ctx context.Context, projectId string, region, bucketName string) (*objectstorage.GetBucketResponse, error)
}

// CreateBucketWaitHandler will wait for bucket creation
func CreateBucketWaitHandler(ctx context.Context, a APIClientBucketInterface, projectId, bucketName string) *wait.AsyncActionHandler[objectstorage.GetBucketResponse] {
func CreateBucketWaitHandler(ctx context.Context, a APIClientBucketInterface, projectId, region, bucketName string) *wait.AsyncActionHandler[objectstorage.GetBucketResponse] {
handler := wait.New(func() (waitFinished bool, response *objectstorage.GetBucketResponse, err error) {
s, err := a.GetBucketExecute(ctx, projectId, bucketName)
s, err := a.GetBucketExecute(ctx, projectId, region, bucketName)
if err != nil {
return false, nil, err
}
Expand All @@ -30,9 +30,9 @@ func CreateBucketWaitHandler(ctx context.Context, a APIClientBucketInterface, pr
}

// DeleteBucketWaitHandler will wait for bucket deletion
func DeleteBucketWaitHandler(ctx context.Context, a APIClientBucketInterface, projectId, bucketName string) *wait.AsyncActionHandler[struct{}] {
func DeleteBucketWaitHandler(ctx context.Context, a APIClientBucketInterface, projectId, region, bucketName string) *wait.AsyncActionHandler[struct{}] {
handler := wait.New(func() (waitFinished bool, response *struct{}, err error) {
_, err = a.GetBucketExecute(ctx, projectId, bucketName)
_, err = a.GetBucketExecute(ctx, projectId, region, bucketName)
if err == nil {
return false, nil, nil
}
Expand Down
6 changes: 3 additions & 3 deletions services/objectstorage/wait/wait_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type apiClientBucketMocked struct {
bucketGetFails bool
}

func (a *apiClientBucketMocked) GetBucketExecute(_ context.Context, _, _ string) (*objectstorage.GetBucketResponse, error) {
func (a *apiClientBucketMocked) GetBucketExecute(_ context.Context, _, _, _ string) (*objectstorage.GetBucketResponse, error) {
if a.bucketGetFails {
return nil, &oapierror.GenericOpenAPIError{
StatusCode: 500,
Expand Down Expand Up @@ -63,7 +63,7 @@ func TestCreateBucketWaitHandler(t *testing.T) {
wantRes = &objectstorage.GetBucketResponse{}
}

handler := CreateBucketWaitHandler(context.Background(), apiClient, "", "")
handler := CreateBucketWaitHandler(context.Background(), apiClient, "", "", "")

gotRes, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())

Expand Down Expand Up @@ -101,7 +101,7 @@ func TestDeleteBucketWaitHandler(t *testing.T) {
bucketGetFails: tt.bucketGetFails,
}

handler := DeleteBucketWaitHandler(context.Background(), apiClient, "", "")
handler := DeleteBucketWaitHandler(context.Background(), apiClient, "", "", "")

_, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())

Expand Down
Loading