Skip to content

Commit

Permalink
Openapi generator br (#229)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shiyuhang0
shiyuhang0 authored Sep 4, 2024
1 parent 9681f03 commit bd7c1f2
Show file tree
Hide file tree
Showing 60 changed files with 3,837 additions and 4,200 deletions.
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ generate-v1beta1-client: install-openapi-generator ## Generate v1beta1 client
rm -rf pkg/tidbcloud/v1beta1/iam
cd tools/openapi-generator && npx openapi-generator-cli generate --additional-properties=withGoMod=false,enumClassPrefix=true --global-property=apiTests=false,apiDocs=false,modelDocs=false,modelTests=false -i ../../pkg/tidbcloud/v1beta1/iam.swagger.json -g go -o ../../pkg/tidbcloud/v1beta1/iam --package-name iam
@echo "==> Generating serverless br client"
swagger generate client -f pkg/tidbcloud/v1beta1/serverless_br/serverless-br.swagger.json -A tidbcloud-serverless -t pkg/tidbcloud/v1beta1/serverless_br
rm -rf pkg/tidbcloud/v1beta1/serverless/br
cd tools/openapi-generator && npx openapi-generator-cli generate --additional-properties=withGoMod=false,enumClassPrefix=true --global-property=apiTests=false,apiDocs=false,modelDocs=false,modelTests=false -i ../../pkg/tidbcloud/v1beta1/serverless/br.swagger.json -g go -o ../../pkg/tidbcloud/v1beta1/serverless/br --package-name br
@echo "==> Generating serverless import client"
swagger generate client -f pkg/tidbcloud/v1beta1/serverless_import/import.swagger.json -A tidbcloud-serverless -t pkg/tidbcloud/v1beta1/serverless_import
go fmt ./pkg/...
Expand Down
4 changes: 1 addition & 3 deletions internal/cli/serverless/backup/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"tidbcloud-cli/internal/flag"
"tidbcloud-cli/internal/service/cloud"
"tidbcloud-cli/internal/util"
brApi "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"

"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
Expand Down Expand Up @@ -148,8 +147,7 @@ func DeleteCmd(h *internal.Helper) *cobra.Command {
}
}

params := brApi.NewBackupRestoreServiceDeleteBackupParams().WithBackupID(backupID).WithContext(ctx)
_, err = d.DeleteBackup(params)
_, err = d.DeleteBackup(ctx, backupID)
if err != nil {
return errors.Trace(err)
}
Expand Down
7 changes: 3 additions & 4 deletions internal/cli/serverless/backup/delete_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"tidbcloud-cli/internal/iostream"
"tidbcloud-cli/internal/mock"
"tidbcloud-cli/internal/service/cloud"
brApi "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"
"tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless/br"

"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down Expand Up @@ -57,9 +57,8 @@ func (suite *DeleteBackupSuite) TestDeleteBackup() {
ctx := context.Background()

backupID := "289048"
suite.mockClient.On("DeleteBackup", brApi.NewBackupRestoreServiceDeleteBackupParams().
WithBackupID(backupID).WithContext(ctx)).
Return(&brApi.BackupRestoreServiceDeleteBackupOK{}, nil)
suite.mockClient.On("DeleteBackup", ctx, backupID).
Return(&br.V1beta1Backup{}, nil)

