Skip to content
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

project: Linode Disk Encryption #541

Merged
merged 13 commits into from
Jul 23, 2024
Merged

project: Linode Disk Encryption #541

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dc61b1d
Linode Disk Encryption Support (#503)
avestuk May 16, 2024
95ccc60
Merge branch 'main' into proj/disk-encryption
zliang-akamai May 23, 2024
6a6014f
Fix LKE tests
zliang-akamai May 23, 2024
3a6208e
Merge branch 'main' into proj/disk-encryption
lgarber-akamai Jul 3, 2024
8d41d43
Fix tests and re-run relevant fixtures
lgarber-akamai Jul 3, 2024
f6208f6
Fix conflicts & re-run fixtures
lgarber-akamai Jul 10, 2024
79f6533
Add go.work.sum to gitignore
lgarber-akamai Jul 10, 2024
0dd7e88
Uncomment LKEClusterID validation test logic
lgarber-akamai Jul 10, 2024
40f67c1
Fix conflicts
lgarber-akamai Jul 23, 2024
d1a2b00
Add LA disclaimers
lgarber-akamai Jul 23, 2024
3816b88
re-run fixtures
lgarber-akamai Jul 23, 2024
0882077
Merge branch 'main' into proj/disk-encryption
lgarber-akamai Jul 23, 2024
31debfb
Response to test fix on main
lgarber-akamai Jul 23, 2024
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
Prev Previous commit
Response to test fix on main
  • Loading branch information
@lgarber-akamai
lgarber-akamai committed Jul 23, 2024
commit 31debfb4520fda82af8751a664080b42679c82db
3 changes: 3 additions & 0 deletions go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
Expand Down
4 changes: 2 additions & 2 deletions test/integration/instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestInstance_Disks_List(t *testing.T) {

func TestInstance_Disks_List_WithEncryption(t *testing.T) {
client, instance, teardown, err := setupInstance(t, "fixtures/TestInstance_Disks_List_WithEncryption", true, func(c *linodego.Client, ico *linodego.InstanceCreateOptions) {
ico.Region = getRegionsWithCaps(t, c, []string{"Disk Encryption"}, []string{})[0]
ico.Region = getRegionsWithCaps(t, c, []string{"Disk Encryption"})[0]
})
defer teardown()
if err != nil {
Expand Down Expand Up @@ -417,7 +417,7 @@ func TestInstance_RebuildWithEncryption(t *testing.T) {
"fixtures/TestInstance_RebuildWithEncryption",
true,
func(client *linodego.Client, options *linodego.InstanceCreateOptions) {
options.Region = getRegionsWithCaps(t, client, []string{"Disk Encryption"}, []string{})[0]
options.Region = getRegionsWithCaps(t, client, []string{"Disk Encryption"})[0]
options.DiskEncryption = linodego.InstanceDiskEncryptionEnabled
},
)
Expand Down