Merge branch 'feat/add-autoscaling-group' of github.com:yfodil/terraform-provider-scaleway into feat/add-autoscaling-group

Author: yfodil

.github/labeler.yml

@@ -117,3 +117,8 @@ webhosting:
   - changed-files:
       - any-glob-to-any-file:
           - internal/services/webhosting/**
+file:
+  - changed-files:
+      - any-glob-to-any-file:
+          - internal/services/file/**
+

.github/workflows/acceptance-tests.yaml

@@ -19,6 +19,7 @@ jobs:
           - cockpit
           - container
           - domain
+          - file
           - flexibleip
           - function
           - iam

.github/workflows/golangci-lint.yml

@@ -13,8 +13,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7.0.0
+        uses: golangci/golangci-lint-action@v8.0.0
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: latest
+          version: v2.1.6
           args: --timeout 5m

.golangci.yml

@@ -118,6 +118,9 @@ linters:
       rules:
         - name: exported
           disabled: true
+    ireturn:
+      reject:
+        - anon
 
   exclusions:
     rules:

TESTING.md

@@ -62,3 +62,16 @@ Running a single test:
 ```sh
 TF_UPDATE_CASSETTES=true TF_LOG=DEBUG SCW_DEBUG=1 TF_ACC=1 go test ./scaleway -v -run=TestAccScalewayDataSourceRDBInstance_Basic -timeout=120m -parallel=10
 ```
+
+## Compressing the cassettes
+
+We record interactions with the Scaleway API in cassettes, which are stored in the `testdata` directory of each service.
+Each wait function used in the resources will perform several requests to the API for pulling a resource state, which can lead to large cassettes.
+We use a compressor to reduce the size of these cassettes once they are recorded.
+By doing so, tests can run faster and the cassettes are easier to read.
+
+To use the compressor on a given cassette, run the following command:
+
+```sh
+go run -v ./cmd/vcr-compressor internal/services/rdb/testdata/acl-basic.cassette
+```

cmd/vcr-compressor/main.go

@@ -0,0 +1,118 @@
+package main
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+
+	"github.com/scaleway/scaleway-sdk-go/api/k8s/v1"
+	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
+	"gopkg.in/dnaeon/go-vcr.v3/cassette"
+)
+
+var transientStates = map[string]bool{
+	k8s.ClusterStatusCreating.String(): true,
+	k8s.ClusterStatusDeleting.String(): true,
+	k8s.ClusterStatusUpdating.String(): true,
+	k8s.PoolStatusDeleting.String():    true,
+	k8s.PoolStatusScaling.String():     true,
+	k8s.PoolStatusUpgrading.String():   true,
+
+	rdb.DatabaseBackupStatusCreating.String():  true,
+	rdb.DatabaseBackupStatusDeleting.String():  true,
+	rdb.DatabaseBackupStatusExporting.String(): true,
+	rdb.DatabaseBackupStatusRestoring.String(): true,
+	rdb.InstanceStatusAutohealing.String():     true,
+	rdb.InstanceStatusBackuping.String():       true,
+	rdb.InstanceStatusConfiguring.String():     true,
+	rdb.InstanceStatusDeleting.String():        true,
+	rdb.InstanceStatusInitializing.String():    true,
+	rdb.InstanceStatusProvisioning.String():    true,
+	rdb.InstanceStatusRestarting.String():      true,
+	rdb.InstanceStatusSnapshotting.String():    true,
+}
+
+func main() {
+	if len(os.Args) < 2 {
+		log.Fatalf("Usage: %s <cassette_file_name_without_yaml>\n", os.Args[0])
+	}
+
+	path := os.Args[1]
+
+	inputCassette, err := cassette.Load(path)
+	if err != nil {
+		log.Fatalf("Error while reading file : %v\n", err)
+	}
+
+	outputCassette := cassette.New(path)
+	transitioning := false
+
+	for i := range len(inputCassette.Interactions) {
+		interaction := inputCassette.Interactions[i]
+		responseBody := interaction.Response.Body
+		requestMethod := interaction.Request.Method
+
+		if requestMethod != "GET" {
+			transitioning = false
+
+			log.Printf("Interaction %d is not a GET request. Recording it\n", i)
+			outputCassette.AddInteraction(interaction)
+
+			continue
+		}
+
+		if responseBody == "" {
+			log.Printf("Interaction %d got an empty response body. Recording it\n", i)
+			outputCassette.AddInteraction(interaction)
+
+			continue
+		}
+
+		var m map[string]interface{}
+
+		err := json.Unmarshal([]byte(responseBody), &m)
+		if err != nil {
+			log.Printf("Interaction %d have an error with unmarshalling response body: %v. Recording it\n", i, err)
+			outputCassette.AddInteraction(interaction)
+
+			continue
+		}
+
+		if m["status"] == nil {
+			log.Printf("Interaction %d does not contain a status field. Recording it\n", i)
+			outputCassette.AddInteraction(interaction)
+
+			continue
+		}
+
+		status := m["status"].(string)
+		// We test if the state is transient
+		if _, ok := transientStates[status]; ok {
+			if transitioning {
+				log.Printf("Interaction %d is in a transient state while we are already in transitient state. No need to record it: %s\n", i, status)
+			} else {
+				log.Printf("Interaction %d is in a transient state: %s, Recording it\n", i, status)
+
+				transitioning = true
+
+				outputCassette.AddInteraction(interaction)
+			}
+		} else {
+			if transitioning {
+				log.Printf("Interaction %d is not in a transient state anymore: %s, Recording it\n", i, status)
+
+				outputCassette.AddInteraction(interaction)
+
+				transitioning = false
+			} else {
+				log.Printf("Interaction %d is not in a transient state: %s, Recording it\n", i, status)
+				outputCassette.AddInteraction(interaction)
+			}
+		}
+	}
+
+	err = outputCassette.Save()
+	if err != nil {
+		log.Fatalf("error while saving file: %v", err)
+	}
+}

cmd/vcr-viewer/main.go

@@ -0,0 +1,55 @@
+package main
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+
+	"gopkg.in/dnaeon/go-vcr.v3/cassette"
+)
+
+func main() {
+	if len(os.Args) < 2 {
+		log.Fatalf("Usage: %s <cassette_file_name_without_yaml>\n", os.Args[0])
+	}
+
+	path := os.Args[1]
+
+	data, err := cassette.Load(path)
+	if err != nil {
+		log.Fatalf("Error while reading file: %v\n", err)
+	}
+
+	for i := range len(data.Interactions) {
+		interaction := data.Interactions[i]
+
+		log.Println("--------------")
+		log.Printf("Interaction %d:\n", i+1)
+		log.Printf("  Request:\n")
+		log.Printf("    Method: %s\n", interaction.Request.Method)
+		log.Printf("    URL: %s\n", interaction.Request.URL)
+
+		if interaction.Request.Body != "" {
+			log.Printf("    Body: %s\n", interaction.Request.Body)
+		}
+
+		log.Printf("  Response:\n")
+		log.Printf("    Status: %s\n", interaction.Response.Status)
+		log.Printf("    Body: %s\n", interaction.Response.Body)
+
+		var m map[string]interface{}
+
+		err := json.Unmarshal([]byte(interaction.Response.Body), &m)
+		if err != nil {
+			continue
+		}
+
+		if m["status"] != nil {
+			log.Println("++++++++++++++++")
+			log.Printf("status: %s\n", m["status"])
+			log.Println("++++++++++++++++")
+		}
+
+		log.Println("--------------")
+	}
+}

docs/data-sources/flexible_ip.md

@@ -11,33 +11,26 @@ Gets information about a Flexible IP.
 
 ```hcl
 # Get info by IP address
-data "scaleway_flexible_ip" "my_ip" {
+data "scaleway_flexible_ip" "with_ip" {
   ip_address = "1.2.3.4"
 }
 
 # Get info by IP ID
-data "scaleway_flexible_ip" "my_ip" {
-  ip_id = "11111111-1111-1111-1111-111111111111"
+data "scaleway_flexible_ip" "with_id" {
+  flexible_ip_id = "11111111-1111-1111-1111-111111111111"
 }
 ```
 
 ## Argument Reference
 
 - `ip_address` - (Optional) The IP address.
-  Only one of `ip_address` and `ip_id` should be specified.
+  Only one of `ip_address` and `flexible_ip_id` should be specified.
 
 - `flexible_ip_id` - (Optional) The IP ID.
   Only one of `ip_address` and `flexible_ip_id` should be specified.
 
-## Attributes Reference
-
-In addition to all above arguments, the following attributes are exported:
+- `project_id` - (Optional. Defaults to [provider](../index.md#project_id) `project_id`) The ID of the Project the Flexible IP is associated with.
 
-- `id` - The ID of the flexible IP.
-
-~> **Important:** Flexible IPs' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
+## Attributes Reference
 
-- `reverse` - The reverse domain associated with this IP.
-- `server_id` - The associated server ID if any
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the IP is in.
-- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the IP is in.
+Exported attributes are the ones from `flexible_ip` [resource](../resources/flexible_ip.md)

docs/resources/container.md

@@ -22,6 +22,7 @@ resource "scaleway_container_namespace" "main" {
 resource "scaleway_container" "main" {
   name            = "my-container-02"
   description     = "environment variables test"
+  tags            = ["tag1", "tag2"]
   namespace_id    = scaleway_container_namespace.main.id
   registry_image  = "${scaleway_container_namespace.main.registry_endpoint}/alpine:test"
   port            = 9997
@@ -35,6 +36,9 @@ resource "scaleway_container" "main" {
   protocol        = "http1"
   deploy          = true
 
+  command = [ "bash", "-c", "script.sh" ]
+  args =    [ "some", "args" ]
+
   environment_variables = {
     "foo" = "var"
   }
@@ -56,6 +60,8 @@ The following arguments are supported:
 
 - `description` (Optional) The description of the container.
 
+- `tags` - (Optional) The list of tags associated with the container.
+
 - `environment_variables` - (Optional) The [environment variables](https://www.scaleway.com/en/docs/serverless-containers/concepts/#environment-variables) of the container.
 
 - `secret_environment_variables` - (Optional) The [secret environment variables](https://www.scaleway.com/en/docs/serverless-containers/concepts/#secrets) of the container.
@@ -99,7 +105,11 @@ The following arguments are supported:
 
 - `deploy` - (Optional) Boolean indicating whether the container is in a production environment.
 
-- `local_storage_limit` - Local storage limit of the container (in MB)
+- `local_storage_limit` - (Optional) Local storage limit of the container (in MB)
+
+- `command` - (Optional) Command executed when the container starts. This overrides the default command defined in the container image. This is usually the main executable, or entry point script to run.
+
+- `args` - (Optional) Arguments passed to the command specified in the "command" field. These override the default arguments from the container image, and behave like command-line parameters.
 
 Note that if you want to use your own configuration, you must consult our configuration [restrictions](https://www.scaleway.com/en/docs/serverless-containers/reference-content/containers-limitations/#configuration-restrictions) section.
 

docs/resources/container_namespace.md

@@ -16,6 +16,7 @@ Refer to the Containers namespace [documentation](https://www.scaleway.com/en/do
 resource "scaleway_container_namespace" "main" {
   name        = "main-container-namespace"
   description = "Main container namespace"
+  tags        = ["tag1", "tag2"]
 }
 ```
 
@@ -27,15 +28,17 @@ The following arguments are supported:
 
 ~> **Important** Updates to the `name` argument will recreate the namespace.
 
-- `description` (Optional) The description of the namespace.
+- `description` - (Optional) The description of the namespace.
+
+- `tags` - (Optional) The list of tags associated with the namespace.
 
 - `region` - (Defaults to [provider](../index.md#region) `region`). The [region](../guides/regions_and_zones.md#regions) in which the namespace is created.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The unique identifier of the project that contains the namespace.
 
-- `environment_variables` - The environment variables of the namespace.
+- `environment_variables` - (Optional) The environment variables of the namespace.
 
-- `secret_environment_variables` - The secret environment variables of the namespace.
+- `secret_environment_variables` - (Optional) The secret environment variables of the namespace.
 
 ## Attributes Reference