feat(cockpit): add field grafana url

scaleway · Dec 20, 2024 · 7287f4e · 7287f4e
1 parent 5d65352
commit 7287f4e
Show file tree

Hide file tree

Showing 5 changed files with 693 additions and 229 deletions.
diff --git a/docs/resources/cockpit_grafana_user.md b/docs/resources/cockpit_grafana_user.md
@@ -41,6 +41,8 @@ This section lists the arguments that are supported:
 In addition to all arguments above, the following attributes are exported:
 
 - `password` - The password of the Grafana user.
+- `grafana_url` - URL for Grafana.
+
 
 ## Import
 

diff --git a/internal/services/cockpit/grafana_user.go b/internal/services/cockpit/grafana_user.go
@@ -50,6 +50,12 @@ func ResourceCockpitGrafanaUser() *schema.Resource {
 				Description:      "The role of the Grafana user",
 				ValidateDiagFunc: verify.ValidateEnum[cockpit.GrafanaUserRole](),
 			},
+			"grafana_url": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The grafana URL",
+			},
+
 			"project_id": account.ProjectIDSchema(),
 		},
 	}
@@ -109,9 +115,21 @@ func ResourceCockpitGrafanaUserRead(ctx context.Context, d *schema.ResourceData,
 		return nil
 	}
 
+	grafana, err := api.GetGrafana(&cockpit.GlobalAPIGetGrafanaRequest{
+		ProjectID: projectID,
+	}, scw.WithContext(ctx))
+	if err != nil {
+		if httperrors.Is404(err) {
+			d.SetId("")
+			return nil
+		}
+		return diag.FromErr(err)
+	}
+
 	_ = d.Set("login", grafanaUser.Login)
 	_ = d.Set("role", grafanaUser.Role)
 	_ = d.Set("project_id", projectID)
+	_ = d.Set("grafana_url", grafana.GrafanaURL)
 
 	return nil
 }

diff --git a/internal/services/cockpit/grafana_user_test.go b/internal/services/cockpit/grafana_user_test.go
@@ -43,6 +43,7 @@ func TestAccGrafanaUser_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_cockpit_grafana_user.main", "login", grafanaTestUsername),
 					resource.TestCheckResourceAttr("scaleway_cockpit_grafana_user.main", "role", "editor"),
 					resource.TestCheckResourceAttrSet("scaleway_cockpit_grafana_user.main", "password"),
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_grafana_user.main", "grafana_url"),
 				),
 			},
 			{
@@ -86,6 +87,7 @@ func TestAccGrafanaUser_Update(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_cockpit_grafana_user.main", "login", grafanaTestUsername),
 					resource.TestCheckResourceAttr("scaleway_cockpit_grafana_user.main", "role", "editor"),
 					resource.TestCheckResourceAttrSet("scaleway_cockpit_grafana_user.main", "password"),
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_grafana_user.main", "grafana_url"),
 				),
 			},
 			{
@@ -106,6 +108,7 @@ func TestAccGrafanaUser_Update(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_cockpit_grafana_user.main", "login", grafanaTestUsername),
 					resource.TestCheckResourceAttr("scaleway_cockpit_grafana_user.main", "role", "viewer"),
 					resource.TestCheckResourceAttrSet("scaleway_cockpit_grafana_user.main", "password"),
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_grafana_user.main", "grafana_url"),
 				),
 			},
 			{