Merge branch 'master' into feat/cockpit-migrate-api-v1

Author: jremy42

.github/workflows/labeler.yml

@@ -9,4 +9,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v5
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Labeler
+        uses: actions/labeler@v5

docs/data-sources/secret_version.md

@@ -57,7 +57,7 @@ The following arguments are supported:
 - `secret_name` - (Optional) The Name of Secret associated wit the secret version.
   Only one of `secret_id` and `secret_name` should be specified.
 
-- `revision` - The revision for this Secret Version.
+- `revision` - The revision for this Secret Version. Alternative values (ex: `latest`) can be found in [API documentation](https://www.scaleway.com/en/developers/api/secret-manager/#path-secret-versions-access-a-secrets-version-using-the-secrets-id)
 
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions)
   in which the resource exists.

docs/resources/secret.md

@@ -20,14 +20,32 @@ resource "scaleway_secret" "main" {
 }
 ```
 
+### Ephemeral Policy
+
+```terraform
+resource "scaleway_secret" "ephemeral" {
+  name = "foo"
+  ephemeral_policy {
+    ttl = "24h"
+    expires_once_accessed = true
+    action = "disable"
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
 
 - `name` - (Required) Name of the secret (e.g. `my-secret`).
 - `path` - (Optional) Path of the secret, defaults to `/`.
+- `protected` - (Optional) True if secret protection is enabled on the secret. A protected secret cannot be deleted, terraform will fail to destroy unless this is set to false.
 - `description` - (Optional) Description of the secret (e.g. `my-new-description`).
 - `tags` - (Optional) Tags of the secret (e.g. `["tag", "secret"]`).
+- `ephemeral_policy` - (Optional) Ephemeral policy of the secret. Policy that defines whether/when a secret's versions expire. By default, the policy is applied to all the secret's versions.
+    - `ttl` - (Optional) Time frame, from one second and up to one year, during which the secret's versions are valid. Has to be specified in [Go Duration format](https://pkg.go.dev/time#ParseDuration) (ex: "30m", "24h").
+    - `expires_once_accessed` - (Optional) True if the secret version expires after a single user access.
+    - `action` - (Required) Action to perform when the version of a secret expires. Available values can be found in [SDK constants](https://pkg.go.dev/github.com/scaleway/scaleway-sdk-go@master/api/secret/v1beta1#pkg-constants).
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions)
   in which the resource exists.
 - `project_id` - (Optional) The project ID containing is the secret.

internal/acctest/validate_cassettes_test.go

@@ -26,6 +26,7 @@ func exceptionsCassettesCases() map[string]struct{} {
 		"../services/rdb/testdata/data-source-privilege-basic.cassette.yaml":    {},
 		"../services/rdb/testdata/privilege-basic.cassette.yaml":                {},
 		"../services/object/testdata/object-bucket-destroy-force.cassette.yaml": {},
+		"../services/secret/testdata/secret-protected.cassette.yaml":            {},
 	}
 }
 

internal/services/container/container_test.go

@@ -93,7 +93,7 @@ func TestAccContainer_Basic(t *testing.T) {
 						min_scale    	= 1
 						max_scale    	= 2
 						max_concurrency = 80
-						memory_limit 	= 256
+						memory_limit 	= 1120
 						cpu_limit		= 280
 						deploy       	= false
 					}
@@ -104,7 +104,7 @@ func TestAccContainer_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_container.main", "name", "my-container-tf"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "port", "5000"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "cpu_limit", "280"),
-					resource.TestCheckResourceAttr("scaleway_container.main", "memory_limit", "256"),
+					resource.TestCheckResourceAttr("scaleway_container.main", "memory_limit", "1120"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "min_scale", "1"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "max_scale", "2"),
 					resource.TestCheckResourceAttr("scaleway_container.main", "timeout", "300"),