Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-iam-api-key-update-usage.golden

@@ -9,6 +9,7 @@ ARGS:
   access-key             Access key to update
   [default-project-id]   New default Project ID to set
   [description]          New description to update
+  [expires-at]           New expiration date of the API key
 
 FLAGS:
   -h, --help   help for update

docs/commands/iam.md

@@ -196,6 +196,7 @@ scw iam api-key update <access-key ...> [arg=value ...]
 | access-key | Required | Access key to update |
 | default-project-id |  | New default Project ID to set |
 | description |  | New description to update |
+| expires-at |  | New expiration date of the API key |
 
 
 

internal/namespaces/iam/v1alpha1/iam_cli.go

@@ -2361,6 +2361,13 @@ func iamAPIKeyUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "expires-at",
+				Short:      `New expiration date of the API key`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 		},
 		Run: func(ctx context.Context, args any) (i any, e error) {
 			request := args.(*iam.UpdateAPIKeyRequest)

internal/namespaces/redis/v1/custom_cluster.go

@@ -68,24 +68,33 @@ func clusterCreateBuilder(c *core.Command) *core.Command {
 		customRequest := argsI.(*redisCreateClusterRequestCustom)
 		createClusterRequest := customRequest.CreateClusterRequest
 
-		for _, customEndpoint := range customRequest.Endpoints {
-			if customEndpoint.PrivateNetwork == nil {
-				continue
-			}
-			var ipamConfig *redis.EndpointSpecPrivateNetworkSpecIpamConfig
-			if customEndpoint.PrivateNetwork.EnableIpam {
-				ipamConfig = &redis.EndpointSpecPrivateNetworkSpecIpamConfig{}
-			}
+		if len(customRequest.Endpoints) == 0 {
 			createClusterRequest.Endpoints = append(
 				createClusterRequest.Endpoints,
 				&redis.EndpointSpec{
-					PrivateNetwork: &redis.EndpointSpecPrivateNetworkSpec{
-						ID:         customEndpoint.PrivateNetwork.ID,
-						ServiceIPs: customEndpoint.PrivateNetwork.ServiceIPs,
-						IpamConfig: ipamConfig,
-					},
+					PublicNetwork: &redis.EndpointSpecPublicNetworkSpec{},
 				},
 			)
+		} else {
+			for _, customEndpoint := range customRequest.Endpoints {
+				if customEndpoint.PrivateNetwork == nil {
+					continue
+				}
+				var ipamConfig *redis.EndpointSpecPrivateNetworkSpecIpamConfig
+				if customEndpoint.PrivateNetwork.EnableIpam {
+					ipamConfig = &redis.EndpointSpecPrivateNetworkSpecIpamConfig{}
+				}
+				createClusterRequest.Endpoints = append(
+					createClusterRequest.Endpoints,
+					&redis.EndpointSpec{
+						PrivateNetwork: &redis.EndpointSpecPrivateNetworkSpec{
+							ID:         customEndpoint.PrivateNetwork.ID,
+							ServiceIPs: customEndpoint.PrivateNetwork.ServiceIPs,
+							IpamConfig: ipamConfig,
+						},
+					},
+				)
+			}
 		}
 
 		cluster, err := api.CreateCluster(createClusterRequest)