Merge branch 'master' into fix/add_optionnal_field_project_id

Author: jremy42

docs/resources/mongodb_instance.md

@@ -49,6 +49,32 @@ resource "scaleway_mongodb_instance" "main" {
 }
 ```
 
+### Private Network and Public Network
+
+```terraform
+resource scaleway_vpc_private_network pn01 {
+  name   = "my_private_network"
+  region = "fr-par"
+}
+
+resource "scaleway_mongodb_instance" "main" {
+  name              = "test-mongodb-basic1"
+  version           = "7.0.12"
+  node_type         = "MGDB-PLAY2-NANO"
+  node_number       = 1
+  user_name         = "my_initial_user"
+  password          = "thiZ_is_v&ry_s3cret"
+  volume_size_in_gb = 5
+
+  private_network {
+    pn_id = "${scaleway_vpc_private_network.pn02.id}"
+  }
+
+  public_network {}
+
+}
+```
+
 
 ### Restore From Snapshot
 
@@ -77,7 +103,9 @@ The following arguments are supported:
 - `snapshot_id` - (Optional) Snapshot ID to restore the MongoDB® instance from.
 - `private_network` - (Optional) Private Network endpoints of the Database Instance.
     - `pn_id` - (Required) The ID of the Private Network.
-- `public_network` - (Optional) Public network specs details.
+- `public_network` - (Optional) Public network endpoint configuration (no arguments).
+~> **Important** If neither private_network nor public_network is specified, a public network endpoint is created by default.
+
 
 ## Attributes Reference
 
@@ -91,6 +119,10 @@ In addition to all arguments above, the following attributes are exported:
     - `ips` - List of IP addresses for your endpoint.
     - `port` - TCP port of the endpoint.
     - `dns_records` - List of DNS records for your endpoint.
+- `public_network` - Private Network endpoints of the Database Instance.
+    - `id` - The ID of the endpoint.
+    - `port` - TCP port of the endpoint.
+    - `dns_records` - List of DNS records for your endpoint.
 
 ## Import
 

internal/services/baremetal/server.go

@@ -273,6 +273,7 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 			"private_ips": {
 				Type:        schema.TypeList,
 				Computed:    true,
+				Optional:    true,
 				Description: "List of private IPv4 and IPv6 addresses associated with the resource",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -534,6 +535,7 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface
 		privateNetworkIDs = append(privateNetworkIDs, pn.PrivateNetworkID)
 	}
 
+	// Read private IPs if possible
 	allPrivateIPs := make([]map[string]interface{}, 0, listPrivateNetworks.TotalCount)
 	diags := diag.Diagnostics{}
 
@@ -542,25 +544,29 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface
 		opts := &ipam.GetResourcePrivateIPsOptions{
 			ResourceType:     &resourceType,
 			PrivateNetworkID: &privateNetworkID,
+			ProjectID:        &server.ProjectID,
 		}
 
 		privateIPs, err := ipam.GetResourcePrivateIPs(ctx, m, pnRegion, opts)
-		if err != nil {
-			if !httperrors.Is403(err) {
-				return diag.FromErr(err)
-			}
 
+		switch {
+		case err == nil:
+			allPrivateIPs = append(allPrivateIPs, privateIPs...)
+		case httperrors.Is403(err):
+			return append(diags, diag.Diagnostic{
+				Severity:      diag.Warning,
+				Summary:       "Unauthorized to read server's private IPs, please check your IAM permissions",
+				Detail:        err.Error(),
+				AttributePath: cty.GetAttrPath("private_ips"),
+			})
+		default:
 			diags = append(diags, diag.Diagnostic{
 				Severity:      diag.Warning,
-				Summary:       err.Error(),
-				Detail:        "Got 403 while reading private IPs from IPAM API, please check your IAM permissions",
+				Summary:       fmt.Sprintf("Unable to get private IPs for server %s (pn_id: %s)", server.ID, privateNetworkID),
+				Detail:        err.Error(),
 				AttributePath: cty.GetAttrPath("private_ips"),
 			})
 		}
-
-		if privateIPs != nil {
-			allPrivateIPs = append(allPrivateIPs, privateIPs...)
-		}
 	}
 
 	_ = d.Set("private_ips", allPrivateIPs)

internal/services/baremetal/testdata/server-create-server-with-private-network.cassette.yaml

@@ -10,6 +10,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/dsf"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -41,10 +42,11 @@ func ResourceSnapshot() *schema.Resource {
 			},
 			"volume_id": {
 				Type:             schema.TypeString,
-				Required:         true,
+				Optional:         true,
 				ValidateDiagFunc: verify.IsUUIDorUUIDWithLocality(),
 				Description:      "ID of the volume from which creates a snapshot",
 				DiffSuppressFunc: dsf.Locality,
+				ConflictsWith:    []string{"import"},
 			},
 			"tags": {
 				Type: schema.TypeList,
@@ -54,6 +56,34 @@ func ResourceSnapshot() *schema.Resource {
 				Optional:    true,
 				Description: "The tags associated with the snapshot",
 			},
+			"import": {
+				Type:     schema.TypeList,
+				ForceNew: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"bucket": {
+							Type:             schema.TypeString,
+							Required:         true,
+							ForceNew:         true,
+							Description:      "Bucket containing qcow",
+							DiffSuppressFunc: dsf.Locality,
+							StateFunc: func(i interface{}) string {
+								return regional.ExpandID(i.(string)).ID
+							},
+						},
+						"key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							ForceNew:    true,
+							Description: "Key of the qcow file in the specified bucket",
+						},
+					},
+				},
+				Optional:      true,
+				Description:   "Import snapshot from a qcow",
+				ConflictsWith: []string{"volume_id"},
+			},
 			"zone":       zonal.Schema(),
 			"project_id": account.ProjectIDSchema(),
 		},
@@ -66,15 +96,33 @@ func ResourceBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
-	snapshot, err := api.CreateSnapshot(&block.CreateSnapshotRequest{
-		Zone:      zone,
-		ProjectID: d.Get("project_id").(string),
-		Name:      types.ExpandOrGenerateString(d.Get("name").(string), "snapshot"),
-		VolumeID:  locality.ExpandID(d.Get("volume_id")),
-		Tags:      types.ExpandStrings(d.Get("tags")),
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
+	var snapshot *block.Snapshot
+
+	if _, isImported := d.GetOk("import"); !isImported {
+		snapshot, err = api.CreateSnapshot(&block.CreateSnapshotRequest{
+			Zone:      zone,
+			ProjectID: d.Get("project_id").(string),
+			Name:      types.ExpandOrGenerateString(d.Get("name").(string), "snapshot"),
+			VolumeID:  locality.ExpandID(d.Get("volume_id")),
+			Tags:      types.ExpandStrings(d.Get("tags")),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	} else {
+		req := &block.ImportSnapshotFromObjectStorageRequest{
+			Zone:      zone,
+			ProjectID: d.Get("project_id").(string),
+			Name:      types.ExpandOrGenerateString(d.Get("name"), "snapshot"),
+			Bucket:    regional.ExpandID(d.Get("import.0.bucket")).ID,
+			Key:       d.Get("import.0.key").(string),
+			Tags:      types.ExpandStrings(d.Get("tags")),
+		}
+
+		snapshot, err = api.ImportSnapshotFromObjectStorage(req, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	d.SetId(zonal.NewIDString(zone, snapshot.ID))

internal/services/block/snapshot.go

@@ -1,11 +1,14 @@
 package block_test
 
 import (
+	"fmt"
 	"testing"
 
+	sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	blocktestfuncs "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/block/testfuncs"
+	objectchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/object/testfuncs"
 )
 
 func TestAccSnapshot_Basic(t *testing.T) {
@@ -38,3 +41,47 @@ func TestAccSnapshot_Basic(t *testing.T) {
 		},
 	})
 }
+
+func TestAccSnapshot_FromS3(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-block-snapshot")
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			blocktestfuncs.IsSnapshotDestroyed(tt),
+			objectchecks.IsObjectDestroyed(tt),
+			objectchecks.IsBucketDestroyed(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "snapshot-bucket" {
+					  name = "%s"
+					}
+					
+					resource "scaleway_object" "qcow-object" {
+					  bucket = scaleway_object_bucket.snapshot-bucket.name
+					  key    = "test-acc-block-snapshot.qcow2"
+					  file   = "testfixtures/small_image.qcow2"
+					}
+
+					resource "scaleway_block_snapshot" "qcow-block-snapshot" {
+					  name = "test-acc-block-snapshot-qcow2"
+					  import {
+					    bucket = scaleway_object.qcow-object.bucket
+					    key    = scaleway_object.qcow-object.key
+					  }
+					}
+				`, bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					blocktestfuncs.IsSnapshotPresent(tt, "scaleway_block_snapshot.qcow-block-snapshot"),
+					acctest.CheckResourceAttrUUID("scaleway_block_snapshot.qcow-block-snapshot", "id"),
+					resource.TestCheckResourceAttr("scaleway_block_snapshot.qcow-block-snapshot", "name", "test-acc-block-snapshot-qcow2"),
+				),
+			},
+		},
+	})
+}