Skip to content

only use ToModel when --no-interpolate is set#11604

Merged
ndeloof merged 1 commit intodocker:mainfrom
ndeloof:config_regressions
Mar 13, 2024
Merged

only use ToModel when --no-interpolate is set#11604
ndeloof merged 1 commit intodocker:mainfrom
ndeloof:config_regressions

Conversation

@ndeloof
Copy link
Copy Markdown
Contributor

@ndeloof ndeloof commented Mar 12, 2024

What I did
#11556 has impact on compose config which disturbs our users. This PR allows to preserve the previous behavior as long as --no-interpolate isn't set, and only switch to raw model parsing when set

We can then work in parallel to get ToModel closer to ToProject until we can eventually remove duplicated code path

Related issue
#11598

(not mandatory) A picture of a cute animal, if possible in relation to what you did

@ndeloof ndeloof force-pushed the config_regressions branch from b871254 to 835b62d Compare March 12, 2024 10:23
@ndeloof ndeloof requested review from a team, glours, jhrotko and milas and removed request for a team March 12, 2024 10:23
Copy link
Copy Markdown
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

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

LGTM, can you add e2e tests to check both behaviours please?

Copy link
Copy Markdown
Contributor

@jhrotko jhrotko left a comment

Choose a reason for hiding this comment

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

LGTM

@ndeloof ndeloof force-pushed the config_regressions branch from 835b62d to db3f61e Compare March 13, 2024 05:05
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 13, 2024

Codecov Report

Attention: Patch coverage is 39.13043% with 14 lines in your changes are missing coverage. Please review.

Project coverage is 57.73%. Comparing base (4efb897) to head (db3f61e).
Report is 1 commits behind head on main.

Files Patch % Lines
cmd/compose/config.go 39.13% 10 Missing and 4 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #11604      +/-   ##
==========================================
- Coverage   58.20%   57.73%   -0.47%     
==========================================
  Files         135      138       +3     
  Lines       11611    11729     +118     
==========================================
+ Hits         6758     6772      +14     
- Misses       4182     4281      +99     
- Partials      671      676       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kamilchm
Copy link
Copy Markdown

Hey @ndeloof, great to see a fix. When are you planning to release it?

@ndeloof ndeloof deleted the config_regressions branch March 14, 2024 14:56
@ndeloof
Copy link
Copy Markdown
Contributor Author

ndeloof commented Mar 14, 2024

I'll run a release tomorrow

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.

4 participants