chore: merge 3.4 into 3.5

manadart · Aug 21, 2024 · a99266c · a99266c
2 parents a3b0c85 + 70b7666
commit a99266c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/provider/ec2/environ.go b/provider/ec2/environ.go
@@ -530,8 +530,9 @@ func (e *environ) Region() (simplestreams.CloudSpec, error) {
 }
 
 const (
-	ebsStorage = "ebs"
-	ssdStorage = "ssd"
+	ebsStorage    = "ebs"
+	ssdGP3Storage = "ssd-gp3"
+	ssdStorage    = "ssd"
 )
 
 // DistributeInstances implements the state.InstanceDistributor policy.
@@ -639,7 +640,7 @@ func (e *environ) StartInstance(
 			Base:        args.InstanceConfig.Base,
 			Arch:        arch,
 			Constraints: args.Constraints,
-			Storage:     []string{ssdStorage, ebsStorage},
+			Storage:     []string{ssdStorage, ebsStorage, ssdGP3Storage},
 		},
 	)
 	if err != nil {

diff --git a/provider/ec2/image_test.go b/provider/ec2/image_test.go
@@ -220,7 +220,7 @@ func (s *specSuite) TestFindInstanceSpec(c *gc.C) {
 			test.storage)
 		stor := test.storage
 		if len(stor) == 0 {
-			stor = []string{ssdStorage, ebsStorage}
+			stor = []string{ssdStorage, ebsStorage, ssdGP3Storage}
 		}
 		// We need to filter the image metadata to the test's
 		// arches and series; the provisioner and bootstrap