Skip to content

Commit bb4b535

Browse files
marceljkmarceljk
committed
adjust server commands
1 parent d1f8baa commit bb4b535

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+485
-359
lines changed

‎internal/cmd/server/backup/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
7070
serverLabel := model.ServerId
7171
// Get server name
7272
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
73-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
73+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
7474
if err != nil {
7575
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
7676
} else if serverName != "" {

‎internal/cmd/server/backup/disable/disable.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
5656
serverLabel := model.ServerId
5757
// Get server name
5858
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
59-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
59+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
6060
if err != nil {
6161
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
6262
} else if serverName != "" {

‎internal/cmd/server/backup/enable/enable.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
5656
serverLabel := model.ServerId
5757
// Get server name
5858
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
59-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
59+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
6060
if err != nil {
6161
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
6262
} else if serverName != "" {

‎internal/cmd/server/backup/list/list.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
7070
serverLabel := model.ServerId
7171
// Get server name
7272
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
73-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
73+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
7474
if err != nil {
7575
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
7676
} else if serverName != "" {

‎internal/cmd/server/backup/schedule/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
7878
serverLabel := model.ServerId
7979
// Get server name
8080
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
81-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
81+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
8282
if err != nil {
8383
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
8484
} else if serverName != "" {

‎internal/cmd/server/backup/schedule/delete/delete.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
5757
serverLabel := model.ServerId
5858
// Get server name
5959
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
60-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
60+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
6161
if err != nil {
6262
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
6363
} else if serverName != "" {

‎internal/cmd/server/backup/schedule/list/list.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6262
serverLabel := model.ServerId
6363
// Get server name
6464
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
65-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
65+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
6666
if err != nil {
6767
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
6868
} else if serverName != "" {

‎internal/cmd/server/command/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6666
serverLabel := model.ServerId
6767
// Get server name
6868
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
69-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
69+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
7070
if err != nil {
7171
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
7272
} else if serverName != "" {

‎internal/cmd/server/command/list/list.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6262
serverLabel := model.ServerId
6363
// Get server name
6464
if iaasApiClient, err := iaasClient.ConfigureClient(params.Printer, params.CliVersion); err == nil {
65-
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.ServerId)
65+
serverName, err := iaasUtils.GetServerName(ctx, iaasApiClient, model.ProjectId, model.Region, model.ServerId)
6666
if err != nil {
6767
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
6868
} else if serverName != "" {

‎internal/cmd/server/console/console.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
5757
return err
5858
}
5959

60-
serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, model.ServerId)
60+
serverLabel, err := iaasUtils.GetServerName(ctx, apiClient, model.ProjectId, model.Region, model.ServerId)
6161
if err != nil {
6262
params.Printer.Debug(print.ErrorLevel, "get server name: %v", err)
6363
serverLabel = model.ServerId
@@ -96,7 +96,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9696
}
9797

9898
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiGetServerConsoleRequest {
99-
return apiClient.GetServerConsole(ctx, model.ProjectId, model.ServerId)
99+
return apiClient.GetServerConsole(ctx, model.ProjectId, model.Region, model.ServerId)
100100
}
101101

102102
func outputResult(p *print.Printer, outputFormat, serverLabel string, serverUrl iaas.ServerConsoleUrl) error {

0 commit comments

Comments
 (0)