Skip to content

Commit 269ede4

Browse files
authored
chore(instance): ignore routed-ip-enabled depreciation (#4122)
1 parent 9e09daf commit 269ede4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

internal/namespaces/instance/v1/custom_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func serversMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error)
103103
PrivateIP: server.PrivateIP,
104104
Tags: server.Tags,
105105
ImageName: serverImageName,
106-
RoutedIPEnabled: server.RoutedIPEnabled,
106+
RoutedIPEnabled: server.RoutedIPEnabled, //nolint: staticcheck // Field is deprecated but still supported
107107
PlacementGroup: server.PlacementGroup,
108108
ModificationDate: server.ModificationDate,
109109
CreationDate: server.CreationDate,

internal/namespaces/instance/v1/custom_server_action_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func Test_ServerEnableRoutedIP(t *testing.T) {
157157
ServerID: storedServer.ID,
158158
})
159159
assert.Nil(t, err)
160-
assert.Equal(t, scw.BoolPtr(true), server.Server.RoutedIPEnabled)
160+
assert.Equal(t, scw.BoolPtr(true), server.Server.RoutedIPEnabled) //nolint: staticcheck // Field is deprecated but tested
161161
ip, err := api.GetIP(&instanceSDK.GetIPRequest{
162162
Zone: storedServer.Zone,
163163
IP: storedServer.PublicIP.ID,

internal/namespaces/instance/v1/custom_server_create_builder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (sb *ServerBuilder) AddTags(tags []string) *ServerBuilder {
8080

8181
func (sb *ServerBuilder) AddRoutedIPEnabled(routedIPEnabled *bool) *ServerBuilder {
8282
if routedIPEnabled != nil {
83-
sb.createReq.RoutedIPEnabled = routedIPEnabled
83+
sb.createReq.RoutedIPEnabled = routedIPEnabled //nolint: staticcheck // Field is deprecated but still supported
8484
}
8585

8686
return sb
@@ -118,8 +118,8 @@ func (sb *ServerBuilder) rootVolumeIsSBS() bool {
118118

119119
// defaultIPType returns the default IP type when created by the CLI. Used for ServerBuilder.AddIP
120120
func (sb *ServerBuilder) defaultIPType() instance.IPType {
121-
if sb.createReq.RoutedIPEnabled != nil {
122-
if *sb.createReq.RoutedIPEnabled {
121+
if sb.createReq.RoutedIPEnabled != nil { //nolint: staticcheck // Field is deprecated but still supported
122+
if *sb.createReq.RoutedIPEnabled { //nolint: staticcheck // Field is deprecated but still supported
123123
return instance.IPTypeRoutedIPv4
124124
}
125125
return instance.IPTypeNat

0 commit comments

Comments
 (0)