Skip to content

Commit add3324

Browse files
committed
ref: make some optional client key fields computed
1 parent 4d77266 commit add3324

File tree

5 files changed

+385
-220
lines changed

5 files changed

+385
-220
lines changed

docs/resources/key.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ resource "sentry_key" "default" {
3333

3434
### Optional
3535

36-
- `javascript_loader_script` (Block, Optional) The JavaScript loader script configuration. (see [below for nested schema](#nestedblock--javascript_loader_script))
36+
- `javascript_loader_script` (Attributes) The JavaScript loader script configuration. (see [below for nested schema](#nestedatt--javascript_loader_script))
3737
- `rate_limit_count` (Number) Number of events that can be reported within the rate limit window.
3838
- `rate_limit_window` (Number) Length of time in seconds that will be considered when checking the rate limit.
3939

@@ -48,7 +48,7 @@ resource "sentry_key" "default" {
4848
- `public` (String) The public key.
4949
- `secret` (String) The secret key.
5050

51-
<a id="nestedblock--javascript_loader_script"></a>
51+
<a id="nestedatt--javascript_loader_script"></a>
5252
### Nested Schema for `javascript_loader_script`
5353

5454
Optional:

internal/provider/data_source_all_client_keys.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ type AllClientKeysDataSourceModel struct {
2121
Keys []ClientKeyResourceModel `tfsdk:"keys"`
2222
}
2323

24-
func (m *AllClientKeysDataSourceModel) Fill(keys []apiclient.ProjectKey) error {
24+
func (m *AllClientKeysDataSourceModel) Fill(ctx context.Context, keys []apiclient.ProjectKey) error {
2525
m.Keys = make([]ClientKeyResourceModel, len(keys))
2626
for i, key := range keys {
27-
if err := m.Keys[i].FillAll(
28-
m.Organization.ValueString(),
29-
m.Project.ValueString(),
30-
key,
31-
); err != nil {
27+
m.Keys[i].Organization = types.StringValue(m.Organization.ValueString())
28+
m.Keys[i].Project = types.StringValue(m.Organization.ValueString())
29+
30+
if err := m.Keys[i].Fill(ctx, key); err != nil {
3231
return err
3332
}
3433
}
@@ -194,7 +193,7 @@ func (d *AllClientKeysDataSource) Read(ctx context.Context, req datasource.ReadR
194193
}
195194
}
196195

197-
if err := data.Fill(allKeys); err != nil {
196+
if err := data.Fill(ctx, allKeys); err != nil {
198197
resp.Diagnostics.Append(diagutils.NewFillError(err))
199198
return
200199
}

internal/provider/data_source_client_key_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,11 @@ data "sentry_key" "test" {
229229
}
230230

231231
func testAccClientKeyDataSourceConfig(teamName, projectName, keyName, extras string) string {
232-
return testAccClientKeyResourceConfig(teamName, projectName, keyName, "") + fmt.Sprintf(`
232+
return testAccClientKeyResourceConfig(testAccClientKeyResourceConfigData{
233+
TeamName: teamName,
234+
ProjectName: projectName,
235+
KeyName: keyName,
236+
}) + fmt.Sprintf(`
233237
data "sentry_key" "test" {
234238
organization = sentry_project.test.organization
235239
project = sentry_project.test.id

0 commit comments

Comments
 (0)