Add support for GCP scopes #1296
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| package config | ||
|
|
||
| type GCPTerraformConfig struct { | ||
| Scope []string `cty:"scope"` | ||
bgdanix marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ package repository | |
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| asset "cloud.google.com/go/asset/apiv1" | ||
| "github.com/snyk/driftctl/pkg/remote/cache" | ||
|
|
@@ -75,101 +74,111 @@ func NewAssetRepository(client *asset.Client, config config.GCPTerraformConfig, | |
| } | ||
|
|
||
| func (s assetRepository) listAllResources(ty string) ([]*assetpb.Asset, error) { | ||
|
|
||
| filteredResults := []*assetpb.Asset{} | ||
|
|
||
| for _, scope := range s.config.Scope { | ||
| cacheKey := "listAllResources" + scope | ||
| cachedResults := s.cache.GetAndLock(cacheKey) | ||
| defer s.cache.Unlock(cacheKey) | ||
|
|
||
| req := &assetpb.ListAssetsRequest{ | ||
| Parent: scope, | ||
|
Contributor
There was a problem hiding this comment. I'm not sure that a folder is supported for Can you double check that ?
Author
There was a problem hiding this comment. Indeed. Ideally we should not use listAssets but only searchAssets as the main difference is that list takes a snapshot of how the assets were at a particular time, which could result in a diff from what it's actually present.
Contributor
There was a problem hiding this comment. Where did you get this info ? I asked this question here a couple of month ago and I didn't get any answer.
Author
There was a problem hiding this comment. From here there are a couple of hints about it: Also in the API it's mentioned the purpose is to list resources from a specific timeframe While the search is more appropriate for our intent: |
||
| ContentType: assetpb.ContentType_RESOURCE, | ||
| AssetTypes: []string{ | ||
| cloudFunctionsFunction, | ||
| bigtableInstanceAssetType, | ||
| bigtableTableAssetType, | ||
| sqlDatabaseInstanceAssetType, | ||
| computeGlobalAddressAssetType, | ||
| nodeGroupAssetType, | ||
| }, | ||
| } | ||
|
|
||
| var results []*assetpb.Asset | ||
|
|
||
| if cachedResults != nil { | ||
| results = cachedResults.([]*assetpb.Asset) | ||
| } | ||
|
|
||
| if results == nil { | ||
| it := s.client.ListAssets(context.Background(), req) | ||
| for { | ||
| resource, err := it.Next() | ||
| if err == iterator.Done { | ||
| break | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| results = append(results, resource) | ||
| } | ||
| s.cache.Put(cacheKey, results) | ||
| } | ||
|
|
||
| for _, result := range results { | ||
| if result.AssetType == ty { | ||
| filteredResults = append(filteredResults, result) | ||
| } | ||
| } | ||
| } | ||
| return filteredResults, nil | ||
| } | ||
|
|
||
| func (s assetRepository) searchAllResources(ty string) ([]*assetpb.ResourceSearchResult, error) { | ||
|
|
||
| filteredResults := []*assetpb.ResourceSearchResult{} | ||
|
|
||
| for _, scope := range s.config.Scope { | ||
| cacheKey := "SearchAllResources" + scope | ||
bgdanix marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| cachedResults := s.cache.GetAndLock(cacheKey) | ||
| defer s.cache.Unlock(cacheKey) | ||
|
|
||
| req := &assetpb.SearchAllResourcesRequest{ | ||
| Scope: scope, | ||
| AssetTypes: []string{ | ||
| storageBucketAssetType, | ||
| computeFirewallAssetType, | ||
| computeRouterAssetType, | ||
| computeInstanceAssetType, | ||
| computeNetworkAssetType, | ||
| computeSubnetworkAssetType, | ||
| dnsManagedZoneAssetType, | ||
| computeInstanceGroupAssetType, | ||
| bigqueryDatasetAssetType, | ||
| bigqueryTableAssetType, | ||
| computeAddressAssetType, | ||
| computeDiskAssetType, | ||
| computeImageAssetType, | ||
| healthCheckAssetType, | ||
| cloudRunServiceAssetType, | ||
| }, | ||
| } | ||
| var results []*assetpb.ResourceSearchResult | ||
|
|
||
| if cachedResults != nil { | ||
| results = cachedResults.([]*assetpb.ResourceSearchResult) | ||
| } | ||
|
|
||
| if results == nil { | ||
| it := s.client.SearchAllResources(context.Background(), req) | ||
| for { | ||
| resource, err := it.Next() | ||
| if err == iterator.Done { | ||
| break | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| results = append(results, resource) | ||
| } | ||
| s.cache.Put(cacheKey, results) | ||
| } | ||
|
|
||
| for _, result := range results { | ||
| if result.AssetType == ty { | ||
| filteredResults = append(filteredResults, result) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Plea try to avoid else-if statements, there is not reason do use them here