Skip to content

feat: added no-merge flag to sync, diff, apply command#1994

Draft
Prashansa-K wants to merge 4 commits intomainfrom
feat/no-merge
Draft

feat: added no-merge flag to sync, diff, apply command#1994
Prashansa-K wants to merge 4 commits intomainfrom
feat/no-merge

Conversation

@Prashansa-K
Copy link
Copy Markdown
Contributor

@Prashansa-K Prashansa-K commented Apr 10, 2026

--no-merge flag enables deck to process the
files passed one by one, rather than merging
them all together and send as a whole.
This is useful in case entities are split
across multiple files with different
select-tags. Merging would tag all entities
with the mentioned select-tags. A no-merge
option bypasses this issue. It also keeps our
request urls sent to admin-api under maxLength

Basing this over 3.13 and 3.14 branch tests branch and tests/konnect to avoid conflicts later.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Apr 10, 2026

Codecov Report

❌ Patch coverage is 0% with 166 lines in your changes missing coverage. Please review.
✅ Project coverage is 32.14%. Comparing base (c07059f) to head (2767d6d).
⚠️ Report is 18 commits behind head on main.

Files with missing lines Patch % Lines
cmd/common.go 0.00% 68 Missing ⚠️
cmd/gateway_diff.go 0.00% 23 Missing ⚠️
cmd/utils.go 0.00% 22 Missing ⚠️
cmd/gateway_sync.go 0.00% 21 Missing ⚠️
cmd/gateway_validate.go 0.00% 19 Missing ⚠️
cmd/gateway_apply.go 0.00% 13 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1994      +/-   ##
==========================================
- Coverage   32.92%   32.14%   -0.79%     
==========================================
  Files          77       77              
  Lines        6988     7149     +161     
==========================================
- Hits         2301     2298       -3     
- Misses       4504     4667     +163     
- Partials      183      184       +1     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Prashansa-K Prashansa-K self-assigned this Apr 10, 2026
@Prashansa-K Prashansa-K changed the base branch from tests/gw-3.13-3.14 to tests/konnect April 10, 2026 05:24
@Prashansa-K
Copy link
Copy Markdown
Contributor Author

Holding off on merge:
This is a basic usecase here.
The following issues still exist:

  • If a directory is passed deck gateway sync dirname --no-merge, files aren't executed without merge.
  • diff and validate don't check for "duplicates" yet.

@Prashansa-K Prashansa-K marked this pull request as draft April 10, 2026 06:12
@gitguardian
Copy link
Copy Markdown

gitguardian bot commented Apr 10, 2026

️✅ There are no secrets present in this pull request anymore.

If these secrets were true positive and are still valid, we highly recommend you to revoke them.
While these secrets were previously flagged, we no longer have a reference to the
specific commits where they were detected. Once a secret has been leaked into a git
repository, you should consider it compromised, even if it was deleted immediately.
Find here more information about risks.


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Base automatically changed from tests/konnect to main April 10, 2026 11:12
--no-merge flag enables deck to process the
files passed one by one, rather than merging
them all together and send as a whole.
This is useful in case entities are split
across multiple files with different
select-tags. Merging would tag all entities
with the mentioned select-tags. A no-merge
option bypasses this issue. It also keeps our
request urls sent to admin-api under maxLength
@Prashansa-K
Copy link
Copy Markdown
Contributor Author

Will add more tests to this to cover directory traversal and duplicates checking.
Need to update validate and apply workflows to account for batching as well.

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.

2 participants