From 583e5df734daf23589c4e844742927a5297f8919 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 24 May 2024 00:51:30 +0000 Subject: [PATCH 1/4] fix(deps): update stackit sdk modules --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 067795c9c..305950b25 100644 --- a/go.mod +++ b/go.mod @@ -15,13 +15,13 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/stackitcloud/stackit-sdk-go/core v0.12.0 - github.com/stackitcloud/stackit-sdk-go/services/authorization v0.2.0 - github.com/stackitcloud/stackit-sdk-go/services/dns v0.9.1 - github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.13.0 + github.com/stackitcloud/stackit-sdk-go/services/authorization v0.3.0 + github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 + github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 - github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.13.0 + github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 - github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.7.0 + github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.4.0 github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 github.com/zalando/go-keyring v0.2.4 @@ -72,7 +72,7 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect - github.com/stackitcloud/stackit-sdk-go/services/argus v0.10.0 + github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0 github.com/stackitcloud/stackit-sdk-go/services/logme v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.14.0 diff --git a/go.sum b/go.sum index d99700f5a..5b94b73ef 100644 --- a/go.sum +++ b/go.sum @@ -124,34 +124,34 @@ github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stackitcloud/stackit-sdk-go/core v0.12.0 h1:auIzUUNRuydKOScvpICP4MifGgvOajiDQd+ncGmBL0U= github.com/stackitcloud/stackit-sdk-go/core v0.12.0/go.mod h1:mDX1mSTsB3mP+tNBGcFNx6gH1mGBN4T+dVt+lcw7nlw= -github.com/stackitcloud/stackit-sdk-go/services/argus v0.10.0 h1:FAYOt6UBy/F2jPH2C/NnZnbjLZryJBjtM3afLVgGc4w= -github.com/stackitcloud/stackit-sdk-go/services/argus v0.10.0/go.mod h1:nVllQfYODhX1q3bgwVTLO7wHOp+8NMLiKbn3u/Dg5nU= -github.com/stackitcloud/stackit-sdk-go/services/authorization v0.2.0 h1:vdv8DiG9KN6r0UilBeNbwEWItX/HqUMm6kab3t71kpY= -github.com/stackitcloud/stackit-sdk-go/services/authorization v0.2.0/go.mod h1:1sLuXa7Qvp9f+wKWdRjyNe8B2F8JX7nSTd8fBKadri4= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.9.1 h1:pj2nAJvgzFSckA56rCPdi7StXGrr06go8qejI1weNJ8= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.9.1/go.mod h1:MdZcRbs19s2NLeJmSLSoqTzm9IPIQhE1ZEMpo9gePq0= +github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0 h1:JVEx/ouHB6PlwGzQa3ywyDym1HTWo3WgrxAyXprCnuM= +github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0/go.mod h1:nVllQfYODhX1q3bgwVTLO7wHOp+8NMLiKbn3u/Dg5nU= +github.com/stackitcloud/stackit-sdk-go/services/authorization v0.3.0 h1:AyzBgcbd0rCm+2+xaWqtfibjWmkKlO+U+7qxqvtKpJ8= +github.com/stackitcloud/stackit-sdk-go/services/authorization v0.3.0/go.mod h1:1sLuXa7Qvp9f+wKWdRjyNe8B2F8JX7nSTd8fBKadri4= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 h1:QIZfs6nJ/l2pOweH1E+wazXnlAUtqisVbYUxWAokTbc= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0/go.mod h1:MdZcRbs19s2NLeJmSLSoqTzm9IPIQhE1ZEMpo9gePq0= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0 h1:LAteZO46XmqTsmPw0QV8n8WiGM205pxrcqHqWznNmyY= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.12.0/go.mod h1:wsO3+vXe1XiKLeCIctWAptaHQZ07Un7kmLTQ+drbj7w= github.com/stackitcloud/stackit-sdk-go/services/logme v0.14.0 h1:vvQFCN5sKZA9tdzrbDnAVMsaTijX8lvTYnPaKQHmkoI= github.com/stackitcloud/stackit-sdk-go/services/logme v0.14.0/go.mod h1:bj9cn1treNSxKTRCEmESwqfENN8vCYn60HUnEA0P83c= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.14.0 h1:tK6imWrbZ5TgQJbukWCUz7yDgcvvFMX8wamxkPTLuDo= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.14.0/go.mod h1:kPetkX9hNm9HkRyiKQL/tlgdi8frZdMP8afg0mEvQ9s= -github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.13.0 h1:Dhanx9aV5VRfpHg22Li07661FbRT5FR9/M6FowN08a8= -github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.13.0/go.mod h1:iFerEzGmkg6R13ldFUyHUWHm0ac9cS4ftTDLhP0k/dU= +github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 h1:FaJYVfha+atvPfFIf3h3+BFjOjeux9OBHukG1J98kq0= +github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0/go.mod h1:iFerEzGmkg6R13ldFUyHUWHm0ac9cS4ftTDLhP0k/dU= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.9.0 h1:rWgy4/eCIgyA2dUuc4a30pldmS6taQDwiLqoeZmyeP8= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.9.0/go.mod h1:dkVMJI88eJ3Xs0ZV15r4tUpgitUGJXcvrX3RL4Zq2bQ= github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 h1:zkhm0r0OZ5NbHJFrm+7B+h11QL0bNLC53nzXhqCaLWo= github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0/go.mod h1:ZecMIf9oYj2DGZqWh93l97WdVaRdLl+tW5Fq3YKGwBM= -github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.13.0 h1:PGLjBZxWM7NIrH1+W1+f+/4kZEgwv9DGnXcUzOqM0M8= -github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.13.0/go.mod h1:SdrqGLCkilL6wl1+jcxmLtks2IocgIg+bsyeyYUIzR4= +github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.14.0 h1:PZAqXd8TVyTZo8qty4bM2sSoLlLG+Nc9tcpxbQhO+GY= +github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.14.0/go.mod h1:SdrqGLCkilL6wl1+jcxmLtks2IocgIg+bsyeyYUIzR4= github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.14.0 h1:wJ+LSMrRol4wlm/ML4wvVPGwIw51VHMFwMCOtwluvKQ= github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.14.0/go.mod h1:eSgnPBknTJh7t+jVKN+xzeAh+Cg1USOlH3QCyfvG20g= github.com/stackitcloud/stackit-sdk-go/services/redis v0.14.0 h1:wcfA/3mTI7UmTFmKX09EKIVsEqflfkiuEoWL/j5cMvg= github.com/stackitcloud/stackit-sdk-go/services/redis v0.14.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 h1:7AIvLkB7JZ5lYKtYLwI0rgJ0185hwQC1PFiUrjcinDM= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0/go.mod h1:p16qz/pAW8b1gEhqMpIgJfutRPeDPqQLlbVGyCo3f8o= -github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.7.0 h1:1Ho+M4DyZHrwbDe1peW//x+/hegIuaUdZqbQEbPlr4k= -github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.7.0/go.mod h1:LX0Mcyr7/QP77zf7e05fHCJO38RMuTxr7nEDUDZ3oPQ= +github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 h1:pJBG455kmtbQFpCxcBfBK8wOuEnmsMv3h90LFcdj3q0= +github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0/go.mod h1:LX0Mcyr7/QP77zf7e05fHCJO38RMuTxr7nEDUDZ3oPQ= github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.4.0 h1:JB1O0E9+L50ZaO36uz7azurvUuB5JdX5s2ZXuIdb9t8= github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.4.0/go.mod h1:Ni9RBJvcaXRIrDIuQBpJcuQvCQSj27crQSyc+WM4p0c= github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 h1:7iTzdiglvJmKMaHlr4JUPvNOmA730rAniry74cnZ8zI= From adebf99a9270a8e6af0300d84d8cd8c9be6162bb Mon Sep 17 00:00:00 2001 From: vicentepinto98 Date: Mon, 27 May 2024 11:54:38 +0100 Subject: [PATCH 2/4] Fix lint --- internal/cmd/secrets-manager/instance/create/create.go | 4 ++-- internal/cmd/secrets-manager/instance/create/create_test.go | 4 ++-- internal/cmd/secrets-manager/instance/describe/describe.go | 4 ++-- internal/cmd/secrets-manager/instance/update/update.go | 4 ++-- internal/cmd/secrets-manager/instance/update/update_test.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/cmd/secrets-manager/instance/create/create.go b/internal/cmd/secrets-manager/instance/create/create.go index c95cb365f..e574e35c8 100644 --- a/internal/cmd/secrets-manager/instance/create/create.go +++ b/internal/cmd/secrets-manager/instance/create/create.go @@ -146,10 +146,10 @@ func buildCreateInstanceRequest(ctx context.Context, model *inputModel, apiClien func buildUpdateACLsRequest(ctx context.Context, model *inputModel, instanceId string, apiClient *secretsmanager.APIClient) secretsmanager.ApiUpdateACLsRequest { req := apiClient.UpdateACLs(ctx, model.ProjectId, instanceId) - cidrs := make([]secretsmanager.AclUpdate, len(*model.Acls)) + cidrs := make([]secretsmanager.UpdateACLPayload, len(*model.Acls)) for i, acl := range *model.Acls { - cidrs[i] = secretsmanager.AclUpdate{Cidr: utils.Ptr(acl)} + cidrs[i] = secretsmanager.UpdateACLPayload{Cidr: utils.Ptr(acl)} } req = req.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{Cidrs: &cidrs}) diff --git a/internal/cmd/secrets-manager/instance/create/create_test.go b/internal/cmd/secrets-manager/instance/create/create_test.go index 42dddc534..96dc7d994 100644 --- a/internal/cmd/secrets-manager/instance/create/create_test.go +++ b/internal/cmd/secrets-manager/instance/create/create_test.go @@ -63,7 +63,7 @@ func fixtureRequest(mods ...func(request *secretsmanager.ApiCreateInstanceReques func fixtureUpdateACLsRequest(mods ...func(request *secretsmanager.ApiUpdateACLsRequest)) secretsmanager.ApiUpdateACLsRequest { request := testClient.UpdateACLs(testCtx, testProjectId, testInstanceId) request = request.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{ - Cidrs: utils.Ptr([]secretsmanager.AclUpdate{ + Cidrs: utils.Ptr([]secretsmanager.UpdateACLPayload{ {Cidr: utils.Ptr("198.51.100.14/24")}, })}) @@ -281,7 +281,7 @@ func TestBuildCreateACLRequests(t *testing.T) { *model.Acls = append(*model.Acls, "1.2.3.4/32") }), expectedRequest: fixtureUpdateACLsRequest().UpdateACLsPayload(secretsmanager.UpdateACLsPayload{ - Cidrs: utils.Ptr([]secretsmanager.AclUpdate{ + Cidrs: utils.Ptr([]secretsmanager.UpdateACLPayload{ {Cidr: utils.Ptr("198.51.100.14/24")}, {Cidr: utils.Ptr("1.2.3.4/32")}, })}), diff --git a/internal/cmd/secrets-manager/instance/describe/describe.go b/internal/cmd/secrets-manager/instance/describe/describe.go index d3f6e56b9..e299138de 100644 --- a/internal/cmd/secrets-manager/instance/describe/describe.go +++ b/internal/cmd/secrets-manager/instance/describe/describe.go @@ -110,10 +110,10 @@ func buildListACLsRequest(ctx context.Context, model *inputModel, apiClient *sec return req } -func outputResult(p *print.Printer, outputFormat string, instance *secretsmanager.Instance, aclList *secretsmanager.AclList) error { +func outputResult(p *print.Printer, outputFormat string, instance *secretsmanager.Instance, aclList *secretsmanager.ListACLsResponse) error { output := struct { *secretsmanager.Instance - *secretsmanager.AclList + *secretsmanager.ListACLsResponse }{instance, aclList} switch outputFormat { diff --git a/internal/cmd/secrets-manager/instance/update/update.go b/internal/cmd/secrets-manager/instance/update/update.go index 61fd3d78e..e013c1e73 100644 --- a/internal/cmd/secrets-manager/instance/update/update.go +++ b/internal/cmd/secrets-manager/instance/update/update.go @@ -124,10 +124,10 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu func buildRequest(ctx context.Context, model *inputModel, apiClient *secretsmanager.APIClient) secretsmanager.ApiUpdateACLsRequest { req := apiClient.UpdateACLs(ctx, model.ProjectId, model.InstanceId) - cidrs := []secretsmanager.AclUpdate{} + cidrs := []secretsmanager.UpdateACLPayload{} for _, acl := range *model.Acls { - cidrs = append(cidrs, secretsmanager.AclUpdate{Cidr: utils.Ptr(acl)}) + cidrs = append(cidrs, secretsmanager.UpdateACLPayload{Cidr: utils.Ptr(acl)}) } req = req.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{Cidrs: &cidrs}) diff --git a/internal/cmd/secrets-manager/instance/update/update_test.go b/internal/cmd/secrets-manager/instance/update/update_test.go index a70193b57..8668d9ca1 100644 --- a/internal/cmd/secrets-manager/instance/update/update_test.go +++ b/internal/cmd/secrets-manager/instance/update/update_test.go @@ -70,7 +70,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { func fixtureRequest(mods ...func(request *secretsmanager.ApiUpdateACLsRequest)) secretsmanager.ApiUpdateACLsRequest { request := testClient.UpdateACLs(testCtx, testProjectId, testInstanceId) request = request.UpdateACLsPayload(secretsmanager.UpdateACLsPayload{ - Cidrs: utils.Ptr([]secretsmanager.AclUpdate{ + Cidrs: utils.Ptr([]secretsmanager.UpdateACLPayload{ {Cidr: utils.Ptr(testACL1)}, })}) @@ -275,7 +275,7 @@ func TestBuildRequest(t *testing.T) { *model.Acls = append(*model.Acls, testACL2) }), expectedRequest: fixtureRequest().UpdateACLsPayload(secretsmanager.UpdateACLsPayload{ - Cidrs: utils.Ptr([]secretsmanager.AclUpdate{ + Cidrs: utils.Ptr([]secretsmanager.UpdateACLPayload{ {Cidr: utils.Ptr(testACL1)}, {Cidr: utils.Ptr(testACL2)}, })}), From 36d501b8b4f8f7d559217c09de8c19046d7ff94c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 28 May 2024 00:51:51 +0000 Subject: [PATCH 3/4] fix(deps): update module github.com/stackitcloud/stackit-sdk-go/services/ske to v0.16.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a293bad92..d573a92bb 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.4.0 - github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 + github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0 github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0 github.com/zalando/go-keyring v0.2.4 golang.org/x/mod v0.17.0 diff --git a/go.sum b/go.sum index 89aba482a..caf9c319e 100644 --- a/go.sum +++ b/go.sum @@ -154,8 +154,8 @@ github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 h1:pJBG455 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0/go.mod h1:LX0Mcyr7/QP77zf7e05fHCJO38RMuTxr7nEDUDZ3oPQ= github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.4.0 h1:JB1O0E9+L50ZaO36uz7azurvUuB5JdX5s2ZXuIdb9t8= github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.4.0/go.mod h1:Ni9RBJvcaXRIrDIuQBpJcuQvCQSj27crQSyc+WM4p0c= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0 h1:7iTzdiglvJmKMaHlr4JUPvNOmA730rAniry74cnZ8zI= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.15.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0 h1:trrJuRMzgXu6fiiMZiUx6+A1FNKEFhA1vGq5cr5Qn3U= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.16.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0 h1:aIXxXx6u4+6C02MPb+hdItigeKeen7m+hEEG+Ej9sNs= github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0/go.mod h1:fQJOQMfasStZ8J9iGX0vTjyJoQtLqMXJ5Npb03QJk84= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From dad167da65d2fc61b82288167dd876469e891a6b Mon Sep 17 00:00:00 2001 From: vicentepinto98 Date: Tue, 28 May 2024 09:30:45 +0100 Subject: [PATCH 4/4] Rename data type --- internal/cmd/ske/kubeconfig/create/create.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/cmd/ske/kubeconfig/create/create.go b/internal/cmd/ske/kubeconfig/create/create.go index d72c54b9c..53310c43f 100644 --- a/internal/cmd/ske/kubeconfig/create/create.go +++ b/internal/cmd/ske/kubeconfig/create/create.go @@ -89,7 +89,7 @@ func NewCmd(p *print.Printer) *cobra.Command { var ( kubeconfig string respKubeconfig *ske.Kubeconfig - respLogin *ske.V1LoginKubeconfig + respLogin *ske.LoginKubeconfig ) if !model.Login { @@ -210,7 +210,7 @@ func buildRequestLogin(ctx context.Context, model *inputModel, apiClient *ske.AP return apiClient.GetLoginKubeconfig(ctx, model.ProjectId, model.ClusterName), nil } -func outputResult(p *print.Printer, model *inputModel, kubeconfigPath string, respKubeconfig *ske.Kubeconfig, respLogin *ske.V1LoginKubeconfig) error { +func outputResult(p *print.Printer, model *inputModel, kubeconfigPath string, respKubeconfig *ske.Kubeconfig, respLogin *ske.LoginKubeconfig) error { switch model.OutputFormat { case print.JSONOutputFormat: var err error