Skip to content
Open
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
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM) ## Runs golangci-lint, gofmt/goimpo
@bash $(GARDENER_HACK_DIR)/check-charts.sh ./charts

# generate mock types for the following services from the SDK (space-separated list)
SDK_MOCK_SERVICES := iaas loadbalancer dns
SDK_MOCK_SERVICES := iaas dns

.PHONY: generate-mocks
generate-mocks: $(MOCKGEN)
Expand All @@ -120,6 +120,7 @@ generate-mocks: $(MOCKGEN)
INTERFACES=`go doc -all github.com/stackitcloud/stackit-sdk-go/services/$$service | grep '^type Api.* interface' | sed -n 's/^type \(.*\) interface.*/\1/p' | paste -sd,`,DefaultApi; \
$(MOCKGEN) -destination ./pkg/stackit/client/mock/$$service/$$service.go -package $$service github.com/stackitcloud/stackit-sdk-go/services/$$service $$INTERFACES; \
done
@$(MOCKGEN) -destination ./pkg/stackit/client/mock/loadbalancer/loadbalancer.go -package loadbalancer github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api DefaultAPI

.PHONY: generate
generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN) $(YQ) $(YAML2JSON) $(GOIMPORTS) generate-mocks ## Generates the controller-registration, other code-gen, the imagename constants as well as executes go:generate directives
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/authorization v0.12.0
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/loadbalancer v1.10.1
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.1
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0
go.uber.org/atomic v1.11.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6 h1:GBRb49x5Nax/oQQaa
github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.6/go.mod h1:IX9iL3MigDZUmzwswTJMfYvyi118KAHrFMfjJUy5NYk=
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5 h1:W57+XRa8wTLsi5CV9Tqa7mGgt/PvlRM//RurXSmvII8=
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/loadbalancer v1.10.1 h1:GWJ8FqI20Z4BYYprqi7CFN6imb6IF2H262a2H2VlB4A=
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.10.1/go.mod h1:hjXxEkJ247sa9IxoACRK8oUvly7Hux2qnIw7rj4c6xs=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.1 h1:IvZqEXjRjXrkjY0aSZFZ5zccOr2ZB+fj+N8AG46ajC4=
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.20.1/go.mod h1:yjrIuyp6+6RCYTiP77NGV1DniULFyhLTz9B5ebwvF40=
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIlXce2C8JcbBDHVa6nZ4SjPTqmnALTgrhms+NKI=
Expand Down
12 changes: 6 additions & 6 deletions pkg/stackit/client/loadbalancing.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

sdkconfig "github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"

stackitv1alpha1 "github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/apis/stackit/v1alpha1"
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/stackit"
Expand All @@ -17,12 +17,12 @@ type LoadBalancingClient interface {
}

type loadBalancingClient struct {
Client loadbalancer.DefaultApi
Client loadbalancer.DefaultAPI
projectID string
region string
}

func NewLoadBalancingClient(ctx context.Context, region string, endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) (LoadBalancingClient, error) {
func NewLoadBalancingClient(_ context.Context, region string, endpoints stackitv1alpha1.APIEndpoints, credentials *stackit.Credentials) (LoadBalancingClient, error) {
options := clientOptions(endpoints, credentials)

if endpoints.LoadBalancer != nil {
Expand All @@ -34,22 +34,22 @@ func NewLoadBalancingClient(ctx context.Context, region string, endpoints stacki
return nil, err
}
return &loadBalancingClient{
Client: apiClient,
Client: apiClient.DefaultAPI,
projectID: credentials.ProjectID,
region: region,
}, nil
}

func (l loadBalancingClient) ListLoadBalancers(ctx context.Context) ([]loadbalancer.LoadBalancer, error) {
lbResponse, err := l.Client.ListLoadBalancersExecute(ctx, l.projectID, l.region)
lbResponse, err := l.Client.ListLoadBalancers(ctx, l.projectID, l.region).Execute()
if err != nil {
return nil, err
}
return lbResponse.GetLoadBalancers(), nil
}

func (l loadBalancingClient) DeleteLoadBalancer(ctx context.Context, lbName string) error {
_, err := l.Client.DeleteLoadBalancerExecute(ctx, l.projectID, l.region, lbName)
_, err := l.Client.DeleteLoadBalancer(ctx, l.projectID, l.region, lbName).Execute()
return err
}

Expand Down
19 changes: 10 additions & 9 deletions pkg/stackit/client/loadbalancing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
"go.uber.org/mock/gomock"

mock "github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/stackit/client/mock/loadbalancer"
Expand All @@ -15,14 +15,14 @@ var _ = Describe("LoadBalancingClient", func() {
var (
ctx context.Context
mockCtrl *gomock.Controller
mockAPI *mock.MockDefaultApi
mockAPI *mock.MockDefaultAPI
client *loadBalancingClient
)

BeforeEach(func() {
ctx = context.Background()
mockCtrl = gomock.NewController(GinkgoT())
mockAPI = mock.NewMockDefaultApi(mockCtrl)
mockAPI = mock.NewMockDefaultAPI(mockCtrl)
client = &loadBalancingClient{
Client: mockAPI,
projectID: "test-project",
Expand All @@ -36,16 +36,18 @@ var _ = Describe("LoadBalancingClient", func() {
{Name: new("testLB2")},
}
response := loadbalancer.ListLoadBalancersResponse{
LoadBalancers: &expectedLoadBalancers,
LoadBalancers: expectedLoadBalancers,
}
mockAPI.EXPECT().ListLoadBalancersExecute(ctx, client.projectID, client.region).Return(&response, nil)
mockAPI.EXPECT().ListLoadBalancers(ctx, client.projectID, client.region).Return(loadbalancer.ApiListLoadBalancersRequest{ApiService: mockAPI})
mockAPI.EXPECT().ListLoadBalancersExecute(gomock.Any()).Return(&response, nil)
actualLoadBalancers, err := client.ListLoadBalancers(ctx)
Expect(err).ToNot(HaveOccurred())
Expect(actualLoadBalancers).To(Equal(expectedLoadBalancers))
})

It("deletes a certain loadbalancer", func() {
mockAPI.EXPECT().DeleteLoadBalancerExecute(ctx, client.projectID, client.region, "testLB").Return(nil, nil)
mockAPI.EXPECT().DeleteLoadBalancer(ctx, client.projectID, client.region, "testLB").Return(loadbalancer.ApiDeleteLoadBalancerRequest{ApiService: mockAPI})
mockAPI.EXPECT().DeleteLoadBalancerExecute(gomock.Any()).Return(nil, nil)
err := client.DeleteLoadBalancer(ctx, "testLB")
Expect(err).NotTo(HaveOccurred())
})
Expand All @@ -55,9 +57,8 @@ var _ = Describe("LoadBalancingClient", func() {
expectedLoadBalancer := &loadbalancer.LoadBalancer{
Name: new(name),
}
request := mock.NewMockApiGetLoadBalancerRequest(mockCtrl)
request.EXPECT().Execute().Return(expectedLoadBalancer, nil)
mockAPI.EXPECT().GetLoadBalancer(ctx, client.projectID, client.region, name).Return(request)
mockAPI.EXPECT().GetLoadBalancer(ctx, client.projectID, client.region, name).Return(loadbalancer.ApiGetLoadBalancerRequest{ApiService: mockAPI})
mockAPI.EXPECT().GetLoadBalancerExecute(gomock.Any()).Return(expectedLoadBalancer, nil)

actualLoadBalancer, err := client.GetLoadBalancer(ctx, "testLB")
Expect(err).NotTo(HaveOccurred())
Expand Down
Loading