Rename resource_tag_filter -> resource_discovery_tag_filter

grafana · Dec 11, 2024 · 0dca871 · 0dca871
1 parent 094e584
commit 0dca871
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 43 deletions.
diff --git a/docs/data-sources/cloud_provider_azure_credential.md b/docs/data-sources/cloud_provider_azure_credential.md
@@ -20,11 +20,11 @@ resource "grafana_cloud_provider_azure_credential" "test" {
   client_secret = "my-client-secret"
   tenant_id     = "my-tenant-id"
 
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-1"
     value = "value-1"
   }
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-2"
     value = "value-2"
   }
@@ -39,14 +39,14 @@ data "grafana_cloud_provider_azure_credential" "test" {
   tenant_id     = grafana_cloud_provider_azure_credential.test.tenant_id
   resource_id   = grafana_cloud_provider_azure_credential.test.resource_id
 
-  resource_tag_filter {
-    key   = grafana_cloud_provider_azure_credential.test.resource_tag_filter[0].key
-    value = grafana_cloud_provider_azure_credential.test.resource_tag_filter[0].value
+  resource_discovery_tag_filter {
+    key   = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[0].key
+    value = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[0].value
   }
 
-  resource_tag_filter {
-    key   = grafana_cloud_provider_azure_credential.test.resource_tag_filter[1].key
-    value = grafana_cloud_provider_azure_credential.test.resource_tag_filter[1].value
+  resource_discovery_tag_filter {
+    key   = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[1].key
+    value = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[1].value
   }
 }
 ```
@@ -65,14 +65,14 @@ data "grafana_cloud_provider_azure_credential" "test" {
 
 ### Optional
 
-- `resource_tag_filter` (Block List) The list of tag filters to apply to resources. (see [below for nested schema](#nestedblock--resource_tag_filter))
+- `resource_discovery_tag_filter` (Block List) The list of tag filters to apply to resources. (see [below for nested schema](#nestedblock--resource_discovery_tag_filter))
 
 ### Read-Only
 
 - `id` (String) The Terraform Resource ID. This has the format "{{ stack_id }}:{{ resource_id }}".
 
-<a id="nestedblock--resource_tag_filter"></a>
-### Nested Schema for `resource_tag_filter`
+<a id="nestedblock--resource_discovery_tag_filter"></a>
+### Nested Schema for `resource_discovery_tag_filter`
 
 Required:
 

diff --git a/docs/resources/cloud_provider_azure_credential.md b/docs/resources/cloud_provider_azure_credential.md
@@ -20,12 +20,12 @@ resource "grafana_cloud_provider_azure_credential" "test" {
   client_secret = "my-client-secret"
   tenant_id     = "my-tenant-id"
 
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-1"
     value = "value-1"
   }
 
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-2"
     value = "value-2"
   }
@@ -45,15 +45,15 @@ resource "grafana_cloud_provider_azure_credential" "test" {
 
 ### Optional
 
-- `resource_tag_filter` (Block List) The list of tag filters to apply to resources. (see [below for nested schema](#nestedblock--resource_tag_filter))
+- `resource_discovery_tag_filter` (Block List) The list of tag filters to apply to resources. (see [below for nested schema](#nestedblock--resource_discovery_tag_filter))
 
 ### Read-Only
 
 - `id` (String) The Terraform Resource ID. This has the format "{{ stack_id }}:{{ resource_id }}".
 - `resource_id` (String) The ID given by the Grafana Cloud Provider API to this AWS Account resource.
 
-<a id="nestedblock--resource_tag_filter"></a>
-### Nested Schema for `resource_tag_filter`
+<a id="nestedblock--resource_discovery_tag_filter"></a>
+### Nested Schema for `resource_discovery_tag_filter`
 
 Required:
 

diff --git a/examples/data-sources/grafana_cloud_provider_azure_credential/data-source.tf b/examples/data-sources/grafana_cloud_provider_azure_credential/data-source.tf
@@ -5,11 +5,11 @@ resource "grafana_cloud_provider_azure_credential" "test" {
   client_secret = "my-client-secret"
   tenant_id     = "my-tenant-id"
 
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-1"
     value = "value-1"
   }
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-2"
     value = "value-2"
   }
@@ -24,13 +24,13 @@ data "grafana_cloud_provider_azure_credential" "test" {
   tenant_id     = grafana_cloud_provider_azure_credential.test.tenant_id
   resource_id   = grafana_cloud_provider_azure_credential.test.resource_id
 
-  resource_tag_filter {
-    key   = grafana_cloud_provider_azure_credential.test.resource_tag_filter[0].key
-    value = grafana_cloud_provider_azure_credential.test.resource_tag_filter[0].value
+  resource_discovery_tag_filter {
+    key   = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[0].key
+    value = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[0].value
   }
 
-  resource_tag_filter {
-    key   = grafana_cloud_provider_azure_credential.test.resource_tag_filter[1].key
-    value = grafana_cloud_provider_azure_credential.test.resource_tag_filter[1].value
+  resource_discovery_tag_filter {
+    key   = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[1].key
+    value = grafana_cloud_provider_azure_credential.test.resource_discovery_tag_filter[1].value
   }
 }
diff --git a/examples/resources/grafana_cloud_provider_azure_credential/resource.tf b/examples/resources/grafana_cloud_provider_azure_credential/resource.tf
@@ -5,12 +5,12 @@ resource "grafana_cloud_provider_azure_credential" "test" {
   client_secret = "my-client-secret"
   tenant_id     = "my-tenant-id"
 
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-1"
     value = "value-1"
   }
 
-  resource_tag_filter {
+  resource_discovery_tag_filter {
     key   = "key-2"
     value = "value-2"
   }

diff --git a/internal/common/cloudproviderapi/client.go b/internal/common/cloudproviderapi/client.go
@@ -213,7 +213,7 @@ type AzureCredential struct {
 	StackID string `json:"stack_id"`
 
 	// ResourceTagFilters is the list of Azure resource tag filters.
-	ResourceTagFilters []TagFilter `json:"resource_tag_filters"`
+	ResourceTagFilters []TagFilter `json:"resource_discovery_tag_filters"`
 }
 
 type TagFilter struct {

diff --git a/internal/resources/cloudprovider/azure_credential_test.go b/internal/resources/cloudprovider/azure_credential_test.go
@@ -27,7 +27,7 @@ func TestAcc_AzureCredential(t *testing.T) {
     "client_id": "my_client_id",
     "client_secret": "",
     "stack_id":"1",
-    "resource_tag_filters": [
+    "resource_discovery_tag_filters": [
       {
         "key": "key-1",
         "value": "value-1"
@@ -56,7 +56,7 @@ func TestAcc_AzureCredential(t *testing.T) {
     "client_id": "my-client-id",
     "client_secret": "",
     "stack_id":"1",
-    "resource_tag_filters": [
+    "resource_discovery_tag_filters": [
       {
         "key": "key-1",
         "value": "value-1"
@@ -80,7 +80,7 @@ func TestAcc_AzureCredential(t *testing.T) {
     "client_id": "my-client-id",
     "client_secret": "",
     "stack_id":"1",
-    "resource_tag_filters": [
+    "resource_discovery_tag_filters": [
       {
         "key": "key-1",
         "value": "value-1"
@@ -122,10 +122,10 @@ func TestAcc_AzureCredential(t *testing.T) {
 					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "tenant_id", "my-tenant-id"),
 					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "client_id", "my-client-id"),
 					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "client_secret", "my-client-secret"),
-					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_tag_filter.0.key", "key-1"),
-					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_tag_filter.1.key", "key-2"),
-					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_tag_filter.0.value", "value-1"),
-					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_tag_filter.1.value", "value-2"),
+					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.0.key", "key-1"),
+					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.1.key", "key-2"),
+					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.0.value", "value-1"),
+					resource.TestCheckResourceAttr("grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.1.value", "value-2"),
 				),
 			},
 			{
@@ -139,10 +139,10 @@ func TestAcc_AzureCredential(t *testing.T) {
 					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "client_id", "my-client-id"),
 					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "client_secret", ""),
 					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_id", resourceID),
-					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_tag_filter.0.key", "key-1"),
-					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_tag_filter.1.key", "key-2"),
-					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_tag_filter.0.value", "value-1"),
-					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_tag_filter.1.value", "value-2"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.0.key", "key-1"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.1.key", "key-2"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.0.value", "value-1"),
+					resource.TestCheckResourceAttr("data.grafana_cloud_provider_azure_credential.test", "resource_discovery_tag_filter.1.value", "value-2"),
 				),
 			},
 		},

diff --git a/internal/resources/cloudprovider/data_source_azure_credential.go b/internal/resources/cloudprovider/data_source_azure_credential.go
@@ -75,7 +75,7 @@ func (r *datasourceAzureCredential) Schema(ctx context.Context, req datasource.S
 			},
 		},
 		Blocks: map[string]schema.Block{
-			"resource_tag_filter": schema.ListNestedBlock{
+			"resource_discovery_tag_filter": schema.ListNestedBlock{
 				Description: "The list of tag filters to apply to resources.",
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{

diff --git a/internal/resources/cloudprovider/resource_azure_credential.go b/internal/resources/cloudprovider/resource_azure_credential.go
@@ -34,7 +34,7 @@ type resourceAzureCredentialModel struct {
 	StackID            types.String `tfsdk:"stack_id"`
 	ClientSecret       types.String `tfsdk:"client_secret"`
 	ResourceID         types.String `tfsdk:"resource_id"`
-	ResourceTagFilters []TagFilter  `tfsdk:"resource_tag_filter"`
+	ResourceTagFilters []TagFilter  `tfsdk:"resource_discovery_tag_filter"`
 }
 
 type resourceAzureCredential struct {
@@ -115,7 +115,7 @@ func (r *resourceAzureCredential) Schema(ctx context.Context, req resource.Schem
 			},
 		},
 		Blocks: map[string]schema.Block{
-			"resource_tag_filter": schema.ListNestedBlock{
+			"resource_discovery_tag_filter": schema.ListNestedBlock{
 				Description: "The list of tag filters to apply to resources.",
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{
@@ -258,7 +258,7 @@ func (r *resourceAzureCredential) Read(ctx context.Context, req resource.ReadReq
 		return
 	}
 
-	diags = resp.State.SetAttribute(ctx, path.Root("resource_tag_filter"), r.convertTagFilters(credential.ResourceTagFilters))
+	diags = resp.State.SetAttribute(ctx, path.Root("resource_discovery_tag_filter"), r.convertTagFilters(credential.ResourceTagFilters))
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -321,7 +321,7 @@ func (r *resourceAzureCredential) Update(ctx context.Context, req resource.Updat
 		return
 	}
 
-	diags = resp.State.SetAttribute(ctx, path.Root("resource_tag_filter"), r.convertTagFilters(credential.ResourceTagFilters))
+	diags = resp.State.SetAttribute(ctx, path.Root("resource_discovery_tag_filter"), r.convertTagFilters(credential.ResourceTagFilters))
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return