Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

set nomerge on delta reset #1921

Merged
merged 2 commits into from
Dec 22, 2022
Merged

set nomerge on delta reset #1921

merged 2 commits into from
Dec 22, 2022

Conversation

ryanfkeepers
Copy link
Contributor

Description

Flag doNotMergeItems for exchange collections
where the delta token was marked as reset (ie,
expired or otherwise unusable). Do this instead
of making a (delete, new) collection tuple for
that path.

Does this PR need a docs update or release note?

  • ⛔ No

Type of change

  • 🌻 Feature

Issue(s)

Test Plan

  • 💚 E2E

@ryanfkeepers ryanfkeepers requested a review from ashmrtn December 22, 2022 21:14
@ryanfkeepers ryanfkeepers self-assigned this Dec 22, 2022
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:15 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:15 — with GitHub Actions Inactive
ryanfkeepers
ryanfkeepers commented Dec 22, 2022
View reviewed changes
src/internal/connector/exchange/exchange_data_collection.go
collectionType: collectionType,
ctrl: ctrlOpts,
state: stateOf(prev, curr),
collectionType: collectionType,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

decided to alphabetize these.

@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:15 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:18 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:18 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:19 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:19 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:19 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 21:19 — with GitHub Actions Inactive
Base automatically changed from issue-1914-donotmerge to main December 22, 2022 21:27
ashmrtn
ashmrtn approved these changes Dec 22, 2022
View reviewed changes
Copy link
Contributor

@ashmrtn ashmrtn left a comment

Choose a reason for hiding this comment

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

Needs rebasing, but looks good

not something I can comment on directly in this PR but I think line 77 in service_iterators.go needs updated to use IDs instead of paths. This change should be done in a new PR

@aviator-app
Copy link
Contributor

aviator-app bot commented Dec 22, 2022 •
edited
Loading

Aviator status

Aviator will automatically update this comment as the status of the PR changes.

This PR was merged using Aviator.

@ryanfkeepers
set nomerge on delta reset
98e2bfa 
Flag doNotMergeItems for exchange collections
where the delta token was marked as reset (ie,
expired or otherwise unusable).  Do this instead
of making a (delete, new) collection tuple for
that path.
@ryanfkeepers
fix missing test prop
c69cbc6
@ryanfkeepers ryanfkeepers force-pushed the issue-1914-set-nomerge branch from 12cab85 to c69cbc6 Compare December 22, 2022 22:37
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 22:37 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 22:37 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 22:37 — with GitHub Actions Inactive
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell B 1 Code Smell

No Coverage information No Coverage information
0.0% 0.0% Duplication

@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 22:38 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 22:38 — with GitHub Actions Inactive
@ryanfkeepers ryanfkeepers temporarily deployed to Testing December 22, 2022 22:38 — with GitHub Actions Inactive
@aviator-app aviator-app bot merged commit 168ba1b into main Dec 22, 2022
@aviator-app aviator-app bot deleted the issue-1914-set-nomerge branch December 22, 2022 22:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ashmrtn ashmrtn ashmrtn approved these changes

Assignees

@ryanfkeepers ryanfkeepers

Labels
backup mergequeue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ryanfkeepers @ashmrtn