From ba3af1547af6aac290fb6a462e04696865041a32 Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 26 Nov 2024 12:13:49 -0800 Subject: [PATCH] Remove unused LocationDescriber interface from google_provider_config_plugin_framework (#12400) (#20487) [upstream:545ef44a990269b60f50ecef1db15ff7d6856392] Signed-off-by: Modular Magician --- .changelog/12400.txt | 3 +++ .../data_source_provider_config_plugin_framework.go | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) create mode 100644 .changelog/12400.txt diff --git a/.changelog/12400.txt b/.changelog/12400.txt new file mode 100644 index 00000000000..42b910df155 --- /dev/null +++ b/.changelog/12400.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` \ No newline at end of file diff --git a/google/fwprovider/data_source_provider_config_plugin_framework.go b/google/fwprovider/data_source_provider_config_plugin_framework.go index 121ae06f17d..e7a3ea44969 100644 --- a/google/fwprovider/data_source_provider_config_plugin_framework.go +++ b/google/fwprovider/data_source_provider_config_plugin_framework.go @@ -12,7 +12,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-google/google/fwmodels" - "github.com/hashicorp/terraform-provider-google/google/fwresource" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) @@ -20,7 +19,6 @@ import ( var ( _ datasource.DataSource = &GoogleProviderConfigPluginFrameworkDataSource{} _ datasource.DataSourceWithConfigure = &GoogleProviderConfigPluginFrameworkDataSource{} - _ fwresource.LocationDescriber = &GoogleProviderConfigPluginFrameworkModel{} ) func NewGoogleProviderConfigPluginFrameworkDataSource() datasource.DataSource { @@ -58,15 +56,6 @@ type GoogleProviderConfigPluginFrameworkModel struct { TerraformAttributionLabelAdditionStrategy types.String `tfsdk:"terraform_attribution_label_addition_strategy"` } -func (m *GoogleProviderConfigPluginFrameworkModel) GetLocationDescription(providerConfig *transport_tpg.Config) fwresource.LocationDescription { - return fwresource.LocationDescription{ - RegionSchemaField: types.StringValue("region"), - ZoneSchemaField: types.StringValue("zone"), - ProviderRegion: types.StringValue(providerConfig.Region), - ProviderZone: types.StringValue(providerConfig.Zone), - } -} - func (d *GoogleProviderConfigPluginFrameworkDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) { resp.TypeName = req.ProviderTypeName + "_provider_config_plugin_framework" }