Skip to content

Commit 299cf55

Browse files
dprokopclaude
andcommitted
Fix CI: goimports, catalog, docs, and cyclomatic complexity
- Fix goimports formatting for v2 import alias - Add grafana_apps_dashboard_dashboard_v2 to catalog-resource.yaml - Rename v1beta1 → v1 in catalog and docs (forced by SDK bump) - Combine switch cases to stay within cyclomatic complexity limit Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 7669c8d commit 299cf55

File tree

4 files changed

+22
-28
lines changed

4 files changed

+22
-28
lines changed

docs/resources/apps_dashboard_dashboard_v1beta1.md renamed to docs/resources/apps_dashboard_dashboard_v1.md

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,20 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "grafana_apps_dashboard_dashboard_v1beta1 Resource - terraform-provider-grafana"
3+
page_title: "grafana_apps_dashboard_dashboard_v1 Resource - terraform-provider-grafana"
44
subcategory: "Grafana Apps"
55
description: |-
66
Manages Grafana dashboards using the new Grafana APIs.
77
Official documentation https://grafana.com/docs/grafana/latest/dashboards/HTTP API https://grafana.com/docs/grafana/latest/developers/http_api/dashboard/#new-dashboard-apis
88
---
99

10-
# grafana_apps_dashboard_dashboard_v1beta1 (Resource)
10+
# grafana_apps_dashboard_dashboard_v1 (Resource)
1111

1212
Manages Grafana dashboards using the new Grafana APIs.
1313

1414
* [Official documentation](https://grafana.com/docs/grafana/latest/dashboards/)
1515
* [HTTP API](https://grafana.com/docs/grafana/latest/developers/http_api/dashboard/#new-dashboard-apis)
1616

17-
## Example Usage
18-
19-
```terraform
20-
resource "grafana_apps_dashboard_dashboard_v1beta1" "example" {
21-
metadata {
22-
uid = "example-dashboard"
23-
}
24-
25-
spec {
26-
title = "Example Dashboard"
27-
json = jsonencode({
28-
title = "Example Dashboard"
29-
uid = "example-dashboard"
30-
panels = []
31-
schemaVersion = 42
32-
})
33-
}
34-
}
35-
```
17+
3618

3719
<!-- schema generated by tfplugindocs -->
3820
## Schema

internal/resources/appplatform/catalog-resource.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: backstage.io/v1alpha1
33
kind: Component
44
metadata:
5-
name: resource-grafana_apps_dashboard_dashboard_v1beta1
6-
title: grafana_apps_dashboard_dashboard_v1beta1 (resource)
5+
name: resource-grafana_apps_dashboard_dashboard_v1
6+
title: grafana_apps_dashboard_dashboard_v1 (resource)
77
description: |
8-
resource `grafana_apps_dashboard_dashboard_v1beta1` in Grafana Labs' Terraform Provider
8+
resource `grafana_apps_dashboard_dashboard_v1` in Grafana Labs' Terraform Provider
99
spec:
1010
subcomponentOf: component:default/terraform-provider-grafana
1111
type: terraform-resource
@@ -27,6 +27,19 @@ spec:
2727
---
2828
apiVersion: backstage.io/v1alpha1
2929
kind: Component
30+
metadata:
31+
name: resource-grafana_apps_dashboard_dashboard_v2
32+
title: grafana_apps_dashboard_dashboard_v2 (resource)
33+
description: |
34+
resource `grafana_apps_dashboard_dashboard_v2` in Grafana Labs' Terraform Provider
35+
spec:
36+
subcomponentOf: component:default/terraform-provider-grafana
37+
type: terraform-resource
38+
owner: group:default/grafana-app-platform-squad
39+
lifecycle: production
40+
---
41+
apiVersion: backstage.io/v1alpha1
42+
kind: Component
3043
metadata:
3144
name: resource-grafana_apps_playlist_playlist_v0alpha1
3245
title: grafana_apps_playlist_playlist_v0alpha1 (resource)

internal/resources/appplatform/dashboard_v2stable_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"encoding/json"
66

7-
"github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2"
7+
v2 "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v2"
88
"github.com/grafana/terraform-provider-grafana/v4/internal/common"
99
"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
1010
"github.com/hashicorp/terraform-plugin-framework/attr"

internal/resources/examples_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ func TestAccExamples(t *testing.T) {
4747
category: "Grafana Apps",
4848
testCheck: func(t *testing.T, filename string) {
4949
switch {
50-
case strings.Contains(filename, "grafana_apps_provisioning_"):
50+
case strings.Contains(filename, "grafana_apps_provisioning_"),
51+
strings.Contains(filename, "grafana_apps_dashboard_dashboard_v2") && !strings.Contains(filename, "v2beta1"):
5152
testutils.CheckOSSTestsEnabled(t, ">=13.0.0")
5253
case strings.Contains(filename, "grafana_apps_dashboard_dashboard_v2beta1"):
5354
testutils.CheckOSSTestsEnabled(t, ">=12.2.0")
54-
case strings.Contains(filename, "grafana_apps_dashboard_dashboard_v2"):
55-
testutils.CheckOSSTestsEnabled(t, ">=13.0.0")
5655
default:
5756
testutils.CheckOSSTestsEnabled(t, ">=12.0.0")
5857
}

0 commit comments

Comments
 (0)