From 6f439694fb97e69669180ca38d9d4f30258097e0 Mon Sep 17 00:00:00 2001 From: Deepti-yb Date: Mon, 24 Feb 2025 05:28:10 +0000 Subject: [PATCH] [PLAT-16887][YBA CLI]Add Linter to CLI project Summary: Add a linter to the YBA CLI project Use `make fmt` in the root directory for formatting Test Plan: Run `make fmt` Reviewers: sneelakantan Reviewed By: sneelakantan Differential Revision: https://phorge.dev.yugabyte.com/D42103 --- .arclint | 2 +- managed/yba-cli/GNUmakefile | 7 ++ managed/yba-cli/cmd/backup/create_backup.go | 46 +++++++++-- managed/yba-cli/cmd/backup/delete_backup.go | 6 +- managed/yba-cli/cmd/backup/describe_backup.go | 6 +- managed/yba-cli/cmd/backup/edit_backup.go | 10 ++- .../cmd/backup/list_incremental_backup.go | 6 +- .../cmd/backup/restore/create_restore.go | 35 ++++++-- .../backup/schedule/create_backup_schedule.go | 42 ++++++++-- .../backup/schedule/delete_backup_schedule.go | 3 +- managed/yba-cli/cmd/ear/aws/update_ear.go | 3 +- .../yba-cli/cmd/ear/earutil/deleteearutil.go | 7 +- .../yba-cli/cmd/ear/earutil/updatearutil.go | 7 +- .../yba-cli/cmd/ear/hashicorp/create_ear.go | 7 +- .../yba-cli/cmd/eit/customca/create_eit.go | 11 ++- .../yba-cli/cmd/eit/download/download_eit.go | 3 +- .../cmd/eit/k8scertmanager/create_eit.go | 4 +- .../yba-cli/cmd/eit/selfsigned/create_eit.go | 4 +- .../cmd/provider/aws/update_provider.go | 22 ++++- .../cmd/provider/azu/update_provider.go | 8 +- .../provider/kubernetes/create_provider.go | 56 ++++++++----- .../provider/kubernetes/update_provider.go | 58 +++++++++----- .../cmd/provider/onprem/create_provider.go | 7 +- .../onprem/instancetypes/add_instancetypes.go | 10 ++- .../instancetypes/describe_instancetypes.go | 3 +- .../instancetypes/list_instancetypes.go | 10 ++- .../instancetypes/remove_instancetypes.go | 15 +++- .../cmd/provider/onprem/node/add_node.go | 17 +++- .../cmd/provider/onprem/node/list_node.go | 3 +- .../provider/onprem/node/preflight_node.go | 3 +- .../cmd/provider/onprem/node/remove_node.go | 3 +- .../providerutil/createproviderutil.go | 7 +- .../providerutil/updateproviderutil.go | 7 +- managed/yba-cli/cmd/rbac/rbacutil/rbacutil.go | 5 +- managed/yba-cli/cmd/rbac/role/update_role.go | 14 +++- .../rbac/rolebinding/delete_rolebinding.go | 15 +++- .../rbac/rolebinding/describe_rolebinding.go | 4 +- managed/yba-cli/cmd/release/create_release.go | 7 +- managed/yba-cli/cmd/release/update_release.go | 7 +- managed/yba-cli/cmd/root.go | 3 +- .../az/list_storageconfiguration.go | 6 +- .../gcs/list_storageconfiguration.go | 6 +- .../nfs/list_storageconfiguration.go | 6 +- .../s3/list_storageconfiguration.go | 6 +- managed/yba-cli/cmd/task/list_task.go | 7 +- managed/yba-cli/cmd/task/retry_task.go | 7 +- .../yba-cli/cmd/universe/build_universe.go | 6 +- .../yba-cli/cmd/universe/create_universe.go | 80 +++++++++++++++---- .../universe/edit/ysqlconfigure_universe.go | 22 +++-- .../cmd/universe/security/ear_universe.go | 10 ++- .../universe/security/eit/cert_universe.go | 6 +- .../cmd/universe/security/eit/tls_universe.go | 24 ++++-- .../table/namespace/list_namespace.go | 4 +- .../universeutil/upgradeuniverseutil.go | 7 +- .../upgrade/gflags/set_gflagsuniverse.go | 5 +- .../yba-cli/cmd/user/reset_password_user.go | 5 +- managed/yba-cli/cmd/user/update_user.go | 4 +- .../yba-cli/cmd/xcluster/create_xcluster.go | 21 ++++- .../yba-cli/cmd/xcluster/delete_xcluster.go | 4 +- .../cmd/xcluster/fullcopytables_xcluster.go | 11 ++- managed/yba-cli/cmd/xcluster/list_xcluster.go | 18 ++++- .../yba-cli/cmd/xcluster/restart_xcluster.go | 19 ++++- managed/yba-cli/cmd/xcluster/sync_xcluster.go | 7 +- .../yba-cli/cmd/xcluster/update_xcluster.go | 3 +- managed/yba-cli/internal/client/az.go | 6 +- managed/yba-cli/internal/client/backup.go | 23 +++--- managed/yba-cli/internal/client/ear.go | 18 +++-- managed/yba-cli/internal/client/eit.go | 30 ++++--- .../yba-cli/internal/client/instancetypes.go | 24 +++--- managed/yba-cli/internal/client/node.go | 40 +++++----- managed/yba-cli/internal/client/provider.go | 22 ++--- managed/yba-cli/internal/client/rbac.go | 34 +++----- managed/yba-cli/internal/client/region.go | 4 +- managed/yba-cli/internal/client/release.go | 64 +++++++-------- managed/yba-cli/internal/client/restore.go | 9 +-- .../internal/client/runtimeconfiguration.go | 32 ++++---- managed/yba-cli/internal/client/schedule.go | 21 ++--- managed/yba-cli/internal/client/session.go | 9 +-- .../internal/client/storageconfiguration.go | 16 ++-- managed/yba-cli/internal/client/table.go | 24 +++--- managed/yba-cli/internal/client/task.go | 35 ++++---- managed/yba-cli/internal/client/universe.go | 58 ++++++++------ managed/yba-cli/internal/client/user.go | 16 +--- managed/yba-cli/internal/client/xcluster.go | 38 +++++---- .../formatter/backup/keyspace_location.go | 10 ++- .../backup/restore/restore_keyspace.go | 6 +- .../rbac/permissioninfo/permissioninfo.go | 6 +- .../internal/formatter/tabwriter/tabwriter.go | 14 +++- .../formatter/tabwriter/tabwriter_test.go | 73 +++++++++++++++-- .../internal/formatter/xcluster/xcluster.go | 4 +- 90 files changed, 963 insertions(+), 460 deletions(-) diff --git a/.arclint b/.arclint index e38b6f34cb2b..e31a631b5eb5 100644 --- a/.arclint +++ b/.arclint @@ -58,7 +58,7 @@ }, "go-files-length": { "type": "text", - "text.max-line-length": 100, + "text.max-line-length": 120, "include": "(^managed/yba-cli/.*[.]go$)", "severity": { "2": "disabled" diff --git a/managed/yba-cli/GNUmakefile b/managed/yba-cli/GNUmakefile index 93bd6b138fff..563a4acac90e 100644 --- a/managed/yba-cli/GNUmakefile +++ b/managed/yba-cli/GNUmakefile @@ -1,5 +1,6 @@ TOP_BUILDDIR ?= . DEVOPS_HOME=$(CURDIR)/../devops +GOLINES := ./bin/golines VERSION_NUMBER ?= $(shell cat $(CURDIR)/version_metadata.json | jq '.version_number') @@ -91,3 +92,9 @@ build: .PHONY: license license: ./licenses/generate-license-file.sh + +.PHONY: fmt +fmt: + go clean -modcache + GOBIN=$(PWD)/bin go install github.com/segmentio/golines@latest + $(GOLINES) --max-len=100 -w . diff --git a/managed/yba-cli/cmd/backup/create_backup.go b/managed/yba-cli/cmd/backup/create_backup.go index 61f5ce2a6635..6ca9f8cad8fe 100644 --- a/managed/yba-cli/cmd/backup/create_backup.go +++ b/managed/yba-cli/cmd/backup/create_backup.go @@ -49,7 +49,11 @@ var createBackupCmd = &cobra.Command{ if len(strings.TrimSpace(storageConfigNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No storage config name found to take a backup\n", formatter.RedColor)) + formatter.Colorize( + "No storage config name found to take a backup\n", + formatter.RedColor, + ), + ) } tableTypeFlag, err := cmd.Flags().GetString("table-type") @@ -59,7 +63,11 @@ var createBackupCmd = &cobra.Command{ if len(strings.TrimSpace(tableTypeFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("Table type not specified to take a backup\n", formatter.RedColor)) + formatter.Colorize( + "Table type not specified to take a backup\n", + formatter.RedColor, + ), + ) } }, Run: func(cmd *cobra.Command, args []string) { @@ -76,7 +84,12 @@ var createBackupCmd = &cobra.Command{ r, response, err := universeListRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Backup", "Create - Get Universe") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Backup", + "Create - Get Universe", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } @@ -252,8 +265,17 @@ var createBackupCmd = &cobra.Command{ if viper.GetBool("wait") { if taskUUID != "" { - logrus.Info(fmt.Sprintf("\nWaiting for backup task %s on universe %s (%s) to be completed\n", - formatter.Colorize(taskUUID, formatter.GreenColor), universeNameFlag, universeUUID)) + logrus.Info( + fmt.Sprintf( + "\nWaiting for backup task %s on universe %s (%s) to be completed\n", + formatter.Colorize( + taskUUID, + formatter.GreenColor, + ), + universeNameFlag, + universeUUID, + ), + ) err = authAPI.WaitForTask(taskUUID, msg) if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) @@ -262,7 +284,12 @@ var createBackupCmd = &cobra.Command{ backupTaskRequest := authAPI.GetBackupByTaskUUID(universeUUID, taskUUID) rBackup, response, err := backupTaskRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Backup", "Create - Get Backup") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Backup", + "Create - Get Backup", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } backupUUID := rBackup[0].GetBackupUUID() @@ -295,7 +322,12 @@ var createBackupCmd = &cobra.Command{ backupListRequest := authAPI.ListBackups().PageBackupsRequest(backupAPIQuery) r, response, err := backupListRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Backup", "Create - Describe Backup") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Backup", + "Create - Describe Backup", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/backup/delete_backup.go b/managed/yba-cli/cmd/backup/delete_backup.go index b6b75d6e573a..fbec60a5c61c 100644 --- a/managed/yba-cli/cmd/backup/delete_backup.go +++ b/managed/yba-cli/cmd/backup/delete_backup.go @@ -31,7 +31,11 @@ var deleteBackupCmd = &cobra.Command{ if len(backupInfoArray) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No backup info specified to delete backup(s)\n", formatter.RedColor)) + formatter.Colorize( + "No backup info specified to delete backup(s)\n", + formatter.RedColor, + ), + ) } }, Run: func(cmd *cobra.Command, args []string) { diff --git a/managed/yba-cli/cmd/backup/describe_backup.go b/managed/yba-cli/cmd/backup/describe_backup.go index 332630330487..7072668ac50f 100644 --- a/managed/yba-cli/cmd/backup/describe_backup.go +++ b/managed/yba-cli/cmd/backup/describe_backup.go @@ -34,7 +34,11 @@ var describeBackupCmd = &cobra.Command{ if len(backupUUID) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No backup UUID specified to describe backup\n", formatter.RedColor)) + formatter.Colorize( + "No backup UUID specified to describe backup\n", + formatter.RedColor, + ), + ) } }, Run: func(cmd *cobra.Command, args []string) { diff --git a/managed/yba-cli/cmd/backup/edit_backup.go b/managed/yba-cli/cmd/backup/edit_backup.go index 92112a530315..c244c732bc59 100644 --- a/managed/yba-cli/cmd/backup/edit_backup.go +++ b/managed/yba-cli/cmd/backup/edit_backup.go @@ -51,7 +51,8 @@ var editBackupCmd = &cobra.Command{ if cmd.Flags().Changed("time-before-delete-in-ms") { logrus.Debugf("Updating time-before-delete-in-ms") - timeBeforeDeleteFromPresentInMillis, err := cmd.Flags().GetInt64("time-before-delete-in-ms") + timeBeforeDeleteFromPresentInMillis, err := cmd.Flags(). + GetInt64("time-before-delete-in-ms") if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } @@ -137,7 +138,12 @@ var editBackupCmd = &cobra.Command{ backupListRequest := authAPI.ListBackups().PageBackupsRequest(backupAPIQuery) r, response, err := backupListRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Backup", "Edit - Describe Backup") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Backup", + "Edit - Describe Backup", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/backup/list_incremental_backup.go b/managed/yba-cli/cmd/backup/list_incremental_backup.go index 313c5a67fff0..d0b2ef03db39 100644 --- a/managed/yba-cli/cmd/backup/list_incremental_backup.go +++ b/managed/yba-cli/cmd/backup/list_incremental_backup.go @@ -32,7 +32,11 @@ var listIncrementalBackupsCmd = &cobra.Command{ if len(backupUUID) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No backup UUID specified to list incremental backup\n", formatter.RedColor)) + formatter.Colorize( + "No backup UUID specified to list incremental backup\n", + formatter.RedColor, + ), + ) } }, Run: func(cmd *cobra.Command, args []string) { diff --git a/managed/yba-cli/cmd/backup/restore/create_restore.go b/managed/yba-cli/cmd/backup/restore/create_restore.go index c2f57b59a184..45f37f17aeef 100644 --- a/managed/yba-cli/cmd/backup/restore/create_restore.go +++ b/managed/yba-cli/cmd/backup/restore/create_restore.go @@ -41,7 +41,11 @@ var createRestoreCmd = &cobra.Command{ if len(strings.TrimSpace(universeNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No universe name found to restore backup to\n", formatter.RedColor)) + formatter.Colorize( + "No universe name found to restore backup to\n", + formatter.RedColor, + ), + ) } storageConfigNameFlag, err := cmd.Flags().GetString("storage-config-name") @@ -51,7 +55,11 @@ var createRestoreCmd = &cobra.Command{ if len(strings.TrimSpace(storageConfigNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No storage config name found for restore\n", formatter.RedColor)) + formatter.Colorize( + "No storage config name found for restore\n", + formatter.RedColor, + ), + ) } }, Run: func(cmd *cobra.Command, args []string) { @@ -68,7 +76,12 @@ var createRestoreCmd = &cobra.Command{ r, response, err := universeListRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Restore", "Create - Get Universe") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Restore", + "Create - Get Universe", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } @@ -194,8 +207,17 @@ var createRestoreCmd = &cobra.Command{ if viper.GetBool("wait") { if taskUUID != "" { - logrus.Info(fmt.Sprintf("\nWaiting for restore task %s on universe %s (%s) to be completed\n", - formatter.Colorize(taskUUID, formatter.GreenColor), universeNameFlag, universeUUID)) + logrus.Info( + fmt.Sprintf( + "\nWaiting for restore task %s on universe %s (%s) to be completed\n", + formatter.Colorize( + taskUUID, + formatter.GreenColor, + ), + universeNameFlag, + universeUUID, + ), + ) err = authAPI.WaitForTask(taskUUID, msg) if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) @@ -275,7 +297,8 @@ func buildBackupInfoList(backupInfos []string) (res []ybaclient.BackupStorageInf backupDetails["storage-location"] = val } case "backup-type": - if !strings.EqualFold(val, "ysql") && !strings.EqualFold(val, "ycql") && !strings.EqualFold(val, "yedis") { + if !strings.EqualFold(val, "ysql") && !strings.EqualFold(val, "ycql") && + !strings.EqualFold(val, "yedis") { logrus.Fatalf(fmt.Sprintf("Table type provided %s is not supported", val)) } diff --git a/managed/yba-cli/cmd/backup/schedule/create_backup_schedule.go b/managed/yba-cli/cmd/backup/schedule/create_backup_schedule.go index 9b2ddabb2ba9..4a5914ad0b52 100644 --- a/managed/yba-cli/cmd/backup/schedule/create_backup_schedule.go +++ b/managed/yba-cli/cmd/backup/schedule/create_backup_schedule.go @@ -38,7 +38,11 @@ var createBackupScheduleCmd = &cobra.Command{ if len(strings.TrimSpace(scheduleName)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No schedule name specified to create a backup schedule\n", formatter.RedColor)) + formatter.Colorize( + "No schedule name specified to create a backup schedule\n", + formatter.RedColor, + ), + ) } universeNameFlag, err := cmd.Flags().GetString("universe-name") @@ -48,7 +52,11 @@ var createBackupScheduleCmd = &cobra.Command{ if len(strings.TrimSpace(universeNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No universe name found to create a backup schedule\n", formatter.RedColor)) + formatter.Colorize( + "No universe name found to create a backup schedule\n", + formatter.RedColor, + ), + ) } storageConfigNameFlag, err := cmd.Flags().GetString("storage-config-name") @@ -58,7 +66,11 @@ var createBackupScheduleCmd = &cobra.Command{ if len(strings.TrimSpace(storageConfigNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No storage config name found to create a backup schedule\n", formatter.RedColor)) + formatter.Colorize( + "No storage config name found to create a backup schedule\n", + formatter.RedColor, + ), + ) } tableTypeFlag, err := cmd.Flags().GetString("table-type") @@ -68,7 +80,11 @@ var createBackupScheduleCmd = &cobra.Command{ if len(strings.TrimSpace(tableTypeFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("Table type not specified to create a backup schedule\n", formatter.RedColor)) + formatter.Colorize( + "Table type not specified to create a backup schedule\n", + formatter.RedColor, + ), + ) } }, Run: func(cmd *cobra.Command, args []string) { @@ -210,8 +226,11 @@ var createBackupScheduleCmd = &cobra.Command{ if scheduleFrequencyInSecs == 0 && len(strings.TrimSpace(cronExpression)) == 0 { logrus.Fatalln( - formatter.Colorize("Neither frequency of the schedule nor cron expression are provided", - formatter.RedColor)) + formatter.Colorize( + "Neither frequency of the schedule nor cron expression are provided", + formatter.RedColor, + ), + ) } frequencyTimeUnit := "MINUTES" @@ -253,7 +272,8 @@ var createBackupScheduleCmd = &cobra.Command{ requestBody.SetCronExpression(cronExpression) } - incrementalBackupFrequencyInSecs, err := cmd.Flags().GetInt64("incremental-backup-frequency-in-secs") + incrementalBackupFrequencyInSecs, err := cmd.Flags(). + GetInt64("incremental-backup-frequency-in-secs") if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } @@ -279,7 +299,13 @@ var createBackupScheduleCmd = &cobra.Command{ if taskUUID != "" { logrus.Info(fmt.Sprintf( "\nWaiting for backup schedule %s creation on universe %s (%s) to be completed\n", - formatter.Colorize(scheduleName, formatter.GreenColor), universeNameFlag, universeUUID)) + formatter.Colorize( + scheduleName, + formatter.GreenColor, + ), + universeNameFlag, + universeUUID, + )) err = authAPI.WaitForTask(taskUUID, msg) if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) diff --git a/managed/yba-cli/cmd/backup/schedule/delete_backup_schedule.go b/managed/yba-cli/cmd/backup/schedule/delete_backup_schedule.go index 4f24019606ad..e3f2acaaf8d1 100644 --- a/managed/yba-cli/cmd/backup/schedule/delete_backup_schedule.go +++ b/managed/yba-cli/cmd/backup/schedule/delete_backup_schedule.go @@ -132,7 +132,8 @@ var deleteBackupScheduleCmd = &cobra.Command{ // Prepare next page request scheduleAPIQuery.Offset = offset - scheduleListRequest = authAPI.ListBackupSchedules().PageScheduleRequest(scheduleAPIQuery) + scheduleListRequest = authAPI.ListBackupSchedules(). + PageScheduleRequest(scheduleAPIQuery) } if len(scheduleUUID) == 0 { diff --git a/managed/yba-cli/cmd/ear/aws/update_ear.go b/managed/yba-cli/cmd/ear/aws/update_ear.go index 204bad5c7bc9..54153ceb7219 100644 --- a/managed/yba-cli/cmd/ear/aws/update_ear.go +++ b/managed/yba-cli/cmd/ear/aws/update_ear.go @@ -82,7 +82,8 @@ var updateAWSEARCmd = &cobra.Command{ if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - if len(strings.TrimSpace(accessKeyID)) != 0 && len(strings.TrimSpace(secretAccessKey)) != 0 { + if len(strings.TrimSpace(accessKeyID)) != 0 && + len(strings.TrimSpace(secretAccessKey)) != 0 { logrus.Debug("Updating AWS credentials\n") hasUpdates = true requestBody[util.AWSAccessKeyEnv] = accessKeyID diff --git a/managed/yba-cli/cmd/ear/earutil/deleteearutil.go b/managed/yba-cli/cmd/ear/earutil/deleteearutil.go index 7a3103fa0ac4..ef9a38783034 100644 --- a/managed/yba-cli/cmd/ear/earutil/deleteearutil.go +++ b/managed/yba-cli/cmd/ear/earutil/deleteearutil.go @@ -66,7 +66,12 @@ func DeleteEARUtil(cmd *cobra.Command, commandCall, earCode string) { if len(strings.TrimSpace(commandCall)) != 0 { callSite = fmt.Sprintf("%s: %s", callSite, commandCall) } - errMessage := util.ErrorFromHTTPResponse(response, err, callSite, "Delete - List KMS Configs") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + callSite, + "Delete - List KMS Configs", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/ear/earutil/updatearutil.go b/managed/yba-cli/cmd/ear/earutil/updatearutil.go index 23a103de62f6..32ea681a44c3 100644 --- a/managed/yba-cli/cmd/ear/earutil/updatearutil.go +++ b/managed/yba-cli/cmd/ear/earutil/updatearutil.go @@ -131,8 +131,11 @@ func GetEARConfig( if len(r) < 1 { logrus.Fatalf( formatter.Colorize( - fmt.Sprintf("No encryption at rest configurations with name: %s and code %s found\n", - earName, earCode), + fmt.Sprintf( + "No encryption at rest configurations with name: %s and code %s found\n", + earName, + earCode, + ), formatter.RedColor, )) } diff --git a/managed/yba-cli/cmd/ear/hashicorp/create_ear.go b/managed/yba-cli/cmd/ear/hashicorp/create_ear.go index f6ea2bacceb1..5d16dc6906b7 100644 --- a/managed/yba-cli/cmd/ear/hashicorp/create_ear.go +++ b/managed/yba-cli/cmd/ear/hashicorp/create_ear.go @@ -127,7 +127,12 @@ var createHashicorpVaultEARCmd = &cobra.Command{ rTask, response, err := authAPI.CreateKMSConfig(util.HashicorpVaultEARType). KMSConfig(requestBody).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "EAR: Hashicorp Vault", "Create") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "EAR: Hashicorp Vault", + "Create", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/eit/customca/create_eit.go b/managed/yba-cli/cmd/eit/customca/create_eit.go index c3fb58a8a170..1db1c674c1fb 100644 --- a/managed/yba-cli/cmd/eit/customca/create_eit.go +++ b/managed/yba-cli/cmd/eit/customca/create_eit.go @@ -46,7 +46,9 @@ var createCustomCAEITCmd = &cobra.Command{ } if len(strings.TrimSpace(rootCertFilePath)) == 0 { - logrus.Fatalf(formatter.Colorize("Missing root certificate file path\n", formatter.RedColor)) + logrus.Fatalf( + formatter.Colorize("Missing root certificate file path\n", formatter.RedColor), + ) } logrus.Debug("Reading contents from root certificate file: ", rootCertFilePath) @@ -110,7 +112,12 @@ var createCustomCAEITCmd = &cobra.Command{ CustomCertInfo: &customCertInfo, } - eitutil.CreateEITUtil(authAPI, configName, util.CustomCertHostPathCertificateType, requestBody) + eitutil.CreateEITUtil( + authAPI, + configName, + util.CustomCertHostPathCertificateType, + requestBody, + ) }, } diff --git a/managed/yba-cli/cmd/eit/download/download_eit.go b/managed/yba-cli/cmd/eit/download/download_eit.go index d31a41f17308..5fceca325ac2 100644 --- a/managed/yba-cli/cmd/eit/download/download_eit.go +++ b/managed/yba-cli/cmd/eit/download/download_eit.go @@ -29,7 +29,8 @@ func init() { DownloadEITCmd.AddCommand(downloadRootEITCmd) DownloadEITCmd.AddCommand(downloadClientEITCmd) - DownloadEITCmd.PersistentFlags().StringP("name", "n", "", "[Required] Name of the configuration.") + DownloadEITCmd.PersistentFlags(). + StringP("name", "n", "", "[Required] Name of the configuration.") DownloadEITCmd.MarkPersistentFlagRequired("name") DownloadEITCmd.PersistentFlags().StringP("cert-type", "c", "", "[Optional] Type of the certificate. "+ diff --git a/managed/yba-cli/cmd/eit/k8scertmanager/create_eit.go b/managed/yba-cli/cmd/eit/k8scertmanager/create_eit.go index 7a8c11ca10dd..7e5e669c1162 100644 --- a/managed/yba-cli/cmd/eit/k8scertmanager/create_eit.go +++ b/managed/yba-cli/cmd/eit/k8scertmanager/create_eit.go @@ -41,7 +41,9 @@ var createK8sCertManagerEITCmd = &cobra.Command{ } if len(strings.TrimSpace(rootCertFilePath)) == 0 { - logrus.Fatalf(formatter.Colorize("Missing root certificate file path\n", formatter.RedColor)) + logrus.Fatalf( + formatter.Colorize("Missing root certificate file path\n", formatter.RedColor), + ) } logrus.Debug("Reading contents from root certificate file: ", rootCertFilePath) diff --git a/managed/yba-cli/cmd/eit/selfsigned/create_eit.go b/managed/yba-cli/cmd/eit/selfsigned/create_eit.go index 19c22014b002..a6beb7e48bbb 100644 --- a/managed/yba-cli/cmd/eit/selfsigned/create_eit.go +++ b/managed/yba-cli/cmd/eit/selfsigned/create_eit.go @@ -41,7 +41,9 @@ var createSelfSignedEITCmd = &cobra.Command{ } if len(strings.TrimSpace(rootCertFilePath)) == 0 { - logrus.Fatalf(formatter.Colorize("Missing root certificate file path\n", formatter.RedColor)) + logrus.Fatalf( + formatter.Colorize("Missing root certificate file path\n", formatter.RedColor), + ) } logrus.Debug("Reading contents from root certificate file: ", rootCertFilePath) diff --git a/managed/yba-cli/cmd/provider/aws/update_provider.go b/managed/yba-cli/cmd/provider/aws/update_provider.go index 26326e62fd8e..e1656f8f9000 100644 --- a/managed/yba-cli/cmd/provider/aws/update_provider.go +++ b/managed/yba-cli/cmd/provider/aws/update_provider.go @@ -92,7 +92,11 @@ var updateAWSProviderCmd = &cobra.Command{ } if len(strings.TrimSpace(provider.GetName())) == 0 { - errMessage := fmt.Sprintf("No provider %s in cloud type %s.", providerName, providerCode) + errMessage := fmt.Sprintf( + "No provider %s in cloud type %s.", + providerName, + providerCode, + ) logrus.Fatalf(formatter.Colorize(errMessage, formatter.RedColor)) } @@ -133,7 +137,8 @@ var updateAWSProviderCmd = &cobra.Command{ if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - if len(strings.TrimSpace(accessKeyID)) != 0 && len(strings.TrimSpace(secretAccessKey)) != 0 { + if len(strings.TrimSpace(accessKeyID)) != 0 && + len(strings.TrimSpace(secretAccessKey)) != 0 { logrus.Debug("Updating AWS credentials\n") awsCloudInfo.SetAwsAccessKeyID(accessKeyID) awsCloudInfo.SetAwsAccessKeySecret(secretAccessKey) @@ -234,7 +239,13 @@ var updateAWSProviderCmd = &cobra.Command{ providerRegions = removeAWSRegions(removeRegions, providerRegions) - providerRegions = editAWSRegions(editRegions, addZones, editZones, removeZones, providerRegions) + providerRegions = editAWSRegions( + editRegions, + addZones, + editZones, + removeZones, + providerRegions, + ) providerRegions = addAWSRegions(addRegions, addZones, providerRegions) @@ -754,7 +765,10 @@ func editAWSImageBundleRegionOverrides( } for _, imageBundleString := range editImageBundleRegionOverrides { - override := providerutil.BuildImageBundleRegionOverrideMapFromString(imageBundleString, "edit") + override := providerutil.BuildImageBundleRegionOverrideMapFromString( + imageBundleString, + "edit", + ) if strings.Compare(override["uuid"], bundleUUID) == 0 { for k, v := range override { if _, ok := imageBundleRegionOverrides[k]; ok { diff --git a/managed/yba-cli/cmd/provider/azu/update_provider.go b/managed/yba-cli/cmd/provider/azu/update_provider.go index ceeabeeb9387..2ae24510a2b3 100644 --- a/managed/yba-cli/cmd/provider/azu/update_provider.go +++ b/managed/yba-cli/cmd/provider/azu/update_provider.go @@ -254,7 +254,13 @@ var updateAzureProviderCmd = &cobra.Command{ providerRegions = removeAzureRegions(removeRegions, providerRegions) - providerRegions = editAzureRegions(editRegions, addZones, editZones, removeZones, providerRegions) + providerRegions = editAzureRegions( + editRegions, + addZones, + editZones, + removeZones, + providerRegions, + ) providerRegions = addAzureRegions(addRegions, addZones, providerRegions) diff --git a/managed/yba-cli/cmd/provider/kubernetes/create_provider.go b/managed/yba-cli/cmd/provider/kubernetes/create_provider.go index 452f8b7770a9..25d97692e761 100644 --- a/managed/yba-cli/cmd/provider/kubernetes/create_provider.go +++ b/managed/yba-cli/cmd/provider/kubernetes/create_provider.go @@ -125,11 +125,13 @@ var createK8sProviderCmd = &cobra.Command{ KubernetesImageRegistry: util.GetStringPointer(imageRegistry), KubernetesProvider: util.GetStringPointer( strings.ToLower(providerType)), - KubernetesPullSecretContent: util.GetStringPointer(pullSecretContent), - KubernetesPullSecretName: util.GetStringPointer(pullSecretName), - KubernetesImagePullSecretName: util.GetStringPointer(kubernetesImagePullSecretName), - KubernetesStorageClass: util.GetStringPointer(storageClass), - KubeConfigContent: util.GetStringPointer(configContent), + KubernetesPullSecretContent: util.GetStringPointer(pullSecretContent), + KubernetesPullSecretName: util.GetStringPointer(pullSecretName), + KubernetesImagePullSecretName: util.GetStringPointer( + kubernetesImagePullSecretName, + ), + KubernetesStorageClass: util.GetStringPointer(storageClass), + KubeConfigContent: util.GetStringPointer(configContent), }, }, }, @@ -243,14 +245,20 @@ func buildK8sRegions( Details: &ybaclient.RegionDetails{ CloudInfo: &ybaclient.RegionCloudInfo{ Kubernetes: &ybaclient.KubernetesRegionInfo{ - CertManagerClusterIssuer: util.GetStringPointer(region["cert-manager-cluster-issuer"]), - CertManagerIssuer: util.GetStringPointer(region["cert-manager-issuer"]), - KubeConfigContent: util.GetStringPointer(configContent), - KubeDomain: util.GetStringPointer(region["domain"]), - KubeNamespace: util.GetStringPointer(region["namespace"]), - KubePodAddressTemplate: util.GetStringPointer(region["pod-address-template"]), - KubernetesStorageClass: util.GetStringPointer(region["storage-class"]), - Overrides: util.GetStringPointer(overrides), + CertManagerClusterIssuer: util.GetStringPointer( + region["cert-manager-cluster-issuer"], + ), + CertManagerIssuer: util.GetStringPointer( + region["cert-manager-issuer"], + ), + KubeConfigContent: util.GetStringPointer(configContent), + KubeDomain: util.GetStringPointer(region["domain"]), + KubeNamespace: util.GetStringPointer(region["namespace"]), + KubePodAddressTemplate: util.GetStringPointer( + region["pod-address-template"], + ), + KubernetesStorageClass: util.GetStringPointer(region["storage-class"]), + Overrides: util.GetStringPointer(overrides), }, }, }, @@ -290,14 +298,20 @@ func buildK8sZones( Details: &ybaclient.AvailabilityZoneDetails{ CloudInfo: &ybaclient.AZCloudInfo{ Kubernetes: &ybaclient.KubernetesRegionInfo{ - CertManagerClusterIssuer: util.GetStringPointer(zone["cert-manager-cluster-issuer"]), - CertManagerIssuer: util.GetStringPointer(zone["cert-manager-issuer"]), - KubeConfigContent: util.GetStringPointer(configContent), - KubeDomain: util.GetStringPointer(zone["domain"]), - KubeNamespace: util.GetStringPointer(zone["namespace"]), - KubePodAddressTemplate: util.GetStringPointer(zone["pod-address-template"]), - KubernetesStorageClass: util.GetStringPointer(zone["storage-class"]), - Overrides: util.GetStringPointer(overrides), + CertManagerClusterIssuer: util.GetStringPointer( + zone["cert-manager-cluster-issuer"], + ), + CertManagerIssuer: util.GetStringPointer( + zone["cert-manager-issuer"], + ), + KubeConfigContent: util.GetStringPointer(configContent), + KubeDomain: util.GetStringPointer(zone["domain"]), + KubeNamespace: util.GetStringPointer(zone["namespace"]), + KubePodAddressTemplate: util.GetStringPointer( + zone["pod-address-template"], + ), + KubernetesStorageClass: util.GetStringPointer(zone["storage-class"]), + Overrides: util.GetStringPointer(overrides), }, }, }, diff --git a/managed/yba-cli/cmd/provider/kubernetes/update_provider.go b/managed/yba-cli/cmd/provider/kubernetes/update_provider.go index 4b73aeb6dc43..8afca1b60b86 100644 --- a/managed/yba-cli/cmd/provider/kubernetes/update_provider.go +++ b/managed/yba-cli/cmd/provider/kubernetes/update_provider.go @@ -71,7 +71,11 @@ var updateK8sProviderCmd = &cobra.Command{ } if len(strings.TrimSpace(provider.GetName())) == 0 { - errMessage := fmt.Sprintf("No provider %s in cloud type %s.", providerName, providerCode) + errMessage := fmt.Sprintf( + "No provider %s in cloud type %s.", + providerName, + providerCode, + ) logrus.Fatalf(formatter.Colorize(errMessage, formatter.RedColor)) } @@ -199,7 +203,13 @@ var updateK8sProviderCmd = &cobra.Command{ providerRegions = removeK8sRegions(removeRegions, providerRegions) - providerRegions = editK8sRegions(editRegions, addZones, editZones, removeZones, providerRegions) + providerRegions = editK8sRegions( + editRegions, + addZones, + editZones, + removeZones, + providerRegions, + ) providerRegions = addK8sRegions(addRegions, addZones, providerRegions) @@ -454,14 +464,20 @@ func addK8sRegions( Details: &ybaclient.RegionDetails{ CloudInfo: &ybaclient.RegionCloudInfo{ Kubernetes: &ybaclient.KubernetesRegionInfo{ - CertManagerClusterIssuer: util.GetStringPointer(region["cert-manager-cluster-issuer"]), - CertManagerIssuer: util.GetStringPointer(region["cert-manager-issuer"]), - KubeConfigContent: util.GetStringPointer(configContent), - KubeDomain: util.GetStringPointer(region["domain"]), - KubeNamespace: util.GetStringPointer(region["namespace"]), - KubePodAddressTemplate: util.GetStringPointer(region["pod-address-template"]), - KubernetesStorageClass: util.GetStringPointer(region["storage-class"]), - Overrides: util.GetStringPointer(overrides), + CertManagerClusterIssuer: util.GetStringPointer( + region["cert-manager-cluster-issuer"], + ), + CertManagerIssuer: util.GetStringPointer( + region["cert-manager-issuer"], + ), + KubeConfigContent: util.GetStringPointer(configContent), + KubeDomain: util.GetStringPointer(region["domain"]), + KubeNamespace: util.GetStringPointer(region["namespace"]), + KubePodAddressTemplate: util.GetStringPointer( + region["pod-address-template"], + ), + KubernetesStorageClass: util.GetStringPointer(region["storage-class"]), + Overrides: util.GetStringPointer(overrides), }, }, }, @@ -618,14 +634,20 @@ func addK8sZones( Details: &ybaclient.AvailabilityZoneDetails{ CloudInfo: &ybaclient.AZCloudInfo{ Kubernetes: &ybaclient.KubernetesRegionInfo{ - CertManagerClusterIssuer: util.GetStringPointer(zone["cert-manager-cluster-issuer"]), - CertManagerIssuer: util.GetStringPointer(zone["cert-manager-issuer"]), - KubeConfigContent: util.GetStringPointer(configContent), - KubeDomain: util.GetStringPointer(zone["domain"]), - KubeNamespace: util.GetStringPointer(zone["namespace"]), - KubePodAddressTemplate: util.GetStringPointer(zone["pod-address-template"]), - KubernetesStorageClass: util.GetStringPointer(zone["storage-class"]), - Overrides: util.GetStringPointer(overrides), + CertManagerClusterIssuer: util.GetStringPointer( + zone["cert-manager-cluster-issuer"], + ), + CertManagerIssuer: util.GetStringPointer( + zone["cert-manager-issuer"], + ), + KubeConfigContent: util.GetStringPointer(configContent), + KubeDomain: util.GetStringPointer(zone["domain"]), + KubeNamespace: util.GetStringPointer(zone["namespace"]), + KubePodAddressTemplate: util.GetStringPointer( + zone["pod-address-template"], + ), + KubernetesStorageClass: util.GetStringPointer(zone["storage-class"]), + Overrides: util.GetStringPointer(overrides), }, }, }, diff --git a/managed/yba-cli/cmd/provider/onprem/create_provider.go b/managed/yba-cli/cmd/provider/onprem/create_provider.go index ea3efbdc6be3..ac1024e786e9 100644 --- a/managed/yba-cli/cmd/provider/onprem/create_provider.go +++ b/managed/yba-cli/cmd/provider/onprem/create_provider.go @@ -96,8 +96,11 @@ var createOnpremProviderCmd = &cobra.Command{ } if len(sshFileContent) == 0 { logrus.Fatalf( - formatter.Colorize("No ssh keypair file content found while using --ssh-keypair-name\n", - formatter.RedColor)) + formatter.Colorize( + "No ssh keypair file content found while using --ssh-keypair-name\n", + formatter.RedColor, + ), + ) } } diff --git a/managed/yba-cli/cmd/provider/onprem/instancetypes/add_instancetypes.go b/managed/yba-cli/cmd/provider/onprem/instancetypes/add_instancetypes.go index aaf8fb86091c..ae38ead01f1e 100644 --- a/managed/yba-cli/cmd/provider/onprem/instancetypes/add_instancetypes.go +++ b/managed/yba-cli/cmd/provider/onprem/instancetypes/add_instancetypes.go @@ -50,10 +50,16 @@ var addInstanceTypesCmd = &cobra.Command{ } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Instance Type", "Add - Get Provider") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Instance Type", + "Add - Get Provider", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } if len(r) < 1 { diff --git a/managed/yba-cli/cmd/provider/onprem/instancetypes/describe_instancetypes.go b/managed/yba-cli/cmd/provider/onprem/instancetypes/describe_instancetypes.go index 8817c117cb86..346bdd4aefb7 100644 --- a/managed/yba-cli/cmd/provider/onprem/instancetypes/describe_instancetypes.go +++ b/managed/yba-cli/cmd/provider/onprem/instancetypes/describe_instancetypes.go @@ -57,7 +57,8 @@ var describeInstanceTypesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { diff --git a/managed/yba-cli/cmd/provider/onprem/instancetypes/list_instancetypes.go b/managed/yba-cli/cmd/provider/onprem/instancetypes/list_instancetypes.go index 19d80c235504..49e957de85b2 100644 --- a/managed/yba-cli/cmd/provider/onprem/instancetypes/list_instancetypes.go +++ b/managed/yba-cli/cmd/provider/onprem/instancetypes/list_instancetypes.go @@ -44,10 +44,16 @@ var listInstanceTypesCmd = &cobra.Command{ } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Instance Type", "List - Get Provider") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Instance Type", + "List - Get Provider", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } if len(r) < 1 { diff --git a/managed/yba-cli/cmd/provider/onprem/instancetypes/remove_instancetypes.go b/managed/yba-cli/cmd/provider/onprem/instancetypes/remove_instancetypes.go index a9d7a8b15cc1..35fc45afb887 100644 --- a/managed/yba-cli/cmd/provider/onprem/instancetypes/remove_instancetypes.go +++ b/managed/yba-cli/cmd/provider/onprem/instancetypes/remove_instancetypes.go @@ -46,8 +46,13 @@ var removeInstanceTypesCmd = &cobra.Command{ "\n", formatter.RedColor)) } err = util.ConfirmCommand( - fmt.Sprintf("Are you sure you want to remove %s: %s", "instance type", instanceTypeName), - viper.GetBool("force")) + fmt.Sprintf( + "Are you sure you want to remove %s: %s", + "instance type", + instanceTypeName, + ), + viper.GetBool("force"), + ) if err != nil { logrus.Fatal(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } @@ -60,7 +65,8 @@ var removeInstanceTypesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse( @@ -82,7 +88,8 @@ var removeInstanceTypesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - rDelete, response, err := authAPI.DeleteInstanceType(providerUUID, instanceTypeName).Execute() + rDelete, response, err := authAPI.DeleteInstanceType(providerUUID, instanceTypeName). + Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse(response, err, "Instance Type", "Remove") logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) diff --git a/managed/yba-cli/cmd/provider/onprem/node/add_node.go b/managed/yba-cli/cmd/provider/onprem/node/add_node.go index 382204cc9d6f..e44027d9a1b7 100644 --- a/managed/yba-cli/cmd/provider/onprem/node/add_node.go +++ b/managed/yba-cli/cmd/provider/onprem/node/add_node.go @@ -49,7 +49,8 @@ var addNodesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse( @@ -106,7 +107,12 @@ var addNodesCmd = &cobra.Command{ if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - regionUUID, err := fetchRegionUUIDFromRegionName(authAPI, providerName, providerUUID, region) + regionUUID, err := fetchRegionUUIDFromRegionName( + authAPI, + providerName, + providerUUID, + region, + ) if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } @@ -182,7 +188,12 @@ var addNodesCmd = &cobra.Command{ } } if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Node Instance", "Add - Fetch Universes") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Node Instance", + "Add - Fetch Universes", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } onprem.Write(nodesCtx, nodeInstanceList) diff --git a/managed/yba-cli/cmd/provider/onprem/node/list_node.go b/managed/yba-cli/cmd/provider/onprem/node/list_node.go index 85ee054f64d2..4d75bebea44c 100644 --- a/managed/yba-cli/cmd/provider/onprem/node/list_node.go +++ b/managed/yba-cli/cmd/provider/onprem/node/list_node.go @@ -44,7 +44,8 @@ var listNodesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse(response, err, diff --git a/managed/yba-cli/cmd/provider/onprem/node/preflight_node.go b/managed/yba-cli/cmd/provider/onprem/node/preflight_node.go index 0606c6c43118..fd868eb9ed3a 100644 --- a/managed/yba-cli/cmd/provider/onprem/node/preflight_node.go +++ b/managed/yba-cli/cmd/provider/onprem/node/preflight_node.go @@ -55,7 +55,8 @@ var preflightNodesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse(response, err, diff --git a/managed/yba-cli/cmd/provider/onprem/node/remove_node.go b/managed/yba-cli/cmd/provider/onprem/node/remove_node.go index 9068de17c748..5891871571fb 100644 --- a/managed/yba-cli/cmd/provider/onprem/node/remove_node.go +++ b/managed/yba-cli/cmd/provider/onprem/node/remove_node.go @@ -60,7 +60,8 @@ var removeNodesCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } providerListRequest := authAPI.GetListOfProviders() - providerListRequest = providerListRequest.Name(providerName).ProviderCode(util.OnpremProviderType) + providerListRequest = providerListRequest.Name(providerName). + ProviderCode(util.OnpremProviderType) r, response, err := providerListRequest.Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse(response, err, diff --git a/managed/yba-cli/cmd/provider/providerutil/createproviderutil.go b/managed/yba-cli/cmd/provider/providerutil/createproviderutil.go index bf0fa2009f05..77ec5b855ee0 100644 --- a/managed/yba-cli/cmd/provider/providerutil/createproviderutil.go +++ b/managed/yba-cli/cmd/provider/providerutil/createproviderutil.go @@ -49,7 +49,12 @@ func WaitForCreateProviderTask( providerData, response, err = authAPI.GetListOfProviders(). Name(providerName).ProviderCode(providerCode).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Provider", "Create - Fetch Provider") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Provider", + "Create - Fetch Provider", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } providersCtx := formatter.Context{ diff --git a/managed/yba-cli/cmd/provider/providerutil/updateproviderutil.go b/managed/yba-cli/cmd/provider/providerutil/updateproviderutil.go index 7288bcd91d86..a1abfa35e6f7 100644 --- a/managed/yba-cli/cmd/provider/providerutil/updateproviderutil.go +++ b/managed/yba-cli/cmd/provider/providerutil/updateproviderutil.go @@ -50,7 +50,12 @@ func WaitForUpdateProviderTask( providerData, response, err = authAPI.GetListOfProviders(). Name(providerName).ProviderCode(providerCode).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Provider", "Update - Fetch Provider") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Provider", + "Update - Fetch Provider", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } providersCtx := formatter.Context{ diff --git a/managed/yba-cli/cmd/rbac/rbacutil/rbacutil.go b/managed/yba-cli/cmd/rbac/rbacutil/rbacutil.go index c21877473ace..993170f9d0aa 100644 --- a/managed/yba-cli/cmd/rbac/rbacutil/rbacutil.go +++ b/managed/yba-cli/cmd/rbac/rbacutil/rbacutil.go @@ -179,7 +179,10 @@ func BuildResourceRoleDefinition( if !systemRole { valueResourceGroup := value.GetResourceGroup() valueResourceDefinitionSet := valueResourceGroup.GetResourceDefinitionSet() - valueResourceDefinitionSet = append(valueResourceDefinitionSet, resourceDefinition) + valueResourceDefinitionSet = append( + valueResourceDefinitionSet, + resourceDefinition, + ) valueResourceGroup.SetResourceDefinitionSet(valueResourceDefinitionSet) value.SetResourceGroup(valueResourceGroup) } else { diff --git a/managed/yba-cli/cmd/rbac/role/update_role.go b/managed/yba-cli/cmd/rbac/role/update_role.go index 0117e0196df7..a227de30f089 100644 --- a/managed/yba-cli/cmd/rbac/role/update_role.go +++ b/managed/yba-cli/cmd/rbac/role/update_role.go @@ -50,7 +50,12 @@ var updateRoleCmd = &cobra.Command{ rList, response, err := authAPI.ListRoles().Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "RBAC: Role", "Update - List Roles") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "RBAC: Role", + "Update - List Roles", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } r := make([]ybaclient.Role, 0) @@ -93,7 +98,9 @@ var updateRoleCmd = &cobra.Command{ PermissionList: rolePermissions, } - rUpdate, response, err := authAPI.EditRole(updateRole.GetRoleUUID()).RoleFormData(req).Execute() + rUpdate, response, err := authAPI.EditRole(updateRole.GetRoleUUID()). + RoleFormData(req). + Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse(response, err, "RBAC: Role", "Update") logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) @@ -153,7 +160,8 @@ func removePermissions( for _, permissionString := range removePermissions { permission := buildPermissionMapFromString(permissionString) for i, r := range rolePermissions { - if r.GetResourceType() == permission["resource-type"] && r.GetAction() == permission["action"] { + if r.GetResourceType() == permission["resource-type"] && + r.GetAction() == permission["action"] { rolePermissions = append(rolePermissions[:i], rolePermissions[i+1:]...) } } diff --git a/managed/yba-cli/cmd/rbac/rolebinding/delete_rolebinding.go b/managed/yba-cli/cmd/rbac/rolebinding/delete_rolebinding.go index d1ffe5fa0cc8..c2023a6474fa 100644 --- a/managed/yba-cli/cmd/rbac/rolebinding/delete_rolebinding.go +++ b/managed/yba-cli/cmd/rbac/rolebinding/delete_rolebinding.go @@ -34,7 +34,11 @@ var deleteRoleBindingCmd = &cobra.Command{ if len(email) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No user email found to delete role binding\n", formatter.RedColor)) + formatter.Colorize( + "No user email found to delete role binding\n", + formatter.RedColor, + ), + ) } roleBindingUUID, err := cmd.Flags().GetString("uuid") if err != nil { @@ -108,7 +112,10 @@ var deleteRoleBindingCmd = &cobra.Command{ if strings.Compare(role.GetRoleType(), util.CustomRoleType) == 0 { roleResourceDefintion.SetResourceGroup(r.GetResourceGroup()) } - roleResourceDefintionList = append(roleResourceDefintionList, roleResourceDefintion) + roleResourceDefintionList = append( + roleResourceDefintionList, + roleResourceDefintion, + ) } else { logrus.Debug("Removing role binding with UUID: ", uuid) } @@ -126,7 +133,9 @@ var deleteRoleBindingCmd = &cobra.Command{ RoleResourceDefinitions: roleResourceDefintionList, } - rDelete, response, err := authAPI.SetRoleBinding(userUUID).RoleBindingFormData(req).Execute() + rDelete, response, err := authAPI.SetRoleBinding(userUUID). + RoleBindingFormData(req). + Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse(response, err, "RBAC: Role Binding", "Delete") logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) diff --git a/managed/yba-cli/cmd/rbac/rolebinding/describe_rolebinding.go b/managed/yba-cli/cmd/rbac/rolebinding/describe_rolebinding.go index afe75eedc307..d61446a5ed59 100644 --- a/managed/yba-cli/cmd/rbac/rolebinding/describe_rolebinding.go +++ b/managed/yba-cli/cmd/rbac/rolebinding/describe_rolebinding.go @@ -68,7 +68,9 @@ var describeRoleBindingCmd = &cobra.Command{ if len(r) > 0 && util.IsOutputType(formatter.TableFormatKey) { fullRoleBindingContext := *rolebinding.NewFullRoleBindingContext() fullRoleBindingContext.Output = os.Stdout - fullRoleBindingContext.Format = rolebinding.NewFullRoleBindingFormat(viper.GetString("output")) + fullRoleBindingContext.Format = rolebinding.NewFullRoleBindingFormat( + viper.GetString("output"), + ) fullRoleBindingContext.SetFullRoleBinding(r[0]) fullRoleBindingContext.Write() return diff --git a/managed/yba-cli/cmd/release/create_release.go b/managed/yba-cli/cmd/release/create_release.go index 8e0a2ebaaa00..a0309779c32d 100644 --- a/managed/yba-cli/cmd/release/create_release.go +++ b/managed/yba-cli/cmd/release/create_release.go @@ -136,7 +136,12 @@ var createReleaseCmd = &cobra.Command{ rGet, response, err := authAPI.GetNewRelease(resourceUUID).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Release", "Create - Get Release") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Release", + "Create - Get Release", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/release/update_release.go b/managed/yba-cli/cmd/release/update_release.go index e069cb6898e7..7bd46b8df7e3 100644 --- a/managed/yba-cli/cmd/release/update_release.go +++ b/managed/yba-cli/cmd/release/update_release.go @@ -142,7 +142,12 @@ var updateReleaseCmd = &cobra.Command{ rGet, response, err := authAPI.GetNewRelease(requestedRelease.GetReleaseUuid()).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Release", "Update - Get Release") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Release", + "Update - Get Release", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/root.go b/managed/yba-cli/cmd/root.go index f98182aa5972..84d8351536ba 100644 --- a/managed/yba-cli/cmd/root.go +++ b/managed/yba-cli/cmd/root.go @@ -79,7 +79,8 @@ func init() { rootCmd.PersistentFlags().StringP("logLevel", "l", "info", "Select the desired log level format. Allowed values: debug, info, warn, error, fatal.") rootCmd.PersistentFlags().Bool("debug", false, "Use debug mode, same as --logLevel debug.") - rootCmd.PersistentFlags().Bool("disable-color", false, "Disable colors in output. (default false)") + rootCmd.PersistentFlags(). + Bool("disable-color", false, "Disable colors in output. (default false)") rootCmd.PersistentFlags().Bool("wait", true, "Wait until the task is completed, otherwise it will exit immediately.") rootCmd.PersistentFlags().Duration("timeout", 7*24*time.Hour, diff --git a/managed/yba-cli/cmd/storageconfiguration/az/list_storageconfiguration.go b/managed/yba-cli/cmd/storageconfiguration/az/list_storageconfiguration.go index b06fbfb92d34..ff9ba97b409c 100644 --- a/managed/yba-cli/cmd/storageconfiguration/az/list_storageconfiguration.go +++ b/managed/yba-cli/cmd/storageconfiguration/az/list_storageconfiguration.go @@ -17,7 +17,11 @@ var listAZStorageConfigurationCmd = &cobra.Command{ Long: "List YugabyteDB Anywhere storage-configurations", Example: `yba storage-config azure list`, Run: func(cmd *cobra.Command, args []string) { - storageconfigurationutil.ListStorageConfigurationUtil(cmd, "Azure", util.AzureStorageConfigType) + storageconfigurationutil.ListStorageConfigurationUtil( + cmd, + "Azure", + util.AzureStorageConfigType, + ) }, } diff --git a/managed/yba-cli/cmd/storageconfiguration/gcs/list_storageconfiguration.go b/managed/yba-cli/cmd/storageconfiguration/gcs/list_storageconfiguration.go index 18606fb6157b..e9d4776edc01 100644 --- a/managed/yba-cli/cmd/storageconfiguration/gcs/list_storageconfiguration.go +++ b/managed/yba-cli/cmd/storageconfiguration/gcs/list_storageconfiguration.go @@ -17,7 +17,11 @@ var listGCSStorageConfigurationCmd = &cobra.Command{ Long: "List GCS YugabyteDB Anywhere storage-configurations", Example: `yba storage-config gcs list`, Run: func(cmd *cobra.Command, args []string) { - storageconfigurationutil.ListStorageConfigurationUtil(cmd, util.GCSStorageConfigType, util.GCSStorageConfigType) + storageconfigurationutil.ListStorageConfigurationUtil( + cmd, + util.GCSStorageConfigType, + util.GCSStorageConfigType, + ) }, } diff --git a/managed/yba-cli/cmd/storageconfiguration/nfs/list_storageconfiguration.go b/managed/yba-cli/cmd/storageconfiguration/nfs/list_storageconfiguration.go index 35fa7dd21e55..67deb529d733 100644 --- a/managed/yba-cli/cmd/storageconfiguration/nfs/list_storageconfiguration.go +++ b/managed/yba-cli/cmd/storageconfiguration/nfs/list_storageconfiguration.go @@ -17,7 +17,11 @@ var listNFSStorageConfigurationCmd = &cobra.Command{ Long: "List NFS YugabyteDB Anywhere storage-configurations", Example: `yba storage-config nfs list`, Run: func(cmd *cobra.Command, args []string) { - storageconfigurationutil.ListStorageConfigurationUtil(cmd, util.NFSStorageConfigType, util.NFSStorageConfigType) + storageconfigurationutil.ListStorageConfigurationUtil( + cmd, + util.NFSStorageConfigType, + util.NFSStorageConfigType, + ) }, } diff --git a/managed/yba-cli/cmd/storageconfiguration/s3/list_storageconfiguration.go b/managed/yba-cli/cmd/storageconfiguration/s3/list_storageconfiguration.go index c8e4a9f8b319..a4c66846ad9a 100644 --- a/managed/yba-cli/cmd/storageconfiguration/s3/list_storageconfiguration.go +++ b/managed/yba-cli/cmd/storageconfiguration/s3/list_storageconfiguration.go @@ -18,7 +18,11 @@ var listS3StorageConfigurationCmd = &cobra.Command{ Example: `yba storage-config s3 list`, Run: func(cmd *cobra.Command, args []string) { - storageconfigurationutil.ListStorageConfigurationUtil(cmd, util.S3StorageConfigType, util.S3StorageConfigType) + storageconfigurationutil.ListStorageConfigurationUtil( + cmd, + util.S3StorageConfigType, + util.S3StorageConfigType, + ) }, } diff --git a/managed/yba-cli/cmd/task/list_task.go b/managed/yba-cli/cmd/task/list_task.go index 5f6164935d21..06cb39494ec9 100644 --- a/managed/yba-cli/cmd/task/list_task.go +++ b/managed/yba-cli/cmd/task/list_task.go @@ -37,7 +37,12 @@ var listTaskCmd = &cobra.Command{ if len(strings.TrimSpace(universeName)) != 0 { r, response, err := authAPI.ListUniverses().Name(universeName).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Task", "List - List Universes") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Task", + "List - List Universes", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } if len(r) < 1 { diff --git a/managed/yba-cli/cmd/task/retry_task.go b/managed/yba-cli/cmd/task/retry_task.go index 2ed915d0a830..44c9806dd688 100644 --- a/managed/yba-cli/cmd/task/retry_task.go +++ b/managed/yba-cli/cmd/task/retry_task.go @@ -91,7 +91,12 @@ var retryTaskCmd = &cobra.Command{ tasks, response, err := authAPI.TasksList().Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Task", "Retry - Fetch Tasks") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Task", + "Retry - Fetch Tasks", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/universe/build_universe.go b/managed/yba-cli/cmd/universe/build_universe.go index cf67350015a4..6726eb856c6e 100644 --- a/managed/yba-cli/cmd/universe/build_universe.go +++ b/managed/yba-cli/cmd/universe/build_universe.go @@ -830,7 +830,8 @@ func buildDeviceInfo( } if i == storageTypeLen { storageTypeDefault := setDefaultStorageTypes(providerType) - if providerType == util.AWSProviderType && util.AwsInstanceTypesWithEphemeralStorageOnly(instanceTypes[i]) { + if providerType == util.AWSProviderType && + util.AwsInstanceTypesWithEphemeralStorageOnly(instanceTypes[i]) { storageTypeDefault = "" } storageType = append(storageType, storageTypeDefault) @@ -890,7 +891,8 @@ func buildMasterDeviceInfo( if len(storageType) == 0 { storageType = setDefaultStorageTypes(providerType) - if providerType == util.AWSProviderType && util.AwsInstanceTypesWithEphemeralStorageOnly(instanceType) { + if providerType == util.AWSProviderType && + util.AwsInstanceTypesWithEphemeralStorageOnly(instanceType) { storageType = "" } } diff --git a/managed/yba-cli/cmd/universe/create_universe.go b/managed/yba-cli/cmd/universe/create_universe.go index 311b434939c4..1a3bb7e13c2f 100644 --- a/managed/yba-cli/cmd/universe/create_universe.go +++ b/managed/yba-cli/cmd/universe/create_universe.go @@ -557,28 +557,67 @@ func init() { v1.BindPFlag("disk-iops", createUniverseCmd.Flags().Lookup("disk-iops")) v1.BindPFlag("throughput", createUniverseCmd.Flags().Lookup("throughput")) v1.BindPFlag("k8s-tserver-mem-size", createUniverseCmd.Flags().Lookup("k8s-tserver-mem-size")) - v1.BindPFlag("k8s-tserver-cpu-core-count", createUniverseCmd.Flags().Lookup("k8s-tserver-cpu-core-count")) - v1.BindPFlag("dedicated-master-instance-type", createUniverseCmd.Flags().Lookup("dedicated-master-instance-type")) - v1.BindPFlag("dedicated-master-num-volumes", createUniverseCmd.Flags().Lookup("dedicated-master-num-volumes")) - v1.BindPFlag("dedicated-master-volume-size", createUniverseCmd.Flags().Lookup("dedicated-master-volume-size")) - v1.BindPFlag("dedicated-master-mount-points", createUniverseCmd.Flags().Lookup("dedicated-master-mount-points")) - v1.BindPFlag("dedicated-master-storage-type", createUniverseCmd.Flags().Lookup("dedicated-master-storage-type")) - v1.BindPFlag("dedicated-master-storage-class", createUniverseCmd.Flags().Lookup("dedicated-master-storage-class")) - v1.BindPFlag("dedicated-master-disk-iops", createUniverseCmd.Flags().Lookup("dedicated-master-disk-iops")) - v1.BindPFlag("dedicated-master-throughput", createUniverseCmd.Flags().Lookup("dedicated-master-throughput")) + v1.BindPFlag( + "k8s-tserver-cpu-core-count", + createUniverseCmd.Flags().Lookup("k8s-tserver-cpu-core-count"), + ) + v1.BindPFlag( + "dedicated-master-instance-type", + createUniverseCmd.Flags().Lookup("dedicated-master-instance-type"), + ) + v1.BindPFlag( + "dedicated-master-num-volumes", + createUniverseCmd.Flags().Lookup("dedicated-master-num-volumes"), + ) + v1.BindPFlag( + "dedicated-master-volume-size", + createUniverseCmd.Flags().Lookup("dedicated-master-volume-size"), + ) + v1.BindPFlag( + "dedicated-master-mount-points", + createUniverseCmd.Flags().Lookup("dedicated-master-mount-points"), + ) + v1.BindPFlag( + "dedicated-master-storage-type", + createUniverseCmd.Flags().Lookup("dedicated-master-storage-type"), + ) + v1.BindPFlag( + "dedicated-master-storage-class", + createUniverseCmd.Flags().Lookup("dedicated-master-storage-class"), + ) + v1.BindPFlag( + "dedicated-master-disk-iops", + createUniverseCmd.Flags().Lookup("dedicated-master-disk-iops"), + ) + v1.BindPFlag( + "dedicated-master-throughput", + createUniverseCmd.Flags().Lookup("dedicated-master-throughput"), + ) v1.BindPFlag("k8s-master-mem-size", createUniverseCmd.Flags().Lookup("k8s-master-mem-size")) - v1.BindPFlag("k8s-master-cpu-core-count", createUniverseCmd.Flags().Lookup("k8s-master-cpu-core-count")) + v1.BindPFlag( + "k8s-master-cpu-core-count", + createUniverseCmd.Flags().Lookup("k8s-master-cpu-core-count"), + ) v1.BindPFlag("assign-public-ip", createUniverseCmd.Flags().Lookup("assign-public-ip")) v1.BindPFlag("enable-ysql", createUniverseCmd.Flags().Lookup("enable-ysql")) v1.BindPFlag("ysql-password", createUniverseCmd.Flags().Lookup("ysql-password")) v1.BindPFlag("enable-ycql", createUniverseCmd.Flags().Lookup("enable-ycql")) v1.BindPFlag("ycql-password", createUniverseCmd.Flags().Lookup("ycql-password")) v1.BindPFlag("enable-yedis", createUniverseCmd.Flags().Lookup("enable-yedis")) - v1.BindPFlag("enable-node-to-node-encrypt", createUniverseCmd.Flags().Lookup("enable-node-to-node-encrypt")) - v1.BindPFlag("enable-client-to-node-encrypt", createUniverseCmd.Flags().Lookup("enable-client-to-node-encrypt")) + v1.BindPFlag( + "enable-node-to-node-encrypt", + createUniverseCmd.Flags().Lookup("enable-node-to-node-encrypt"), + ) + v1.BindPFlag( + "enable-client-to-node-encrypt", + createUniverseCmd.Flags().Lookup("enable-client-to-node-encrypt"), + ) v1.BindPFlag("root-ca", createUniverseCmd.Flags().Lookup("root-ca")) v1.BindPFlag("client-root-ca", createUniverseCmd.Flags().Lookup("client-root-ca")) - v1.BindPFlag("enable-volume-encryption", createUniverseCmd.Flags().Lookup("enable-volume-encryption")) + v1.BindPFlag( + "enable-volume-encryption", + createUniverseCmd.Flags().Lookup("enable-volume-encryption"), + ) v1.BindPFlag("kms-config", createUniverseCmd.Flags().Lookup("kms-config")) v1.BindPFlag("enable-ipv6", createUniverseCmd.Flags().Lookup("enable-ipv6")) v1.BindPFlag("yb-db-version", createUniverseCmd.Flags().Lookup("yb-db-version")) @@ -586,12 +625,21 @@ func init() { v1.BindPFlag("access-key-code", createUniverseCmd.Flags().Lookup("access-key-code")) v1.BindPFlag("aws-arn-string", createUniverseCmd.Flags().Lookup("aws-arn-string")) v1.BindPFlag("user-tags", createUniverseCmd.Flags().Lookup("user-tags")) - v1.BindPFlag("kubernetes-universe-overrides-file-path", createUniverseCmd.Flags().Lookup("kubernetes-universe-overrides-file-path")) - v1.BindPFlag("kubernetes-az-overrides-file-path", createUniverseCmd.Flags().Lookup("kubernetes-az-overrides-file-path")) + v1.BindPFlag( + "kubernetes-universe-overrides-file-path", + createUniverseCmd.Flags().Lookup("kubernetes-universe-overrides-file-path"), + ) + v1.BindPFlag( + "kubernetes-az-overrides-file-path", + createUniverseCmd.Flags().Lookup("kubernetes-az-overrides-file-path"), + ) v1.BindPFlag("master-http-port", createUniverseCmd.Flags().Lookup("master-http-port")) v1.BindPFlag("master-rpc-port", createUniverseCmd.Flags().Lookup("master-rpc-port")) v1.BindPFlag("node-exporter-port", createUniverseCmd.Flags().Lookup("node-exporter-port")) - v1.BindPFlag("redis-server-http-port", createUniverseCmd.Flags().Lookup("redis-server-http-port")) + v1.BindPFlag( + "redis-server-http-port", + createUniverseCmd.Flags().Lookup("redis-server-http-port"), + ) v1.BindPFlag("redis-server-rpc-port", createUniverseCmd.Flags().Lookup("redis-server-rpc-port")) v1.BindPFlag("tserver-http-port", createUniverseCmd.Flags().Lookup("tserver-http-port")) v1.BindPFlag("tserver-rpc-port", createUniverseCmd.Flags().Lookup("tserver-rpc-port")) diff --git a/managed/yba-cli/cmd/universe/edit/ysqlconfigure_universe.go b/managed/yba-cli/cmd/universe/edit/ysqlconfigure_universe.go index 3dd77ec68041..b51d8c58e9af 100644 --- a/managed/yba-cli/cmd/universe/edit/ysqlconfigure_universe.go +++ b/managed/yba-cli/cmd/universe/edit/ysqlconfigure_universe.go @@ -69,7 +69,11 @@ var editYSQLUniverseCmd = &cobra.Command{ } if len(strings.TrimSpace(ysqlPassword)) == 0 { logrus.Fatalf( - formatter.Colorize("YSQL password not found while enabling auth\n", formatter.RedColor)) + formatter.Colorize( + "YSQL password not found while enabling auth\n", + formatter.RedColor, + ), + ) } } @@ -188,7 +192,10 @@ var editYSQLUniverseCmd = &cobra.Command{ enableConnectionPooling = true } if enableConnectionPooling == userIntent.GetEnableConnectionPooling() { - logrus.Debugf("Enable connection-pooling is already set to %t\n", enableConnectionPooling) + logrus.Debugf( + "Enable connection-pooling is already set to %t\n", + enableConnectionPooling, + ) } logrus.Debugf("Setting connection-pooling to %t\n", enableConnectionPooling) req.SetEnableConnectionPooling(enableConnectionPooling) @@ -272,9 +279,14 @@ func init() { editYSQLUniverseCmd.Flags().String("ysql-auth", "", "[Optional] YSQL authentication. Allowed values: enable, disable.") editYSQLUniverseCmd.Flags().String("ysql-password", "", - fmt.Sprintf("[Optional] YSQL authentication password. Use single quotes ('') to provide "+ - "values with special characters. %s", - formatter.Colorize("Required when YSQL authentication is enabled", formatter.GreenColor))) + fmt.Sprintf( + "[Optional] YSQL authentication password. Use single quotes ('') to provide "+ + "values with special characters. %s", + formatter.Colorize( + "Required when YSQL authentication is enabled", + formatter.GreenColor, + ), + )) editYSQLUniverseCmd.Flags().String("connection-pooling", "", "[Optional] Connection Pooling settings. Allowed values: enable, disable.") // editYSQLUniverseCmd.Flags().String("connection-pooling-gflags", "", diff --git a/managed/yba-cli/cmd/universe/security/ear_universe.go b/managed/yba-cli/cmd/universe/security/ear_universe.go index 7a9d1253fbc2..d76f473b6e6d 100644 --- a/managed/yba-cli/cmd/universe/security/ear_universe.go +++ b/managed/yba-cli/cmd/universe/security/ear_universe.go @@ -53,9 +53,13 @@ var encryptionAtRestCmd = &cobra.Command{ } err = util.ConfirmCommand( - fmt.Sprintf("Are you sure you want to change encryption at rest configuration for %s: %s", - util.UniverseType, universeName), - viper.GetBool("force")) + fmt.Sprintf( + "Are you sure you want to change encryption at rest configuration for %s: %s", + util.UniverseType, + universeName, + ), + viper.GetBool("force"), + ) if err != nil { logrus.Fatal(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } diff --git a/managed/yba-cli/cmd/universe/security/eit/cert_universe.go b/managed/yba-cli/cmd/universe/security/eit/cert_universe.go index 5a3e5ba7304c..f7e0a6f64845 100644 --- a/managed/yba-cli/cmd/universe/security/eit/cert_universe.go +++ b/managed/yba-cli/cmd/universe/security/eit/cert_universe.go @@ -136,7 +136,11 @@ var certEncryptionInTransitCmd = &cobra.Command{ } if requestBody.GetRootCA() == "" { logrus.Fatalf( - formatter.Colorize("No root CA found with name: "+rootCAName+"\n", formatter.RedColor)) + formatter.Colorize( + "No root CA found with name: "+rootCAName+"\n", + formatter.RedColor, + ), + ) } } else { logrus.Debugf("Root CA is Universe's Root CA\n") diff --git a/managed/yba-cli/cmd/universe/security/eit/tls_universe.go b/managed/yba-cli/cmd/universe/security/eit/tls_universe.go index 68ae790e17dd..1e41b0521a90 100644 --- a/managed/yba-cli/cmd/universe/security/eit/tls_universe.go +++ b/managed/yba-cli/cmd/universe/security/eit/tls_universe.go @@ -46,8 +46,11 @@ var tlsEncryptionInTransitCmd = &cobra.Command{ if strings.Compare(upgradeOption, "Rolling") == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("Only a \"Non-Rolling\" type of restart is allowed for TLS upgrade.\n", - formatter.RedColor)) + formatter.Colorize( + "Only a \"Non-Rolling\" type of restart is allowed for TLS upgrade.\n", + formatter.RedColor, + ), + ) } } @@ -60,7 +63,11 @@ var tlsEncryptionInTransitCmd = &cobra.Command{ if strings.Compare(clientToNodeEncryption, util.EnableOpType) != 0 && strings.Compare(clientToNodeEncryption, util.DisableOpType) != 0 { logrus.Fatalf( - formatter.Colorize("Invalid client-to-node-encryption value\n", formatter.RedColor)) + formatter.Colorize( + "Invalid client-to-node-encryption value\n", + formatter.RedColor, + ), + ) } } @@ -73,7 +80,11 @@ var tlsEncryptionInTransitCmd = &cobra.Command{ if strings.Compare(nodeToNodeEncryption, util.EnableOpType) != 0 && strings.Compare(nodeToNodeEncryption, util.DisableOpType) != 0 { logrus.Fatalf( - formatter.Colorize("Invalid node-to-node-encryption value\n", formatter.RedColor)) + formatter.Colorize( + "Invalid node-to-node-encryption value\n", + formatter.RedColor, + ), + ) } } @@ -147,7 +158,10 @@ var tlsEncryptionInTransitCmd = &cobra.Command{ logrus.Debugf("Enable client-to-node encryption is already set to %t\n", enableClientToNodeEncryption) } - logrus.Debugf("Setting client-to-node encryption to: %t\n", enableClientToNodeEncryption) + logrus.Debugf( + "Setting client-to-node encryption to: %t\n", + enableClientToNodeEncryption, + ) requestBody.SetEnableClientToNodeEncrypt(enableClientToNodeEncryption) } else { logrus.Debugf("Setting client-to-node encryption to: %t\n", diff --git a/managed/yba-cli/cmd/universe/table/namespace/list_namespace.go b/managed/yba-cli/cmd/universe/table/namespace/list_namespace.go index f72f5e5139cb..4135c2f86a0b 100644 --- a/managed/yba-cli/cmd/universe/table/namespace/list_namespace.go +++ b/managed/yba-cli/cmd/universe/table/namespace/list_namespace.go @@ -69,7 +69,9 @@ var listNamespaceCmd = &cobra.Command{ } r, response, err := authAPI. - GetAllNamespaces(universeUUID).IncludeSystemNamespaces(includeSystemNamespaceInfo).Execute() + GetAllNamespaces( + universeUUID, + ).IncludeSystemNamespaces(includeSystemNamespaceInfo).Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse( response, diff --git a/managed/yba-cli/cmd/universe/universeutil/upgradeuniverseutil.go b/managed/yba-cli/cmd/universe/universeutil/upgradeuniverseutil.go index 22d4dfa67e72..21a2e89c0345 100644 --- a/managed/yba-cli/cmd/universe/universeutil/upgradeuniverseutil.go +++ b/managed/yba-cli/cmd/universe/universeutil/upgradeuniverseutil.go @@ -51,7 +51,12 @@ func WaitForUpgradeUniverseTask( universeData, response, err = authAPI.ListUniverses().Name(universeName).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "Universe", "Upgrade - Fetch Universe") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "Universe", + "Upgrade - Fetch Universe", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } universesCtx := formatter.Context{ diff --git a/managed/yba-cli/cmd/universe/upgrade/gflags/set_gflagsuniverse.go b/managed/yba-cli/cmd/universe/upgrade/gflags/set_gflagsuniverse.go index 1128e4a6014a..f29dccb4e984 100644 --- a/managed/yba-cli/cmd/universe/upgrade/gflags/set_gflagsuniverse.go +++ b/managed/yba-cli/cmd/universe/upgrade/gflags/set_gflagsuniverse.go @@ -153,7 +153,10 @@ var setGflagsUniverseCmd = &cobra.Command{ clusterUserIntent := clusters[i].GetUserIntent() clusterType := clusters[i].GetClusterType() clusterUUID := clusters[i].GetUuid() - if strings.Compare(strings.ToUpper(clusterType), strings.ToUpper(gflags.ClusterType)) == 0 { + if strings.Compare( + strings.ToUpper(clusterType), + strings.ToUpper(gflags.ClusterType), + ) == 0 { if strings.Compare(clusterUUID, gflags.ClusterUUID) == 0 { logrus.Debugf( "Updating specific gflags for cluster %s (%s)\n", diff --git a/managed/yba-cli/cmd/user/reset_password_user.go b/managed/yba-cli/cmd/user/reset_password_user.go index 029d22929bbd..a96165cd1ff6 100644 --- a/managed/yba-cli/cmd/user/reset_password_user.go +++ b/managed/yba-cli/cmd/user/reset_password_user.go @@ -49,7 +49,10 @@ var resetPasswordUserCmd = &cobra.Command{ "No new password found\n", formatter.RedColor)) } - if strings.Compare(strings.TrimSpace(currentPassword), strings.TrimSpace(newPassword)) == 0 { + if strings.Compare( + strings.TrimSpace(currentPassword), + strings.TrimSpace(newPassword), + ) == 0 { cmd.Help() logrus.Fatalln( formatter.Colorize( diff --git a/managed/yba-cli/cmd/user/update_user.go b/managed/yba-cli/cmd/user/update_user.go index 819347f41a85..3675c1fe9b28 100644 --- a/managed/yba-cli/cmd/user/update_user.go +++ b/managed/yba-cli/cmd/user/update_user.go @@ -82,7 +82,9 @@ var updateUserCmd = &cobra.Command{ Timezone: util.GetStringPointer(timezone), } - rUpdate, response, err := authAPI.UpdateUserProfile(updateUser.GetUuid()).Users(req).Execute() + rUpdate, response, err := authAPI.UpdateUserProfile(updateUser.GetUuid()). + Users(req). + Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse( response, diff --git a/managed/yba-cli/cmd/xcluster/create_xcluster.go b/managed/yba-cli/cmd/xcluster/create_xcluster.go index 9930e1caee8a..be5f70748d16 100644 --- a/managed/yba-cli/cmd/xcluster/create_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/create_xcluster.go @@ -38,7 +38,11 @@ var createXClusterCmd = &cobra.Command{ if len(name) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No xcluster name found to create replication\n", formatter.RedColor)) + formatter.Colorize( + "No xcluster name found to create replication\n", + formatter.RedColor, + ), + ) } storageConfigNameFlag, err := cmd.Flags().GetString("storage-config-name") @@ -48,7 +52,11 @@ var createXClusterCmd = &cobra.Command{ if len(strings.TrimSpace(storageConfigNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No storage config name found to take a backup\n", formatter.RedColor)) + formatter.Colorize( + "No storage config name found to take a backup\n", + formatter.RedColor, + ), + ) } sourceUniName, err := cmd.Flags().GetString("source-universe-name") @@ -59,7 +67,8 @@ var createXClusterCmd = &cobra.Command{ if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - if len(strings.TrimSpace(sourceUniName)) == 0 || len(strings.TrimSpace(targetUniName)) == 0 { + if len(strings.TrimSpace(sourceUniName)) == 0 || + len(strings.TrimSpace(targetUniName)) == 0 { cmd.Help() logrus.Fatalln( formatter.Colorize("Missing source or target universe name\n", formatter.RedColor)) @@ -265,7 +274,11 @@ var createXClusterCmd = &cobra.Command{ "The xcluster config %s between source universe %s (%s) "+ "and target universe %s (%s) is being created", formatter.Colorize(name, formatter.GreenColor), - sourceUniverse.GetName(), sourceUniverseUUID, targetUniverse.GetName(), targetUniverseUUID) + sourceUniverse.GetName(), + sourceUniverseUUID, + targetUniverse.GetName(), + targetUniverseUUID, + ) if viper.GetBool("wait") { if len(rTask.GetTaskUUID()) > 0 { diff --git a/managed/yba-cli/cmd/xcluster/delete_xcluster.go b/managed/yba-cli/cmd/xcluster/delete_xcluster.go index b693ad81bf6a..c65c658c1ebd 100644 --- a/managed/yba-cli/cmd/xcluster/delete_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/delete_xcluster.go @@ -56,7 +56,9 @@ var deleteXClusterCmd = &cobra.Command{ logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - rTask, response, err := authAPI.DeleteXClusterConfig(uuid).IsForceDelete(forceDelete).Execute() + rTask, response, err := authAPI.DeleteXClusterConfig(uuid). + IsForceDelete(forceDelete). + Execute() if err != nil { errMessage := util.ErrorFromHTTPResponse( response, diff --git a/managed/yba-cli/cmd/xcluster/fullcopytables_xcluster.go b/managed/yba-cli/cmd/xcluster/fullcopytables_xcluster.go index 3c04242ffffb..dde436aa201e 100644 --- a/managed/yba-cli/cmd/xcluster/fullcopytables_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/fullcopytables_xcluster.go @@ -146,10 +146,13 @@ var fullCopyXClusterCmd = &cobra.Command{ if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - tablesNeedBootstrap = append(tablesNeedBootstrap, util.XClusterConfigNeedBootstrapResponse{ - TableUUID: tableID, - BootstrapInfo: &needBootstrapInfo, - }) + tablesNeedBootstrap = append( + tablesNeedBootstrap, + util.XClusterConfigNeedBootstrapResponse{ + TableUUID: tableID, + BootstrapInfo: &needBootstrapInfo, + }, + ) } xcluster.FullCopyTableWrite(xclusterNeedBootstrapCtx, tablesNeedBootstrap) diff --git a/managed/yba-cli/cmd/xcluster/list_xcluster.go b/managed/yba-cli/cmd/xcluster/list_xcluster.go index ae4ef7ecd28b..8e7d33b9b99d 100644 --- a/managed/yba-cli/cmd/xcluster/list_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/list_xcluster.go @@ -36,7 +36,8 @@ var listXClusterCmd = &cobra.Command{ if err != nil { logrus.Fatalf(formatter.Colorize(err.Error()+"\n", formatter.RedColor)) } - if len(strings.TrimSpace(sourceUniName)) == 0 || len(strings.TrimSpace(targetUniName)) == 0 { + if len(strings.TrimSpace(sourceUniName)) == 0 || + len(strings.TrimSpace(targetUniName)) == 0 { cmd.Help() logrus.Fatalln( formatter.Colorize("Missing source or target universe name\n", formatter.RedColor)) @@ -62,7 +63,10 @@ var listXClusterCmd = &cobra.Command{ if len(sourceXClusterConfigList) < 1 { logrus.Fatalf( formatter.Colorize( - fmt.Sprintf("No source xcluster found in universe: %s\n", sourceUniverse.GetName()), + fmt.Sprintf( + "No source xcluster found in universe: %s\n", + sourceUniverse.GetName(), + ), formatter.RedColor, )) } @@ -72,12 +76,18 @@ var listXClusterCmd = &cobra.Command{ if len(targetXClusterConfigList) < 1 { logrus.Fatalf( formatter.Colorize( - fmt.Sprintf("No target xcluster found in universe: %s\n", targetUniverse.GetName()), + fmt.Sprintf( + "No target xcluster found in universe: %s\n", + targetUniverse.GetName(), + ), formatter.RedColor, )) } - xclusterUUIDs := util.FindCommonStringElements(sourceXClusterConfigList, targetXClusterConfigList) + xclusterUUIDs := util.FindCommonStringElements( + sourceXClusterConfigList, + targetXClusterConfigList, + ) if len(xclusterUUIDs) < 1 { logrus.Fatalf( formatter.Colorize( diff --git a/managed/yba-cli/cmd/xcluster/restart_xcluster.go b/managed/yba-cli/cmd/xcluster/restart_xcluster.go index 0e96044739db..1c7b03d23823 100644 --- a/managed/yba-cli/cmd/xcluster/restart_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/restart_xcluster.go @@ -35,7 +35,11 @@ var restartXClusterCmd = &cobra.Command{ if len(uuid) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No xcluster uuid found to restart replication\n", formatter.RedColor)) + formatter.Colorize( + "No xcluster uuid found to restart replication\n", + formatter.RedColor, + ), + ) } storageConfigNameFlag, err := cmd.Flags().GetString("storage-config-name") @@ -45,7 +49,11 @@ var restartXClusterCmd = &cobra.Command{ if len(strings.TrimSpace(storageConfigNameFlag)) == 0 { cmd.Help() logrus.Fatalln( - formatter.Colorize("No storage config name found to take a backup\n", formatter.RedColor)) + formatter.Colorize( + "No storage config name found to take a backup\n", + formatter.RedColor, + ), + ) } err = util.ConfirmCommand( fmt.Sprintf("Are you sure you want to restart %s: %s", "xcluster", uuid), @@ -165,7 +173,12 @@ var restartXClusterCmd = &cobra.Command{ rXCluster, response, err := authAPI.GetXClusterConfig(uuid).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "XCluster", "Restart - Get XCluster") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "XCluster", + "Restart - Get XCluster", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } r := make([]ybaclient.XClusterConfigGetResp, 0) diff --git a/managed/yba-cli/cmd/xcluster/sync_xcluster.go b/managed/yba-cli/cmd/xcluster/sync_xcluster.go index c0cc3934f519..ef2b00c72776 100644 --- a/managed/yba-cli/cmd/xcluster/sync_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/sync_xcluster.go @@ -76,7 +76,12 @@ var syncXClusterCmd = &cobra.Command{ formatter.Colorize(uuid, formatter.GreenColor)) rXCluster, response, err := authAPI.GetXClusterConfig(uuid).Execute() if err != nil { - errMessage := util.ErrorFromHTTPResponse(response, err, "XCluster", "Sync - Get XCluster") + errMessage := util.ErrorFromHTTPResponse( + response, + err, + "XCluster", + "Sync - Get XCluster", + ) logrus.Fatalf(formatter.Colorize(errMessage.Error()+"\n", formatter.RedColor)) } r := make([]ybaclient.XClusterConfigGetResp, 0) diff --git a/managed/yba-cli/cmd/xcluster/update_xcluster.go b/managed/yba-cli/cmd/xcluster/update_xcluster.go index f42b6dd5decc..47aa85c70a82 100644 --- a/managed/yba-cli/cmd/xcluster/update_xcluster.go +++ b/managed/yba-cli/cmd/xcluster/update_xcluster.go @@ -185,7 +185,8 @@ var updateXClusterCmd = &cobra.Command{ logrus.Fatalf( formatter.Colorize( "Storage configuration must be provided since a tables need bootstrap\n", - formatter.RedColor), + formatter.RedColor, + ), ) } diff --git a/managed/yba-cli/internal/client/az.go b/managed/yba-cli/internal/client/az.go index c7ba8fd675a0..53ca3ca82c02 100644 --- a/managed/yba-cli/internal/client/az.go +++ b/managed/yba-cli/internal/client/az.go @@ -9,8 +9,8 @@ import ( ) // ListOfAZ fetches az list of a provider region -func (a *AuthAPIClient) ListOfAZ(pUUID, rUUID string) ( - ybaclient.AvailabilityZonesApiApiListOfAZRequest, -) { +func (a *AuthAPIClient) ListOfAZ( + pUUID, rUUID string, +) ybaclient.AvailabilityZonesApiApiListOfAZRequest { return a.APIClient.AvailabilityZonesApi.ListOfAZ(a.ctx, a.CustomerUUID, pUUID, rUUID) } diff --git a/managed/yba-cli/internal/client/backup.go b/managed/yba-cli/internal/client/backup.go index cd76d71b30c5..37883d713cb8 100644 --- a/managed/yba-cli/internal/client/backup.go +++ b/managed/yba-cli/internal/client/backup.go @@ -9,20 +9,20 @@ import ( ) // CreateBackup creates backups associated with the universe -func (a *AuthAPIClient) CreateBackup() ( - ybaclient.BackupsApiApiCreatebackupRequest) { +func (a *AuthAPIClient) CreateBackup() ybaclient.BackupsApiApiCreatebackupRequest { return a.APIClient.BackupsApi.Createbackup(a.ctx, a.CustomerUUID) } // ListBackups associated with the customer -func (a *AuthAPIClient) ListBackups() ( - ybaclient.BackupsApiApiListBackupsV2Request) { +func (a *AuthAPIClient) ListBackups() ybaclient.BackupsApiApiListBackupsV2Request { return a.APIClient.BackupsApi.ListBackupsV2(a.ctx, a.CustomerUUID) } // GetBackupByTaskUUID fetches backups by the universe and task UUID -func (a *AuthAPIClient) GetBackupByTaskUUID(universeUUID string, taskUUID string) ( - ybaclient.BackupsApiApiFetchBackupsByTaskUUIDRequest) { +func (a *AuthAPIClient) GetBackupByTaskUUID( + universeUUID string, + taskUUID string, +) ybaclient.BackupsApiApiFetchBackupsByTaskUUIDRequest { return a.APIClient.BackupsApi.FetchBackupsByTaskUUID( a.ctx, a.CustomerUUID, @@ -31,19 +31,18 @@ func (a *AuthAPIClient) GetBackupByTaskUUID(universeUUID string, taskUUID string } // EditBackup edits a backup -func (a *AuthAPIClient) EditBackup(backupUUID string) ( - ybaclient.BackupsApiApiEditBackupV2Request) { +func (a *AuthAPIClient) EditBackup(backupUUID string) ybaclient.BackupsApiApiEditBackupV2Request { return a.APIClient.BackupsApi.EditBackupV2(a.ctx, a.CustomerUUID, backupUUID) } // DeleteBackups deletes the backups -func (a *AuthAPIClient) DeleteBackups() ( - ybaclient.BackupsApiApiDeleteBackupsV2Request) { +func (a *AuthAPIClient) DeleteBackups() ybaclient.BackupsApiApiDeleteBackupsV2Request { return a.APIClient.BackupsApi.DeleteBackupsV2(a.ctx, a.CustomerUUID) } // ListIncrementalBackups lists the incremental backups -func (a *AuthAPIClient) ListIncrementalBackups(backupUUID string) ( - ybaclient.BackupsApiApiListIncrementalBackupsRequest) { +func (a *AuthAPIClient) ListIncrementalBackups( + backupUUID string, +) ybaclient.BackupsApiApiListIncrementalBackupsRequest { return a.APIClient.BackupsApi.ListIncrementalBackups(a.ctx, a.CustomerUUID, backupUUID) } diff --git a/managed/yba-cli/internal/client/ear.go b/managed/yba-cli/internal/client/ear.go index 92e7d686384d..0200d431b4e8 100644 --- a/managed/yba-cli/internal/client/ear.go +++ b/managed/yba-cli/internal/client/ear.go @@ -9,25 +9,27 @@ import ( ) // ListKMSConfigs fetches list of kms configs associated with the customer -func (a *AuthAPIClient) ListKMSConfigs() ( - ybaclient.EncryptionAtRestApiApiListKMSConfigsRequest) { +func (a *AuthAPIClient) ListKMSConfigs() ybaclient.EncryptionAtRestApiApiListKMSConfigsRequest { return a.APIClient.EncryptionAtRestApi.ListKMSConfigs(a.ctx, a.CustomerUUID) } // DeleteKMSConfig deletes kms config -func (a *AuthAPIClient) DeleteKMSConfig(configUUID string) ( - ybaclient.EncryptionAtRestApiApiDeleteKMSConfigRequest) { +func (a *AuthAPIClient) DeleteKMSConfig( + configUUID string, +) ybaclient.EncryptionAtRestApiApiDeleteKMSConfigRequest { return a.APIClient.EncryptionAtRestApi.DeleteKMSConfig(a.ctx, a.CustomerUUID, configUUID) } // CreateKMSConfig creates kms config -func (a *AuthAPIClient) CreateKMSConfig(providerType string) ( - ybaclient.EncryptionAtRestApiApiCreateKMSConfigRequest) { +func (a *AuthAPIClient) CreateKMSConfig( + providerType string, +) ybaclient.EncryptionAtRestApiApiCreateKMSConfigRequest { return a.APIClient.EncryptionAtRestApi.CreateKMSConfig(a.ctx, a.CustomerUUID, providerType) } // EditKMSConfig edits kms config -func (a *AuthAPIClient) EditKMSConfig(configUUID string) ( - ybaclient.EncryptionAtRestApiApiEditKMSConfigRequest) { +func (a *AuthAPIClient) EditKMSConfig( + configUUID string, +) ybaclient.EncryptionAtRestApiApiEditKMSConfigRequest { return a.APIClient.EncryptionAtRestApi.EditKMSConfig(a.ctx, a.CustomerUUID, configUUID) } diff --git a/managed/yba-cli/internal/client/eit.go b/managed/yba-cli/internal/client/eit.go index 20b459917911..c9eee0a21a25 100644 --- a/managed/yba-cli/internal/client/eit.go +++ b/managed/yba-cli/internal/client/eit.go @@ -9,41 +9,39 @@ import ( ) // GetListOfCertificates fetches list of certificates associated with the customer -func (a *AuthAPIClient) GetListOfCertificates() ( - ybaclient.CertificateInfoApiApiGetListOfCertificateRequest) { +func (a *AuthAPIClient) GetListOfCertificates() ybaclient.CertificateInfoApiApiGetListOfCertificateRequest { return a.APIClient.CertificateInfoApi.GetListOfCertificate(a.ctx, a.CustomerUUID) } // DeleteCertificate - delete certificate -func (a *AuthAPIClient) DeleteCertificate(certUUID string) ( - ybaclient.CertificateInfoApiApiDeleteCertificateRequest) { +func (a *AuthAPIClient) DeleteCertificate( + certUUID string, +) ybaclient.CertificateInfoApiApiDeleteCertificateRequest { return a.APIClient.CertificateInfoApi.DeleteCertificate(a.ctx, a.CustomerUUID, certUUID) } // Upload - upload certificate -func (a *AuthAPIClient) Upload() ( - ybaclient.CertificateInfoApiApiUploadRequest, -) { +func (a *AuthAPIClient) Upload() ybaclient.CertificateInfoApiApiUploadRequest { return a.APIClient.CertificateInfoApi.Upload(a.ctx, a.CustomerUUID) } // EditCertificate - edit certificate -func (a *AuthAPIClient) EditCertificate(certUUID string) ( - ybaclient.CertificateInfoApiApiEditCertificateRequest, -) { +func (a *AuthAPIClient) EditCertificate( + certUUID string, +) ybaclient.CertificateInfoApiApiEditCertificateRequest { return a.APIClient.CertificateInfoApi.EditCertificate(a.ctx, a.CustomerUUID, certUUID) } // GetRootCert - get root certificate -func (a *AuthAPIClient) GetRootCert(certUUID string) ( - ybaclient.CertificateInfoApiApiGetRootCertRequest, -) { +func (a *AuthAPIClient) GetRootCert( + certUUID string, +) ybaclient.CertificateInfoApiApiGetRootCertRequest { return a.APIClient.CertificateInfoApi.GetRootCert(a.ctx, a.CustomerUUID, certUUID) } // GetClientCert - get client certificate -func (a *AuthAPIClient) GetClientCert(certUUID string) ( - ybaclient.CertificateInfoApiApiGetClientCertRequest, -) { +func (a *AuthAPIClient) GetClientCert( + certUUID string, +) ybaclient.CertificateInfoApiApiGetClientCertRequest { return a.APIClient.CertificateInfoApi.GetClientCert(a.ctx, a.CustomerUUID, certUUID) } diff --git a/managed/yba-cli/internal/client/instancetypes.go b/managed/yba-cli/internal/client/instancetypes.go index 1d3d2497cea1..4b068609d7e4 100644 --- a/managed/yba-cli/internal/client/instancetypes.go +++ b/managed/yba-cli/internal/client/instancetypes.go @@ -10,31 +10,31 @@ import ( // ListOfInstanceType fetches the list of instance types // associated with the provider (for onprem) -func (a *AuthAPIClient) ListOfInstanceType(pUUID string) ( - ybaclient.InstanceTypesApiApiListOfInstanceTypeRequest, -) { +func (a *AuthAPIClient) ListOfInstanceType( + pUUID string, +) ybaclient.InstanceTypesApiApiListOfInstanceTypeRequest { return a.APIClient.InstanceTypesApi.ListOfInstanceType(a.ctx, a.CustomerUUID, pUUID) } // CreateInstanceType for onprem providers -func (a *AuthAPIClient) CreateInstanceType(pUUID string) ( - ybaclient.InstanceTypesApiApiCreateInstanceTypeRequest, -) { +func (a *AuthAPIClient) CreateInstanceType( + pUUID string, +) ybaclient.InstanceTypesApiApiCreateInstanceTypeRequest { return a.APIClient.InstanceTypesApi.CreateInstanceType(a.ctx, a.CustomerUUID, pUUID) } // DeleteInstanceType for onprem providers -func (a *AuthAPIClient) DeleteInstanceType(pUUID, instanceTypeName string) ( - ybaclient.InstanceTypesApiApiDeleteInstanceTypeRequest, -) { +func (a *AuthAPIClient) DeleteInstanceType( + pUUID, instanceTypeName string, +) ybaclient.InstanceTypesApiApiDeleteInstanceTypeRequest { return a.APIClient.InstanceTypesApi.DeleteInstanceType(a.ctx, a.CustomerUUID, pUUID, instanceTypeName) } // InstanceTypeDetail fetches details of the instance type in an onprem provider -func (a *AuthAPIClient) InstanceTypeDetail(pUUID, instanceTypeName string) ( - ybaclient.InstanceTypesApiApiInstanceTypeDetailRequest, -) { +func (a *AuthAPIClient) InstanceTypeDetail( + pUUID, instanceTypeName string, +) ybaclient.InstanceTypesApiApiInstanceTypeDetailRequest { return a.APIClient.InstanceTypesApi.InstanceTypeDetail(a.ctx, a.CustomerUUID, pUUID, instanceTypeName) } diff --git a/managed/yba-cli/internal/client/node.go b/managed/yba-cli/internal/client/node.go index 43f402464068..0f96d01e2371 100644 --- a/managed/yba-cli/internal/client/node.go +++ b/managed/yba-cli/internal/client/node.go @@ -9,48 +9,50 @@ import ( ) // CreateNodeInstance adds a node instance to an onprem provider -func (a *AuthAPIClient) CreateNodeInstance(azUUID string) ( - ybaclient.NodeInstancesApiApiCreateNodeInstanceRequest, -) { +func (a *AuthAPIClient) CreateNodeInstance( + azUUID string, +) ybaclient.NodeInstancesApiApiCreateNodeInstanceRequest { return a.APIClient.NodeInstancesApi.CreateNodeInstance(a.ctx, a.CustomerUUID, azUUID) } // ListByProvider fetches node instances associated to an onprem provider -func (a *AuthAPIClient) ListByProvider(pUUID string) ( - ybaclient.NodeInstancesApiApiListByProviderRequest, -) { +func (a *AuthAPIClient) ListByProvider( + pUUID string, +) ybaclient.NodeInstancesApiApiListByProviderRequest { return a.APIClient.NodeInstancesApi.ListByProvider(a.ctx, a.CustomerUUID, pUUID) } // DeleteInstance deletes the node instance from the onprem provider -func (a *AuthAPIClient) DeleteInstance(pUUID, ip string) ( - ybaclient.NodeInstancesApiApiDeleteInstanceRequest, -) { +func (a *AuthAPIClient) DeleteInstance( + pUUID, ip string, +) ybaclient.NodeInstancesApiApiDeleteInstanceRequest { return a.APIClient.NodeInstancesApi.DeleteInstance(a.ctx, a.CustomerUUID, pUUID, ip) } // DetachedNodeAction deletes the node instance from the onprem provider -func (a *AuthAPIClient) DetachedNodeAction(pUUID, ip string) ( - ybaclient.NodeInstancesApiApiDetachedNodeActionRequest, -) { +func (a *AuthAPIClient) DetachedNodeAction( + pUUID, ip string, +) ybaclient.NodeInstancesApiApiDetachedNodeActionRequest { return a.APIClient.NodeInstancesApi.DetachedNodeAction(a.ctx, a.CustomerUUID, pUUID, ip) } // GetNodeInstance fetches a node based on UUID -func (a *AuthAPIClient) GetNodeInstance(nUUID string) ( - ybaclient.NodeInstancesApiApiGetNodeInstanceRequest, -) { +func (a *AuthAPIClient) GetNodeInstance( + nUUID string, +) ybaclient.NodeInstancesApiApiGetNodeInstanceRequest { return a.APIClient.NodeInstancesApi.GetNodeInstance(a.ctx, a.CustomerUUID, nUUID) } // GetNodeDetails fetches a node based on UUID -func (a *AuthAPIClient) GetNodeDetails(uUUID, nName string) ( - ybaclient.NodeInstancesApiApiGetNodeDetailsRequest) { +func (a *AuthAPIClient) GetNodeDetails( + uUUID, nName string, +) ybaclient.NodeInstancesApiApiGetNodeDetailsRequest { return a.APIClient.NodeInstancesApi.GetNodeDetails(a.ctx, a.CustomerUUID, uUUID, nName) } // NodeAction for the node operations for universes -func (a *AuthAPIClient) NodeAction(uUUID, nodeName string) ( - ybaclient.NodeInstancesApiApiNodeActionRequest) { +func (a *AuthAPIClient) NodeAction( + uUUID, nodeName string, +) ybaclient.NodeInstancesApiApiNodeActionRequest { return a.APIClient.NodeInstancesApi.NodeAction(a.ctx, a.CustomerUUID, uUUID, nodeName) } diff --git a/managed/yba-cli/internal/client/provider.go b/managed/yba-cli/internal/client/provider.go index 8a51853b2f3f..99a5122ab8c3 100644 --- a/managed/yba-cli/internal/client/provider.go +++ b/managed/yba-cli/internal/client/provider.go @@ -10,40 +10,34 @@ import ( ) // GetListOfProviders fetches list of providers associated with the customer -func (a *AuthAPIClient) GetListOfProviders() ( - ybaclient.CloudProvidersApiApiGetListOfProvidersRequest) { +func (a *AuthAPIClient) GetListOfProviders() ybaclient.CloudProvidersApiApiGetListOfProvidersRequest { return a.APIClient.CloudProvidersApi.GetListOfProviders(a.ctx, a.CustomerUUID) } // GetProvider fetches provider associated with the customer and providerUUID -func (a *AuthAPIClient) GetProvider(pUUID string) ( - ybaclient.CloudProvidersApiApiGetProviderRequest) { +func (a *AuthAPIClient) GetProvider(pUUID string) ybaclient.CloudProvidersApiApiGetProviderRequest { return a.APIClient.CloudProvidersApi.GetProvider(a.ctx, a.CustomerUUID, pUUID) } // CreateProvider calls the create provider API -func (a *AuthAPIClient) CreateProvider() ( - ybaclient.CloudProvidersApiApiCreateProvidersRequest) { +func (a *AuthAPIClient) CreateProvider() ybaclient.CloudProvidersApiApiCreateProvidersRequest { return a.APIClient.CloudProvidersApi.CreateProviders(a.ctx, a.CustomerUUID) } // DeleteProvider deletes provider associated with the providerUUID -func (a *AuthAPIClient) DeleteProvider(pUUID string) ( - ybaclient.CloudProvidersApiApiDeleteRequest) { +func (a *AuthAPIClient) DeleteProvider(pUUID string) ybaclient.CloudProvidersApiApiDeleteRequest { return a.APIClient.CloudProvidersApi.Delete(a.ctx, a.CustomerUUID, pUUID) } // EditProvider edits the provider associated with the providerUUIS -func (a *AuthAPIClient) EditProvider(pUUID string) ( - ybaclient.CloudProvidersApiApiEditProviderRequest, -) { +func (a *AuthAPIClient) EditProvider( + pUUID string, +) ybaclient.CloudProvidersApiApiEditProviderRequest { return a.APIClient.CloudProvidersApi.EditProvider(a.ctx, a.CustomerUUID, pUUID) } // List fetches the list of access keys associated with the provider -func (a *AuthAPIClient) List(pUUID string) ( - ybaclient.AccessKeysApiApiListRequest, -) { +func (a *AuthAPIClient) List(pUUID string) ybaclient.AccessKeysApiApiListRequest { return a.APIClient.AccessKeysApi.List(a.ctx, a.CustomerUUID, pUUID) } diff --git a/managed/yba-cli/internal/client/rbac.go b/managed/yba-cli/internal/client/rbac.go index fc857e727ecb..5da1ab3d51be 100644 --- a/managed/yba-cli/internal/client/rbac.go +++ b/managed/yba-cli/internal/client/rbac.go @@ -18,58 +18,44 @@ import ( ) // ListPermissions fetches list of permissions -func (a *AuthAPIClient) ListPermissions() ( - ybaclient.RBACManagementApiApiListPermissionsRequest, -) { +func (a *AuthAPIClient) ListPermissions() ybaclient.RBACManagementApiApiListPermissionsRequest { return a.APIClient.RBACManagementApi.ListPermissions(a.ctx, a.CustomerUUID) } // GetRole fetches role -func (a *AuthAPIClient) GetRole(rUUID string) ( - ybaclient.RBACManagementApiApiGetRoleRequest, -) { +func (a *AuthAPIClient) GetRole(rUUID string) ybaclient.RBACManagementApiApiGetRoleRequest { return a.APIClient.RBACManagementApi.GetRole(a.ctx, a.CustomerUUID, rUUID) } // CreateRole creates role -func (a *AuthAPIClient) CreateRole() ( - ybaclient.RBACManagementApiApiCreateRoleRequest, -) { +func (a *AuthAPIClient) CreateRole() ybaclient.RBACManagementApiApiCreateRoleRequest { return a.APIClient.RBACManagementApi.CreateRole(a.ctx, a.CustomerUUID) } // DeleteRole deletes role -func (a *AuthAPIClient) DeleteRole(rUUID string) ( - ybaclient.RBACManagementApiApiDeleteRoleRequest, -) { +func (a *AuthAPIClient) DeleteRole(rUUID string) ybaclient.RBACManagementApiApiDeleteRoleRequest { return a.APIClient.RBACManagementApi.DeleteRole(a.ctx, a.CustomerUUID, rUUID) } // EditRole edits role -func (a *AuthAPIClient) EditRole(rUUID string) ( - ybaclient.RBACManagementApiApiEditRoleRequest, -) { +func (a *AuthAPIClient) EditRole(rUUID string) ybaclient.RBACManagementApiApiEditRoleRequest { return a.APIClient.RBACManagementApi.EditRole(a.ctx, a.CustomerUUID, rUUID) } // ListRoles fetches list of roles -func (a *AuthAPIClient) ListRoles() ( - ybaclient.RBACManagementApiApiListRolesRequest, -) { +func (a *AuthAPIClient) ListRoles() ybaclient.RBACManagementApiApiListRolesRequest { return a.APIClient.RBACManagementApi.ListRoles(a.ctx, a.CustomerUUID) } // SetRoleBinding sets role binding -func (a *AuthAPIClient) SetRoleBinding(userUUID string) ( - ybaclient.RBACManagementApiApiSetRoleBindingRequest, -) { +func (a *AuthAPIClient) SetRoleBinding( + userUUID string, +) ybaclient.RBACManagementApiApiSetRoleBindingRequest { return a.APIClient.RBACManagementApi.SetRoleBinding(a.ctx, a.CustomerUUID, userUUID) } // GetRoleBindings fetches role bindings -func (a *AuthAPIClient) GetRoleBindings() ( - ybaclient.RBACManagementApiApiGetRoleBindingsRequest, -) { +func (a *AuthAPIClient) GetRoleBindings() ybaclient.RBACManagementApiApiGetRoleBindingsRequest { return a.APIClient.RBACManagementApi.GetRoleBindings(a.ctx, a.CustomerUUID) } diff --git a/managed/yba-cli/internal/client/region.go b/managed/yba-cli/internal/client/region.go index 0ed7c0d36eaa..73a3c5c19ff6 100644 --- a/managed/yba-cli/internal/client/region.go +++ b/managed/yba-cli/internal/client/region.go @@ -9,8 +9,6 @@ import ( ) // GetRegion fetches region list of a provider -func (a *AuthAPIClient) GetRegion(pUUID string) ( - ybaclient.RegionManagementApiApiGetRegionRequest, -) { +func (a *AuthAPIClient) GetRegion(pUUID string) ybaclient.RegionManagementApiApiGetRegionRequest { return a.APIClient.RegionManagementApi.GetRegion(a.ctx, a.CustomerUUID, pUUID) } diff --git a/managed/yba-cli/internal/client/release.go b/managed/yba-cli/internal/client/release.go index 932f8cdca238..858f2534e2ef 100644 --- a/managed/yba-cli/internal/client/release.go +++ b/managed/yba-cli/internal/client/release.go @@ -25,81 +25,71 @@ import ( ) // Refresh the releases page to get the latest YugabyteDB releases -func (a *AuthAPIClient) Refresh() ( - ybaclient.ReleaseManagementApiApiRefreshRequest, -) { +func (a *AuthAPIClient) Refresh() ybaclient.ReleaseManagementApiApiRefreshRequest { return a.APIClient.ReleaseManagementApi.Refresh(a.ctx, a.CustomerUUID) } // GetListOfReleases API to fetch list of releases -func (a *AuthAPIClient) GetListOfReleases(includeMetadata bool) ( - ybaclient.ReleaseManagementApiApiGetListOfReleasesRequest, -) { +func (a *AuthAPIClient) GetListOfReleases( + includeMetadata bool, +) ybaclient.ReleaseManagementApiApiGetListOfReleasesRequest { return a.APIClient.ReleaseManagementApi. GetListOfReleases(a.ctx, a.CustomerUUID). IncludeMetadata(includeMetadata) } // ListNewReleases API to fetch list of new releases -func (a *AuthAPIClient) ListNewReleases() ( - ybaclient.NewReleaseManagementApiApiListNewReleasesRequest, -) { +func (a *AuthAPIClient) ListNewReleases() ybaclient.NewReleaseManagementApiApiListNewReleasesRequest { return a.APIClient.NewReleaseManagementApi.ListNewReleases(a.ctx, a.CustomerUUID) } // GetNewRelease API to fetch list of new releases -func (a *AuthAPIClient) GetNewRelease(rUUID string) ( - ybaclient.NewReleaseManagementApiApiGetNewReleaseRequest, -) { +func (a *AuthAPIClient) GetNewRelease( + rUUID string, +) ybaclient.NewReleaseManagementApiApiGetNewReleaseRequest { return a.APIClient.NewReleaseManagementApi.GetNewRelease(a.ctx, a.CustomerUUID, rUUID) } // CreateNewRelease API to create new release -func (a *AuthAPIClient) CreateNewRelease() ( - ybaclient.NewReleaseManagementApiApiCreateNewReleaseRequest, -) { +func (a *AuthAPIClient) CreateNewRelease() ybaclient.NewReleaseManagementApiApiCreateNewReleaseRequest { return a.APIClient.NewReleaseManagementApi.CreateNewRelease(a.ctx, a.CustomerUUID) } // DeleteNewRelease API to delete new release -func (a *AuthAPIClient) DeleteNewRelease(rUUID string) ( - ybaclient.NewReleaseManagementApiApiDeleteNewReleaseRequest, -) { +func (a *AuthAPIClient) DeleteNewRelease( + rUUID string, +) ybaclient.NewReleaseManagementApiApiDeleteNewReleaseRequest { return a.APIClient.NewReleaseManagementApi.DeleteNewRelease(a.ctx, a.CustomerUUID, rUUID) } // UpdateNewRelease API to update new release -func (a *AuthAPIClient) UpdateNewRelease(rUUID string) ( - ybaclient.NewReleaseManagementApiApiUpdateNewReleaseRequest, -) { +func (a *AuthAPIClient) UpdateNewRelease( + rUUID string, +) ybaclient.NewReleaseManagementApiApiUpdateNewReleaseRequest { return a.APIClient.NewReleaseManagementApi.UpdateNewRelease(a.ctx, a.CustomerUUID, rUUID) } // UploadRelease API to upload URL -func (a *AuthAPIClient) UploadRelease() ( - ybaclient.UploadReleasePackagesApiApiUploadReleaseRequest, -) { +func (a *AuthAPIClient) UploadRelease() ybaclient.UploadReleasePackagesApiApiUploadReleaseRequest { return a.APIClient.UploadReleasePackagesApi.UploadRelease(a.ctx, a.CustomerUUID) } // GetUploadRelease API to get URL -func (a *AuthAPIClient) GetUploadRelease(fileUUID string) ( - ybaclient.UploadReleasePackagesApiApiGetUploadReleaseRequest, -) { +func (a *AuthAPIClient) GetUploadRelease( + fileUUID string, +) ybaclient.UploadReleasePackagesApiApiGetUploadReleaseRequest { return a.APIClient.UploadReleasePackagesApi.GetUploadRelease(a.ctx, a.CustomerUUID, fileUUID) } // ExtractMetadata API to extract metadata from tarball -func (a *AuthAPIClient) ExtractMetadata() ( - ybaclient.ExtractMetadataFromRemoteTarballApiApiExtractMetadataRequest, -) { +func (a *AuthAPIClient) ExtractMetadata() ybaclient.ExtractMetadataFromRemoteTarballApiApiExtractMetadataRequest { return a.APIClient.ExtractMetadataFromRemoteTarballApi.ExtractMetadata(a.ctx, a.CustomerUUID) } // GetExtractMetadata API to get extract metadata -func (a *AuthAPIClient) GetExtractMetadata(fileUUID string) ( - ybaclient.ExtractMetadataFromRemoteTarballApiApiExtractMetadata_0Request, -) { +func (a *AuthAPIClient) GetExtractMetadata( + fileUUID string, +) ybaclient.ExtractMetadataFromRemoteTarballApiApiExtractMetadata_0Request { return a.APIClient.ExtractMetadataFromRemoteTarballApi.ExtractMetadata_1( a.ctx, a.CustomerUUID, @@ -157,8 +147,12 @@ func (a *AuthAPIClient) UploadReleaseRest( var req *http.Request - req, err = http.NewRequest("POST", fmt.Sprintf("%s://%s/api/v1/customers/%s/ybdb_release/upload", - a.RestClient.Scheme, a.RestClient.Host, a.CustomerUUID), bodyBuffer) + req, err = http.NewRequest( + "POST", + fmt.Sprintf("%s://%s/api/v1/customers/%s/ybdb_release/upload", + a.RestClient.Scheme, a.RestClient.Host, a.CustomerUUID), + bodyBuffer, + ) if err != nil { return ybaclient.YBPCreateSuccess{}, diff --git a/managed/yba-cli/internal/client/restore.go b/managed/yba-cli/internal/client/restore.go index ca146df063b4..e6c2b050e73e 100644 --- a/managed/yba-cli/internal/client/restore.go +++ b/managed/yba-cli/internal/client/restore.go @@ -9,19 +9,16 @@ import ( ) // RestoreBackup restores a backup -func (a *AuthAPIClient) RestoreBackup() ( - ybaclient.BackupsApiApiRestoreBackupV2Request) { +func (a *AuthAPIClient) RestoreBackup() ybaclient.BackupsApiApiRestoreBackupV2Request { return a.APIClient.BackupsApi.RestoreBackupV2(a.ctx, a.CustomerUUID) } // ListRestores associated with the customer -func (a *AuthAPIClient) ListRestores() ( - ybaclient.BackupsApiApiListBackupRestoresV2Request) { +func (a *AuthAPIClient) ListRestores() ybaclient.BackupsApiApiListBackupRestoresV2Request { return a.APIClient.BackupsApi.ListBackupRestoresV2(a.ctx, a.CustomerUUID) } // GetRestore fetches restores of the customer -func (a *AuthAPIClient) GetRestore() ( - ybaclient.BackupsApiApiListBackupRestoresV2Request) { +func (a *AuthAPIClient) GetRestore() ybaclient.BackupsApiApiListBackupRestoresV2Request { return a.APIClient.BackupsApi.ListBackupRestoresV2(a.ctx, a.CustomerUUID) } diff --git a/managed/yba-cli/internal/client/runtimeconfiguration.go b/managed/yba-cli/internal/client/runtimeconfiguration.go index 360f96a6e4d2..6e57c630716d 100644 --- a/managed/yba-cli/internal/client/runtimeconfiguration.go +++ b/managed/yba-cli/internal/client/runtimeconfiguration.go @@ -9,32 +9,31 @@ import ( ) // ListKeys fetches list of mutable runtime configuration keys -func (a *AuthAPIClient) ListKeys() ( - ybaclient.RuntimeConfigurationApiApiListKeysRequest) { +func (a *AuthAPIClient) ListKeys() ybaclient.RuntimeConfigurationApiApiListKeysRequest { return a.APIClient.RuntimeConfigurationApi.ListKeys(a.ctx) } // ListKeyInfo fetches list of mutable runtime configuration keys -func (a *AuthAPIClient) ListKeyInfo() ( - ybaclient.RuntimeConfigurationApiApiListKeyInfoRequest) { +func (a *AuthAPIClient) ListKeyInfo() ybaclient.RuntimeConfigurationApiApiListKeyInfoRequest { return a.APIClient.RuntimeConfigurationApi.ListKeyInfo(a.ctx) } // ListScopes fetches list of mutable runtime configuration scopes -func (a *AuthAPIClient) ListScopes() ( - ybaclient.RuntimeConfigurationApiApiListScopesRequest) { +func (a *AuthAPIClient) ListScopes() ybaclient.RuntimeConfigurationApiApiListScopesRequest { return a.APIClient.RuntimeConfigurationApi.ListScopes(a.ctx, a.CustomerUUID) } // GetConfig fetches runtime configuration -func (a *AuthAPIClient) GetConfig(scope string) ( - ybaclient.RuntimeConfigurationApiApiGetConfigRequest) { +func (a *AuthAPIClient) GetConfig( + scope string, +) ybaclient.RuntimeConfigurationApiApiGetConfigRequest { return a.APIClient.RuntimeConfigurationApi.GetConfig(a.ctx, a.CustomerUUID, scope) } // GetConfigurationKey fetches runtime configuration key -func (a *AuthAPIClient) GetConfigurationKey(scope, key string) ( - ybaclient.RuntimeConfigurationApiApiGetConfigurationKeyRequest) { +func (a *AuthAPIClient) GetConfigurationKey( + scope, key string, +) ybaclient.RuntimeConfigurationApiApiGetConfigurationKeyRequest { return a.APIClient.RuntimeConfigurationApi.GetConfigurationKey( a.ctx, a.CustomerUUID, @@ -42,8 +41,9 @@ func (a *AuthAPIClient) GetConfigurationKey(scope, key string) ( } // SetKey sets runtime configuration key -func (a *AuthAPIClient) SetKey(scope, key string) ( - ybaclient.RuntimeConfigurationApiApiSetKeyRequest) { +func (a *AuthAPIClient) SetKey( + scope, key string, +) ybaclient.RuntimeConfigurationApiApiSetKeyRequest { return a.APIClient.RuntimeConfigurationApi.SetKey( a.ctx, a.CustomerUUID, @@ -51,8 +51,9 @@ func (a *AuthAPIClient) SetKey(scope, key string) ( } // DeleteKey deletes runtime configuration key -func (a *AuthAPIClient) DeleteKey(scope, key string) ( - ybaclient.RuntimeConfigurationApiApiDeleteKeyRequest) { +func (a *AuthAPIClient) DeleteKey( + scope, key string, +) ybaclient.RuntimeConfigurationApiApiDeleteKeyRequest { return a.APIClient.RuntimeConfigurationApi.DeleteKey( a.ctx, a.CustomerUUID, @@ -60,7 +61,6 @@ func (a *AuthAPIClient) DeleteKey(scope, key string) ( } // ListFeatureFlags fetches list of feature flags -func (a *AuthAPIClient) ListFeatureFlags() ( - ybaclient.RuntimeConfigurationApiApiListFeatureFlagsRequest) { +func (a *AuthAPIClient) ListFeatureFlags() ybaclient.RuntimeConfigurationApiApiListFeatureFlagsRequest { return a.APIClient.RuntimeConfigurationApi.ListFeatureFlags(a.ctx) } diff --git a/managed/yba-cli/internal/client/schedule.go b/managed/yba-cli/internal/client/schedule.go index 911759086ee3..bfe70c5368cc 100644 --- a/managed/yba-cli/internal/client/schedule.go +++ b/managed/yba-cli/internal/client/schedule.go @@ -17,32 +17,33 @@ import ( ) // CreateBackupSchedule creates a backup schedule -func (a *AuthAPIClient) CreateBackupSchedule() ( - ybaclient.BackupsApiApiCreateBackupScheduleAsyncRequest) { +func (a *AuthAPIClient) CreateBackupSchedule() ybaclient.BackupsApiApiCreateBackupScheduleAsyncRequest { return a.APIClient.BackupsApi.CreateBackupScheduleAsync(a.ctx, a.CustomerUUID) } // ListBackupSchedules associated with the customer -func (a *AuthAPIClient) ListBackupSchedules() ( - ybaclient.ScheduleManagementApiApiListSchedulesV2Request) { +func (a *AuthAPIClient) ListBackupSchedules() ybaclient.ScheduleManagementApiApiListSchedulesV2Request { return a.APIClient.ScheduleManagementApi.ListSchedulesV2(a.ctx, a.CustomerUUID) } // GetBackupSchedule fetches backups by the universe and task UUID -func (a *AuthAPIClient) GetBackupSchedule(scheduleUUID string) ( - ybaclient.ScheduleManagementApiApiGetScheduleRequest) { +func (a *AuthAPIClient) GetBackupSchedule( + scheduleUUID string, +) ybaclient.ScheduleManagementApiApiGetScheduleRequest { return a.APIClient.ScheduleManagementApi.GetSchedule(a.ctx, a.CustomerUUID, scheduleUUID) } // DeleteBackupSchedule deletes the backup schedule -func (a *AuthAPIClient) DeleteBackupSchedule(scheduleUUID string) ( - ybaclient.ScheduleManagementApiApiDeleteScheduleV2Request) { +func (a *AuthAPIClient) DeleteBackupSchedule( + scheduleUUID string, +) ybaclient.ScheduleManagementApiApiDeleteScheduleV2Request { return a.APIClient.ScheduleManagementApi.DeleteScheduleV2(a.ctx, a.CustomerUUID, scheduleUUID) } // EditBackupSchedule edits a backup schedule -func (a *AuthAPIClient) EditBackupSchedule(scheduleUUID string) ( - ybaclient.ScheduleManagementApiApiEditBackupScheduleV2Request) { +func (a *AuthAPIClient) EditBackupSchedule( + scheduleUUID string, +) ybaclient.ScheduleManagementApiApiEditBackupScheduleV2Request { return a.APIClient.ScheduleManagementApi.EditBackupScheduleV2( a.ctx, a.CustomerUUID, diff --git a/managed/yba-cli/internal/client/session.go b/managed/yba-cli/internal/client/session.go index 8c90d9088411..6d03c49631e5 100644 --- a/managed/yba-cli/internal/client/session.go +++ b/managed/yba-cli/internal/client/session.go @@ -22,20 +22,17 @@ func (a *AuthAPIClient) ApiLogin() ybaclient.SessionManagementApiApiApiLoginRequ } // RegisterCustomer registers a YugabyteDB Anywhere customer -func (a *AuthAPIClient) RegisterCustomer() ( - ybaclient.SessionManagementApiApiRegisterCustomerRequest) { +func (a *AuthAPIClient) RegisterCustomer() ybaclient.SessionManagementApiApiRegisterCustomerRequest { return a.APIClient.SessionManagementApi.RegisterCustomer(a.ctx) } // ApiToken regenerates and fetches unmasked API token -func (a *AuthAPIClient) ApiToken() ( - ybaclient.SessionManagementApiApiApiTokenRequest) { +func (a *AuthAPIClient) ApiToken() ybaclient.SessionManagementApiApiApiTokenRequest { return a.APIClient.SessionManagementApi.ApiToken(a.ctx, a.CustomerUUID) } // GetSessionInfo fetches YugabyteDB Anywhere session info -func (a *AuthAPIClient) GetSessionInfo() ( - ybaclient.SessionManagementApiApiGetSessionInfoRequest) { +func (a *AuthAPIClient) GetSessionInfo() ybaclient.SessionManagementApiApiGetSessionInfoRequest { return a.APIClient.SessionManagementApi.GetSessionInfo(a.ctx) } diff --git a/managed/yba-cli/internal/client/storageconfiguration.go b/managed/yba-cli/internal/client/storageconfiguration.go index db1b00bebb5e..bf9de88ac9eb 100644 --- a/managed/yba-cli/internal/client/storageconfiguration.go +++ b/managed/yba-cli/internal/client/storageconfiguration.go @@ -9,27 +9,27 @@ import ( ) // GetListOfCustomerConfig fetches list of configs associated with the customer -func (a *AuthAPIClient) GetListOfCustomerConfig() ( - ybaclient.CustomerConfigurationApiApiGetListOfCustomerConfigRequest) { +func (a *AuthAPIClient) GetListOfCustomerConfig() ybaclient.CustomerConfigurationApiApiGetListOfCustomerConfigRequest { return a.APIClient.CustomerConfigurationApi.GetListOfCustomerConfig(a.ctx, a.CustomerUUID) } // DeleteCustomerConfig deletes configs associated with the customer -func (a *AuthAPIClient) DeleteCustomerConfig(configUUID string) ( - ybaclient.CustomerConfigurationApiApiDeleteCustomerConfigRequest) { +func (a *AuthAPIClient) DeleteCustomerConfig( + configUUID string, +) ybaclient.CustomerConfigurationApiApiDeleteCustomerConfigRequest { return a.APIClient.CustomerConfigurationApi.DeleteCustomerConfig( a.ctx, a.CustomerUUID, configUUID) } // CreateCustomerConfig creates configs associated with the customer -func (a *AuthAPIClient) CreateCustomerConfig() ( - ybaclient.CustomerConfigurationApiApiCreateCustomerConfigRequest) { +func (a *AuthAPIClient) CreateCustomerConfig() ybaclient.CustomerConfigurationApiApiCreateCustomerConfigRequest { return a.APIClient.CustomerConfigurationApi.CreateCustomerConfig(a.ctx, a.CustomerUUID) } // EditCustomerConfig edits configs associated with the customer -func (a *AuthAPIClient) EditCustomerConfig(configUUID string) ( - ybaclient.CustomerConfigurationApiApiEditCustomerConfigRequest) { +func (a *AuthAPIClient) EditCustomerConfig( + configUUID string, +) ybaclient.CustomerConfigurationApiApiEditCustomerConfigRequest { return a.APIClient.CustomerConfigurationApi.EditCustomerConfig( a.ctx, a.CustomerUUID, diff --git a/managed/yba-cli/internal/client/table.go b/managed/yba-cli/internal/client/table.go index a22391b620f7..e7cec445272d 100644 --- a/managed/yba-cli/internal/client/table.go +++ b/managed/yba-cli/internal/client/table.go @@ -9,29 +9,29 @@ import ( ) // GetAllTables for the listing of all tables in the universe -func (a *AuthAPIClient) GetAllTables(uUUID string) ( - ybaclient.TableManagementApiApiGetAllTablesRequest, -) { +func (a *AuthAPIClient) GetAllTables( + uUUID string, +) ybaclient.TableManagementApiApiGetAllTablesRequest { return a.APIClient.TableManagementApi.GetAllTables(a.ctx, a.CustomerUUID, uUUID) } // DescribeTable for the description of a table in the universe -func (a *AuthAPIClient) DescribeTable(uUUID, tUUID string) ( - ybaclient.TableManagementApiApiDescribeTableRequest, -) { +func (a *AuthAPIClient) DescribeTable( + uUUID, tUUID string, +) ybaclient.TableManagementApiApiDescribeTableRequest { return a.APIClient.TableManagementApi.DescribeTable(a.ctx, a.CustomerUUID, uUUID, tUUID) } // GetAllNamespaces for the listing of all namespaces in the universe -func (a *AuthAPIClient) GetAllNamespaces(uUUID string) ( - ybaclient.TableManagementApiApiGetAllNamespacesRequest, -) { +func (a *AuthAPIClient) GetAllNamespaces( + uUUID string, +) ybaclient.TableManagementApiApiGetAllNamespacesRequest { return a.APIClient.TableManagementApi.GetAllNamespaces(a.ctx, a.CustomerUUID, uUUID) } // GetAllTableSpaces for the listing of all table spaces in the universe -func (a *AuthAPIClient) GetAllTableSpaces(uUUID string) ( - ybaclient.TableManagementApiApiGetAllTableSpacesRequest, -) { +func (a *AuthAPIClient) GetAllTableSpaces( + uUUID string, +) ybaclient.TableManagementApiApiGetAllTableSpacesRequest { return a.APIClient.TableManagementApi.GetAllTableSpaces(a.ctx, a.CustomerUUID, uUUID) } diff --git a/managed/yba-cli/internal/client/task.go b/managed/yba-cli/internal/client/task.go index e793b1cc7bb7..ab0ab1217e38 100644 --- a/managed/yba-cli/internal/client/task.go +++ b/managed/yba-cli/internal/client/task.go @@ -22,32 +22,31 @@ import ( ) // GetCustomerTaskStatus fetches the customer task status -func (a *AuthAPIClient) GetCustomerTaskStatus(taskUUID string) ( - ybaclient.CustomerTasksApiApiTaskStatusRequest) { +func (a *AuthAPIClient) GetCustomerTaskStatus( + taskUUID string, +) ybaclient.CustomerTasksApiApiTaskStatusRequest { return a.APIClient.CustomerTasksApi.TaskStatus(a.ctx, a.CustomerUUID, taskUUID) } // ListFailedSubtasks fetches the customer failed task status -func (a *AuthAPIClient) ListFailedSubtasks(taskUUID string) ( - ybaclient.CustomerTasksApiApiListFailedSubtasksRequest) { +func (a *AuthAPIClient) ListFailedSubtasks( + taskUUID string, +) ybaclient.CustomerTasksApiApiListFailedSubtasksRequest { return a.APIClient.CustomerTasksApi.ListFailedSubtasks(a.ctx, a.CustomerUUID, taskUUID) } // RetryTask triggers retry universe/provider API -func (a *AuthAPIClient) RetryTask(tUUID string) ( - ybaclient.CustomerTasksApiApiRetryTaskRequest) { +func (a *AuthAPIClient) RetryTask(tUUID string) ybaclient.CustomerTasksApiApiRetryTaskRequest { return a.APIClient.CustomerTasksApi.RetryTask(a.ctx, a.CustomerUUID, tUUID) } // AbortTask triggers abort task API -func (a *AuthAPIClient) AbortTask(tUUID string) ( - ybaclient.CustomerTasksApiApiAbortTaskRequest) { +func (a *AuthAPIClient) AbortTask(tUUID string) ybaclient.CustomerTasksApiApiAbortTaskRequest { return a.APIClient.CustomerTasksApi.AbortTask(a.ctx, a.CustomerUUID, tUUID) } // TasksList triggers abort task API -func (a *AuthAPIClient) TasksList() ( - ybaclient.CustomerTasksApiApiTasksListRequest) { +func (a *AuthAPIClient) TasksList() ybaclient.CustomerTasksApiApiTasksListRequest { return a.APIClient.CustomerTasksApi.TasksList(a.ctx, a.CustomerUUID) } @@ -130,8 +129,12 @@ func (a *AuthAPIClient) WaitForTaskCI(taskUUID, message string) error { if allowed { r, response, errR := a.ListFailedSubtasks(taskUUID).Execute() if errR != nil { - errMessage := util.ErrorFromHTTPResponse(response, errR, "ListFailedSubtasks", - "Get Failed Tasks") + errMessage := util.ErrorFromHTTPResponse( + response, + errR, + "ListFailedSubtasks", + "Get Failed Tasks", + ) return errMessage } @@ -233,8 +236,12 @@ func (a *AuthAPIClient) WaitForTaskProgressBar(taskUUID, message string) error { if allowed { r, response, errR := a.ListFailedSubtasks(taskUUID).Execute() if errR != nil { - errMessage := util.ErrorFromHTTPResponse(response, errR, "ListFailedSubtasks", - "Get Failed Tasks") + errMessage := util.ErrorFromHTTPResponse( + response, + errR, + "ListFailedSubtasks", + "Get Failed Tasks", + ) return errMessage } diff --git a/managed/yba-cli/internal/client/universe.go b/managed/yba-cli/internal/client/universe.go index 910557f5abca..d1f201042d69 100644 --- a/managed/yba-cli/internal/client/universe.go +++ b/managed/yba-cli/internal/client/universe.go @@ -10,77 +10,83 @@ import ( ) // ListUniverses fetches list of universes associated with the customer -func (a *AuthAPIClient) ListUniverses() ( - ybaclient.UniverseManagementApiApiListUniversesRequest) { +func (a *AuthAPIClient) ListUniverses() ybaclient.UniverseManagementApiApiListUniversesRequest { return a.APIClient.UniverseManagementApi.ListUniverses(a.ctx, a.CustomerUUID) } // GetUniverse fetches of universe associated with the universeUUID -func (a *AuthAPIClient) GetUniverse(uUUID string) ( - ybaclient.UniverseManagementApiApiGetUniverseRequest) { +func (a *AuthAPIClient) GetUniverse( + uUUID string, +) ybaclient.UniverseManagementApiApiGetUniverseRequest { return a.APIClient.UniverseManagementApi.GetUniverse(a.ctx, a.CustomerUUID, uUUID) } // DeleteUniverse deletes universe associated with the universeUUID -func (a *AuthAPIClient) DeleteUniverse(uUUID string) ( - ybaclient.UniverseManagementApiApiDeleteUniverseRequest) { +func (a *AuthAPIClient) DeleteUniverse( + uUUID string, +) ybaclient.UniverseManagementApiApiDeleteUniverseRequest { return a.APIClient.UniverseManagementApi.DeleteUniverse(a.ctx, a.CustomerUUID, uUUID) } // CreateAllClusters creates a universe with a minimum of 1 cluster -func (a *AuthAPIClient) CreateAllClusters() ( - ybaclient.UniverseClusterMutationsApiApiCreateAllClustersRequest) { +func (a *AuthAPIClient) CreateAllClusters() ybaclient.UniverseClusterMutationsApiApiCreateAllClustersRequest { return a.APIClient.UniverseClusterMutationsApi.CreateAllClusters(a.ctx, a.CustomerUUID) } // UpgradeSoftware upgrades the universe YugabyteDB version -func (a *AuthAPIClient) UpgradeSoftware(uUUID string) ( - ybaclient.UniverseUpgradesManagementApiApiUpgradeSoftwareRequest) { +func (a *AuthAPIClient) UpgradeSoftware( + uUUID string, +) ybaclient.UniverseUpgradesManagementApiApiUpgradeSoftwareRequest { return a.APIClient.UniverseUpgradesManagementApi.UpgradeSoftware(a.ctx, a.CustomerUUID, uUUID) } // UpgradeGFlags upgrades the universe gflags -func (a *AuthAPIClient) UpgradeGFlags(uUUID string) ( - ybaclient.UniverseUpgradesManagementApiApiUpgradeGFlagsRequest) { +func (a *AuthAPIClient) UpgradeGFlags( + uUUID string, +) ybaclient.UniverseUpgradesManagementApiApiUpgradeGFlagsRequest { return a.APIClient.UniverseUpgradesManagementApi.UpgradeGFlags(a.ctx, a.CustomerUUID, uUUID) } // UpgradeVMImage upgrades the VM image of the universe -func (a *AuthAPIClient) UpgradeVMImage(uUUID string) ( - ybaclient.UniverseUpgradesManagementApiApiUpgradeVMImageRequest) { +func (a *AuthAPIClient) UpgradeVMImage( + uUUID string, +) ybaclient.UniverseUpgradesManagementApiApiUpgradeVMImageRequest { return a.APIClient.UniverseUpgradesManagementApi.UpgradeVMImage(a.ctx, a.CustomerUUID, uUUID) } // UpgradeTLS upgrades the TLS settings of the universe -func (a *AuthAPIClient) UpgradeTLS(uUUID string) ( - ybaclient.UniverseUpgradesManagementApiApiUpgradeTlsRequest) { +func (a *AuthAPIClient) UpgradeTLS( + uUUID string, +) ybaclient.UniverseUpgradesManagementApiApiUpgradeTlsRequest { return a.APIClient.UniverseUpgradesManagementApi.UpgradeTls(a.ctx, a.CustomerUUID, uUUID) } // UpgradeCerts upgrades the TLS certs of the universe -func (a *AuthAPIClient) UpgradeCerts(uUUID string) ( - ybaclient.UniverseUpgradesManagementApiApiUpgradeCertsRequest) { +func (a *AuthAPIClient) UpgradeCerts( + uUUID string, +) ybaclient.UniverseUpgradesManagementApiApiUpgradeCertsRequest { return a.APIClient.UniverseUpgradesManagementApi.UpgradeCerts(a.ctx, a.CustomerUUID, uUUID) } // RestartUniverse for restart operation -func (a *AuthAPIClient) RestartUniverse(uUUID string) ( - ybaclient.UniverseUpgradesManagementApiApiRestartUniverseRequest) { +func (a *AuthAPIClient) RestartUniverse( + uUUID string, +) ybaclient.UniverseUpgradesManagementApiApiRestartUniverseRequest { return a.APIClient.UniverseUpgradesManagementApi.RestartUniverse(a.ctx, a.CustomerUUID, uUUID) } // SetUniverseKey to change universe EAR settings -func (a *AuthAPIClient) SetUniverseKey(uUUID string) ( - ybaclient.UniverseManagementApiApiSetUniverseKeyRequest, -) { +func (a *AuthAPIClient) SetUniverseKey( + uUUID string, +) ybaclient.UniverseManagementApiApiSetUniverseKeyRequest { return a.APIClient.UniverseManagementApi.SetUniverseKey(a.ctx, a.CustomerUUID, uUUID) } // ConfigureYSQL for YSQL configuration -func (a *AuthAPIClient) ConfigureYSQL(uUUID string) ( - ybaclient.UniverseDatabaseManagementApiApiConfigureYSQLRequest, -) { +func (a *AuthAPIClient) ConfigureYSQL( + uUUID string, +) ybaclient.UniverseDatabaseManagementApiApiConfigureYSQLRequest { return a.APIClient.UniverseDatabaseManagementApi.ConfigureYSQL(a.ctx, a.CustomerUUID, uUUID) } diff --git a/managed/yba-cli/internal/client/user.go b/managed/yba-cli/internal/client/user.go index 5522e4a62896..c48195433c7f 100644 --- a/managed/yba-cli/internal/client/user.go +++ b/managed/yba-cli/internal/client/user.go @@ -9,23 +9,17 @@ import ( ) // ListUsers fetches list of users associated with the customer -func (a *AuthAPIClient) ListUsers() ( - ybaclient.UserManagementApiApiListUsersRequest, -) { +func (a *AuthAPIClient) ListUsers() ybaclient.UserManagementApiApiListUsersRequest { return a.APIClient.UserManagementApi.ListUsers(a.ctx, a.CustomerUUID) } // CreateUser creates a new user -func (a *AuthAPIClient) CreateUser() ( - ybaclient.UserManagementApiApiCreateUserRequest, -) { +func (a *AuthAPIClient) CreateUser() ybaclient.UserManagementApiApiCreateUserRequest { return a.APIClient.UserManagementApi.CreateUser(a.ctx, a.CustomerUUID) } // DeleteUser deletes a user -func (a *AuthAPIClient) DeleteUser(uUUID string) ( - ybaclient.UserManagementApiApiDeleteUserRequest, -) { +func (a *AuthAPIClient) DeleteUser(uUUID string) ybaclient.UserManagementApiApiDeleteUserRequest { return a.APIClient.UserManagementApi.DeleteUser(a.ctx, a.CustomerUUID, uUUID) } @@ -37,9 +31,7 @@ func (a *AuthAPIClient) GetUserDetails( } // ResetUserPassword resets the password of the user -func (a *AuthAPIClient) ResetUserPassword() ( - ybaclient.UserManagementApiApiResetUserPasswordRequest, -) { +func (a *AuthAPIClient) ResetUserPassword() ybaclient.UserManagementApiApiResetUserPasswordRequest { return a.APIClient.UserManagementApi.ResetUserPassword(a.ctx, a.CustomerUUID) } diff --git a/managed/yba-cli/internal/client/xcluster.go b/managed/yba-cli/internal/client/xcluster.go index f8fbeca0fc94..9d3b1b9dea4c 100644 --- a/managed/yba-cli/internal/client/xcluster.go +++ b/managed/yba-cli/internal/client/xcluster.go @@ -9,16 +9,16 @@ import ( ) // CreateXClusterConfig create xCluster config -func (a *AuthAPIClient) CreateXClusterConfig() ( - ybaclient.AsynchronousReplicationApiApiCreateXClusterConfigRequest) { +func (a *AuthAPIClient) CreateXClusterConfig() ybaclient.AsynchronousReplicationApiApiCreateXClusterConfigRequest { return a.APIClient.AsynchronousReplicationApi.CreateXClusterConfig( a.ctx, a.CustomerUUID) } // DeleteXClusterConfig delete xCluster config -func (a *AuthAPIClient) DeleteXClusterConfig(xclusterUUID string) ( - ybaclient.AsynchronousReplicationApiApiDeleteXClusterConfigRequest) { +func (a *AuthAPIClient) DeleteXClusterConfig( + xclusterUUID string, +) ybaclient.AsynchronousReplicationApiApiDeleteXClusterConfigRequest { return a.APIClient.AsynchronousReplicationApi.DeleteXClusterConfig( a.ctx, a.CustomerUUID, @@ -26,8 +26,9 @@ func (a *AuthAPIClient) DeleteXClusterConfig(xclusterUUID string) ( } // GetXClusterConfig get xCluster config -func (a *AuthAPIClient) GetXClusterConfig(xclusterUUID string) ( - ybaclient.AsynchronousReplicationApiApiGetXClusterConfigRequest) { +func (a *AuthAPIClient) GetXClusterConfig( + xclusterUUID string, +) ybaclient.AsynchronousReplicationApiApiGetXClusterConfigRequest { return a.APIClient.AsynchronousReplicationApi.GetXClusterConfig( a.ctx, a.CustomerUUID, @@ -35,8 +36,9 @@ func (a *AuthAPIClient) GetXClusterConfig(xclusterUUID string) ( } // EditXClusterConfig edit xCluster config -func (a *AuthAPIClient) EditXClusterConfig(xclusterUUID string) ( - ybaclient.AsynchronousReplicationApiApiEditXClusterConfigRequest) { +func (a *AuthAPIClient) EditXClusterConfig( + xclusterUUID string, +) ybaclient.AsynchronousReplicationApiApiEditXClusterConfigRequest { return a.APIClient.AsynchronousReplicationApi.EditXClusterConfig( a.ctx, a.CustomerUUID, @@ -44,8 +46,9 @@ func (a *AuthAPIClient) EditXClusterConfig(xclusterUUID string) ( } // RestartXClusterConfig restart xCluster -func (a *AuthAPIClient) RestartXClusterConfig(xclusterUUID string) ( - ybaclient.AsynchronousReplicationApiApiRestartXClusterConfigRequest) { +func (a *AuthAPIClient) RestartXClusterConfig( + xclusterUUID string, +) ybaclient.AsynchronousReplicationApiApiRestartXClusterConfigRequest { return a.APIClient.AsynchronousReplicationApi.RestartXClusterConfig( a.ctx, a.CustomerUUID, @@ -53,8 +56,9 @@ func (a *AuthAPIClient) RestartXClusterConfig(xclusterUUID string) ( } // SyncXClusterConfig sync xCluster -func (a *AuthAPIClient) SyncXClusterConfig(xclusterUUID string) ( - ybaclient.AsynchronousReplicationApiApiSyncXClusterConfigV2Request) { +func (a *AuthAPIClient) SyncXClusterConfig( + xclusterUUID string, +) ybaclient.AsynchronousReplicationApiApiSyncXClusterConfigV2Request { return a.APIClient.AsynchronousReplicationApi.SyncXClusterConfigV2( a.ctx, a.CustomerUUID, @@ -62,8 +66,9 @@ func (a *AuthAPIClient) SyncXClusterConfig(xclusterUUID string) ( } // NeedBootstrapTable need bootstrap table -func (a *AuthAPIClient) NeedBootstrapTable(universeUUID string) ( - ybaclient.AsynchronousReplicationApiApiNeedBootstrapTableRequest) { +func (a *AuthAPIClient) NeedBootstrapTable( + universeUUID string, +) ybaclient.AsynchronousReplicationApiApiNeedBootstrapTableRequest { return a.APIClient.AsynchronousReplicationApi.NeedBootstrapTable( a.ctx, a.CustomerUUID, @@ -71,8 +76,9 @@ func (a *AuthAPIClient) NeedBootstrapTable(universeUUID string) ( } // NeedBootstrapXClusterConfig need bootstrap xCluster -func (a *AuthAPIClient) NeedBootstrapXClusterConfig(xclusterUUID string) ( - ybaclient.AsynchronousReplicationApiApiNeedBootstrapXClusterConfigRequest) { +func (a *AuthAPIClient) NeedBootstrapXClusterConfig( + xclusterUUID string, +) ybaclient.AsynchronousReplicationApiApiNeedBootstrapXClusterConfigRequest { return a.APIClient.AsynchronousReplicationApi.NeedBootstrapXClusterConfig( a.ctx, a.CustomerUUID, diff --git a/managed/yba-cli/internal/formatter/backup/keyspace_location.go b/managed/yba-cli/internal/formatter/backup/keyspace_location.go index 23992b4eb284..14cc00832d9a 100644 --- a/managed/yba-cli/internal/formatter/backup/keyspace_location.go +++ b/managed/yba-cli/internal/formatter/backup/keyspace_location.go @@ -46,7 +46,9 @@ func NewKeyspaceLocationFormat(source string) formatter.Format { } // SetKeyspaceLocation initializes the context with the keyspace location data -func (k *KeyspaceLocationContext) SetKeyspaceLocation(keyspaceLocation ybaclient.KeyspaceTablesList) { +func (k *KeyspaceLocationContext) SetKeyspaceLocation( + keyspaceLocation ybaclient.KeyspaceTablesList, +) { k.k = keyspaceLocation } @@ -68,7 +70,11 @@ func (k *KeyspaceLocationContext) Write(index int) error { logrus.Errorf("%s", err.Error()) return err } - k.Output.Write([]byte(formatter.Colorize(fmt.Sprintf("Keyspace %d Details", index+1), formatter.BlueColor))) + k.Output.Write( + []byte( + formatter.Colorize(fmt.Sprintf("Keyspace %d Details", index+1), formatter.BlueColor), + ), + ) k.Output.Write([]byte("\n")) if err := k.ContextFormat(tmpl, kc.KeyspaceLocation); err != nil { logrus.Errorf("%s", err.Error()) diff --git a/managed/yba-cli/internal/formatter/backup/restore/restore_keyspace.go b/managed/yba-cli/internal/formatter/backup/restore/restore_keyspace.go index 0af1d290d092..6d20f176c2ff 100644 --- a/managed/yba-cli/internal/formatter/backup/restore/restore_keyspace.go +++ b/managed/yba-cli/internal/formatter/backup/restore/restore_keyspace.go @@ -70,7 +70,11 @@ func (r *RestoreKeyspaceContext) Write(index int) error { logrus.Errorf("%s", err.Error()) return err } - r.Output.Write([]byte(formatter.Colorize(fmt.Sprintf("Keyspace %d Details", index+1), formatter.BlueColor))) + r.Output.Write( + []byte( + formatter.Colorize(fmt.Sprintf("Keyspace %d Details", index+1), formatter.BlueColor), + ), + ) r.Output.Write([]byte("\n")) if err := r.ContextFormat(tmpl, rc.RestoreKeyspace); err != nil { logrus.Errorf("%s", err.Error()) diff --git a/managed/yba-cli/internal/formatter/rbac/permissioninfo/permissioninfo.go b/managed/yba-cli/internal/formatter/rbac/permissioninfo/permissioninfo.go index d8651bd32493..cba8d381d073 100644 --- a/managed/yba-cli/internal/formatter/rbac/permissioninfo/permissioninfo.go +++ b/managed/yba-cli/internal/formatter/rbac/permissioninfo/permissioninfo.go @@ -123,7 +123,11 @@ func (c *Context) PrerequisitePermissions() string { for _, p := range c.p.GetPrerequisitePermissions() { permissionPrereq = fmt.Sprintf( - "%sAction: %s, Resource Type: %s\n", permissionPrereq, p.GetAction(), p.GetResourceType()) + "%sAction: %s, Resource Type: %s\n", + permissionPrereq, + p.GetAction(), + p.GetResourceType(), + ) } return permissionPrereq } diff --git a/managed/yba-cli/internal/formatter/tabwriter/tabwriter.go b/managed/yba-cli/internal/formatter/tabwriter/tabwriter.go index b5f6793ac422..6e23c121606a 100644 --- a/managed/yba-cli/internal/formatter/tabwriter/tabwriter.go +++ b/managed/yba-cli/internal/formatter/tabwriter/tabwriter.go @@ -210,7 +210,12 @@ const ( // (for correct-looking results, tabwidth must correspond // to the tab width in the viewer displaying the result) // flags formatting control -func (b *Writer) Init(output io.Writer, minwidth, tabwidth, padding int, padchar byte, flags uint) *Writer { +func (b *Writer) Init( + output io.Writer, + minwidth, tabwidth, padding int, + padchar byte, + flags uint, +) *Writer { if minwidth < 0 || tabwidth < 0 || padding < 0 { panic("negative minwidth, tabwidth, or padding") } @@ -599,6 +604,11 @@ func (b *Writer) Write(buf []byte) (n int, err error) { // NewWriter allocates and initializes a new tabwriter.Writer. // The parameters are the same as for the Init function. -func NewWriter(output io.Writer, minwidth, tabwidth, padding int, padchar byte, flags uint) *Writer { +func NewWriter( + output io.Writer, + minwidth, tabwidth, padding int, + padchar byte, + flags uint, +) *Writer { return new(Writer).Init(output, minwidth, tabwidth, padding, padchar, flags) } diff --git a/managed/yba-cli/internal/formatter/tabwriter/tabwriter_test.go b/managed/yba-cli/internal/formatter/tabwriter/tabwriter_test.go index 03530c25084b..b6ea687b2b30 100644 --- a/managed/yba-cli/internal/formatter/tabwriter/tabwriter_test.go +++ b/managed/yba-cli/internal/formatter/tabwriter/tabwriter_test.go @@ -41,7 +41,13 @@ func write(t *testing.T, testname string, w *Writer, src string) { t.Errorf("--- test: %s\n--- src:\n%q\n--- write error: %v\n", testname, src, err) } if written != len(src) { - t.Errorf("--- test: %s\n--- src:\n%q\n--- written = %d, len(src) = %d\n", testname, src, written, len(src)) + t.Errorf( + "--- test: %s\n--- src:\n%q\n--- written = %d, len(src) = %d\n", + testname, + src, + written, + len(src), + ) } } @@ -53,11 +59,24 @@ func verify(t *testing.T, testname string, w *Writer, b *buffer, src, expected s res := b.String() if res != expected { - t.Errorf("--- test: %s\n--- src:\n%q\n--- found:\n%q\n--- expected:\n%q\n", testname, src, res, expected) + t.Errorf( + "--- test: %s\n--- src:\n%q\n--- found:\n%q\n--- expected:\n%q\n", + testname, + src, + res, + expected, + ) } } -func check(t *testing.T, testname string, minwidth, tabwidth, padding int, padchar byte, flags uint, src, expected string) { +func check( + t *testing.T, + testname string, + minwidth, tabwidth, padding int, + padchar byte, + flags uint, + src, expected string, +) { var b buffer b.init(1000) @@ -611,7 +630,17 @@ var tests = []struct { func Test(t *testing.T) { for _, e := range tests { - check(t, e.testname, e.minwidth, e.tabwidth, e.padding, e.padchar, e.flags, e.src, e.expected) + check( + t, + e.testname, + e.minwidth, + e.tabwidth, + e.padding, + e.padchar, + e.flags, + e.src, + e.expected, + ) } } @@ -662,7 +691,14 @@ func BenchmarkTable(b *testing.B) { b.Run("new", func(b *testing.B) { b.ReportAllocs() for i := 0; i < b.N; i++ { - w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings + w := NewWriter( + io.Discard, + 4, + 4, + 1, + ' ', + 0, + ) // no particular reason for these settings // Write the line h times. for j := 0; j < h; j++ { w.Write(line) @@ -673,7 +709,14 @@ func BenchmarkTable(b *testing.B) { b.Run("reuse", func(b *testing.B) { b.ReportAllocs() - w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings + w := NewWriter( + io.Discard, + 4, + 4, + 1, + ' ', + 0, + ) // no particular reason for these settings for i := 0; i < b.N; i++ { // Write the line h times. for j := 0; j < h; j++ { @@ -694,7 +737,14 @@ func BenchmarkPyramid(b *testing.B) { b.Run(fmt.Sprintf("%d", x), func(b *testing.B) { b.ReportAllocs() for i := 0; i < b.N; i++ { - w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings + w := NewWriter( + io.Discard, + 4, + 4, + 1, + ' ', + 0, + ) // no particular reason for these settings // Write increasing prefixes of that line. for j := 0; j < x; j++ { w.Write(line[:j*2]) @@ -716,7 +766,14 @@ func BenchmarkRagged(b *testing.B) { b.Run(fmt.Sprintf("%d", h), func(b *testing.B) { b.ReportAllocs() for i := 0; i < b.N; i++ { - w := NewWriter(io.Discard, 4, 4, 1, ' ', 0) // no particular reason for these settings + w := NewWriter( + io.Discard, + 4, + 4, + 1, + ' ', + 0, + ) // no particular reason for these settings // Write the lines in turn h times. for j := 0; j < h; j++ { w.Write(lines[j%len(lines)]) diff --git a/managed/yba-cli/internal/formatter/xcluster/xcluster.go b/managed/yba-cli/internal/formatter/xcluster/xcluster.go index 6a8761a6dc37..639e5a3018de 100644 --- a/managed/yba-cli/internal/formatter/xcluster/xcluster.go +++ b/managed/yba-cli/internal/formatter/xcluster/xcluster.go @@ -178,7 +178,9 @@ func (c *Context) Status() string { return formatter.Colorize(state, formatter.YellowColor) // Red color for "Deleted" and "Deletion Failed" and "Failed" - case util.DeletedXClusterUniverseState, util.DeletionFailedXClusterState, util.FailedXClusterState: + case util.DeletedXClusterUniverseState, + util.DeletionFailedXClusterState, + util.FailedXClusterState: return formatter.Colorize(state, formatter.RedColor) // Default: Gray color for unknown states