From 0d18eaebdf30f51e5289db08dbdfd97afed2561f Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Mon, 21 Oct 2024 18:29:51 -0400 Subject: [PATCH] Fix constants --- internal/service/lakeformation/data_lake_settings.go | 6 +++--- .../service/lakeformation/data_lake_settings_data_source.go | 4 ++-- internal/service/lakeformation/data_lake_settings_test.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/lakeformation/data_lake_settings.go b/internal/service/lakeformation/data_lake_settings.go index b48d9b20a80..4db40512958 100644 --- a/internal/service/lakeformation/data_lake_settings.go +++ b/internal/service/lakeformation/data_lake_settings.go @@ -137,7 +137,7 @@ func ResourceDataLakeSettings() *schema.Resource { ValidateFunc: validPrincipal, }, }, - "parameters": { + names.AttrParameters: { Type: schema.TypeMap, Computed: true, Optional: true, @@ -216,7 +216,7 @@ func resourceDataLakeSettingsCreate(ctx context.Context, d *schema.ResourceData, settings.ExternalDataFilteringAllowList = expandDataLakeSettingsDataFilteringAllowList(v.(*schema.Set)) } - if v, ok := d.GetOk("parameters"); ok { + if v, ok := d.GetOk(names.AttrParameters); ok { settings.Parameters = flex.ExpandStringValueMap(v.(map[string]interface{})) } @@ -300,7 +300,7 @@ func resourceDataLakeSettingsRead(ctx context.Context, d *schema.ResourceData, m d.Set("create_database_default_permissions", flattenDataLakeSettingsCreateDefaultPermissions(settings.CreateDatabaseDefaultPermissions)) d.Set("create_table_default_permissions", flattenDataLakeSettingsCreateDefaultPermissions(settings.CreateTableDefaultPermissions)) d.Set("external_data_filtering_allow_list", flattenDataLakeSettingsDataFilteringAllowList(settings.ExternalDataFilteringAllowList)) - d.Set("parameters", flex.FlattenStringValueMap(settings.Parameters)) + d.Set(names.AttrParameters, flex.FlattenStringValueMap(settings.Parameters)) d.Set("read_only_admins", flattenDataLakeSettingsAdmins(settings.ReadOnlyAdmins)) d.Set("trusted_resource_owners", flex.FlattenStringValueList(settings.TrustedResourceOwners)) diff --git a/internal/service/lakeformation/data_lake_settings_data_source.go b/internal/service/lakeformation/data_lake_settings_data_source.go index f870b510e47..e620c215f24 100644 --- a/internal/service/lakeformation/data_lake_settings_data_source.go +++ b/internal/service/lakeformation/data_lake_settings_data_source.go @@ -88,7 +88,7 @@ func DataSourceDataLakeSettings() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, - "parameters": { + names.AttrParameters: { Type: schema.TypeMap, Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, @@ -143,7 +143,7 @@ func dataSourceDataLakeSettingsRead(ctx context.Context, d *schema.ResourceData, d.Set("create_database_default_permissions", flattenDataLakeSettingsCreateDefaultPermissions(settings.CreateDatabaseDefaultPermissions)) d.Set("create_table_default_permissions", flattenDataLakeSettingsCreateDefaultPermissions(settings.CreateTableDefaultPermissions)) d.Set("external_data_filtering_allow_list", flattenDataLakeSettingsDataFilteringAllowList(settings.ExternalDataFilteringAllowList)) - d.Set("parameters", flex.FlattenStringValueMap(settings.Parameters)) + d.Set(names.AttrParameters, flex.FlattenStringValueMap(settings.Parameters)) d.Set("read_only_admins", flattenDataLakeSettingsAdmins(settings.ReadOnlyAdmins)) d.Set("trusted_resource_owners", flex.FlattenStringyValueList(settings.TrustedResourceOwners)) diff --git a/internal/service/lakeformation/data_lake_settings_test.go b/internal/service/lakeformation/data_lake_settings_test.go index a805ab89b8f..6ce2ecee340 100644 --- a/internal/service/lakeformation/data_lake_settings_test.go +++ b/internal/service/lakeformation/data_lake_settings_test.go @@ -138,7 +138,7 @@ func testAccDataLakeSettings_parameters(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDataLakeSettingsExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "parameters.%", acctest.Ct2), // In fresh account, with empty config, API returns map[CROSS_ACCOUNT_VERSION:1 SET_CONTEXT:TRUE] - resource.TestCheckResourceAttr(resourceName, "parameters.SET_CONTEXT", "TRUE"), + resource.TestCheckResourceAttr(resourceName, "parameters.SET_CONTEXT", acctest.CtTrueCaps), resource.TestCheckResourceAttr(resourceName, "parameters.CROSS_ACCOUNT_VERSION", acctest.Ct1), ), }, @@ -162,7 +162,7 @@ func testAccDataLakeSettings_parameters(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDataLakeSettingsExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "parameters.%", acctest.Ct2), // In fresh account, with empty config, API returns map[CROSS_ACCOUNT_VERSION:1 SET_CONTEXT:TRUE] - resource.TestCheckResourceAttr(resourceName, "parameters.SET_CONTEXT", "TRUE"), + resource.TestCheckResourceAttr(resourceName, "parameters.SET_CONTEXT", acctest.CtTrueCaps), resource.TestCheckResourceAttr(resourceName, "parameters.CROSS_ACCOUNT_VERSION", acctest.Ct1), ), },