Merge branch 'master' into iot-setdevcrt

Author: remyleone

.github/workflows/acceptance-tests.yaml

@@ -12,6 +12,7 @@ jobs:
           - Account
           - AppleSilicon
           - Baremetal
+          - DomainRecord
           - Instance
           - Iot
           - K8S
@@ -35,6 +36,7 @@ jobs:
           TF_LOG: DEBUG
           TF_ACC: 1
           TF_UPDATE_CASSETTES: false
+          TF_TEST_DOMAIN: scaleway-terraform.com
           SCW_DEBUG: 0
           SCW_ACCESS_KEY: "SCWXXXXXXXXXXXXXFAKE"
           SCW_SECRET_KEY: "11111111-1111-1111-1111-111111111111"

.github/workflows/nightly.yml

@@ -3,7 +3,7 @@ name: Nightly Acceptance Tests
 on:
   schedule:
     # Will run at 00:00 every day
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 jobs:
   nightly:
@@ -14,6 +14,7 @@ jobs:
           - Account
           - AppleSilicon
           - Baremetal
+          - DomainRecord
           - Instance
           - Iot
           - K8S
@@ -39,6 +40,7 @@ jobs:
           TF_ACC: 1
           # Enable recording with the cassette system. By doing so, we ensure that real HTTPS requests are made.
           TF_UPDATE_CASSETTES: true
+          TF_TEST_DOMAIN: scaleway-terraform.com
           SCW_DEBUG: 1
           SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
           SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}

.gitignore

@@ -15,6 +15,7 @@ website/node_modules
 *.backup
 ./*.tfstate
 .terraform/
+test.tf
 *.log
 *.bak
 *~

SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+At Scaleway we take security seriously. If you have any issue regarding security,
+please notify us by sending an email to [email protected].
+
+Please, DO NOT create a GitHub issue.
+
+We will follow up with you promptly with more information and a plan for remediation.
+We currently do not offer a paid security bounty program, but we would love to send some
+Scaleway swag your way along with our deepest gratitude for your assistance in making
+Scaleway a more secure Cloud ecosystem.

TESTING.md

@@ -30,14 +30,22 @@ export TF_UPDATE_CASSETTES=true
 make testacc
 ```
 
-It's also required to have Scaleway environment vars available :
+It's also required to have Scaleway environment vars available:
 
 ```sh
 export SCW_ACCESS_KEY=SCWXXXXXXXXXXXXXXXXX
 export SCW_SECRET_KEY=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
 export SCW_DEFAULT_PROJECT_ID=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
 ```
 
+For testing the domain API, it will use the first available domain in your domains list. You need to have a valid domain.
+
+You can force the test domain with an environment var:
+
+```sh
+export TF_TEST_DOMAIN=your-domain.tld
+```
+
 To ease debugging you can also set:
 ```sh
 export TF_LOG=DEBUG
@@ -46,5 +54,5 @@ export SCW_DEBUG=1
 
 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
+TF_UPDATE_CASSETTES=true TF_LOG=DEBUG SCW_DEBUG=1 TF_ACC=1 go test ./scaleway -v -run=TestAccScalewayDataSourceRDBInstance_Basic -timeout=120m -parallel=10
 ```

docs/index.md

@@ -40,6 +40,11 @@ You can test this config by creating a `test.tf` and run terraform commands from
 - Build the infrastructure: `terraform apply`
 
 ```hcl
+variable "project_id" {
+  type        = string
+  description = "Your project ID."
+}
+
 terraform {
   required_providers {
     scaleway = {
@@ -50,18 +55,31 @@ terraform {
 }
 
 provider "scaleway" {
-  zone            = "fr-par-1"
-  region          = "fr-par"
+  zone   = "fr-par-1"
+  region = "fr-par"
 }
 
-resource "scaleway_instance_ip" "public_ip" {}
+resource "scaleway_instance_ip" "public_ip" {
+  project_id = var.project_id
+}
+resource "scaleway_instance_ip" "public_ip_backup" {
+  project_id = var.project_id
+}
 
 resource "scaleway_instance_volume" "data" {
+  project_id = var.project_id
   size_in_gb = 30
-  type = "l_ssd"
+  type       = "l_ssd"
+}
+
+resource "scaleway_instance_volume" "data_backup" {
+  project_id = var.project_id
+  size_in_gb = 10
+  type       = "l_ssd"
 }
 
 resource "scaleway_instance_security_group" "www" {
+  project_id              = var.project_id
   inbound_default_policy  = "drop"
   outbound_default_policy = "accept"
 
@@ -83,14 +101,15 @@ resource "scaleway_instance_security_group" "www" {
 }
 
 resource "scaleway_instance_server" "web" {
-  type  = "DEV1-L"
-  image = "ubuntu_focal"
+  project_id = var.project_id
+  type       = "DEV1-L"
+  image      = "ubuntu_focal"
 
-  tags = [ "front", "web" ]
+  tags = ["front", "web"]
 
   ip_id = scaleway_instance_ip.public_ip.id
 
-  additional_volume_ids = [ scaleway_instance_volume.data.id ]
+  additional_volume_ids = [scaleway_instance_volume.data.id]
 
   root_volume {
     # The local storage of a DEV1-L instance is 80 GB, subtract 30 GB from the additional l_ssd volume, then the root volume needs to be 50 GB.