Merge branch 'master' into feat/audit-trail-event-data-source

Author: estellesoulard

docs/data-sources/cockpit_grafana.md

@@ -61,6 +61,33 @@ output "grafana_connection_info" {
 }
 ```
 
+### Using the Grafana Terraform provider
+
+When you need to configure Grafana resources programmatically, supply the IAM secret key as an `X-Auth-Token` header. The Grafana provider itself stays in `anonymous` mode.
+
+```terraform
+variable "scaleway_secret_key" {
+  description = "Scaleway IAM secret key reused by the Grafana provider"
+  type        = string
+  sensitive   = true
+}
+
+data "scaleway_cockpit_grafana" "main" {
+  project_id = scaleway_account_project.project.id
+}
+
+provider "grafana" {
+  url  = data.scaleway_cockpit_grafana.main.grafana_url
+  auth = "anonymous"
+
+  http_headers = {
+    "X-Auth-Token" = var.scaleway_secret_key
+  }
+}
+```
+
+Keep the secret key in a secure backend (environment variables, Vault, etc.) and never commit it to source control.
+
 ## Argument Reference
 
 - `project_id` - (Optional) The ID of the project the Grafana instance is associated with. If not provided, the default project configured in the provider is used.

docs/resources/cockpit_grafana_user.md

@@ -38,6 +38,33 @@ output "grafana_url" {
 }
 ```
 
+### Programmatic access with the Grafana provider
+
+To automate Grafana configuration (e.g., dashboards, alerting) with Terraform, reuse your Scaleway IAM secret as an `X-Auth-Token` header. The Grafana provider must run in `anonymous` mode because user/password authentication is deprecated.
+
+```terraform
+variable "scaleway_secret_key" {
+  description = "Scaleway IAM secret key used for both the Scaleway and Grafana providers"
+  type        = string
+  sensitive   = true
+}
+
+data "scaleway_cockpit_grafana" "main" {
+  project_id = scaleway_account_project.project.id
+}
+
+provider "grafana" {
+  url  = data.scaleway_cockpit_grafana.main.grafana_url
+  auth = "anonymous"
+
+  http_headers = {
+    "X-Auth-Token" = var.scaleway_secret_key
+  }
+}
+```
+
+The header `X-Auth-Token` is mandatory when Grafana users are disabled. Store the IAM secret key securely (environment variable, secrets manager, etc.) and avoid committing it to version control.
+
 ### Create a Grafana user (Deprecated)
 
 The following command allows you to create a Grafana user within a specific Scaleway Project.

internal/acctest/acctest.go

@@ -33,6 +33,7 @@ type TestTools struct {
 
 var foldersUsingVCRv4 = []string{
 	"audittrail",
+	"account",
 	"container",
 	"instance",
 	"k8s",

internal/services/account/project_data_source_test.go

@@ -2,6 +2,7 @@ package account_test
 
 import (
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -125,6 +126,11 @@ func TestAccDataSourceProject_List(t *testing.T) {
 		orgID = dummyOrgID
 	}
 
+	projectID, projectIDExists := tt.Meta.ScwClient().GetDefaultProjectID()
+	if !projectIDExists {
+		t.Skip("no default project ID")
+	}
+
 	resource.ParallelTest(t, resource.TestCase{
 		ProtoV6ProviderFactories: tt.ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
@@ -137,11 +143,21 @@ func TestAccDataSourceProject_List(t *testing.T) {
 						organization_id = "%s"
 					}`, orgID),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("data.scaleway_account_projects.projects", "projects.#", "8"),
-					resource.TestCheckResourceAttr("data.scaleway_account_projects.projects", "projects.0.id", "6867048b-fe12-4e96-835e-41c79a39604b"),
-					resource.TestCheckResourceAttr("data.scaleway_account_projects.projects", "projects.1.id", "8cc8dd4d-a094-407a-89a3-9d004674e936"),
+					resource.TestCheckResourceAttrSet("data.scaleway_account_projects.projects", "projects.#"),
+					resource.TestCheckResourceAttrWith("data.scaleway_account_projects.projects", "projects.#", func(value string) error {
+						count, err := strconv.Atoi(value)
+						if err != nil {
+							return err
+						}
+
+						if count < 1 {
+							return fmt.Errorf("expected at least one project, got %d", count)
+						}
+
+						return nil
+					}),
+					resource.TestCheckResourceAttr("data.scaleway_account_projects.projects", "projects.0.id", projectID),
 					resource.TestCheckResourceAttr("data.scaleway_account_projects.projects", "projects.0.name", "default"),
-					resource.TestCheckResourceAttr("data.scaleway_account_projects.projects", "projects.1.name", "tf_tests_container_trigger_sqs"),
 				),
 			},
 		},