8000 Add storage bucket iam members and policies by moadibfr · Pull Request #1083 · snyk/driftctl · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add storage bucket iam members and policies #1083

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 5 commits into from
Oct 7, 2021
Merged

Add storage bucket iam members and policies #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f4f56c
add support for google_storage_bucket_iam_member
Sep 28, 2021
7cd13a9
add support for google_storage_bucket_iam_policy, add tests
Sep 29, 2021
9dc7d8d
transform every bucket iam into members
Oct 4, 2021
c5978ec
fix incorrect naming
Oct 6, 2021
0949440
Merge branch 'main' into fea/google_storage_bucket_iam_members
eliecharra Oct 7, 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
6 changes: 5 additions & 1 deletion pkg/driftctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ func (d DriftCTL) Run() (*analyser.Analysis, error) {
middlewares.NewTagsAllManager(),
middlewares.NewEipAssociationExpander(d.resourceFactory),
middlewares.NewRDSClusterInstanceExpander(d.resourceFactory),
middlewares.NewGoogleLegacyBucketIAMBindings(),

middlewares.NewGoogleStorageBucketIAMBindingTransformer(d.resourceFactory),
middlewares.NewGoogleStorageBucketIAMPolicyTransformer(d.resourceFactory),
middlewares.NewGoogleLegacyBucketIAMMember(),

middlewares.NewAzurermSubnetExpander(d.resourceFactory),
middlewares.NewAwsApiGatewayDeploymentExpander(d.resourceFactory),
middlewares.NewAwsApiGatewayResourceExpander(d.resourceFactory),
Expand Down
2 changes: 2 additions & 0 deletions pkg/iac/terraform/state/terraform_state_reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ func TestTerraformStateReader_Google_Resources(t *testing.T) {
{name: "compute router", dirName: "google_compute_router", wantErr: false},
{name: "compute instance", dirName: "google_compute_instance", wantErr: false},
{name: "Bucket IAM Bindings", dirName: "google_bucket_iam_binding", wantErr: false},
{name: "Bucket IAM members", dirName: "google_bucket_iam_member", wantErr: false},
{name: "Bucket IAM Policy", dirName: "google_bucket_iam_policy", wantErr: false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
28 changes: 16 additions & 12 deletions pkg/iac/terraform/state/test/google_bucket_iam_binding/results.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
[
{
"Id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin",
"Type": "google_storage_bucket_iam_binding",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin",
"members": [
"user:elie.charra@cloudskiff.com"
],
"role": "roles/storage.admin"
}
},
{
"Id": "b/dctlgstoragebucketiambinding-2/roles/storage.admin",
"Type": "google_storage_bucket_iam_binding",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-2/roles/storage.admin",
"members": [
"user:william.beuil@cloudskiff.com"
Expand All @@ -16,6 +30,7 @@
"Type": "google_storage_bucket_iam_binding",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.objectViewer",
"members": [
"user:william.beuil@cloudskiff.com"
Expand All @@ -28,23 +43,12 @@
"Type": "google_storage_bucket_iam_binding",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-2/roles/storage.objectViewer",
"members": [
"user:elie.charra@cloudskiff.com"
],
"role": "roles/storage.objectViewer"
}
},
{
"Id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin",
"Type": "google_storage_bucket_iam_binding",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin",
"members": [
"user:elie.charra@cloudskiff.com"
],
"role": "roles/storage.admin"
}
}
]
42 changes: 42 additions & 0 deletions pkg/iac/terraform/state/test/google_bucket_iam_member/results.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"Id": "b/dctlgstoragebucketiambinding-2/roles/storage.objectViewer/user:elie.charra@cloudskiff.com",
"Type": "google_storage_bucket_iam_member",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"id": "b/dctlgstoragebucketiambinding-2/roles/storage.objectViewer/user:elie.charra@cloudskiff.com",
"member": "user:elie.charra@cloudskiff.com",
"role": "roles/storage.objectViewer"
}
},
{
"Id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin/user:elie.charra@cloudskiff.com",
"Type": "google_storage_bucket_iam_member",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin/user:elie.charra@cloudskiff.com",
"member": "user:elie.charra@cloudskiff.com",
"role": "roles/storage.admin"
}
},
{
"Id": "b/dctlgstoragebucketiambinding-1/roles/storage.objectViewer/user:william.beuil@cloudskiff.com",
"Type": "google_storage_bucket_iam_member",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.objectViewer/user:william.beuil@cloudskiff.com",
"member": "user:william.beuil@cloudskiff.com",
"role": "roles/storage.objectViewer"
}
},
{
"Id": "b/dctlgstoragebucketiambinding-2/roles/storage.admin/user:william.beuil@cloudskiff.com",
"Type": "google_storage_bucket_iam_member",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"id": "b/dctlgstoragebucketiambinding-2/roles/storage.admin/user:william.beuil@cloudskiff.com",
"member": "user:william.beuil@cloudskiff.com",
"role": "roles/storage.admin"
}
}
]
105 changes: 105 additions & 0 deletions pkg/iac/terraform/state/test/google_bucket_iam_member/terraform.tfstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"version": 4,
"terraform_version": "0.14.5",
"serial": 79,
"lineage": "c2cd867e-c930-5de3-8592-8eb915e60cb8",
"outputs": {},
"resources": [
{
"mode": "managed",
"type": "google_storage_bucket_iam_member",
"name": "eli2",
"provider": "provider[\"registry.terraform.io/hashicorp/google\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"condition": [],
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-2/roles/storage.objectViewer/user:elie.charra@cloudskiff.com",
"member": "user:elie.charra@cloudskiff.com",
"role": "roles/storage.objectViewer"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"google_storage_bucket.dctlgstoragebucketiambinding-2"
]
}
]
},
{
"mode": "managed",
"type": "google_storage_bucket_iam_member",
"name": "elie1",
"provider": "provider[\"registry.terraform.io/hashicorp/google\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"condition": [],
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.admin/user:elie.charra@cloudskiff.com",
"member": "user:elie.charra@cloudskiff.com",
"role": "roles/storage.admin"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"google_storage_bucket.dctlgstoragebucketiambinding-1"
]
}
]
},
{
"mode": "managed",
"type": "google_storage_bucket_iam_member",
"name": "will1",
"provider": "provider[\"registry.terraform.io/hashicorp/google\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"condition": [],
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-1/roles/storage.objectViewer/user:william.beuil@cloudskiff.com",
"member": "user:william.beuil@cloudskiff.com",
"role": "roles/storage.objectViewer"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"google_storage_bucket.dctlgstoragebucketiambinding-1"
]
}
]
},
{
"mode": "managed",
"type": "google_storage_bucket_iam_member",
"name": "will2",
"provider": "provider[\"registry.terraform.io/hashicorp/google\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"condition": [],
"etag": "CAM=",
"id": "b/dctlgstoragebucketiambinding-2/roles/storage.admin/user:william.beuil@cloudskiff.com",
"member": "user:william.beuil@cloudskiff.com",
"role": "roles/storage.admin"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"google_storage_bucket.dctlgstoragebucketiambinding-2"
]
}
]
}
]
}
22 changes: 22 additions & 0 deletions pkg/iac/terraform/state/test/google_bucket_iam_policy/results.golden.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"Id": "b/dctlgstoragebucketiambinding-1",
"Type": "google_storage_bucket_iam_policy",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"etag": "CAU=",
"id": "b/dctlgstoragebucketiambinding-1",
"policy_data": "{\"bindings\":[{\"members\":[\"serviceAccount:driftctl@cloudskiff-dev-martin.iam.gserviceaccount.com\",\"user:elie.charra@cloudskiff.com\",\"user:martin.guibert@cloudskiff.com\"],\"role\":\"roles/storage.admin\"},{\"members\":[\"user:william.beuil@cloudskiff.com\"],\"role\":\"roles/storage.objectViewer\"}]}"
}
},
{
"Id": "b/dctlgstoragebucketiambinding-2",
"Type": "google_storage_bucket_iam_policy",
"Attrs": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"etag": "CAU=",
"id": "b/dctlgstoragebucketiambinding-2",
"policy_data": "{\"bindings\":[{\"members\":[\"serviceAccount:driftctl@cloudskiff-dev-martin.iam.gserviceaccount.com\",\"user:elie.charra@cloudskiff.com\",\"user:martin.guibert@cloudskiff.com\"],\"role\":\"roles/storage.admin\"},{\"members\":[\"user:william.beuil@cloudskiff.com\"],\"role\":\"roles/storage.objectViewer\"}]}"
}
}
]
55 changes: 55 additions & 0 deletions pkg/iac/terraform/state/test/google_bucket_iam_policy/terraform.tfstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 4,
"terraform_version": "0.14.5",
"serial": 33,
"lineage": "3e964c0c-f80f-f7d8-621f-94c9f5b8924b",
"outputs": {},
"resources": [
{
"mode": "managed",
"type": "google_storage_bucket_iam_policy",
"name": "policy",
"provider": "provider[\"registry.terraform.io/hashicorp/google\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"bucket": "b/dctlgstoragebucketiambinding-1",
"etag": "CAU=",
"id": "b/dctlgstoragebucketiambinding-1",
"policy_data": "{\"bindings\":[{\"members\":[\"serviceAccount:driftctl@cloudskiff-dev-martin.iam.gserviceaccount.com\",\"user:elie.charra@cloudskiff.com\",\"user:martin.guibert@cloudskiff.com\"],\"role\":\"roles/storage.admin\"},{\"members\":[\"user:william.beuil@cloudskiff.com\"],\"role\":\"roles/storage.objectViewer\"}]}"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"data.google_iam_policy.binding_admin_1",
"google_storage_bucket.dctlgstoragebucketiambinding-1"
]
}
]
},
{
"mode": "managed",
"type": "google_storage_bucket_iam_policy",
"name": "policy2",
"provider": "provider[\"registry.terraform.io/hashicorp/google\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"bucket": "b/dctlgstoragebucketiambinding-2",
"etag": "CAU=",
"id": "b/dctlgstoragebucketiambinding-2",
"policy_data": "{\"bindings\":[{\"members\":[\"serviceAccount:driftctl@cloudskiff-dev-martin.iam.gserviceaccount.com\",\"user:elie.charra@cloudskiff.com\",\"user:martin.guibert@cloudskiff.com\"],\"role\":\"roles/storage.admin\"},{\"members\":[\"user:william.beuil@cloudskiff.com\"],\"role\":\"roles/storage.objectViewer\"}]}"
},
"sensitive_attributes": [],
"private": "bnVsbA==",
"dependencies": [
"data.google_iam_policy.binding_admin_2",
"google_storage_bucket.dctlgstoragebucketiambinding-2"
]
}
]
}
]
}
16 changes: 8 additions & 8 deletions ...ares/google_legacy_bucket_iam_bindings.go → ...ewares/google_legacy_bucket_iam_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ import (
)

