Skip to content

resource/aws_lakeformation_permissions: Simplifies filtering implementation #44896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 6, 2025
+73 −694
Merged

resource/aws_lakeformation_permissions: Simplifies filtering implementation #44896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c95407
Returned permissions are already filtered, so additional call to `fi…
gdavison Oct 30, 2025
db74f03
In acceptance tests, filter permissions inside `Retry`, similar to `s…
gdavison Oct 31, 2025
84d8a43
Filters permissions before appending to list
gdavison Oct 31, 2025
a0784ef
`filterPermissions` is no longer called
gdavison Oct 31, 2025
1a7a6fb
Removes status `statusFailed`
gdavison Oct 31, 2025
e6ba5f1
Removes status `statusNotFound`
gdavison Oct 31, 2025
ce85b23
Reorders to be alphabetical
gdavison Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions internal/service/lakeformation/exports_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ var (

ValidPrincipal = validPrincipal

FilterPermissions = filterPermissions

IncludePrincipalIdentifierInList = includePrincipalIdentifierInList

FilterCatalogPermissions = filterCatalogPermissions
Expand Down
9 changes: 0 additions & 9 deletions internal/service/lakeformation/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,8 @@ package lakeformation
import (
"github.com/aws/aws-sdk-go-v2/aws"
awstypes "github.com/aws/aws-sdk-go-v2/service/lakeformation/types"
tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
)

func filterPermissions(filter PermissionsFilter, allPermissions []awstypes.PrincipalResourcePermissions) []awstypes.PrincipalResourcePermissions {
if filter != nil {
return tfslices.Filter(allPermissions, filter)
}

return nil
}

func filterCatalogPermissions(principalIdentifier string) PermissionsFilter {
return func(permissions awstypes.PrincipalResourcePermissions) bool {
return principalIdentifier == aws.ToString(permissions.Principal.DataLakePrincipalIdentifier) && permissions.Resource.Catalog != nil
Expand Down
Loading
Loading