Skip to content
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

Jump to bottom

fix: handling of errors for services, subscriptions and bindings #352

Merged
merged 1 commit into from
Jul 31, 2023
Merged

fix: handling of errors for services, subscriptions and bindings #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions internal/provider/resource_subaccount_service_binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provider

import (
"context"
"errors"
"fmt"
"net/http"
"strings"
Expand Down Expand Up @@ -187,14 +188,19 @@ func (rs *subaccountServiceBindingResource) Create(ctx context.Context, req reso

createStateConf := &tfutils.StateChangeConf{
Pending: []string{servicemanager.StateInProgress},
Target: []string{servicemanager.StateSucceeded, servicemanager.StateFailed},
Target: []string{servicemanager.StateSucceeded},
Refresh: func() (interface{}, string, error) {
subRes, _, err := rs.cli.Services.Binding.GetById(ctx, plan.SubaccountId.ValueString(), cliRes.Id)

if err != nil {
return subRes, "", err
}

// No error returned even if operation failed
if subRes.LastOperation.State == servicemanager.StateFailed {
return subRes, subRes.LastOperation.State, errors.New("undefined API error during service binding creation")
}

return subRes, subRes.LastOperation.State, nil
},
Timeout: 10 * time.Minute,
Expand Down Expand Up @@ -245,7 +251,7 @@ func (rs *subaccountServiceBindingResource) Delete(ctx context.Context, req reso

deleteStateConf := &tfutils.StateChangeConf{
Pending: []string{servicemanager.StateInProgress},
Target: []string{servicemanager.StateFailed, "DELETED"},
Target: []string{"DELETED"},
Refresh: func() (interface{}, string, error) {
subRes, comRes, err := rs.cli.Services.Binding.GetById(ctx, state.SubaccountId.ValueString(), state.Id.ValueString())

Expand All @@ -257,6 +263,11 @@ func (rs *subaccountServiceBindingResource) Delete(ctx context.Context, req reso
return subRes, servicemanager.StateFailed, err
}

// No error returned even if operation failed
if subRes.LastOperation.State == servicemanager.StateFailed {
return subRes, subRes.LastOperation.State, errors.New("undefined API error during service binding deletion")
}

return subRes, subRes.LastOperation.State, nil
},
Timeout: 10 * time.Minute,
Expand Down
22 changes: 19 additions & 3 deletions internal/provider/resource_subaccount_service_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provider

import (
"context"
"errors"
"fmt"
"net/http"
"strings"
Expand Down Expand Up @@ -189,14 +190,19 @@ func (rs *subaccountServiceInstanceResource) Create(ctx context.Context, req res

createStateConf := &tfutils.StateChangeConf{
Pending: []string{servicemanager.StateInProgress},
Target: []string{servicemanager.StateSucceeded, servicemanager.StateFailed},
Target: []string{servicemanager.StateSucceeded},
Refresh: func() (interface{}, string, error) {
subRes, _, err := rs.cli.Services.Instance.GetById(ctx, state.SubaccountId.ValueString(), cliRes.Id)

if err != nil {
return subRes, "", err
}

// No error returned even if operation failed
if subRes.LastOperation.State == servicemanager.StateFailed {
return subRes, subRes.LastOperation.State, errors.New("undefined API error during service instance creation")
}

return subRes, subRes.LastOperation.State, nil
},
Timeout: 10 * time.Minute,
Expand Down Expand Up @@ -264,14 +270,19 @@ func (rs *subaccountServiceInstanceResource) Update(ctx context.Context, req res

updateStateConf := &tfutils.StateChangeConf{
Pending: []string{servicemanager.StateInProgress},
Target: []string{servicemanager.StateSucceeded, servicemanager.StateFailed},
Target: []string{servicemanager.StateSucceeded},
Refresh: func() (interface{}, string, error) {
subRes, _, err := rs.cli.Services.Instance.GetById(ctx, state.SubaccountId.ValueString(), cliRes.Id)

if err != nil {
return subRes, "", err
}

// No error returned even if operation failed
if subRes.LastOperation.State == servicemanager.StateFailed {
return subRes, subRes.LastOperation.State, errors.New("undefined API error during service instance update")
}

return subRes, subRes.LastOperation.State, nil
},
Timeout: 10 * time.Minute,
Expand Down Expand Up @@ -308,7 +319,7 @@ func (rs *subaccountServiceInstanceResource) Delete(ctx context.Context, req res

deleteStateConf := &tfutils.StateChangeConf{
Pending: []string{servicemanager.StateInProgress},
Target: []string{servicemanager.StateFailed, "DELETED"},
Target: []string{"DELETED"},
Refresh: func() (interface{}, string, error) {
subRes, comRes, err := rs.cli.Services.Instance.GetById(ctx, state.SubaccountId.ValueString(), state.Id.ValueString())

Expand All @@ -320,6 +331,11 @@ func (rs *subaccountServiceInstanceResource) Delete(ctx context.Context, req res
return subRes, subRes.LastOperation.State, err
}

// No error returned even if operation failed
if subRes.LastOperation.State == servicemanager.StateFailed {
return subRes, subRes.LastOperation.State, errors.New("undefined API error during service instance deletion")
}

return subRes, subRes.LastOperation.State, nil
},
Timeout: 10 * time.Minute,
Expand Down
15 changes: 13 additions & 2 deletions internal/provider/resource_subaccount_subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provider

import (
"context"
"errors"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -229,14 +230,19 @@ func (rs *subaccountSubscriptionResource) Create(ctx context.Context, req resour

createStateConf := &tfutils.StateChangeConf{
Pending: []string{saas_manager_service.StateInProcess},
Target: []string{saas_manager_service.StateSubscribed, saas_manager_service.StateSubscribeFailed},
Target: []string{saas_manager_service.StateSubscribed},
Refresh: func() (interface{}, string, error) {
subRes, _, err := rs.cli.Accounts.Subscription.Get(ctx, plan.SubaccountId.ValueString(), plan.AppName.ValueString(), plan.PlanName.ValueString())

if err != nil {
return subRes, "", err
}

// No error returned even is subscription failed
if subRes.State == saas_manager_service.StateSubscribeFailed {
return subRes, subRes.State, errors.New("undefined API error during subscription")
}

return subRes, subRes.State, nil
},
Timeout: 10 * time.Minute,
Expand Down Expand Up @@ -287,14 +293,19 @@ func (rs *subaccountSubscriptionResource) Delete(ctx context.Context, req resour

deleteStateConf := &tfutils.StateChangeConf{
Pending: []string{saas_manager_service.StateInProcess},
Target: []string{saas_manager_service.StateUnsubscribeFailed, saas_manager_service.StateNotSubscribed},
Target: []string{saas_manager_service.StateNotSubscribed},
Refresh: func() (interface{}, string, error) {
subRes, _, err := rs.cli.Accounts.Subscription.Get(ctx, state.SubaccountId.ValueString(), state.AppName.ValueString(), state.PlanName.ValueString())

if err != nil {
return subRes, subRes.State, err
}

// No error returned even is unsubscribe failed
if subRes.State == saas_manager_service.StateUnsubscribeFailed {
return subRes, subRes.State, errors.New("undefined API error during unsubscription")
}

return subRes, subRes.State, nil
},
Timeout: 10 * time.Minute,
Expand Down
Loading