Added support for Block Storage Encryption

instances.go

@@ -67,7 +67,8 @@ type Instance struct {
 	// NOTE: Disk encryption may not currently be available to all users.
 	DiskEncryption InstanceDiskEncryption `json:"disk_encryption"`
 
-	LKEClusterID int `json:"lke_cluster_id"`
+	LKEClusterID int      `json:"lke_cluster_id"`
+	Capabilities []string `json:"capabilities"`
 }
 
 // InstanceSpec represents a linode spec

regions.go

@@ -35,6 +35,7 @@ const (
 	CapabilityBackups                string = "Backups"
 	CapabilityPlacementGroup         string = "Placement Group"
 	CapabilityDiskEncryption         string = "Disk Encryption"
+	CapabilityBlockStorageEncryption string = "Block Storage Encryption"
 )
 
 // Region-related endpoints have a custom expiry time as the

test/integration/instances_test.go

@@ -3,12 +3,11 @@ package integration
 import (
 	"context"
 	"encoding/base64"
+	"github.com/linode/linodego"
+	"github.com/stretchr/testify/require"
+	"slices"
 	"strconv"
 	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/linode/linodego"
 )
 
 type instanceModifier func(*linodego.Client, *linodego.InstanceCreateOptions)
@@ -561,6 +560,24 @@ func TestInstance_DiskEncryption(t *testing.T) {
 	}
 }
 
+func TestInstance_withBlockStorageEncryption(t *testing.T) {
+	client, clientTeardown := createTestClient(t, "fixtures/TestInstance_withBlockStorageEncryption")
+
+	inst, err := createInstance(t, client, true, func(client *linodego.Client, options *linodego.InstanceCreateOptions) {
+		options.Region = getRegionsWithCaps(t, client, []string{"Linodes", "Block Storage Encryption"})[0]
+		options.Label = "go-inst-test-create-bde"
+	})
+	require.NoError(t, err)
+
+	defer func() {
+		client.DeleteInstance(context.Background(), inst.ID)
+		clientTeardown()
+	}()
+
+	// Filtering is not currently supported on capabilities
+	require.True(t, slices.Contains(inst.Capabilities, "Block Storage Encryption"))
+}
+
 func TestInstance_withPG(t *testing.T) {
 	client, clientTeardown := createTestClient(t, "fixtures/TestInstance_withPG")
 

test/integration/regions_test.go

@@ -45,3 +45,17 @@ func TestRegions_pgLimits(t *testing.T) {
 	require.NotZero(t, region.PlacementGroupLimits.MaximumLinodesPerPG)
 	require.NotZero(t, region.PlacementGroupLimits.MaximumPGsPerCustomer)
 }
+
+func TestRegions_blockStorageEncryption(t *testing.T) {
+	client, teardown := createTestClient(t, "fixtures/TestRegions_blockStorageEncryption")
+	defer teardown()
+
+	regions, err := client.ListRegions(context.Background(), nil)
+	require.NoError(t, err)
+
+	// Filtering is not currently supported on capabilities
+	regionIdx := slices.IndexFunc(regions, func(region linodego.Region) bool {
+		return slices.Contains(region.Capabilities, "Block Storage Encryption")
+	})
+	require.NotZero(t, regionIdx)
+}

test/integration/volumes_test.go

@@ -36,6 +36,33 @@ func TestVolume_Create_smoke(t *testing.T) {
 	}
 }
 
