Merge branch 'master' into fix-nightly-object

Author: remyleone

docs/resources/instance_server.md

@@ -201,6 +201,8 @@ To retrieve more information by label please use: ```scw marketplace image get l
 
 - `security_group_id` - (Optional) The [security group](https://www.scaleway.com/en/developers/api/instance/#path-security-groups-update-a-security-group9) the server is attached to.
 
+~> **Important:** If you don't specify a security group, a default one will be created, which won't be tracked by Terraform unless you import it.
+
 - `placement_group_id` - (Optional) The [placement group](https://www.scaleway.com/en/developers/api/instance/#path-security-groups-update-a-security-group the server is attached to.
 
 

docs/resources/lb.md

@@ -161,6 +161,8 @@ The following arguments are supported:
 
 - `ip_ids` - (Optional) The List of IP IDs to attach to the Load Balancer.
 
+~> **Important:** Make sure to use a [`scaleway_lb_ip`](./lb_ip.md) resource to create the IPs.
+
 - `ip_id` - (Deprecated) The ID of the associated Load Balancer IP. See below.
 
 ~> **Important:** Updates to `ip_id` will recreate the Load Balancer.

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.7.2
 	github.com/nats-io/nats.go v1.37.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241021115642-2d127a2d76c7
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.28.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -295,8 +295,8 @@ github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXq
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241021115642-2d127a2d76c7 h1:mWi3yS37Lhf73OP2Z4CboKtXJM4mWDAUWFHKSx2WK7k=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241021115642-2d127a2d76c7/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb h1:OsRpbw60numCy/+3FS7UhZzkdiTu6OZwq29bb4b3gNo=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=

internal/services/container/namespace.go

@@ -46,6 +46,14 @@ func ResourceNamespace() *schema.Resource {
 				Optional:    true,
 				Description: "The description of the container namespace",
 			},
+			"tags": {
+				Type: schema.TypeList,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional:    true,
+				Description: "List of tags [\"tag1\", \"tag2\", ...] attached to the container namespace",
+			},
 			"environment_variables": {
 				Type:        schema.TypeMap,
 				Optional:    true,
@@ -97,14 +105,21 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
-	ns, err := api.CreateNamespace(&container.CreateNamespaceRequest{
+	createReq := &container.CreateNamespaceRequest{
 		Description:                types.ExpandStringPtr(d.Get("description").(string)),
 		EnvironmentVariables:       types.ExpandMapPtrStringString(d.Get("environment_variables")),
 		SecretEnvironmentVariables: expandContainerSecrets(d.Get("secret_environment_variables")),
 		Name:                       types.ExpandOrGenerateString(d.Get("name").(string), "ns"),
 		ProjectID:                  d.Get("project_id").(string),
 		Region:                     region,
-	}, scw.WithContext(ctx))
+	}
+
+	rawTag, tagExist := d.GetOk("tags")
+	if tagExist {
+		createReq.Tags = types.ExpandStrings(rawTag)
+	}
+
+	ns, err := api.CreateNamespace(createReq, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -135,6 +150,7 @@ func ResourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceData,
 	}
 
 	_ = d.Set("description", types.FlattenStringPtr(ns.Description))
+	_ = d.Set("tags", types.FlattenSliceString(ns.Tags))
 	_ = d.Set("environment_variables", ns.EnvironmentVariables)
 	_ = d.Set("name", ns.Name)
 	_ = d.Set("organization_id", ns.OrganizationID)
@@ -166,6 +182,10 @@ func ResourceContainerNamespaceUpdate(ctx context.Context, d *schema.ResourceDat
 		req.Description = types.ExpandUpdatedStringPtr(d.Get("description"))
 	}
 
+	if d.HasChange("tags") {
+		req.Tags = types.ExpandUpdatedStringsPtr(d.Get("tags"))
+	}
+
 	if d.HasChanges("environment_variables") {
 		req.EnvironmentVariables = types.ExpandMapPtrStringString(d.Get("environment_variables"))
 	}

internal/services/container/namespace_test.go

@@ -70,6 +70,32 @@ func TestAccNamespace_Basic(t *testing.T) {
 					acctest.CheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
 				),
 			},
+			{
+				Config: `
+					resource scaleway_container_namespace main {
+						name = "test-cr-ns-01"
+						environment_variables = {
+							"test" = "test"
+						}
+						secret_environment_variables = {
+							"test_secret" = "test_secret"
+						}
+						tags = ["tag1", "tag2"]
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isNamespacePresent(tt, "scaleway_container_namespace.main"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "description", ""),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "name", "test-cr-ns-01"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "environment_variables.test", "test"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.#", "2"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.0", "tag1"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.1", "tag2"),
+
+					acctest.CheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
+				),
+			},
 			{
 				Config: `
 					resource scaleway_container_namespace main {
@@ -80,6 +106,7 @@ func TestAccNamespace_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scaleway_container_namespace.main", "name"),
 					resource.TestCheckResourceAttrSet("scaleway_container_namespace.main", "registry_endpoint"),
 					resource.TestCheckResourceAttrSet("scaleway_container_namespace.main", "registry_namespace_id"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.#", "0"),
 				),
 			},
 			{
@@ -99,7 +126,7 @@ func TestAccNamespace_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "name", "tf-env-test"),
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "environment_variables.test", "test"),
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "secret_environment_variables.test_secret", "test_secret"),
-
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.#", "0"),
 					acctest.CheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
 				),
 			},
@@ -120,6 +147,23 @@ func TestAccNamespace_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "name", "tf-env-test"),
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "environment_variables.foo", "bar"),
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "secret_environment_variables.foo_secret", "bar_secret"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.#", "0"),
+					acctest.CheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_container_namespace main {
+						name = "tf-tags-test"
+						tags = ["tag1", "tag2"]
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isNamespacePresent(tt, "scaleway_container_namespace.main"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "name", "tf-tags-test"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.#", "2"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.0", "tag1"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "tags.1", "tag2"),
 
 					acctest.CheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
 				),