Improve public IPs management

internal/service/scaleway/client/instance.go

@@ -33,6 +33,7 @@ type InstanceAPI interface {
 	DeleteServer(req *instance.DeleteServerRequest, opts ...scw.RequestOption) error
 	ListPlacementGroups(req *instance.ListPlacementGroupsRequest, opts ...scw.RequestOption) (*instance.ListPlacementGroupsResponse, error)
 	ListSecurityGroups(req *instance.ListSecurityGroupsRequest, opts ...scw.RequestOption) (*instance.ListSecurityGroupsResponse, error)
+	UpdateServer(req *instance.UpdateServerRequest, opts ...scw.RequestOption) (*instance.UpdateServerResponse, error)
 }
 
 type Instance interface {
@@ -44,7 +45,7 @@ type Instance interface {
 		placementGroupID, securityGroupID *string,
 		rootVolumeSize scw.Size,
 		rootVolumeType instance.VolumeVolumeType,
-		publicIPs, tags []string,
+		tags []string,
 	) (*instance.Server, error)
 	FindImage(ctx context.Context, zone scw.Zone, name string) (*instance.Image, error)
 	FindIPs(ctx context.Context, zone scw.Zone, tags []string) ([]*instance.IP, error)
@@ -62,6 +63,7 @@ type Instance interface {
 	DeleteServer(ctx context.Context, zone scw.Zone, serverID string) error
 	FindPlacementGroup(ctx context.Context, zone scw.Zone, name string) (*instance.PlacementGroup, error)
 	FindSecurityGroup(ctx context.Context, zone scw.Zone, name string) (*instance.SecurityGroup, error)
+	UpdateServerPublicIPs(ctx context.Context, zone scw.Zone, id string, publicIPIDs []string) (*instance.Server, error)
 }
 
 // FindServer finds an existing Instance server by tags.
@@ -106,7 +108,7 @@ func (c *Client) CreateServer(
 	placementGroupID, securityGroupID *string,
 	rootVolumeSize scw.Size,
 	rootVolumeType instance.VolumeVolumeType,
-	publicIPs, tags []string,
+	tags []string,
 ) (*instance.Server, error) {
 	if err := c.validateZone(c.instance, zone); err != nil {
 		return nil, err
@@ -138,10 +140,6 @@ func (c *Client) CreateServer(
 		Tags: append(tags, createdByTag),
 	}
 
-	if len(publicIPs) > 0 {
-		req.PublicIPs = &publicIPs
-	}
-
 	// Automatically attach scratch volume if server supports it.
 	if serverType.ScratchStorageMaxSize != nil && *serverType.ScratchStorageMaxSize > 0 {
 		req.Volumes["1"] = &instance.VolumeServerTemplate{
@@ -482,3 +480,20 @@ func (c *Client) FindSecurityGroup(ctx context.Context, zone scw.Zone, name stri
 		return nil, fmt.Errorf("%w: found %d security groups with name %s", ErrTooManyItemsFound, len(securityGroups), name)
 	}
 }
+
+func (c *Client) UpdateServerPublicIPs(ctx context.Context, zone scw.Zone, id string, publicIPIDs []string) (*instance.Server, error) {
+	if err := c.validateZone(c.instance, zone); err != nil {
+		return nil, err
+	}
+
+	resp, err := c.instance.UpdateServer(&instance.UpdateServerRequest{
+		Zone:      zone,
+		ServerID:  id,
+		PublicIPs: &publicIPIDs,
+	}, scw.WithContext(ctx))
+	if err != nil {
+		return nil, newCallError("UpdateServer", err)
+	}
+
+	return resp.Server, nil
+}

internal/service/scaleway/client/instance_test.go

@@ -176,7 +176,6 @@ func TestClient_CreateServer(t *testing.T) {
 		securityGroupID  *string
 		rootVolumeSize   scw.Size
 		rootVolumeType   instance.VolumeVolumeType
-		publicIPs        []string
 		tags             []string
 	}
 	tests := []struct {
@@ -203,7 +202,6 @@ func TestClient_CreateServer(t *testing.T) {
 				securityGroupID:  scw.StringPtr(securityGroupID),
 				rootVolumeSize:   rootVolumeSize,
 				rootVolumeType:   instance.VolumeVolumeTypeBSSD,
-				publicIPs:        []string{"42.42.42.42"},
 				tags:             []string{"tag1", "tag2", "tag3"},
 			},
 			expect: func(d *mock_client.MockInstanceAPIMockRecorder) {
@@ -227,8 +225,7 @@ func TestClient_CreateServer(t *testing.T) {
 							Boot:       scw.BoolPtr(true),
 						},
 					},
-					Tags:      []string{"tag1", "tag2", "tag3", createdByTag},
-					PublicIPs: &[]string{"42.42.42.42"},
+					Tags: []string{"tag1", "tag2", "tag3", createdByTag},
 				}, gomock.Any()).Return(&instance.CreateServerResponse{
 					Server: &instance.Server{
 						Name: "server",
@@ -316,7 +313,7 @@ func TestClient_CreateServer(t *testing.T) {
 				region:    tt.fields.region,
 				instance:  instanceMock,
 			}
-			got, err := c.CreateServer(tt.args.ctx, tt.args.zone, tt.args.name, tt.args.commercialType, tt.args.imageID, tt.args.placementGroupID, tt.args.securityGroupID, tt.args.rootVolumeSize, tt.args.rootVolumeType, tt.args.publicIPs, tt.args.tags)
+			got, err := c.CreateServer(tt.args.ctx, tt.args.zone, tt.args.name, tt.args.commercialType, tt.args.imageID, tt.args.placementGroupID, tt.args.securityGroupID, tt.args.rootVolumeSize, tt.args.rootVolumeType, tt.args.tags)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Client.CreateServer() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -1731,3 +1728,82 @@ func TestClient_FindSecurityGroup(t *testing.T) {
 		})
 	}
 }
+
+func TestClient_UpdateServerPublicIPs(t *testing.T) {
+	t.Parallel()
+	type fields struct {
+		projectID string
+		region    scw.Region
+	}
+	type args struct {
+		ctx         context.Context
+		zone        scw.Zone
+		id          string
+		publicIPIDs []string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    *instance.Server
+		wantErr bool
+		expect  func(d *mock_client.MockInstanceAPIMockRecorder)
+	}{
+		{
+			name: "update public IPs",
+			fields: fields{
+				projectID: projectID,
+				region:    scw.RegionFrPar,
+			},
+			args: args{
+				ctx:         context.TODO(),
+				zone:        scw.ZoneFrPar1,
+				id:          serverID,
+				publicIPIDs: []string{ipID},
+			},
+			want: &instance.Server{
+				ID: serverID,
+			},
+			expect: func(d *mock_client.MockInstanceAPIMockRecorder) {
+				d.UpdateServer(&instance.UpdateServerRequest{
+					Zone:      scw.ZoneFrPar1,
+					ServerID:  serverID,
+					PublicIPs: &[]string{ipID},
+				}, gomock.Any()).Return(&instance.UpdateServerResponse{
+					Server: &instance.Server{
+						ID: serverID,
+					},
+				}, nil)
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			mockCtrl := gomock.NewController(t)
+			defer mockCtrl.Finish()
+
+			instanceMock := mock_client.NewMockInstanceAPI(mockCtrl)
+
+			// Every API call must be preceded by a zone check.
+			instanceMock.EXPECT().Zones().Return(tt.fields.region.GetZones())
+
+			tt.expect(instanceMock.EXPECT())
+
+			c := &Client{
+				projectID: tt.fields.projectID,
+				region:    tt.fields.region,
+				instance:  instanceMock,
+			}
+			got, err := c.UpdateServerPublicIPs(tt.args.ctx, tt.args.zone, tt.args.id, tt.args.publicIPIDs)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Client.UpdateServerPublicIPs() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Client.UpdateServerPublicIPs() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}