From f55a12fc254840ff4b7bab0722c6df762e96cc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Fri, 6 Feb 2026 10:44:11 +0100 Subject: [PATCH 1/2] dbaas mysql: revert type changes in egoscale * Type changes were accidentally introduced in https://github.com/exoscale/egoscale/pull/743 * They got fixed in https://github.com/exoscale/egoscale/pull/745 * This reverts the mysql changes from https://github.com/exoscale/cli/pull/790 --- cmd/dbaas/dbaas_create_mysql.go | 2 +- cmd/dbaas/dbaas_user_reset_mysql.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/exoscale/egoscale/v3/operations.go | 4 ++-- vendor/modules.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/dbaas/dbaas_create_mysql.go b/cmd/dbaas/dbaas_create_mysql.go index 4dafb2005..c35401369 100644 --- a/cmd/dbaas/dbaas_create_mysql.go +++ b/cmd/dbaas/dbaas_create_mysql.go @@ -45,7 +45,7 @@ func (c *dbaasServiceCreateCmd) createMysql(_ *cobra.Command, _ []string) error } if c.MysqlAdminPassword != "" { - databaseService.AdminPassword = v3.DBAASMysqlUserPassword(c.MysqlAdminPassword) + databaseService.AdminPassword = c.MysqlAdminPassword } if c.MysqlAdminUsername != "" { diff --git a/cmd/dbaas/dbaas_user_reset_mysql.go b/cmd/dbaas/dbaas_user_reset_mysql.go index 1e032db81..f190a237f 100644 --- a/cmd/dbaas/dbaas_user_reset_mysql.go +++ b/cmd/dbaas/dbaas_user_reset_mysql.go @@ -22,7 +22,7 @@ func (c *dbaasUserResetCmd) resetMysql(cmd *cobra.Command, _ []string) error { req := v3.ResetDBAASMysqlUserPasswordRequest{} if c.Password != "" { - req.Password = v3.DBAASMysqlUserPassword(c.Password) + req.Password = v3.DBAASUserPassword(c.Password) } if c.MysqlAuthenticationMethod != "" { req.Authentication = v3.EnumMysqlAuthenticationPlugin(c.MysqlAuthenticationMethod) diff --git a/go.mod b/go.mod index e19511446..c13b5283f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.2.0 github.com/aws/smithy-go v1.1.0 github.com/dustin/go-humanize v1.0.1 - github.com/exoscale/egoscale/v3 v3.1.34-0.20260204205607-841b140c4adc + github.com/exoscale/egoscale/v3 v3.1.34-0.20260206093319-99a05e32e6d3 github.com/exoscale/openapi-cli-generator v1.2.0 github.com/fatih/camelcase v1.0.0 github.com/hashicorp/go-multierror v1.1.1 diff --git a/go.sum b/go.sum index db7cc833f..faf95e16f 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/exoscale/egoscale/v3 v3.1.34-0.20260204205607-841b140c4adc h1:afmNeED0XhllWEfNRLrwJ1UjHrPoZXC1E8HVLpkOf0Y= -github.com/exoscale/egoscale/v3 v3.1.34-0.20260204205607-841b140c4adc/go.mod h1:0iY8OxgHJCS5TKqDNhwOW95JBKCnBZl3YGU4Yt+NqkU= +github.com/exoscale/egoscale/v3 v3.1.34-0.20260206093319-99a05e32e6d3 h1:Pq//fGah46pEOcG1YJnjpou7DXMlDYPlZD3W2uTxqcY= +github.com/exoscale/egoscale/v3 v3.1.34-0.20260206093319-99a05e32e6d3/go.mod h1:0iY8OxgHJCS5TKqDNhwOW95JBKCnBZl3YGU4Yt+NqkU= github.com/exoscale/openapi-cli-generator v1.2.0 h1:xgTff1bInBP+JZCauD7Jq9GNBFoKK31Cnv5FIAcxtrk= github.com/exoscale/openapi-cli-generator v1.2.0/go.mod h1:TZBnbT7f3hJ5ImyUphJwRM+X5xF/zCQZ6o8a42gQeTs= github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= diff --git a/vendor/github.com/exoscale/egoscale/v3/operations.go b/vendor/github.com/exoscale/egoscale/v3/operations.go index b767f68ad..eb22192e8 100644 --- a/vendor/github.com/exoscale/egoscale/v3/operations.go +++ b/vendor/github.com/exoscale/egoscale/v3/operations.go @@ -4944,7 +4944,7 @@ type CreateDBAASServiceMysqlRequestMigration struct { } type CreateDBAASServiceMysqlRequest struct { - AdminPassword DBAASMysqlUserPassword `json:"admin-password,omitempty" validate:"omitempty,gte=8,lte=256"` + AdminPassword string `json:"admin-password,omitempty" validate:"omitempty,gte=8,lte=256"` // Custom username for admin user. This must be set only when a new service is being created. AdminUsername string `json:"admin-username,omitempty" validate:"omitempty,gte=1,lte=64"` BackupSchedule *CreateDBAASServiceMysqlRequestBackupSchedule `json:"backup-schedule,omitempty"` @@ -5464,7 +5464,7 @@ func (c Client) DeleteDBAASMysqlUser(ctx context.Context, serviceName string, us type ResetDBAASMysqlUserPasswordRequest struct { Authentication EnumMysqlAuthenticationPlugin `json:"authentication,omitempty"` - Password DBAASMysqlUserPassword `json:"password,omitempty" validate:"omitempty,gte=8,lte=256"` + Password DBAASUserPassword `json:"password,omitempty" validate:"omitempty,gte=8,lte=256"` } // If no password is provided one will be generated automatically. diff --git a/vendor/modules.txt b/vendor/modules.txt index 87a4e1817..b35ffc787 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -154,7 +154,7 @@ github.com/dlclark/regexp2/syntax # github.com/dustin/go-humanize v1.0.1 ## explicit; go 1.16 github.com/dustin/go-humanize -# github.com/exoscale/egoscale/v3 v3.1.34-0.20260204205607-841b140c4adc +# github.com/exoscale/egoscale/v3 v3.1.34-0.20260206093319-99a05e32e6d3 ## explicit; go 1.23.8 github.com/exoscale/egoscale/v3 github.com/exoscale/egoscale/v3/credentials From 654024bed9d5e957baee4d9359e8cff928d02844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Fri, 6 Feb 2026 10:56:23 +0100 Subject: [PATCH 2/2] fixup! dbaas mysql: revert type changes in egoscale --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c13b5283f..052289702 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/exoscale/cli -go 1.24.12 +go 1.24.13 require ( github.com/aws/aws-sdk-go-v2 v1.2.0