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.

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

fix: conflict detection only for generated files #393

Merged
merged 20 commits into from
Jun 15, 2022
Merged

Conversation

i4ki
Copy link
Contributor

@i4ki i4ki commented Jun 10, 2022

Closes #390

@i4ki i4ki marked this pull request as draft June 10, 2022 11:30
@codecov
Copy link

codecov bot commented Jun 10, 2022

Codecov Report

Merging #393 (c8450ad) into main (f90fb75) will increase coverage by 0.07%.
The diff coverage is 97.35%.

@@            Coverage Diff             @@
##             main     #393      +/-   ##
==========================================
+ Coverage   69.57%   69.65%   +0.07%     
==========================================
  Files          37       37              
  Lines        7314     7276      -38     
==========================================
- Hits         5089     5068      -21     
+ Misses       1971     1958      -13     
+ Partials      254      250       -4     
Flag Coverage Δ
tests 69.65% <97.35%> (+0.07%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
generate/generate.go 82.76% <96.38%> (+4.09%) ⬆️
generate/genhcl/genhcl.go 96.26% <96.96%> (-0.59%) ⬇️
generate/genfile/genfile.go 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f90fb75...c8450ad. Read the comment docs.

@i4ki i4ki requested a review from katcipis June 13, 2022 10:12
@i4ki i4ki marked this pull request as ready for review June 13, 2022 10:13
katcipis
katcipis previously approved these changes Jun 13, 2022
Copy link
Contributor

@katcipis katcipis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM + some small possible improvements. Regarding sorting it can also be ignored or assessed later in a different PR. Thanks for fixing this 🚀

generate/generate.go Show resolved Hide resolved
generate/generate.go Show resolved Hide resolved
generate/generate_hcl_test.go Show resolved Hide resolved
generate/generate_test.go Show resolved Hide resolved
generate/genfile/genfile.go Outdated Show resolved Hide resolved
generate/genhcl/genhcl.go Show resolved Hide resolved
generate/genhcl/genhcl_test.go Outdated Show resolved Hide resolved
generate/genhcl/genhcl_test.go Show resolved Hide resolved
generate/genhcl/genhcl_test.go Outdated Show resolved Hide resolved
generate/genhcl/genhcl_test.go Outdated Show resolved Hide resolved
i4ki and others added 8 commits June 14, 2022 12:43
Co-authored-by: Tiago Cesar Katcipis <tiagokatcipis@gmail.com>
Co-authored-by: Tiago Cesar Katcipis <tiagokatcipis@gmail.com>
Co-authored-by: Tiago Cesar Katcipis <tiagokatcipis@gmail.com>
Co-authored-by: Tiago Cesar Katcipis <tiagokatcipis@gmail.com>
@i4ki i4ki requested a review from katcipis June 14, 2022 11:55
@i4ki i4ki merged commit 3830aae into main Jun 15, 2022
@i4ki i4ki deleted the i4k-fix-conflict-detection branch June 15, 2022 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Label conflict in conditional code generation when different conditions is used
2 participants