Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/resources/cockpit.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ resource "grafana_folder" "test_folder" {

In addition to all arguments above, the following attributes are exported:

- `plan_id` - The ID of the current plan
- `endpoints` - Endpoints
- `metrics_url` - The metrics URL
- `logs_url` - The logs URL
- `alertmanager_url` - The alertmanager URL
- `grafana_url` - The grafana URL

- `plan_id` - The ID of the current plan.
- `endpoints` - Endpoints.
- `metrics_url` - The metrics URL.
- `logs_url` - The logs URL.
- `alertmanager_url` - The alertmanager URL.
- `grafana_url` - The grafana URL.
- `traces_url` - The traces URL.

## Import

Expand Down
22 changes: 12 additions & 10 deletions docs/resources/cockpit_token.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,24 @@ resource "scaleway_cockpit_token" "main" {

## Arguments Reference

- `name` - (Required) The name of the token
- `scopes` - (Optional) Allowed scopes
- `query_metrics` - (Defaults to `false`) Query metrics
- `write_metrics` - (Defaults to `true`) Write metrics
- `setup_metrics_rules` - (Defaults to `false`) Setup metrics rules
- `query_logs` - (Defaults to `false`) Query logs
- `write_logs` - (Defaults to `true`) Write logs
- `setup_logs_rules` - (Defaults to `false`) Setup logs rules
- `setup_alerts` - (Defaults to `false`) Setup alerts
- `name` - (Required) The name of the token.
- `scopes` - (Optional) Allowed scopes.
- `query_metrics` - (Defaults to `false`) Query metrics.
- `write_metrics` - (Defaults to `true`) Write metrics.
- `setup_metrics_rules` - (Defaults to `false`) Setup metrics rules.
- `query_logs` - (Defaults to `false`) Query logs.
- `write_logs` - (Defaults to `true`) Write logs.
- `setup_logs_rules` - (Defaults to `false`) Setup logs rules.
- `setup_alerts` - (Defaults to `false`) Setup alerts.
- `query_traces` - (Defaults to `false`) Query traces.
- `write_traces` - (Defaults to `false`) Write traces.
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the cockpit is associated with.

## Attributes Reference

In addition to all arguments above, the following attributes are exported:

- `secret_key` - The secret key of the token
- `secret_key` - The secret key of the token.

## Import

Expand Down
2 changes: 1 addition & 1 deletion docs/resources/object_bucket_policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ page_title: "Scaleway: scaleway_object_bucket_policy"
# scaleway_object_bucket

Creates and manages Scaleway object storage bucket policy.
For more information, see [the documentation](https://www.scaleway.com/en/docs/storage/object/api-cli/using-bucket-policies/).
For more information, see [the documentation](https://www.scaleway.com/en/docs/storage/object/api-cli/bucket-policy/).

## Example Usage

Expand Down
5 changes: 5 additions & 0 deletions scaleway/helpers_cockpit.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func flattenCockpitEndpoints(endpoints *cockpit.CockpitEndpoints) []map[string]i
"logs_url": endpoints.LogsURL,
"alertmanager_url": endpoints.AlertmanagerURL,
"grafana_url": endpoints.GrafanaURL,
"traces_url": endpoints.TracesURL,
},
}
}
Expand All @@ -82,6 +83,8 @@ func expandCockpitTokenScopes(raw interface{}) *cockpit.TokenScopes {
WriteLogs: rawMap["write_logs"].(bool),
SetupLogsRules: rawMap["setup_logs_rules"].(bool),
SetupAlerts: rawMap["setup_alerts"].(bool),
QueryTraces: rawMap["query_traces"].(bool),
WriteTraces: rawMap["write_traces"].(bool),
}
}

Expand All @@ -95,6 +98,8 @@ func flattenCockpitTokenScopes(scopes *cockpit.TokenScopes) []map[string]interfa
"write_logs": scopes.WriteLogs,
"setup_logs_rules": scopes.SetupLogsRules,
"setup_alerts": scopes.SetupAlerts,
"query_traces": scopes.QueryTraces,
"write_traces": scopes.WriteTraces,
},
}
}
Expand Down
5 changes: 5 additions & 0 deletions scaleway/resource_cockpit.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ func resourceScalewayCockpit() *schema.Resource {
Computed: true,
Description: "The grafana URL",
},
"traces_url": {
Type: schema.TypeString,
Computed: true,
Description: "The traces URL",
},
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion scaleway/resource_cockpit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ func TestAccScalewayCockpit_Basic(t *testing.T) {
testAccCheckScalewayCockpitExists(tt, "scaleway_cockpit.main"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "plan_id"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.metrics_url"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.metrics_url"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.logs_url"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.alertmanager_url"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.grafana_url"),
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.traces_url"),
resource.TestCheckResourceAttrPair("scaleway_cockpit.main", "project_id", "scaleway_account_project.project", "id"),
),
},
Expand Down
16 changes: 16 additions & 0 deletions scaleway/resource_cockpit_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,20 @@ func resourceScalewayCockpitTokenScopes() *schema.Resource {
ForceNew: true,
Description: "Setup alerts",
},
"query_traces": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
Description: "Query traces",
},
"write_traces": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
Description: "Write traces",
},
},
}
}
Expand All @@ -126,6 +140,8 @@ func resourceScalewayCockpitTokenCreate(ctx context.Context, d *schema.ResourceD
WriteLogs: schema["write_logs"].Default.(bool),
SetupLogsRules: schema["setup_logs_rules"].Default.(bool),
SetupAlerts: schema["setup_alerts"].Default.(bool),
QueryTraces: schema["query_traces"].Default.(bool),
WriteTraces: schema["write_traces"].Default.(bool),
}
}

Expand Down
8 changes: 8 additions & 0 deletions scaleway/resource_cockpit_token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ func TestAccScalewayCockpitToken_Basic(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
),
},
},
Expand Down Expand Up @@ -147,6 +149,8 @@ func TestAccScalewayCockpitToken_NoScopes(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "true"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
),
},
},
Expand Down Expand Up @@ -195,6 +199,8 @@ func TestAccScalewayCockpitToken_Update(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
),
},
{
Expand Down Expand Up @@ -227,6 +233,8 @@ func TestAccScalewayCockpitToken_Update(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "true"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
),
},
},
Expand Down
Loading