Skip to content

Commit 9245633

Browse files
yfodilyfodil
authored
feat(cockpit): add traces (#2222)
* feat(cockpit): add traces * update cassettes * fix broken link
1 parent 9dd51f5 commit 9245633

14 files changed

+1091
-1055
lines changed

‎docs/resources/cockpit.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ resource "grafana_folder" "test_folder" {
5656

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

59-
- `plan_id` - The ID of the current plan
60-
- `endpoints` - Endpoints
61-
- `metrics_url` - The metrics URL
62-
- `logs_url` - The logs URL
63-
- `alertmanager_url` - The alertmanager URL
64-
- `grafana_url` - The grafana URL
65-
59+
- `plan_id` - The ID of the current plan.
60+
- `endpoints` - Endpoints.
61+
- `metrics_url` - The metrics URL.
62+
- `logs_url` - The logs URL.
63+
- `alertmanager_url` - The alertmanager URL.
64+
- `grafana_url` - The grafana URL.
65+
- `traces_url` - The traces URL.
6666

6767
## Import
6868

‎docs/resources/cockpit_token.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,24 @@ resource "scaleway_cockpit_token" "main" {
4444

4545
## Arguments Reference
4646

47-
- `name` - (Required) The name of the token
48-
- `scopes` - (Optional) Allowed scopes
49-
- `query_metrics` - (Defaults to `false`) Query metrics
50-
- `write_metrics` - (Defaults to `true`) Write metrics
51-
- `setup_metrics_rules` - (Defaults to `false`) Setup metrics rules
52-
- `query_logs` - (Defaults to `false`) Query logs
53-
- `write_logs` - (Defaults to `true`) Write logs
54-
- `setup_logs_rules` - (Defaults to `false`) Setup logs rules
55-
- `setup_alerts` - (Defaults to `false`) Setup alerts
47+
- `name` - (Required) The name of the token.
48+
- `scopes` - (Optional) Allowed scopes.
49+
- `query_metrics` - (Defaults to `false`) Query metrics.
50+
- `write_metrics` - (Defaults to `true`) Write metrics.
51+
- `setup_metrics_rules` - (Defaults to `false`) Setup metrics rules.
52+
- `query_logs` - (Defaults to `false`) Query logs.
53+
- `write_logs` - (Defaults to `true`) Write logs.
54+
- `setup_logs_rules` - (Defaults to `false`) Setup logs rules.
55+
- `setup_alerts` - (Defaults to `false`) Setup alerts.
56+
- `query_traces` - (Defaults to `false`) Query traces.
57+
- `write_traces` - (Defaults to `false`) Write traces.
5658
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the cockpit is associated with.
5759

5860
## Attributes Reference
5961

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

62-
- `secret_key` - The secret key of the token
64+
- `secret_key` - The secret key of the token.
6365

6466
## Import
6567

‎docs/resources/object_bucket_policy.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ page_title: "Scaleway: scaleway_object_bucket_policy"
66
# scaleway_object_bucket
77

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

1111
## Example Usage
1212

‎scaleway/helpers_cockpit.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func flattenCockpitEndpoints(endpoints *cockpit.CockpitEndpoints) []map[string]i
6464
"logs_url": endpoints.LogsURL,
6565
"alertmanager_url": endpoints.AlertmanagerURL,
6666
"grafana_url": endpoints.GrafanaURL,
67+
"traces_url": endpoints.TracesURL,
6768
},
6869
}
6970
}
@@ -82,6 +83,8 @@ func expandCockpitTokenScopes(raw interface{}) *cockpit.TokenScopes {
8283
WriteLogs: rawMap["write_logs"].(bool),
8384
SetupLogsRules: rawMap["setup_logs_rules"].(bool),
8485
SetupAlerts: rawMap["setup_alerts"].(bool),
86+
QueryTraces: rawMap["query_traces"].(bool),
87+
WriteTraces: rawMap["write_traces"].(bool),
8588
}
8689
}
8790

@@ -95,6 +98,8 @@ func flattenCockpitTokenScopes(scopes *cockpit.TokenScopes) []map[string]interfa
9598
"write_logs": scopes.WriteLogs,
9699
"setup_logs_rules": scopes.SetupLogsRules,
97100
"setup_alerts": scopes.SetupAlerts,
101+
"query_traces": scopes.QueryTraces,
102+
"write_traces": scopes.WriteTraces,
98103
},
99104
}
100105
}

‎scaleway/resource_cockpit.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ func resourceScalewayCockpit() *schema.Resource {
6262
Computed: true,
6363
Description: "The grafana URL",
6464
},
65+
"traces_url": {
66+
Type: schema.TypeString,
67+
Computed: true,
68+
Description: "The traces URL",
69+
},
6570
},
6671
},
6772
},

‎scaleway/resource_cockpit_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ func TestAccScalewayCockpit_Basic(t *testing.T) {
8181
testAccCheckScalewayCockpitExists(tt, "scaleway_cockpit.main"),
8282
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "plan_id"),
8383
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.metrics_url"),
84-
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.metrics_url"),
8584
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.logs_url"),
8685
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.alertmanager_url"),
8786
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.grafana_url"),
87+
resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.traces_url"),
8888
resource.TestCheckResourceAttrPair("scaleway_cockpit.main", "project_id", "scaleway_account_project.project", "id"),
8989
),
9090
},

‎scaleway/resource_cockpit_token.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,20 @@ func resourceScalewayCockpitTokenScopes() *schema.Resource {
102102
ForceNew: true,
103103
Description: "Setup alerts",
104104
},
105+
"query_traces": {
106+
Type: schema.TypeBool,
107+
Optional: true,
108+
Default: false,
109+
ForceNew: true,
110+
Description: "Query traces",
111+
},
112+
"write_traces": {
113+
Type: schema.TypeBool,
114+
Optional: true,
115+
Default: false,
116+
ForceNew: true,
117+
Description: "Write traces",
118+
},
105119
},
106120
}
107121
}
@@ -126,6 +140,8 @@ func resourceScalewayCockpitTokenCreate(ctx context.Context, d *schema.ResourceD
126140
WriteLogs: schema["write_logs"].Default.(bool),
127141
SetupLogsRules: schema["setup_logs_rules"].Default.(bool),
128142
SetupAlerts: schema["setup_alerts"].Default.(bool),
143+
QueryTraces: schema["query_traces"].Default.(bool),
144+
WriteTraces: schema["write_traces"].Default.(bool),
129145
}
130146
}
131147

‎scaleway/resource_cockpit_token_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ func TestAccScalewayCockpitToken_Basic(t *testing.T) {
103103
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
104104
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "false"),
105105
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
106+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
107+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
106108
),
107109
},
108110
},
@@ -147,6 +149,8 @@ func TestAccScalewayCockpitToken_NoScopes(t *testing.T) {
147149
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
148150
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "true"),
149151
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
152+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
153+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
150154
),
151155
},
152156
},
@@ -195,6 +199,8 @@ func TestAccScalewayCockpitToken_Update(t *testing.T) {
195199
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
196200
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "false"),
197201
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
202+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
203+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
198204
),
199205
},
200206
{
@@ -227,6 +233,8 @@ func TestAccScalewayCockpitToken_Update(t *testing.T) {
227233
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_logs", "false"),
228234
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_logs", "true"),
229235
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.setup_logs_rules", "false"),
236+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.query_traces", "false"),
237+
resource.TestCheckResourceAttr("scaleway_cockpit_token.main", "scopes.0.write_traces", "false"),
230238
),
231239
},
232240
},

0 commit comments

Comments
 (0)