use omitzero

Author: yec-akamai

instances.go

@@ -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,omitzero"`
+	UserAlerts    []int `json:"user_alerts,omitzero"`
 }
 
 // InstanceBackup represents backup settings for an instance
@@ -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,omitzero"`
+	UserAlerts   []int `json:"user_alerts,omitzero"`
 }
 
 // InstanceCreatePlacementGroupOptions represents the placement group

test/unit/instance_test.go

@@ -44,18 +44,12 @@ 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 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.SystemAlerts) >= 2 {
+		assert.Equal(t, 123, linode.Alerts.SystemAlerts[0])
+		assert.Equal(t, 456, linode.Alerts.SystemAlerts[1])
 	}
-	if linode.Alerts.UserAlerts != nil {
-		userAlerts := *linode.Alerts.UserAlerts
-		if len(userAlerts) > 0 {
-			assert.Equal(t, 555, userAlerts[0])
-		}
+	if len(linode.Alerts.UserAlerts) > 0 {
+		assert.Equal(t, 555, linode.Alerts.UserAlerts[0])
 	}
 }
 
@@ -90,18 +84,12 @@ 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 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.SystemAlerts) >= 2 {
+		assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
+		assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
 	}
-	if instance.Alerts.UserAlerts != nil {
-		userAlerts := *instance.Alerts.UserAlerts
-		if len(userAlerts) > 0 {
-			assert.Equal(t, 555, userAlerts[0])
-		}
+	if len(instance.Alerts.UserAlerts) > 0 {
+		assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
 	}
 }
 
@@ -207,8 +195,8 @@ func TestInstance_Create(t *testing.T) {
 		RootPass:          "securepassword",
 		MaintenancePolicy: linodego.Pointer("linode/migrate"),
 		Alerts: &linodego.InstanceACLPAlertsOptions{
-			SystemAlerts: linodego.Pointer([]int{123, 456}),
-			UserAlerts:   linodego.Pointer([]int{555}),
+			SystemAlerts: []int{123, 456},
+			UserAlerts:  []int{555},
 		},
 	}
 
@@ -218,18 +206,12 @@ 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 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.SystemAlerts) >= 2 {
+		assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
+		assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
 	}
-	if instance.Alerts.UserAlerts != nil {
-		userAlerts := *instance.Alerts.UserAlerts
-		if len(userAlerts) > 0 {
-			assert.Equal(t, 555, userAlerts[0])
-		}
+	if len(instance.Alerts.UserAlerts) > 0 {
+		assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
 	}
 }
 
@@ -245,8 +227,8 @@ func TestInstance_Update(t *testing.T) {
 		Label:             "updated-instance",
 		MaintenancePolicy: linodego.Pointer("linode/power_off_on"),
 		Alerts: &linodego.InstanceAlert{
-			SystemAlerts: linodego.Pointer([]int{123, 456}),
-			UserAlerts:   linodego.Pointer([]int{555}),
+			SystemAlerts: []int{123, 456},
+			UserAlerts:   []int{555},
 		},
 	}
 
@@ -256,18 +238,12 @@ 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 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.SystemAlerts) >= 2 {
+		assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
+		assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
 	}
-	if instance.Alerts.UserAlerts != nil {
-		userAlerts := *instance.Alerts.UserAlerts
-		if len(userAlerts) > 0 {
-			assert.Equal(t, 555, userAlerts[0])
-		}
+	if len(instance.Alerts.UserAlerts) > 0 {
+		assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
 	}
 }
 
@@ -317,8 +293,8 @@ func TestInstance_Clone(t *testing.T) {
 		Type:   "g6-standard-1",
 		Label:  "cloned-instance",
 		Alerts: &linodego.InstanceACLPAlertsOptions{
-			SystemAlerts: linodego.Pointer([]int{123, 456}),
-			UserAlerts:   linodego.Pointer([]int{555}),
+			SystemAlerts: []int{123, 456},
+			UserAlerts:   []int{555},
 		},
 	}
 
@@ -328,18 +304,12 @@ 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 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.SystemAlerts) >= 2 {
+		assert.Equal(t, 123, instance.Alerts.SystemAlerts[0])
+		assert.Equal(t, 456, instance.Alerts.SystemAlerts[1])
 	}
-	if instance.Alerts.UserAlerts != nil {
-		userAlerts := *instance.Alerts.UserAlerts
-		if len(userAlerts) > 0 {
-			assert.Equal(t, 555, userAlerts[0])
-		}
+	if len(instance.Alerts.UserAlerts) > 0 {
+		assert.Equal(t, 555, instance.Alerts.UserAlerts[0])
 	}
 }