Fix errors in stackit package

Author: fischerman

pkg/stackit/applicationloadbalancer.go

@@ -2,12 +2,9 @@ package stackit
 
 import (
 	"context"
-	"errors"
-	"net/http"
 
 	"github.com/google/uuid"
 
-	oapiError "github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	albsdk "github.com/stackitcloud/stackit-sdk-go/services/alb/v2api"
 )
 
@@ -48,7 +45,7 @@ func NewClient(cl *albsdk.APIClient) (Client, error) {
 }
 
 func (cl client) GetLoadBalancer(ctx context.Context, projectID, region, name string) (*albsdk.LoadBalancer, error) {
-	lb, err := cl.client.GetLoadBalancerExecute(ctx, projectID, region, name)
+	lb, err := cl.client.DefaultAPI.GetLoadBalancer(ctx, projectID, region, name).Execute()
 	if isOpenAPINotFound(err) {
 		return lb, ErrorNotFound
 	}
@@ -57,13 +54,13 @@ func (cl client) GetLoadBalancer(ctx context.Context, projectID, region, name st
 
 // DeleteLoadBalancer returns no error if the load balancer doesn't exist.
 func (cl client) DeleteLoadBalancer(ctx context.Context, projectID, region, name string) error {
-	_, err := cl.client.DeleteLoadBalancerExecute(ctx, projectID, region, name)
+	_, err := cl.client.DefaultAPI.DeleteLoadBalancer(ctx, projectID, region, name).Execute()
 	return err
 }
 
 // CreateLoadBalancer returns ErrorNotFound if the project is not enabled.
 func (cl client) CreateLoadBalancer(ctx context.Context, projectID, region string, create *albsdk.CreateLoadBalancerPayload) (*albsdk.LoadBalancer, error) {
-	lb, err := cl.client.CreateLoadBalancer(ctx, projectID, region).CreateLoadBalancerPayload(*create).XRequestID(uuid.NewString()).Execute()
+	lb, err := cl.client.DefaultAPI.CreateLoadBalancer(ctx, projectID, region).CreateLoadBalancerPayload(*create).XRequestID(uuid.NewString()).Execute()
 	if isOpenAPINotFound(err) {
 		return lb, ErrorNotFound
 	}
@@ -73,11 +70,11 @@ func (cl client) CreateLoadBalancer(ctx context.Context, projectID, region strin
 func (cl client) UpdateLoadBalancer(ctx context.Context, projectID, region, name string, update *albsdk.UpdateLoadBalancerPayload) (
 	*albsdk.LoadBalancer, error,
 ) {
-	return cl.client.UpdateLoadBalancer(ctx, projectID, region, name).UpdateLoadBalancerPayload(*update).Execute()
+	return cl.client.DefaultAPI.UpdateLoadBalancer(ctx, projectID, region, name).UpdateLoadBalancerPayload(*update).Execute()
 }
 
 func (cl client) UpdateTargetPool(ctx context.Context, projectID, region, name, targetPoolName string, payload albsdk.UpdateTargetPoolPayload) error {
-	_, err := cl.client.UpdateTargetPool(ctx, projectID, region, name, targetPoolName).UpdateTargetPoolPayload(payload).Execute()
+	_, err := cl.client.DefaultAPI.UpdateTargetPool(ctx, projectID, region, name, targetPoolName).UpdateTargetPoolPayload(payload).Execute()
 	return err
 }
 
@@ -87,41 +84,29 @@ func (cl client) CreateCredentials(
 	region string,
 	payload albsdk.CreateCredentialsPayload,
 ) (*albsdk.CreateCredentialsResponse, error) {
-	return cl.client.CreateCredentials(ctx, projectID, region).CreateCredentialsPayload(payload).XRequestID(uuid.NewString()).Execute()
+	return cl.client.DefaultAPI.CreateCredentials(ctx, projectID, region).CreateCredentialsPayload(payload).XRequestID(uuid.NewString()).Execute()
 }
 
 func (cl client) ListCredentials(ctx context.Context, projectID, region string) (*albsdk.ListCredentialsResponse, error) {
-	return cl.client.ListCredentialsExecute(ctx, projectID, region)
+	return cl.client.DefaultAPI.ListCredentials(ctx, projectID, region).Execute()
 }
 
 func (cl client) GetCredentials(ctx context.Context, projectID, region, credentialsRef string) (*albsdk.GetCredentialsResponse, error) {
-	return cl.client.GetCredentialsExecute(ctx, projectID, region, credentialsRef)
+	return cl.client.DefaultAPI.GetCredentials(ctx, projectID, region, credentialsRef).Execute()
 }
 
 func (cl client) UpdateCredentials(ctx context.Context, projectID, region, credentialsRef string, payload albsdk.UpdateCredentialsPayload) error {
-	_, err := cl.client.UpdateCredentials(ctx, projectID, region, credentialsRef).UpdateCredentialsPayload(payload).Execute()
+	_, err := cl.client.DefaultAPI.UpdateCredentials(ctx, projectID, region, credentialsRef).UpdateCredentialsPayload(payload).Execute()
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func (cl client) DeleteCredentials(ctx context.Context, projectID, region, credentialsRef string) error {
-	_, err := cl.client.DeleteCredentials(ctx, projectID, region, credentialsRef).Execute()
+	_, err := cl.client.DefaultAPI.DeleteCredentials(ctx, projectID, region, credentialsRef).Execute()
 	if err != nil {
 		return err
 	}
 	return nil
 }
-
-func isOpenAPINotFound(err error) bool {
-	apiErr := &oapiError.GenericOpenAPIError{}
-	if !errors.As(err, &apiErr) {
-		return false
-	}
-	return apiErr.StatusCode == http.StatusNotFound
-}
-
-func IsNotFound(err error) bool {
-	return errors.Is(err, ErrorNotFound)
-}

pkg/stackit/applicationloadbalancercertificates.go

@@ -2,10 +2,7 @@ package stackit
 
 import (
 	"context"
-	"errors"
-	"net/http"
 
-	oapiError "github.com/stackitcloud/stackit-sdk-go/core/oapierror"
 	certsdk "github.com/stackitcloud/stackit-sdk-go/services/certificates/v2api"
 )
 
@@ -22,44 +19,32 @@ type certClient struct {
 
 var _ CertificatesClient = (*certClient)(nil)
 
-func NewCertClient(cl *certsdk.APIClient) (Client, error) {
+func NewCertClient(cl *certsdk.APIClient) (CertificatesClient, error) {
 	return &certClient{client: cl}, nil
 }
 
 func (cl certClient) GetCertificate(ctx context.Context, projectID, region, name string) (*certsdk.GetCertificateResponse, error) {
-	cert, err := cl.client.GetCertificateExecute(ctx, projectID, region, name)
+	cert, err := cl.client.DefaultAPI.GetCertificate(ctx, projectID, region, name).Execute()
 	if isOpenAPINotFound(err) {
 		return cert, ErrorNotFound
 	}
 	return cert, err
 }
 
 func (cl certClient) DeleteCertificate(ctx context.Context, projectID, region, name string) error {
-	_, err := cl.client.DeleteCertificateExecute(ctx, projectID, region, name)
+	_, err := cl.client.DefaultAPI.DeleteCertificate(ctx, projectID, region, name).Execute()
 	return err
 }
 
 func (cl certClient) CreateCertificate(ctx context.Context, projectID, region string, certificate *certsdk.CreateCertificatePayload) (*certsdk.GetCertificateResponse, error) {
-	cert, err := cl.client.CreateCertificate(ctx, projectID, region).CreateCertificatePayload(*certificate).Execute()
+	cert, err := cl.client.DefaultAPI.CreateCertificate(ctx, projectID, region).CreateCertificatePayload(*certificate).Execute()
 	if isOpenAPINotFound(err) {
 		return cert, ErrorNotFound
 	}
 	return cert, err
 }
 
 func (cl certClient) ListCertificate(ctx context.Context, projectID, region string) (*certsdk.ListCertificatesResponse, error) {
-	certs, err := cl.client.ListCertificates(ctx, projectID, region).Execute()
+	certs, err := cl.client.DefaultAPI.ListCertificates(ctx, projectID, region).Execute()
 	return certs, err
 }
-
-func isOpenAPINotFound(err error) bool {
-	apiErr := &oapiError.GenericOpenAPIError{}
-	if !errors.As(err, &apiErr) {
-		return false
-	}
-	return apiErr.StatusCode == http.StatusNotFound
-}
-
-func IsNotFound(err error) bool {
-	return errors.Is(err, ErrorNotFound)
-}