Skip to content
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

[WIP] Experiment with aws policy equivalence #22036

Closed
wants to merge 2 commits into from
Closed

[WIP] Experiment with aws policy equivalence #22036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47768ba
Incorporate AWS policy equivalence
YakDriver Dec 3, 2021
088a9a2
Drop AWS from names
YakDriver Dec 3, 2021
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
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ require (
github.com/mitchellh/copystructure v1.2.0
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/go-testing-interface v1.14.1
github.com/mitchellh/mapstructure v1.1.2
github.com/pquerna/otp v1.3.0
github.com/shopspring/decimal v1.3.1
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
Expand Down
5 changes: 3 additions & 2 deletions internal/service/lakeformation/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package lakeformation
import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/lakeformation"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
)

func FilterPermissions(input *lakeformation.ListPermissionsInput, tableType string, columnNames []*string, excludedColumnNames []*string, columnWildcard bool, allPermissions []*lakeformation.PrincipalResourcePermissions) []*lakeformation.PrincipalResourcePermissions {
Expand Down Expand Up @@ -102,7 +103,7 @@ func FilterTableWithColumnsPermissions(principal *string, twc *lakeformation.Tab
}

if perm.Resource.TableWithColumns != nil && perm.Resource.TableWithColumns.ColumnNames != nil {
if StringSlicesEqualIgnoreOrder(perm.Resource.TableWithColumns.ColumnNames, columnNames) {
if verify.StringValueSlicesEqualIgnoreOrder(perm.Resource.TableWithColumns.ColumnNames, columnNames) {
cleanPermissions = append(cleanPermissions, perm)
continue
}
Expand All @@ -114,7 +115,7 @@ func FilterTableWithColumnsPermissions(principal *string, twc *lakeformation.Tab
continue
}

if len(excludedColumnNames) > 0 && StringSlicesEqualIgnoreOrder(perm.Resource.TableWithColumns.ColumnWildcard.ExcludedColumnNames, excludedColumnNames) {
if len(excludedColumnNames) > 0 && verify.StringValueSlicesEqualIgnoreOrder(perm.Resource.TableWithColumns.ColumnWildcard.ExcludedColumnNames, excludedColumnNames) {
cleanPermissions = append(cleanPermissions, perm)
continue
}
Expand Down
33 changes: 0 additions & 33 deletions internal/service/lakeformation/strings.go
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions internal/verify/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
awspolicy "github.com/jen20/awspolicyequivalence"
)

func SuppressEquivalentPolicyDiffs(k, old, new string, d *schema.ResourceData) bool {
equivalent, err := awspolicy.PoliciesAreEquivalent(old, new)
equivalent, err := PoliciesAreEquivalent(old, new)
if err != nil {
return false
}
Expand Down Expand Up @@ -91,7 +90,7 @@ func SecondJSONUnlessEquivalent(old, new string) (string, error) {
return new, nil
}

equivalent, err := awspolicy.PoliciesAreEquivalent(old, new)
equivalent, err := PoliciesAreEquivalent(old, new)

if err != nil {
return "", err
Expand Down
Loading