Skip to content

feat(instance): remove deprecated and duplicated IP fields #5037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
Merged

feat(instance): remove deprecated and duplicated IP fields #5037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 66 additions & 12 deletions internal/namespaces/instance/v1/custom_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,71 @@ func serverUpdateBuilder(c *core.Command) *core.Command {
return c
}

func volumeIsFromSBS(api *block.API, zone scw.Zone, volumeID string) bool {
_, err := api.GetVolume(&block.GetVolumeRequest{
Zone: zone,
VolumeID: volumeID,
})
// customServer is a copy of instance.Server without the fields that are deprecated or duplicated in another section.
// It is used by the `instance server get` command.
type customServer struct {
ID string `json:"id"`
Name string `json:"name"`
Organization string `json:"organization"`
Project string `json:"project"`
AllowedActions []instance.ServerAction `json:"allowed_actions"`
Tags []string `json:"tags"`
CommercialType string `json:"commercial_type"`
CreationDate *time.Time `json:"creation_date"`
DynamicIPRequired bool `json:"dynamic_ip_required"`
RoutedIPEnabled *bool `json:"routed_ip_enabled"`
Hostname string `json:"hostname"`
Image *instance.Image `json:"image"`
Protected bool `json:"protected"`
PrivateIP *string `json:"private_ip"`
PublicIPs []*instance.ServerIP `json:"public_ips"`
MacAddress string `json:"mac_address"`
ModificationDate *time.Time `json:"modification_date"`
State instance.ServerState `json:"state"`
StateDetail string `json:"state_detail"`
IPv6 *instance.ServerIPv6 `json:"ipv6"`
BootType instance.BootType `json:"boot_type"`
SecurityGroup *instance.SecurityGroupSummary `json:"security_group"`
Arch instance.Arch `json:"arch"`
PlacementGroup *instance.PlacementGroup `json:"placement_group"`
Zone scw.Zone `json:"zone"`
AdminPasswordEncryptionSSHKeyID *string `json:"admin_password_encryption_ssh_key_id"`
AdminPasswordEncryptedValue *string `json:"admin_password_encrypted_value"`
Filesystems []*instance.ServerFilesystem `json:"filesystems"`
EndOfService bool `json:"end_of_service"`
}

return err == nil
func customServerFromInstanceServer(server *instance.Server) *customServer {
return &customServer{
ID: server.ID,
Name: server.Name,
Organization: server.Organization,
Project: server.Project,
AllowedActions: server.AllowedActions,
Tags: server.Tags,
CommercialType: server.CommercialType,
CreationDate: server.CreationDate,
DynamicIPRequired: server.DynamicIPRequired,
RoutedIPEnabled: server.RoutedIPEnabled,
Hostname: server.Hostname,
Image: server.Image,
Protected: server.Protected,
PrivateIP: server.PrivateIP,
PublicIPs: server.PublicIPs,
MacAddress: server.MacAddress,
ModificationDate: server.ModificationDate,
State: server.State,
StateDetail: server.StateDetail,
BootType: server.BootType,
SecurityGroup: server.SecurityGroup,
Arch: server.Arch,
PlacementGroup: server.PlacementGroup,
Zone: server.Zone,
AdminPasswordEncryptionSSHKeyID: server.AdminPasswordEncryptionSSHKeyID,
AdminPasswordEncryptedValue: server.AdminPasswordEncryptedValue,
Filesystems: server.Filesystems,
EndOfService: server.EndOfService,
}
}

func serverGetBuilder(c *core.Command) *core.Command {
Expand Down Expand Up @@ -506,12 +564,12 @@ func serverGetBuilder(c *core.Command) *core.Command {
}

return &struct {
*instance.Server
*customServer
Volumes []*customVolume
PrivateNics []customNICs `json:"private_nics"`
Warnings []string `json:"warnings"`
}{
server,
customServerFromInstanceServer(server),
orderVolumes(volumes),
nics,
warnings,
Expand All @@ -536,10 +594,6 @@ func serverGetBuilder(c *core.Command) *core.Command {
Title: "Public IPs",
FieldName: "PublicIPs",
},
{
Title: "IPv6",
FieldName: "IPv6",
},
{
FieldName: "PrivateNics",
Title: "Private NICs",
Expand Down
10 changes: 10 additions & 0 deletions internal/namespaces/instance/v1/helpers_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/fatih/color"
"github.com/scaleway/scaleway-cli/v2/core"
"github.com/scaleway/scaleway-cli/v2/internal/terminal"
block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
product_catalog "github.com/scaleway/scaleway-sdk-go/api/product_catalog/v2alpha1"
"github.com/scaleway/scaleway-sdk-go/scw"
Expand Down Expand Up @@ -51,6 +52,15 @@ func SizeValue(s *scw.Size) scw.Size {
return 0
}

func volumeIsFromSBS(api *block.API, zone scw.Zone, volumeID string) bool {
_, err := api.GetVolume(&block.GetVolumeRequest{
Zone: zone,
VolumeID: volumeID,
})

return err == nil
}

func warningServerTypeDeprecated(
ctx context.Context,
client *scw.Client,
Expand Down
Loading
Loading