Skip to content

Commit 168214e

Browse files
simaarfaniasimaarfania
authored
fix(catalog): prefix catalog entry names with type (#2238)
* fix(catalog): prefix catalog entry names with type * fix: remove platform monitoring as owner * fix: test jsonnet validation
1 parent c3afb21 commit 168214e

23 files changed

+292
-288
lines changed

‎.github/actions/validate-catalog/validate.jsonnet‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ function(catalog, schema)
66
std.sort(
77
std.filterMap(
88
function(obj) obj.spec.type == 'terraform-resource',
9-
function(obj) obj.metadata.name,
9+
function(obj)
10+
// Strip 'resource-' prefix to match schema names
11+
if std.startsWith(obj.metadata.name, 'resource-')
12+
then std.substr(obj.metadata.name, 9, std.length(obj.metadata.name) - 9)
13+
else obj.metadata.name,
1014
components
1115
)
1216
);

‎internal/resources/appplatform/catalog-resource.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: backstage.io/v1alpha1
33
kind: Component
44
metadata:
5-
name: grafana_apps_dashboard_dashboard_v1beta1
6-
title: grafana_apps_dashboard_dashboard_v1beta1
5+
name: resource-grafana_apps_dashboard_dashboard_v1beta1
6+
title: grafana_apps_dashboard_dashboard_v1beta1 (resource)
77
description: |
88
resource `grafana_apps_dashboard_dashboard_v1beta1` in Grafana Labs' Terraform Provider
99
spec:
@@ -15,8 +15,8 @@ spec:
1515
apiVersion: backstage.io/v1alpha1
1616
kind: Component
1717
metadata:
18-
name: grafana_apps_playlist_playlist_v0alpha1
19-
title: grafana_apps_playlist_playlist_v0alpha1
18+
name: resource-grafana_apps_playlist_playlist_v0alpha1
19+
title: grafana_apps_playlist_playlist_v0alpha1 (resource)
2020
description: |
2121
resource `grafana_apps_playlist_playlist_v0alpha1` in Grafana Labs' Terraform Provider
2222
spec:

‎internal/resources/cloud/catalog-data-source.yaml‎

Lines changed: 16 additions & 16 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: grafana_cloud_access_policies
6-
title: grafana_cloud_access_policies
5+
name: datasource-grafana_cloud_access_policies
6+
title: grafana_cloud_access_policies (data source)
77
description: |
8-
resource `grafana_cloud_access_policies` in Grafana Labs' Terraform Provider
8+
data source `grafana_cloud_access_policies` in Grafana Labs' Terraform Provider
99
spec:
1010
subcomponentOf: component:default/terraform-provider-grafana
1111
type: terraform-data-source
@@ -15,23 +15,23 @@ spec:
1515
apiVersion: backstage.io/v1alpha1
1616
kind: Component
1717
metadata:
18-
name: grafana_cloud_ips
19-
title: grafana_cloud_ips
18+
name: datasource-grafana_cloud_ips
19+
title: grafana_cloud_ips (data source)
2020
description: |
21-
resource `grafana_cloud_ips` in Grafana Labs' Terraform Provider
21+
data source `grafana_cloud_ips` in Grafana Labs' Terraform Provider
2222
spec:
2323
subcomponentOf: component:default/terraform-provider-grafana
2424
type: terraform-data-source
25-
owner:
25+
owner:
2626
lifecycle: production
2727
---
2828
apiVersion: backstage.io/v1alpha1
2929
kind: Component
3030
metadata:
31-
name: grafana_cloud_organization
32-
title: grafana_cloud_organization
31+
name: datasource-grafana_cloud_organization
32+
title: grafana_cloud_organization (data source)
3333
description: |
34-
resource `grafana_cloud_organization` in Grafana Labs' Terraform Provider
34+
data source `grafana_cloud_organization` in Grafana Labs' Terraform Provider
3535
spec:
3636
subcomponentOf: component:default/terraform-provider-grafana
3737
type: terraform-data-source
@@ -41,10 +41,10 @@ spec:
4141
apiVersion: backstage.io/v1alpha1
4242
kind: Component
4343
metadata:
44-
name: grafana_cloud_private_data_source_connect_networks
45-
title: grafana_cloud_private_data_source_connect_networks
44+
name: datasource-grafana_cloud_private_data_source_connect_networks
45+
title: grafana_cloud_private_data_source_connect_networks (data source)
4646
description: |
47-
resource `grafana_cloud_private_data_source_connect_networks` in Grafana Labs' Terraform Provider
47+
data source `grafana_cloud_private_data_source_connect_networks` in Grafana Labs' Terraform Provider
4848
spec:
4949
subcomponentOf: component:default/terraform-provider-grafana
5050
type: terraform-data-source
@@ -54,10 +54,10 @@ spec:
5454
apiVersion: backstage.io/v1alpha1
5555
kind: Component
5656
metadata:
57-
name: grafana_cloud_stack
58-
title: grafana_cloud_stack
57+
name: datasource-grafana_cloud_stack
58+
title: grafana_cloud_stack (data source)
5959
description: |
60-
resource `grafana_cloud_stack` in Grafana Labs' Terraform Provider
60+
data source `grafana_cloud_stack` in Grafana Labs' Terraform Provider
6161
spec:
6262
subcomponentOf: component:default/terraform-provider-grafana
6363
type: terraform-data-source

‎internal/resources/cloud/catalog-resource.yaml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: backstage.io/v1alpha1
33
kind: Component
44
metadata:
5-
name: grafana_cloud_access_policy
6-
title: grafana_cloud_access_policy
5+
name: resource-grafana_cloud_access_policy
6+
title: grafana_cloud_access_policy (resource)
77
description: |
88
resource `grafana_cloud_access_policy` in Grafana Labs' Terraform Provider
99
spec:
@@ -15,8 +15,8 @@ spec:
1515
apiVersion: backstage.io/v1alpha1
1616
kind: Component
1717
metadata:
18-
name: grafana_cloud_access_policy_token
19-
title: grafana_cloud_access_policy_token
18+
name: resource-grafana_cloud_access_policy_token
19+
title: grafana_cloud_access_policy_token (resource)
2020
description: |
2121
resource `grafana_cloud_access_policy_token` in Grafana Labs' Terraform Provider
2222
spec:
@@ -28,8 +28,8 @@ spec:
2828
apiVersion: backstage.io/v1alpha1
2929
kind: Component
3030
metadata:
31-
name: grafana_cloud_org_member
32-
title: grafana_cloud_org_member
31+
name: resource-grafana_cloud_org_member
32+
title: grafana_cloud_org_member (resource)
3333
description: |
3434
resource `grafana_cloud_org_member` in Grafana Labs' Terraform Provider
3535
spec:
@@ -41,8 +41,8 @@ spec:
4141
apiVersion: backstage.io/v1alpha1
4242
kind: Component
4343
metadata:
44-
name: grafana_cloud_plugin_installation
45-
title: grafana_cloud_plugin_installation
44+
name: resource-grafana_cloud_plugin_installation
45+
title: grafana_cloud_plugin_installation (resource)
4646
description: |
4747
resource `grafana_cloud_plugin_installation` in Grafana Labs' Terraform Provider
4848
spec:
@@ -54,8 +54,8 @@ spec:
5454
apiVersion: backstage.io/v1alpha1
5555
kind: Component
5656
metadata:
57-
name: grafana_cloud_private_data_source_connect_network
58-
title: grafana_cloud_private_data_source_connect_network
57+
name: resource-grafana_cloud_private_data_source_connect_network
58+
title: grafana_cloud_private_data_source_connect_network (resource)
5959
description: |
6060
resource `grafana_cloud_private_data_source_connect_network` in Grafana Labs' Terraform Provider
6161
spec:
@@ -67,8 +67,8 @@ spec:
6767
apiVersion: backstage.io/v1alpha1
6868
kind: Component
6969
metadata:
70-
name: grafana_cloud_private_data_source_connect_network_token
71-
title: grafana_cloud_private_data_source_connect_network_token
70+
name: resource-grafana_cloud_private_data_source_connect_network_token
71+
title: grafana_cloud_private_data_source_connect_network_token (resource)
7272
description: |
7373
resource `grafana_cloud_private_data_source_connect_network_token` in Grafana Labs' Terraform Provider
7474
spec:
@@ -80,8 +80,8 @@ spec:
8080
apiVersion: backstage.io/v1alpha1
8181
kind: Component
8282
metadata:
83-
name: grafana_cloud_stack
84-
title: grafana_cloud_stack
83+
name: resource-grafana_cloud_stack
84+
title: grafana_cloud_stack (resource)
8585
description: |
8686
resource `grafana_cloud_stack` in Grafana Labs' Terraform Provider
8787
spec:
@@ -93,8 +93,8 @@ spec:
9393
apiVersion: backstage.io/v1alpha1
9494
kind: Component
9595
metadata:
96-
name: grafana_cloud_stack_service_account
97-
title: grafana_cloud_stack_service_account
96+
name: resource-grafana_cloud_stack_service_account
97+
title: grafana_cloud_stack_service_account (resource)
9898
description: |
9999
resource `grafana_cloud_stack_service_account` in Grafana Labs' Terraform Provider
100100
spec:
@@ -106,8 +106,8 @@ spec:
106106
apiVersion: backstage.io/v1alpha1
107107
kind: Component
108108
metadata:
109-
name: grafana_cloud_stack_service_account_token
110-
title: grafana_cloud_stack_service_account_token
109+
name: resource-grafana_cloud_stack_service_account_token
110+
title: grafana_cloud_stack_service_account_token (resource)
111111
description: |
112112
resource `grafana_cloud_stack_service_account_token` in Grafana Labs' Terraform Provider
113113
spec:
@@ -119,8 +119,8 @@ spec:
119119
apiVersion: backstage.io/v1alpha1
120120
kind: Component
121121
metadata:
122-
name: grafana_k6_installation
123-
title: grafana_k6_installation
122+
name: resource-grafana_k6_installation
123+
title: grafana_k6_installation (resource)
124124
description: |
125125
resource `grafana_k6_installation` in Grafana Labs' Terraform Provider
126126
spec:
@@ -132,8 +132,8 @@ spec:
132132
apiVersion: backstage.io/v1alpha1
133133
kind: Component
134134
metadata:
135-
name: grafana_synthetic_monitoring_installation
136-
title: grafana_synthetic_monitoring_installation
135+
name: resource-grafana_synthetic_monitoring_installation
136+
title: grafana_synthetic_monitoring_installation (resource)
137137
description: |
138138
resource `grafana_synthetic_monitoring_installation` in Grafana Labs' Terraform Provider
139139
spec:

‎internal/resources/cloudprovider/catalog-data-source.yaml‎

Lines changed: 12 additions & 12 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: grafana_cloud_provider_aws_account
6-
title: grafana_cloud_provider_aws_account
5+
name: datasource-grafana_cloud_provider_aws_account
6+
title: grafana_cloud_provider_aws_account (data source)
77
description: |
8-
resource `grafana_cloud_provider_aws_account` in Grafana Labs' Terraform Provider
8+
data source `grafana_cloud_provider_aws_account` in Grafana Labs' Terraform Provider
99
spec:
1010
subcomponentOf: component:default/terraform-provider-grafana
1111
type: terraform-data-source
@@ -15,10 +15,10 @@ spec:
1515
apiVersion: backstage.io/v1alpha1
1616
kind: Component
1717
metadata:
18-
name: grafana_cloud_provider_aws_cloudwatch_scrape_job
19-
title: grafana_cloud_provider_aws_cloudwatch_scrape_job
18+
name: datasource-grafana_cloud_provider_aws_cloudwatch_scrape_job
19+
title: grafana_cloud_provider_aws_cloudwatch_scrape_job (data source)
2020
description: |
21-
resource `grafana_cloud_provider_aws_cloudwatch_scrape_job` in Grafana Labs' Terraform Provider
21+
data source `grafana_cloud_provider_aws_cloudwatch_scrape_job` in Grafana Labs' Terraform Provider
2222
spec:
2323
subcomponentOf: component:default/terraform-provider-grafana
2424
type: terraform-data-source
@@ -28,10 +28,10 @@ spec:
2828
apiVersion: backstage.io/v1alpha1
2929
kind: Component
3030
metadata:
31-
name: grafana_cloud_provider_aws_cloudwatch_scrape_jobs
32-
title: grafana_cloud_provider_aws_cloudwatch_scrape_jobs
31+
name: datasource-grafana_cloud_provider_aws_cloudwatch_scrape_jobs
32+
title: grafana_cloud_provider_aws_cloudwatch_scrape_jobs (data source)
3333
description: |
34-
resource `grafana_cloud_provider_aws_cloudwatch_scrape_jobs` in Grafana Labs' Terraform Provider
34+
data source `grafana_cloud_provider_aws_cloudwatch_scrape_jobs` in Grafana Labs' Terraform Provider
3535
spec:
3636
subcomponentOf: component:default/terraform-provider-grafana
3737
type: terraform-data-source
@@ -41,10 +41,10 @@ spec:
4141
apiVersion: backstage.io/v1alpha1
4242
kind: Component
4343
metadata:
44-
name: grafana_cloud_provider_azure_credential
45-
title: grafana_cloud_provider_azure_credential
44+
name: datasource-grafana_cloud_provider_azure_credential
45+
title: grafana_cloud_provider_azure_credential (data source)
4646
description: |
47-
resource `grafana_cloud_provider_azure_credential` in Grafana Labs' Terraform Provider
47+
data source `grafana_cloud_provider_azure_credential` in Grafana Labs' Terraform Provider
4848
spec:
4949
subcomponentOf: component:default/terraform-provider-grafana
5050
type: terraform-data-source

‎internal/resources/cloudprovider/catalog-resource.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: backstage.io/v1alpha1
33
kind: Component
44
metadata:
5-
name: grafana_cloud_provider_aws_account
6-
title: grafana_cloud_provider_aws_account
5+
name: resource-grafana_cloud_provider_aws_account
6+
title: grafana_cloud_provider_aws_account (resource)
77
description: |
88
resource `grafana_cloud_provider_aws_account` in Grafana Labs' Terraform Provider
99
spec:
@@ -15,8 +15,8 @@ spec:
1515
apiVersion: backstage.io/v1alpha1
1616
kind: Component
1717
metadata:
18-
name: grafana_cloud_provider_aws_cloudwatch_scrape_job
19-
title: grafana_cloud_provider_aws_cloudwatch_scrape_job
18+
name: resource-grafana_cloud_provider_aws_cloudwatch_scrape_job
19+
title: grafana_cloud_provider_aws_cloudwatch_scrape_job (resource)
2020
description: |
2121
resource `grafana_cloud_provider_aws_cloudwatch_scrape_job` in Grafana Labs' Terraform Provider
2222
spec:
@@ -28,8 +28,8 @@ spec:
2828
apiVersion: backstage.io/v1alpha1
2929
kind: Component
3030
metadata:
31-
name: grafana_cloud_provider_aws_resource_metadata_scrape_job
32-
title: grafana_cloud_provider_aws_resource_metadata_scrape_job
31+
name: resource-grafana_cloud_provider_aws_resource_metadata_scrape_job
32+
title: grafana_cloud_provider_aws_resource_metadata_scrape_job (resource)
3333
description: |
3434
resource `grafana_cloud_provider_aws_resource_metadata_scrape_job` in Grafana Labs' Terraform Provider
3535
spec:
@@ -41,8 +41,8 @@ spec:
4141
apiVersion: backstage.io/v1alpha1
4242
kind: Component
4343
metadata:
44-
name: grafana_cloud_provider_azure_credential
45-
title: grafana_cloud_provider_azure_credential
44+
name: resource-grafana_cloud_provider_azure_credential
45+
title: grafana_cloud_provider_azure_credential (resource)
4646
description: |
4747
resource `grafana_cloud_provider_azure_credential` in Grafana Labs' Terraform Provider
4848
spec:

‎internal/resources/connections/catalog-data-source.yaml‎

Lines changed: 3 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: grafana_connections_metrics_endpoint_scrape_job
6-
title: grafana_connections_metrics_endpoint_scrape_job
5+
name: datasource-grafana_connections_metrics_endpoint_scrape_job
6+
title: grafana_connections_metrics_endpoint_scrape_job (data source)
77
description: |
8-
resource `grafana_connections_metrics_endpoint_scrape_job` in Grafana Labs' Terraform Provider
8+
data source `grafana_connections_metrics_endpoint_scrape_job` in Grafana Labs' Terraform Provider
99
spec:
1010
subcomponentOf: component:default/terraform-provider-grafana
1111
type: terraform-data-source

‎internal/resources/connections/catalog-resource.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: backstage.io/v1alpha1
33
kind: Component
44
metadata:
5-
name: grafana_connections_metrics_endpoint_scrape_job
6-
title: grafana_connections_metrics_endpoint_scrape_job
5+
name: resource-grafana_connections_metrics_endpoint_scrape_job
6+
title: grafana_connections_metrics_endpoint_scrape_job (resource)
77
description: |
88
resource `grafana_connections_metrics_endpoint_scrape_job` in Grafana Labs' Terraform Provider
99
spec:

‎internal/resources/fleetmanagement/catalog-data-source.yaml‎

Lines changed: 6 additions & 6 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: grafana_fleet_management_collector
6-
title: grafana_fleet_management_collector
5+
name: datasource-grafana_fleet_management_collector
6+
title: grafana_fleet_management_collector (data source)
77
description: |
8-
resource `grafana_fleet_management_collector` in Grafana Labs' Terraform Provider
8+
data source `grafana_fleet_management_collector` in Grafana Labs' Terraform Provider
99
spec:
1010
subcomponentOf: component:default/terraform-provider-grafana
1111
type: terraform-data-source
@@ -15,10 +15,10 @@ spec:
1515
apiVersion: backstage.io/v1alpha1
1616
kind: Component
1717
metadata:
18-
name: grafana_fleet_management_collectors
19-
title: grafana_fleet_management_collectors
18+
name: datasource-grafana_fleet_management_collectors
19+
title: grafana_fleet_management_collectors (data source)
2020
description: |
21-
resource `grafana_fleet_management_collectors` in Grafana Labs' Terraform Provider
21+
data source `grafana_fleet_management_collectors` in Grafana Labs' Terraform Provider
2222
spec:
2323
subcomponentOf: component:default/terraform-provider-grafana
2424
type: terraform-data-source

0 commit comments

Comments
 (0)