Merge branch 'master' into feat/edge-services

Author: remyleone

.github/workflows/release.yml

@@ -18,31 +18,36 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v4
-      -
-        name: Unshallow
+
+      - name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Set up Go
+
+      - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: 1.22
-      -
-        name: Import GPG key
+
+      - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
           fingerprint: ${{ secrets.GPG_FINGERPRINT }}
-      -
-        name: Run GoReleaser
+
+      - name: Check goreleaser
         uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
-          args: release --rm-dist
+          args: check
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          version: latest
+          args: release
         env:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -1,5 +1,6 @@
 # Visit https://goreleaser.com for documentation on how to customize this
 # behavior.
+version: 2
 before:
   hooks:
     - go mod tidy
@@ -50,4 +51,4 @@ release:
   # Manually examine the release before its live
   draft: true
 changelog:
-  skip: false
+  use: github

internal/services/instance/helpers_instance_block.go

@@ -29,37 +29,42 @@ type UnknownVolume struct {
 	ServerID *string
 	Boot     *bool
 
-	// IsBlockVolume is true if volume is managed by block API
-	IsBlockVolume bool
-
 	InstanceVolumeType instance.VolumeVolumeType
 }
 
 // VolumeTemplate returns a template to be used for servers requests.
 func (volume *UnknownVolume) VolumeTemplate() *instance.VolumeServerTemplate {
 	template := &instance.VolumeServerTemplate{}
+
 	if volume.ID != "" {
 		template.ID = &volume.ID
+		if !volume.IsBlockVolume() {
+			template.Name = &volume.Name
+		}
 	} else {
+		template.VolumeType = volume.InstanceVolumeType
 		template.Size = volume.Size
 	}
 
 	if volume.Boot != nil {
 		template.Boot = volume.Boot
 	}
 
-	if volume.IsBlockVolume {
+	if volume.IsBlockVolume() {
 		template.VolumeType = volume.InstanceVolumeType
-	} else {
-		template.Name = &volume.Name
 	}
 
 	return template
 }
 
 // IsLocal returns true if the volume is a local volume
 func (volume *UnknownVolume) IsLocal() bool {
-	return !volume.IsBlockVolume && volume.InstanceVolumeType == instance.VolumeVolumeTypeLSSD
+	return !volume.IsBlockVolume() && volume.InstanceVolumeType == instance.VolumeVolumeTypeLSSD
+}
+
+// IsBlockVolume is true if volume is managed by block API
+func (volume *UnknownVolume) IsBlockVolume() bool {
+	return volume.InstanceVolumeType == instance.VolumeVolumeTypeSbsVolume
 }
 
 // IsAttached returns true if the volume is attached to a server
@@ -83,7 +88,6 @@ func (api *BlockAndInstanceAPI) GetUnknownVolume(req *GetUnknownVolumeRequest, o
 			ID:                 getVolumeResponse.Volume.ID,
 			Name:               getVolumeResponse.Volume.Name,
 			Size:               &getVolumeResponse.Volume.Size,
-			IsBlockVolume:      false,
 			InstanceVolumeType: getVolumeResponse.Volume.VolumeType,
 		}
 		if getVolumeResponse.Volume.Server != nil {
@@ -106,7 +110,6 @@ func (api *BlockAndInstanceAPI) GetUnknownVolume(req *GetUnknownVolumeRequest, o
 		ID:                 blockVolume.ID,
 		Name:               blockVolume.Name,
 		Size:               &blockVolume.Size,
-		IsBlockVolume:      true,
 		InstanceVolumeType: instance.VolumeVolumeTypeSbsVolume,
 	}
 	for _, ref := range blockVolume.References {

internal/services/instance/helpers_instance_block_test.go

@@ -0,0 +1,77 @@
+package instance_test
+
+import (
+	"testing"
+
+	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestUnknownVolume_VolumeTemplate(t *testing.T) {
+	type fields struct {
+		Zone               scw.Zone
+		ID                 string
+		Name               string
+		Size               *scw.Size
+		ServerID           *string
+		Boot               *bool
+		IsBlockVolume      bool
+		InstanceVolumeType instanceSDK.VolumeVolumeType
+	}
+	tests := []struct {
+		name   string
+		volume *instance.UnknownVolume
+		want   *instanceSDK.VolumeServerTemplate
+	}{
+		{
+			name: "Root Volume",
+			volume: &instance.UnknownVolume{
+				Name:               "",
+				ID:                 "",
+				InstanceVolumeType: instanceSDK.VolumeVolumeTypeLSSD,
+				Size:               scw.SizePtr(20000000000),
+				Boot:               scw.BoolPtr(false),
+			},
+			want: &instanceSDK.VolumeServerTemplate{
+				Boot:       scw.BoolPtr(false),
+				Size:       scw.SizePtr(20000000000),
+				VolumeType: instanceSDK.VolumeVolumeTypeLSSD,
+			},
+		},
+		{
+			name: "Root Volume from ID",
+			volume: &instance.UnknownVolume{
+				Name:               "tf-vol-stoic-johnson",
+				ID:                 "25152794-d15a-4dd5-abfc-b19ec276aa20",
+				InstanceVolumeType: instanceSDK.VolumeVolumeTypeLSSD,
+				Size:               scw.SizePtr(20000000000),
+				Boot:               scw.BoolPtr(true),
+			},
+			want: &instanceSDK.VolumeServerTemplate{
+				ID:   scw.StringPtr("25152794-d15a-4dd5-abfc-b19ec276aa20"),
+				Boot: scw.BoolPtr(true),
+				Name: scw.StringPtr("tf-vol-stoic-johnson"),
+			},
+		},
+		{
+			name: "Additional Volume sbs",
+			volume: &instance.UnknownVolume{
+				Name:               "tf-volume-elegant-minsky",
+				ID:                 "cc380989-b71b-47f0-829f-062e329f4097",
+				InstanceVolumeType: instanceSDK.VolumeVolumeTypeSbsVolume,
+				Size:               scw.SizePtr(10000000000),
+			},
+			want: &instanceSDK.VolumeServerTemplate{
+				ID:         scw.StringPtr("cc380989-b71b-47f0-829f-062e329f4097"),
+				VolumeType: instanceSDK.VolumeVolumeTypeSbsVolume,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.want, tt.volume.VolumeTemplate())
+		})
+	}
+}

internal/services/lb/helpers_lb.go

@@ -23,7 +23,7 @@ import (
 )
 
 const (
-	defaultLbLbTimeout = 10 * time.Minute
+	defaultLbLbTimeout = 15 * time.Minute
 	RetryLbIPInterval  = 5 * time.Second
 )