Skip to content

TPT-3925: Use omitzero for ACLP alerts to support empty lists #928

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

Open
yec-akamai wants to merge 8 commits into
base: proj/aclp-linode-alerts
Choose a base branch
from
+9 −9
Open

TPT-3925: Use omitzero for ACLP alerts to support empty lists #928

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
599870d
rm omitempty
yec-akamai Apr 6, 2026
2352c1b
use pointer
yec-akamai Apr 6, 2026
ab5fb31
update unit test
yec-akamai Apr 6, 2026
54d0303
misc
yec-akamai Apr 6, 2026
30e3964
Merge branch 'main' into fix-update-alerts-empty
yec-akamai Apr 6, 2026
5c1d4e1
Merge branch 'proj/aclp-linode-alerts' into fix-update-alerts-empty
yec-akamai Apr 6, 2026
af4eaeb
use omitzero
yec-akamai Apr 6, 2026
86e68c2
nit
yec-akamai Apr 6, 2026
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
18 changes: 9 additions & 9 deletions instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ type InstanceSpec struct {

// InstanceAlert represents a metric alert
type InstanceAlert struct {
CPU int `json:"cpu"`
IO int `json:"io"`
NetworkIn int `json:"network_in"`
NetworkOut int `json:"network_out"`
TransferQuota int `json:"transfer_quota"`
SystemAlerts []int `json:"system_alerts,omitempty"`
UserAlerts []int `json:"user_alerts,omitempty"`
CPU int `json:"cpu"`
IO int `json:"io"`
NetworkIn int `json:"network_in"`
NetworkOut int `json:"network_out"`
TransferQuota int `json:"transfer_quota"`
SystemAlerts *[]int `json:"system_alerts,omitempty"`
UserAlerts *[]int `json:"user_alerts,omitempty"`
}

// InstanceBackup represents backup settings for an instance
Expand Down Expand Up @@ -230,8 +230,8 @@ type InstanceCreateOptions struct {

// InstanceACLPAlertsOptions represents ACLP alerts options for instance creation and cloning.
type InstanceACLPAlertsOptions struct {
SystemAlerts []int `json:"system_alerts,omitempty"`
UserAlerts []int `json:"user_alerts,omitempty"`
SystemAlerts *[]int `json:"system_alerts,omitempty"`
UserAlerts *[]int `json:"user_alerts,omitempty"`
}

// InstanceCreatePlacementGroupOptions represents the placement group
Expand Down
92 changes: 61 additions & 31 deletions test/unit/instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,18 @@ func TestInstances_List(t *testing.T) {
require.NotNil(t, linode.PlacementGroup.MigratingTo)
assert.Equal(t, 2468, *linode.PlacementGroup.MigratingTo)
assert.Equal(t, "linode/migrate", linode.MaintenancePolicy)
if len(linode.Alerts.SystemAlerts) > 2 {
assert.Equal(t, 123, linode.Alerts.SystemAlerts[0])
assert.Equal(t, 456, linode.Alerts.SystemAlerts[1])
if linode.Alerts.SystemAlerts != nil {
systemAlerts := *linode.Alerts.SystemAlerts
if len(systemAlerts) >= 2 {
assert.Equal(t, 123, systemAlerts[0])
assert.Equal(t, 456, systemAlerts[1])
}
}
if len(linode.Alerts.UserAlerts) > 0 {
assert.Equal(t, 555, linode.Alerts.UserAlerts[0])
if linode.Alerts.UserAlerts != nil {
userAlerts := *linode.Alerts.UserAlerts
if len(userAlerts) > 0 {
assert.Equal(t, 555, userAlerts[0])
}
}
}

Expand Down Expand Up @@ -84,12 +90,18 @@ func TestInstance_Get(t *testing.T) {
assert.Equal(t, "linode/migrate", instance.MaintenancePolicy)
require.NotNil(t, instance.PlacementGroup.MigratingTo)
assert.Equal(t, 2468, *instance.PlacementGroup.MigratingTo)
if len(instance.Alerts.SystemAlerts) > 2 {
assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
if instance.Alerts.SystemAlerts != nil {
systemAlerts := *instance.Alerts.SystemAlerts
if len(systemAlerts) >= 2 {
assert.Equal(t, 123, systemAlerts[0])
assert.Equal(t, 456, systemAlerts[1])
}
}
if len(instance.Alerts.UserAlerts) > 0 {
assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
if instance.Alerts.UserAlerts != nil {
userAlerts := *instance.Alerts.UserAlerts
if len(userAlerts) > 0 {
assert.Equal(t, 555, userAlerts[0])
}
}
}

Expand Down Expand Up @@ -195,8 +207,8 @@ func TestInstance_Create(t *testing.T) {
RootPass: "securepassword",
MaintenancePolicy: linodego.Pointer("linode/migrate"),
Alerts: &linodego.InstanceACLPAlertsOptions{
SystemAlerts: []int{123, 456},
UserAlerts: []int{555},
SystemAlerts: linodego.Pointer([]int{123, 456}),
UserAlerts: linodego.Pointer([]int{555}),
},
}

Expand All @@ -206,12 +218,18 @@ func TestInstance_Create(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "new-instance", instance.Label)
assert.Equal(t, "linode/migrate", instance.MaintenancePolicy)
if len(instance.Alerts.SystemAlerts) > 2 {
assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
if instance.Alerts.SystemAlerts != nil {
systemAlerts := *instance.Alerts.SystemAlerts
if len(systemAlerts) >= 2 {
assert.Equal(t, 123, systemAlerts[0])
assert.Equal(t, 456, systemAlerts[1])
}
}
if len(instance.Alerts.UserAlerts) > 0 {
assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
if instance.Alerts.UserAlerts != nil {
userAlerts := *instance.Alerts.UserAlerts
if len(userAlerts) > 0 {
assert.Equal(t, 555, userAlerts[0])
}
}
}

Expand All @@ -227,8 +245,8 @@ func TestInstance_Update(t *testing.T) {
Label: "updated-instance",
MaintenancePolicy: linodego.Pointer("linode/power_off_on"),
Alerts: &linodego.InstanceAlert{
SystemAlerts: []int{123, 456},
UserAlerts: []int{555},
SystemAlerts: linodego.Pointer([]int{123, 456}),
UserAlerts: linodego.Pointer([]int{555}),
},
}

Expand All @@ -238,12 +256,18 @@ func TestInstance_Update(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "updated-instance", instance.Label)
assert.Equal(t, "linode/power_off_on", instance.MaintenancePolicy)
if len(instance.Alerts.SystemAlerts) > 2 {
assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
if instance.Alerts.SystemAlerts != nil {
systemAlerts := *instance.Alerts.SystemAlerts
if len(systemAlerts) >= 2 {
assert.Equal(t, 123, systemAlerts[0])
assert.Equal(t, 456, systemAlerts[1])
}
}
if len(instance.Alerts.UserAlerts) > 0 {
assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
if instance.Alerts.UserAlerts != nil {
userAlerts := *instance.Alerts.UserAlerts
if len(userAlerts) > 0 {
assert.Equal(t, 555, userAlerts[0])
}
}
}

Expand Down Expand Up @@ -293,8 +317,8 @@ func TestInstance_Clone(t *testing.T) {
Type: "g6-standard-1",
Label: "cloned-instance",
Alerts: &linodego.InstanceACLPAlertsOptions{
SystemAlerts: []int{123, 456},
UserAlerts: []int{555},
SystemAlerts: linodego.Pointer([]int{123, 456}),
UserAlerts: linodego.Pointer([]int{555}),
},
}

Expand All @@ -304,12 +328,18 @@ func TestInstance_Clone(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "cloned-instance", instance.Label)
assert.Equal(t, "linode/migrate", instance.MaintenancePolicy)
if len(instance.Alerts.SystemAlerts) > 2 {
assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
if instance.Alerts.SystemAlerts != nil {
systemAlerts := *instance.Alerts.SystemAlerts
if len(systemAlerts) >= 2 {
assert.Equal(t, 123, systemAlerts[0])
assert.Equal(t, 456, systemAlerts[1])
}
}
if len(instance.Alerts.UserAlerts) > 0 {
assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
if instance.Alerts.UserAlerts != nil {
userAlerts := *instance.Alerts.UserAlerts
if len(userAlerts) > 0 {
assert.Equal(t, 555, userAlerts[0])
}
}
}

Expand Down
Loading