Skip to content

Commit

Permalink
Fix constants
Browse files Browse the repository at this point in the history
  • Loading branch information
YakDriver committed Oct 21, 2024
1 parent 1de6c1b commit 0d18eae
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions internal/service/lakeformation/data_lake_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func ResourceDataLakeSettings() *schema.Resource {
ValidateFunc: validPrincipal,
},
},
"parameters": {
names.AttrParameters: {
Type: schema.TypeMap,
Computed: true,
Optional: true,
Expand Down Expand Up @@ -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{}))
}

Expand Down Expand Up @@ -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))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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))

Expand Down
4 changes: 2 additions & 2 deletions internal/service/lakeformation/data_lake_settings_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
},
Expand All @@ -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),
),
},
Expand Down

0 comments on commit 0d18eae

Please sign in to comment.