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

feat(instance): rely on api default volume type in server creation #2775

Closed
wants to merge 1 commit into from
Closed

feat(instance): rely on api default volume type in server creation #2775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions internal/services/instance/helpers_instance_block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package instance

import (
"errors"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
Expand Down Expand Up @@ -194,8 +195,14 @@ func instanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*BlockAndI
}

func volumeTypeToMarketplaceFilter(volumeType any) marketplace.LocalImageType {
if volumeType != nil && instance.VolumeVolumeType(volumeType.(string)) == instance.VolumeVolumeTypeSbsVolume {
return marketplace.LocalImageTypeInstanceSbs
if volumeType != nil {
volumeTypeString := volumeType.(string)
if strings.HasPrefix(volumeTypeString, "sbs") {
return marketplace.LocalImageTypeInstanceSbs
} else {
return marketplace.LocalImageTypeInstanceLocal
}
}
return marketplace.LocalImageTypeInstanceLocal

return marketplace.LocalImageTypeUnknownType
}
14 changes: 1 addition & 13 deletions internal/services/instance/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,19 +391,7 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
imageUUID := locality.ExpandID(d.Get("image"))
if imageUUID != "" && !scwvalidation.IsUUID(imageUUID) {
// Replace dashes with underscores ubuntu-focal -> ubuntu_focal
imageLabel := formatImageLabel(imageUUID)

marketPlaceAPI := marketplace.NewAPI(meta.ExtractScwClient(m))
image, err := marketPlaceAPI.GetLocalImageByLabel(&marketplace.GetLocalImageByLabelRequest{
CommercialType: commercialType,
Zone: zone,
ImageLabel: imageLabel,
Type: volumeTypeToMarketplaceFilter(d.Get("root_volume.0.volume_type")),
})
if err != nil {
return diag.FromErr(fmt.Errorf("could not get image '%s': %s", zonal.NewID(zone, imageLabel), err))
}
imageUUID = image.ID
imageUUID = formatImageLabel(imageUUID)
}

req := &instanceSDK.CreateServerRequest{
Expand Down
27 changes: 27 additions & 0 deletions internal/services/instance/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,33 @@ func TestAccServer_RootVolume_ID(t *testing.T) {
})
}

func TestAccServer_RootVolume_DefaultTypeSBS(t *testing.T) {
t.Skip("tmp")
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: instancechecks.IsServerDestroyed(tt),
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_instance_server" "base" {
image = "ubuntu_jammy"
type = "PLAY2-PICO"
state = "stopped"
tags = [ "terraform-test", "scaleway_instance_server", "root_volume" ]
}`,
Check: resource.ComposeTestCheckFunc(
isServerPresent(tt, "scaleway_instance_server.base"),
resource.TestCheckResourceAttr("scaleway_instance_server.base", "root_volume.0.volume_type", "sbs_volume"),
serverHasNewVolume(tt, "scaleway_instance_server.base"),
),
},
},
})
}

func TestAccServer_Basic(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
Expand Down
Loading