Extract metadata from enumeration pkg #1572
Merged
Conversation
This file contains 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
moadibfr
suggested changes
Jul 29, 2022
elie.tf
Outdated
| @@ -0,0 +1,23 @@ | |||
| provider "aws" { | |||
| region = "us-east-1" | |||
There was a problem hiding this comment.
I think you added this file by mistake ?
There was a problem hiding this comment.
Oh yeah good catch thanks a lot
| @@ -69,7 +70,7 @@ func (e *S3BucketAnalyticEnumerator) Enumerate() ([]*resource.Resource, error) { | |||
| string(e.SupportedType()), | |||
| id, | |||
| map[string]interface{}{ | |||
| "region": region, | |||
| "alias": region, | |||
There was a problem hiding this comment.
no sure I understand this change ˆˆ
There was a problem hiding this comment.
If you read the previous func that defined read attributes for those s3 related resources, we were retrieviing the regions attribute and setting it to the "alias" field. Since we do not have this method anymore, I needed to change it there directly.
Does it answer your question ?
Those tests were broken due to removal of SetResolveReadAttributesFunc. Sometimes in those methods we were casting field from different types to string. If we loose that case it causes some issues since in the detail fetcher we only take into account strings attributes. To fix that I added some cast directly in the detail fetcher. That should not cause any issues to retrieve details if we send additional (useless) fields to the ReadResource call.
eliecharra
force-pushed
the
extract_metadata
branch
from
d54e9e6
to
a18af39
Compare
Codecov Report
@@ Coverage Diff @@
## main #1572 +/- ##
==========================================
- Coverage 83.81% 78.86% -4.96%
==========================================
Files 179 219 +40
Lines 6131 6918 +787
==========================================
+ Hits 5139 5456 +317
- Misses 847 1266 +419
- Partials 145 196 +51
|
moadibfr
approved these changes
Aug 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Metadata are now in driftctl pkg.
I removed completely func
SetResolveReadAttributesFunc, attributes set in the enumerator are now used as it byt the detail fetcher.The main issue was that the detail fetcher was only using string attributes in ReadResource, so I added some casting logic in it (see latest commits on tests fix).
This had some side effects on following resources:
aws_network_acl_rule(and by heritance we also had impact onaws_network_acltoo)aws_cloudformation_stackaws_security_group_ruleI added a normalization pass on driftctl side after the remote scan to apply normalization. No now we retrieve resources then normalize them instead of doing the normalization directly while retrieving resources. That's why now there is two resource factories, one in enum pkg that only create the struct but without any modification. We got another factory in drifctl that is applying normalization.
All golden files rename can be ommited in the review, it's a side effect to have more attributes fields. Because now we are not only using fields from
SetResolveReadAttributesFunc. That should not cause any issues to retrieve details if we send additional (useless) fields to theReadResourcecall.