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.

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

feat(certificate): allow retrying managed certificate issuance #847

Merged
merged 1 commit into from
Aug 26, 2024
Merged
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
1 change: 1 addition & 0 deletions internal/cmd/certificate/certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func NewCommand(s state.State) *cobra.Command {
LabelCmds.RemoveCobraCommand(s),
DeleteCmd.CobraCommand(s),
DescribeCmd.CobraCommand(s),
RetryCmd.CobraCommand(s),
)

return cmd
Expand Down
44 changes: 44 additions & 0 deletions internal/cmd/certificate/retry.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package certificate

import (
"fmt"

"github.com/spf13/cobra"

"github.com/hetznercloud/cli/internal/cmd/base"
"github.com/hetznercloud/cli/internal/hcapi2"
"github.com/hetznercloud/cli/internal/state"
)

var RetryCmd = base.Cmd{
BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
return &cobra.Command{
Use: "retry <certificate>",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is debatable whether retry or retry-issuance is a better name for the command. retry-issuance is more precise, but also very cumbersome to use. Although it probably won't be used much anyway, since this feature was missing for 3 years and nobody noticed.

Its called retry in the API and RetryIssuance in Go, so we are not consistent any way.

I lean towards retry to be consistent with the API.

Short: "Retry a managed certificate's issuance",
TraverseChildren: true,
DisableFlagsInUseLine: true,
}
},
Run: func(s state.State, cmd *cobra.Command, args []string) error {
idOrName := args[0]
certificate, _, err := s.Client().Certificate().Get(s, idOrName)
if err != nil {
return err
}
if certificate == nil {
return fmt.Errorf("certificate not found: %s", idOrName)
}

action, _, err := s.Client().Certificate().RetryIssuance(s, certificate)
if err != nil {
return err
}

if err := s.WaitForActions(cmd, s, action); err != nil {
return err
}

cmd.Printf("Retried issuance of certificate %s\n", certificate.Name)
return nil
},
}
44 changes: 44 additions & 0 deletions internal/cmd/certificate/retry_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package certificate_test

import (
"testing"
"time"

"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"

"github.com/hetznercloud/cli/internal/cmd/certificate"
"github.com/hetznercloud/cli/internal/testutil"
"github.com/hetznercloud/hcloud-go/v2/hcloud"
)

func TestRetry(t *testing.T) {
fx := testutil.NewFixture(t)
defer fx.Finish()

time.Local = time.UTC

cmd := certificate.RetryCmd.CobraCommand(fx.State())

cert := &hcloud.Certificate{
ID: 123,
Name: "my-test-cert",
}

fx.ExpectEnsureToken()
fx.Client.CertificateClient.EXPECT().
Get(gomock.Any(), "123").
Return(cert, nil, nil)
fx.Client.CertificateClient.EXPECT().
RetryIssuance(gomock.Any(), cert).
Return(&hcloud.Action{ID: 456}, nil, nil)
fx.ActionWaiter.EXPECT().
WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 456}).
Return(nil)

out, errOut, err := fx.Run(cmd, []string{"123"})

assert.NoError(t, err)
assert.Empty(t, errOut)
assert.Equal(t, "Retried issuance of certificate my-test-cert\n", out)
}