tests := []struct {
name string
Expand Down
12 changes: 4 additions & 8 deletions internal/cli/serverless/backup/describe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,14 @@ package backup
import (
"fmt"

"tidbcloud-cli/internal/output"

"tidbcloud-cli/internal"
"tidbcloud-cli/internal/config"
"tidbcloud-cli/internal/flag"
"tidbcloud-cli/internal/output"
"tidbcloud-cli/internal/service/cloud"
brAPI "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"

"github.com/spf13/cobra"

"github.com/juju/errors"
"github.com/spf13/cobra"
)

type DescribeOpts struct {
Expand Down Expand Up @@ -121,15 +118,14 @@ func DescribeCmd(h *internal.Helper) *cobra.Command {
}
}

params := brAPI.NewBackupRestoreServiceGetBackupParams().WithBackupID(backupID).WithContext(ctx)
if err != nil {
return errors.Trace(err)
}
backup, err := d.GetBackup(params)
backup, err := d.GetBackup(ctx, backupID)
if err != nil {
return errors.Trace(err)
}
err = output.PrintJson(h.IOStreams.Out, backup.Payload)
err = output.PrintJson(h.IOStreams.Out, backup)
if err != nil {
return errors.Trace(err)
}
Expand Down
15 changes: 5 additions & 10 deletions internal/cli/serverless/backup/describe_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import (
"tidbcloud-cli/internal/iostream"
"tidbcloud-cli/internal/mock"
"tidbcloud-cli/internal/service/cloud"
brApi "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"
brModel "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/models"
"tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless/br"

"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand All @@ -36,7 +35,7 @@ import (
const getBackupResult = `{
"backupId": "289048",
"clusterId": "10048930788495339885",
"createTime": "2023-12-15T07:00:00.000Z",
"createTime": "2023-12-15T07:00:00Z",
"name": "backups/289048"
}
`
Expand Down Expand Up @@ -66,17 +65,13 @@ func (suite *DescribeBackupSuite) TestDescribeBackup() {
assert := require.New(suite.T())
ctx := context.Background()

body := &brModel.V1beta1Backup{}
body := &br.V1beta1Backup{}
err := json.Unmarshal([]byte(getBackupResult), body)
assert.Nil(err)
result := &brApi.BackupRestoreServiceGetBackupOK{
Payload: body,
}
backupId := "289048"

suite.mockClient.On("GetBackup", brApi.NewBackupRestoreServiceGetBackupParams().
WithBackupID(backupId).WithContext(ctx)).
Return(result, nil)
suite.mockClient.On("GetBackup", ctx, backupId).
Return(body, nil)

tests := []struct {
name string
Expand Down
13 changes: 7 additions & 6 deletions internal/cli/serverless/backup/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ package backup

import (
"fmt"
"time"

"tidbcloud-cli/internal"
"tidbcloud-cli/internal/config"
"tidbcloud-cli/internal/flag"
"tidbcloud-cli/internal/output"
"tidbcloud-cli/internal/service/cloud"
brModel "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/models"
"tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless/br"

"github.com/juju/errors"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -126,9 +127,9 @@ func ListCmd(h *internal.Helper) *cobra.Command {
// for terminal which can prompt, humanFormat is the default format.
// for other terminals, json format is the default format.
if format == output.JsonFormat || !h.IOStreams.CanPrompt {
res := &brModel.V1beta1ListBackupsResponse{
res := &br.V1beta1ListBackupsResponse{
Backups: items,
TotalSize: total,
TotalSize: &total,
}
err := output.PrintJson(h.IOStreams.Out, res)
if err != nil {
Expand All @@ -144,9 +145,9 @@ func ListCmd(h *internal.Helper) *cobra.Command {
var rows []output.Row
for _, item := range items {
rows = append(rows, output.Row{
item.BackupID,
*item.ClusterID,
item.CreateTime.String(),
*item.BackupId,
item.ClusterId,
item.CreateTime.Format(time.RFC3339),
})
}

Expand Down
35 changes: 14 additions & 21 deletions internal/cli/serverless/backup/list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import (
"tidbcloud-cli/internal/iostream"
"tidbcloud-cli/internal/mock"
"tidbcloud-cli/internal/service/cloud"
brApi "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"
brModel "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/models"
"tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless/br"

"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand All @@ -38,7 +37,7 @@ const listResultStr = `{
{
"backupId": "289048",
"clusterId": "10048930788495339885",
"createTime": "2023-12-15T07:00:00.000Z",
"createTime": "2023-12-15T07:00:00Z",
"name": "backups/289048"
}
],
Expand All @@ -51,13 +50,13 @@ const listResultMultiPageStr = `{
{
"backupId": "289048",
"clusterId": "10048930788495339885",
"createTime": "2023-12-15T07:00:00.000Z",
"createTime": "2023-12-15T07:00:00Z",
"name": "backups/289048"
},
{
"backupId": "289048",
"clusterId": "10048930788495339885",
"createTime": "2023-12-15T07:00:00.000Z",
"createTime": "2023-12-15T07:00:00Z",
"name": "backups/289048"
}
],
Expand Down Expand Up @@ -92,17 +91,13 @@ func (suite *ListBackupSuite) TestListBackups() {
assert := require.New(suite.T())
ctx := context.Background()

body := &brModel.V1beta1ListBackupsResponse{}
body := &br.V1beta1ListBackupsResponse{}
err := json.Unmarshal([]byte(listResultStr), body)
assert.Nil(err)
result := &brApi.BackupRestoreServiceListBackupsOK{
Payload: body,
}
pageSize := int32(suite.pageSize)
clusterID := "10048930788495339885"
suite.mockClient.On("ListBackups", brApi.NewBackupRestoreServiceListBackupsParams().
WithClusterID(clusterID).WithPageSize(&pageSize).WithContext(ctx)).
Return(result, nil)
suite.mockClient.On("ListBackups", ctx, &clusterID, &pageSize, (*string)(nil)).
Return(body, nil)

tests := []struct {
name string
Expand Down Expand Up @@ -156,20 +151,18 @@ func (suite *ListBackupSuite) TestListBackupsWithMultiPages() {
pageToken := "2"
clusterID := "10048930788495339885"

body := &brModel.V1beta1ListBackupsResponse{}
body := &br.V1beta1ListBackupsResponse{}
err := json.Unmarshal([]byte(strings.ReplaceAll(listResultStr, `"total": 1`, `"total": 2`)), body)
assert.Nil(err)
body.NextPageToken = pageToken
suite.mockClient.On("ListBackups", brApi.NewBackupRestoreServiceListBackupsParams().
WithClusterID(clusterID).WithPageSize(&pageSize).WithContext(ctx)).
Return(&brApi.BackupRestoreServiceListBackupsOK{Payload: body}, nil)
body.NextPageToken = &pageToken
suite.mockClient.On("ListBackups", ctx, &clusterID, &pageSize, (*string)(nil)).
Return(body, nil)

body2 := &brModel.V1beta1ListBackupsResponse{}
body2 := &br.V1beta1ListBackupsResponse{}
err = json.Unmarshal([]byte(strings.ReplaceAll(listResultStr, `"total": 1`, `"total": 2`)), body2)
assert.Nil(err)
suite.mockClient.On("ListBackups", brApi.NewBackupRestoreServiceListBackupsParams().
WithClusterID(clusterID).WithPageToken(&pageToken).WithPageSize(&pageSize).WithContext(ctx)).
Return(&brApi.BackupRestoreServiceListBackupsOK{Payload: body2}, nil)
suite.mockClient.On("ListBackups", ctx, &clusterID, &pageSize, &pageToken).
Return(body2, nil)

tests := []struct {
name string
Expand Down
24 changes: 11 additions & 13 deletions internal/cli/serverless/restore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@ package serverless

import (
"fmt"
"time"

"tidbcloud-cli/internal"
"tidbcloud-cli/internal/config"
"tidbcloud-cli/internal/flag"
"tidbcloud-cli/internal/service/cloud"
"tidbcloud-cli/internal/ui"
"tidbcloud-cli/internal/util"
brApi "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"
brModel "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/models"
"tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless/br"

"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/fatih/color"
"github.com/go-openapi/strfmt"
"github.com/juju/errors"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -156,30 +155,29 @@ func RestoreCmd(h *internal.Helper) *cobra.Command {
}
}

params := brApi.NewBackupRestoreServiceRestoreParams().WithBody(&brModel.V1beta1RestoreRequest{}).WithContext(ctx)
body := &br.V1beta1RestoreRequest{}
if backupID != "" {
params.Body.Snapshot = &brModel.RestoreRequestSnapshot{
BackupID: backupID,
body.Snapshot = &br.RestoreRequestSnapshot{
BackupId: &backupID,
}
} else {
if backupTimeStr == "" {
return errors.New("backup time is required in point-in-time mode")
}
var backupTime strfmt.DateTime
backupTime, err = strfmt.ParseDateTime(backupTimeStr)
backupTime, err := time.Parse(time.RFC3339, backupTimeStr)
if err != nil {
return errors.New(fmt.Sprintf("invalid backup time %s. Please input the backup time with the 2006-01-02T15:04:05Z formate", backupTimeStr))
}
params.Body.PointInTime = &brModel.RestoreRequestPointInTime{
ClusterID: clusterID,
BackupTime: backupTime,
body.PointInTime = &br.RestoreRequestPointInTime{
ClusterId: &clusterID,
BackupTime: &backupTime,
}
}
resp, err := d.Restore(params)
resp, err := d.Restore(ctx, body)
if err != nil {
return errors.Trace(err)
}
fmt.Fprintln(h.IOStreams.Out, color.GreenString(fmt.Sprintf("restore to clsuter %s, use \"ticloud serverless get -c %s\" to check the restore process", *resp.Payload.ClusterID, *resp.Payload.ClusterID)))
fmt.Fprintln(h.IOStreams.Out, color.GreenString(fmt.Sprintf("restore to clsuter %s, use \"ticloud serverless get -c %s\" to check the restore process", resp.ClusterId, resp.ClusterId)))
return nil
},
}
Expand Down
33 changes: 14 additions & 19 deletions internal/cli/serverless/restore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ import (
"fmt"
"os"
"testing"
"time"

"tidbcloud-cli/internal"
"tidbcloud-cli/internal/iostream"
"tidbcloud-cli/internal/mock"
"tidbcloud-cli/internal/service/cloud"
brApi "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/client/backup_restore_service"
brModel "tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless_br/models"
"tidbcloud-cli/pkg/tidbcloud/v1beta1/serverless/br"

"github.com/go-openapi/strfmt"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
)
Expand Down Expand Up @@ -63,15 +62,13 @@ func (suite *RestoreClusterSuite) TestRestoreClusterSnapshot() {
clusterID := "10048930788495339885"
backupID := "289048"

body := &brModel.V1beta1RestoreRequest{
Snapshot: &brModel.RestoreRequestSnapshot{
BackupID: backupID,
body := &br.V1beta1RestoreRequest{
Snapshot: &br.RestoreRequestSnapshot{
BackupId: &backupID,
},
}
suite.mockClient.On("Restore", brApi.NewBackupRestoreServiceRestoreParams().
WithBody(body).WithContext(ctx)).
Return(&brApi.BackupRestoreServiceRestoreOK{Payload: &brModel.V1beta1RestoreResponse{
ClusterID: &clusterID}}, nil)
suite.mockClient.On("Restore", ctx, body).
Return(&br.V1beta1RestoreResponse{ClusterId: clusterID}, nil)

tests := []struct {
name string
Expand Down Expand Up @@ -113,18 +110,16 @@ func (suite *RestoreClusterSuite) TestRestoreClusterPointInTime() {
clusterID := "10048930788495339885"
backupTimeStr := "2023-12-15T07:00:00.000Z"

backupTime, err := strfmt.ParseDateTime(backupTimeStr)
backupTime, err := time.Parse(time.RFC3339, backupTimeStr)
assert.Nil(err)
body := &brModel.V1beta1RestoreRequest{
PointInTime: &brModel.RestoreRequestPointInTime{
BackupTime: backupTime,
ClusterID: clusterID,
body := &br.V1beta1RestoreRequest{
PointInTime: &br.RestoreRequestPointInTime{
BackupTime: &backupTime,
ClusterId: &clusterID,
},
}
suite.mockClient.On("Restore", brApi.NewBackupRestoreServiceRestoreParams().
WithBody(body).WithContext(ctx)).
Return(&brApi.BackupRestoreServiceRestoreOK{Payload: &brModel.V1beta1RestoreResponse{
ClusterID: &clusterID}}, nil)
suite.mockClient.On("Restore", ctx, body).
Return(&br.V1beta1RestoreResponse{ClusterId: clusterID}, nil)

tests := []struct {
name string
Expand Down
Loading

0 comments on commit bd7c1f2

Please sign in to comment.