+func TestVolume_Create_withEncryption(t *testing.T) {
+	client, teardown := createTestClient(t, "fixtures/TestVolume_Create_withEncryption")
+	defer teardown()
+
+	createOpts := linodego.VolumeCreateOptions{
+		Label:      "go-vol-test-create-encryption",
+		Region:     getRegionsWithCaps(t, client, []string{"Linodes", "Block Storage Encryption"})[0],
+		Encryption: "enabled",
+	}
+	volume, err := client.CreateVolume(context.Background(), createOpts)
+	if err != nil {
+		t.Errorf("Error listing volumes, expected struct, got error %v", err)
+	}
+	if volume.ID == 0 {
+		t.Errorf("Expected a volumes id, but got 0")
+	}
+
+	assertDateSet(t, volume.Created)
+	assertDateSet(t, volume.Updated)
+
+	// volumes deleted too fast tend to stick, adding a few seconds to catch up
+	time.Sleep(time.Second * 5)
+	if err := client.DeleteVolume(context.Background(), volume.ID); err != nil {
+		t.Errorf("Expected to delete a volume, but got %v", err)
+	}
+}
+
 func TestVolume_Resize(t *testing.T) {
 	client, volume, teardown, err := setupVolume(t, "fixtures/TestVolume_Resize")
 	defer teardown()
@@ -88,6 +115,55 @@ func TestVolume_Get(t *testing.T) {
 	assertDateSet(t, volume.Updated)
 }
 
+func TestVolume_Get_withEncryption(t *testing.T) {
+	client, teardown := createTestClient(t, "fixtures/TestVolume_Get_withEncryption")
+	defer teardown()
+
+	createOpts := linodego.VolumeCreateOptions{
+		Label:      "go-vol-test-get-encryption",
+		Region:     getRegionsWithCaps(t, client, []string{"Linodes", "Block Storage Encryption"})[0],
+		Encryption: "enabled",
+	}
+	volume, err := client.CreateVolume(context.Background(), createOpts)
+	if err != nil {
+		t.Errorf("Error listing volumes, expected struct, got error %v", err)
+	}
+	if volume.ID == 0 {
+		t.Errorf("Expected a volumes id, but got 0")
+	}
+
+	returnedVolume, err := client.GetVolume(context.Background(), volume.ID)
+	if err != nil {
+		t.Errorf("Error getting volume %d, expected *LinodeVolume, got error %v", volume.ID, err)
+	}
+	if returnedVolume.Encryption != "enabled" {
+		t.Errorf("Expected volume encryption to be enabled, but got %v", returnedVolume.Encryption)
+	}
+
+	volumes, err := client.ListVolumes(context.Background(), nil)
+	if err != nil {
+		t.Errorf("Error listing volumes, expected struct, got error %v", err)
+	}
+	found := false
+	for _, v := range volumes {
+		if v.ID == volume.ID {
+			found = true
+			if v.Encryption != "enabled" {
+				t.Errorf("Expected volume encryption to be enabled, but got %v", v.Encryption)
+			}
+		}
+	}
+	if !found {
+		t.Errorf("%d volume not found in list", volume.ID)
+	}
+
+	// volumes deleted too fast tend to stick, adding a few seconds to catch up
+	time.Sleep(time.Second * 5)
+	if err := client.DeleteVolume(context.Background(), volume.ID); err != nil {
+		t.Errorf("Expected to delete a volume, but got %v", err)
+	}
+}
+
 func TestVolume_WaitForLinodeID_nil(t *testing.T) {
 	client, volume, teardown, err := setupVolume(t, "fixtures/TestVolume_WaitForLinodeID_nil")
 	defer teardown()

volumes.go

@@ -37,6 +37,9 @@ type Volume struct {
 	Tags           []string     `json:"tags"`
 	Created        *time.Time   `json:"-"`
 	Updated        *time.Time   `json:"-"`
+
+	// Note: Block Storage Disk Encryption is not currently available to all users.
+	Encryption string `json:"encryption"`
 }
 
 // VolumeCreateOptions fields are those accepted by CreateVolume
@@ -50,6 +53,7 @@ type VolumeCreateOptions struct {
 	// An array of tags applied to this object. Tags are for organizational purposes only.
 	Tags               []string `json:"tags"`
 	PersistAcrossBoots *bool    `json:"persist_across_boots,omitempty"`
+	Encryption         string   `json:"encryption,omitempty"`
 }
 
 // VolumeUpdateOptions fields are those accepted by UpdateVolume