Skip to content

fix(objectstorage): check service enablement only if service call fails #1479

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

Open
SerseusWasTaken wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(objectstorage): check service enablement only if service call fails #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc8bc1b
fix(objectstorage): check service enablement only if initial service …
SerseusWasTaken Jul 16, 2026
afc2b2a
Merge branch 'main' into fix/object-storage-check-service-enablement-…
SerseusWasTaken Jul 17, 2026
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
21 changes: 10 additions & 11 deletions internal/cmd/object-storage/bucket/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,20 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
return err
}

// Check if the project is enabled before trying to create
enabled, err := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if err != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", err)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}

// Call API
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("create Object Storage bucket: %w", err)
}

Expand Down
11 changes: 11 additions & 0 deletions internal/cmd/object-storage/bucket/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
"github.com/stackitcloud/stackit-cli/internal/pkg/projectname"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/object-storage/client"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/object-storage/utils"
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
)

Expand Down Expand Up @@ -63,6 +64,16 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("get Object Storage buckets: %w", err)
}
buckets := resp.GetBuckets()
Expand Down
21 changes: 10 additions & 11 deletions internal/cmd/object-storage/compliance-lock/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,20 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
return err
}

// Check if the project is enabled before trying to describe
enabled, err := objectStorageUtils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if err != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", err)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}

// Call API
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := objectStorageUtils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("get object storage compliance lock: %w", err)
}

Expand Down
21 changes: 10 additions & 11 deletions internal/cmd/object-storage/compliance-lock/lock/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,20 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
return err
}

// Check if the project is enabled before trying to create
enabled, err := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if err != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", err)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}

// Call API
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("create object storage compliance lock: %w", err)
}

Expand Down
21 changes: 10 additions & 11 deletions internal/cmd/object-storage/compliance-lock/unlock/unlock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,19 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
return err
}

// Check if the project is enabled before trying to create
enabled, err := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if err != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", err)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}

// Call API
_, err = buildRequest(ctx, model, apiClient).Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("delete object storage compliance lock: %w", err)
}

Expand Down
11 changes: 11 additions & 0 deletions internal/cmd/object-storage/credentials-group/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/object-storage/client"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/object-storage/utils"
)

const (
Expand Down Expand Up @@ -61,6 +62,16 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("create Object Storage credentials group: %w", err)
}

Expand Down
11 changes: 11 additions & 0 deletions internal/cmd/object-storage/credentials-group/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/object-storage/client"
"github.com/stackitcloud/stackit-cli/internal/pkg/services/object-storage/utils"
"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
)

Expand Down Expand Up @@ -62,6 +63,16 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := utils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("list Object Storage credentials groups: %w", err)
}
credentialsGroups := resp.GetCredentialsGroups()
Expand Down
10 changes: 10 additions & 0 deletions internal/cmd/object-storage/credentials/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := objectStorageUtils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("create Object Storage credentials: %w", err)
}

Expand Down
10 changes: 10 additions & 0 deletions internal/cmd/object-storage/credentials/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
req := buildRequest(ctx, model, apiClient)
resp, err := req.Execute()
if err != nil {
// Check if the service is enabled for the given project
enabled, enabledErr := objectStorageUtils.ProjectEnabled(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
if enabledErr != nil {
return fmt.Errorf("check if Object Storage is enabled: %w", enabledErr)
}
if !enabled {
return &errors.ServiceDisabledError{
Service: "object-storage",
}
}
return fmt.Errorf("list Object Storage credentials: %w", err)
}
credentials := resp.GetAccessKeys()
Expand Down
Loading