// Creating buckets add legacy role bindings, this middleware will filter them unless they are managed.
type GoogleLegacyBucketIAMBindings struct{}
type GoogleLegacyBucketIAMMember struct{}

func NewGoogleLegacyBucketIAMBindings() GoogleLegacyBucketIAMBindings {
return GoogleLegacyBucketIAMBindings{}
func NewGoogleLegacyBucketIAMMember() *GoogleLegacyBucketIAMMember {
return &GoogleLegacyBucketIAMMember{}
}

func (m GoogleLegacyBucketIAMBindings) Execute(remoteResources, resourcesFromState *[]*resource.Resource) error {
func (m *GoogleLegacyBucketIAMMember) Execute(remoteResources, resourcesFromState *[]*resource.Resource) error {

newRemoteResources := make([]*resource.Resource, 0)

for _, remoteResource := range *remoteResources {
// Ignore all resources other than BucketIamBinding
if remoteResource.ResourceType() != google.GoogleStorageBucketIamBindingResourceType {
if remoteResource.ResourceType() != google.GoogleStorageBucketIamMemberResourceType {
newRemoteResources = append(newRemoteResources, remoteResource)
continue
}

// Ignore all non-legacy bindings
// Ig 82AA nore all non-legacy member
if roleName := remoteResource.Attrs.GetString("role"); roleName != nil && !strings.Contains(*roleName, "legacy") {
newRemoteResources = append(newRemoteResources, remoteResource)
continue
}

// Check if bindings is managed by IaC
// Check if member is managed by IaC
existInState := false
for _, stateResource := range *resourcesFromState {
if remoteResource.Equal(stateResource) {
Expand All @@ -51,7 +51,7 @@ func (m GoogleLegacyBucketIAMBindings) Execute(remoteResources, resourcesFromSta
logrus.WithFields(logrus.Fields{
"id": remoteResource.ResourceId(),
"type": remoteResource.ResourceType(),
}).Debug("Ignoring legacy bucket bindings as it is not managed by IaC")
}).Debug("Ignoring legacy bucket member as it is not managed by IaC")
}

*remoteResources = newRemoteResources
Expand Down
Loading
0