Merge branch 'master' into fix/cockpit_add_grafana_url_manual_creation

Author: jremy42

docs/resources/instance_server.md

@@ -163,6 +163,20 @@ resource "scaleway_instance_server" "from_snapshot" {
 }
 ```
 
+#### Using Scaleway Block Storage (SBS) volume
+
+```terraform
+resource "scaleway_instance_server" "server" {
+  type = "PLAY2-MICRO"
+  image = "ubuntu_jammy"
+  root_volume {
+    volume_type = "sbs_volume"
+    sbs_iops = 15000
+    size_in_gb = 50
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -198,8 +212,9 @@ To retrieve more information by label please use: ```scw marketplace image get l
       To find the right size use [this endpoint](https://www.scaleway.com/en/developers/api/instance/#path-instances-list-all-instances) and
       check the `volumes_constraint.{min|max}_size` (in bytes) for your `commercial_type`.
       Updates to this field will recreate a new resource.
-    - `volume_type` - (Optional) Volume type of root volume, can be `b_ssd` or `l_ssd`, default value depends on server type
+    - `volume_type` - (Optional) Volume type of root volume, can be `b_ssd`, `l_ssd` or `sbs_volume`, default value depends on server type
     - `delete_on_termination` - (Defaults to `true`) Forces deletion of the root volume on instance termination.
+    - `sbs_iops` - (Optional) Choose IOPS of your sbs volume, has to be used with `sbs_volume` for root volume type.
 
 ~> **Important:** Updates to `root_volume.size_in_gb` will be ignored after the creation of the server.
 

docs/resources/tem_domain.md

@@ -58,6 +58,21 @@ resource "scaleway_domain_record" "dmarc" {
 }
 ```
 
+### Automatically Configure DNS Settings for Your Domain
+
+```terraform
+variable "domain_name" {
+  type    = string
+}
+
+resource "scaleway_tem_domain" "main" {
+  name       = var.domain_name
+  accept_tos = true
+  autoconfig = true
+}
+
+```
+
 ### Configuring GitLab Project Variables
 
 ```terraform
@@ -101,6 +116,8 @@ The following arguments are supported:
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the domain is associated with.
 
+- `autoconfig` - (Defaults to `false`) Automatically configures DNS settings for the domain, simplifying the setup process by applying predefined configurations.
+
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:

internal/services/account/helpers.go

@@ -1,8 +1,11 @@
 package account
 
 import (
+	"errors"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3"
+	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
@@ -25,3 +28,16 @@ func GetOrganizationID(m interface{}, d *schema.ResourceData) *string {
 
 	return nil
 }
+
+func isProjectNotUsableError(err error) bool {
+	if err == nil {
+		return false
+	}
+
+	responseError := &scw.PreconditionFailedError{}
+	if errors.As(err, &responseError) && responseError.Precondition == "resource_not_usable" {
+		return true
+	}
+
+	return false
+}

internal/services/account/project.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -131,10 +132,20 @@ func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m
 func resourceAccountProjectDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	accountAPI := NewProjectAPI(m)
 
-	err := accountAPI.DeleteProject(&accountSDK.ProjectAPIDeleteProjectRequest{
-		ProjectID: d.Id(),
-	}, scw.WithContext(ctx))
-	if err != nil && !httperrors.Is404(err) {
+	err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError {
+		err := accountAPI.DeleteProject(&accountSDK.ProjectAPIDeleteProjectRequest{
+			ProjectID: d.Id(),
+		}, scw.WithContext(ctx))
+		if err != nil && !httperrors.Is404(err) {
+			if isProjectNotUsableError(err) {
+				return retry.RetryableError(err)
+			}
+
+			return retry.NonRetryableError(err)
+		}
+		return nil
+	})
+	if err != nil {
 		return diag.FromErr(err)
 	}
 

internal/services/instance/helpers_instance_block.go

@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	block "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
+	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
@@ -29,6 +30,10 @@ type UnknownVolume struct {
 	ServerID *string
 	Boot     *bool
 
+	// Iops is set for Block volume only, use IsBlockVolume
+	// Can be nil if not available in the Block API.
+	Iops *uint32
+
 	InstanceVolumeType instance.VolumeVolumeType
 }
 
@@ -112,6 +117,9 @@ func (api *BlockAndInstanceAPI) GetUnknownVolume(req *GetUnknownVolumeRequest, o
 		Size:               &blockVolume.Size,
 		InstanceVolumeType: instance.VolumeVolumeTypeSbsVolume,
 	}
+	if blockVolume.Specs != nil {
+		vol.Iops = blockVolume.Specs.PerfIops
+	}
 	for _, ref := range blockVolume.References {
 		if ref.ProductResourceType == "instance_server" {
 			vol.ServerID = &ref.ProductResourceID
@@ -152,3 +160,10 @@ func instanceAndBlockAPIWithZoneAndID(m interface{}, zonedID string) (*BlockAndI
 		blockAPI: blockAPI,
 	}, zone, ID, nil
 }
+
+func volumeTypeToMarketplaceFilter(volumeType any) marketplace.LocalImageType {
+	if volumeType != nil && instance.VolumeVolumeType(volumeType.(string)) == instance.VolumeVolumeTypeSbsVolume {
+		return marketplace.LocalImageTypeInstanceSbs
+	}
+	return marketplace.LocalImageTypeInstanceLocal
+}