Skip to content

fix(load-balancer): wait for action of managed certificate #1144

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
apricote merged 1 commit into from
Jan 30, 2026
Merged

fix(load-balancer): wait for action of managed certificate #1144

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
2 changes: 1 addition & 1 deletion hcloud/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (c *cloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
lbOps := &hcops.LoadBalancerOps{
LBClient: &c.client.LoadBalancer,
RobotClient: c.robotClient,
CertOps: &hcops.CertificateOps{CertClient: &c.client.Certificate},
CertOps: &hcops.CertificateOps{ActionClient: &c.client.Action, CertClient: &c.client.Certificate},
ActionClient: &c.client.Action,
NetworkClient: &c.client.Network,
NetworkID: c.networkID,
Expand Down
11 changes: 9 additions & 2 deletions internal/hcops/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ type HCloudCertificateClient interface {

// CertificateOps implements all operations regarding Hetzner Cloud Certificates.
type CertificateOps struct {
CertClient HCloudCertificateClient
ActionClient HCloudActionClient
CertClient HCloudCertificateClient
}

// GetCertificateByNameOrID obtains a certificate from the Hetzner Cloud
Expand Down Expand Up @@ -81,12 +82,18 @@ func (co *CertificateOps) CreateManagedCertificate(
DomainNames: domains,
Labels: labels,
}
_, _, err := co.CertClient.CreateCertificate(ctx, opts)
result, _, err := co.CertClient.CreateCertificate(ctx, opts)
if hcloud.IsError(err, hcloud.ErrorCodeUniquenessError) {
return fmt.Errorf("%s: %w", op, ErrAlreadyExists)
}
if err != nil {
return fmt.Errorf("%s: %w", op, err)
}

err = co.ActionClient.WaitFor(ctx, result.Action)
if err != nil {
return fmt.Errorf("%s: %w", op, err)
}

return nil
}
14 changes: 9 additions & 5 deletions internal/hcops/certificates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func TestCertificateOps_CreateManagedCertificate(t *testing.T) {
{
Name: "certificate creation successful",
Mock: func(_ *testing.T, tt *certificateOpsTestCase) {
res := hcloud.CertificateCreateResult{Certificate: &hcloud.Certificate{ID: 1}}
res := hcloud.CertificateCreateResult{Certificate: &hcloud.Certificate{ID: 1}, Action: &hcloud.Action{ID: 2}}
tt.CertClient.
On("CreateCertificate", tt.Ctx, hcloud.CertificateCreateOpts{
Name: "test-cert",
Expand All @@ -180,6 +180,7 @@ func TestCertificateOps_CreateManagedCertificate(t *testing.T) {
Labels: map[string]string{"key": "value"},
}).
Return(res, nil, nil)
tt.ActionClient.On("WaitFor", tt.Ctx, &hcloud.Action{ID: 2}).Return(nil)
},
Perform: func(t *testing.T, tt *certificateOpsTestCase) {
err := tt.CertOps.CreateManagedCertificate(
Expand All @@ -204,9 +205,10 @@ type certificateOpsTestCase struct {
ClientErr error

// Set in run before actual test execution
Ctx context.Context
CertOps *hcops.CertificateOps
CertClient *mocks.CertificateClient
Ctx context.Context
CertOps *hcops.CertificateOps
CertClient *mocks.CertificateClient
ActionClient *mocks.ActionClient
}

func (tt *certificateOpsTestCase) run(t *testing.T) {
Expand All @@ -215,7 +217,9 @@ func (tt *certificateOpsTestCase) run(t *testing.T) {
tt.Ctx = context.Background()
tt.CertClient = &mocks.CertificateClient{}
tt.CertClient.Test(t)
tt.CertOps = &hcops.CertificateOps{CertClient: tt.CertClient}
tt.ActionClient = &mocks.ActionClient{}
tt.ActionClient.Test(t)
tt.CertOps = &hcops.CertificateOps{ActionClient: tt.ActionClient, CertClient: tt.CertClient}

if tt.Mock != nil {
tt.Mock(t, tt)
Expand Down
7 changes: 5 additions & 2 deletions internal/hcops/load_balancer_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ func TestHCLBServiceOptsBuilder(t *testing.T) {
mock func(t *testing.T, tt *testCase)

// Set during test setup
certClient *mocks.CertificateClient
certClient *mocks.CertificateClient
actionClient *mocks.ActionClient
}

tests := []testCase{
Expand Down Expand Up @@ -429,6 +430,8 @@ func TestHCLBServiceOptsBuilder(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
tt.certClient = &mocks.CertificateClient{}
tt.certClient.Test(t)
tt.actionClient = &mocks.ActionClient{}
tt.actionClient.Test(t)

if tt.mock != nil {
tt.mock(t, &tt)
Expand All @@ -442,7 +445,7 @@ func TestHCLBServiceOptsBuilder(t *testing.T) {
Annotations: map[string]string{},
},
},
CertOps: &CertificateOps{CertClient: tt.certClient},
CertOps: &CertificateOps{ActionClient: tt.actionClient, CertClient: tt.certClient},
cfg: tt.cfg,
}
for k, v := range tt.serviceAnnotations {
Expand Down
2 changes: 1 addition & 1 deletion internal/hcops/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func NewLoadBalancerOpsFixture(t *testing.T) *LoadBalancerOpsFixture {

fx.LBOps = &LoadBalancerOps{
LBClient: fx.LBClient,
CertOps: &CertificateOps{CertClient: fx.CertClient},
CertOps: &CertificateOps{ActionClient: fx.ActionClient, CertClient: fx.CertClient},
ActionClient: fx.ActionClient,
NetworkClient: fx.NetworkClient,
RobotClient: fx.RobotClient,
Expand Down