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(SqlExecutionRepository): fixed bug in sql repository in orca-sql … (backport #4697) #4701

Merged
merged 2 commits into from
Apr 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2024

This fixes two bugs in the selectExecutions method of the orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/SqlExecutionRepository.kt file. These were probably never found because they are only used for some cleanup job: OldPipelineCleanupPollingNotificationAgent.


This is an automatic backport of pull request #4697 done by [Mergify](https://mergify.com).

#4697)

* fix(SqlExecutionRepository): fixed bug in sql repository in orca-sql module

* test(sql): demonstrate behavior of retrievePipelinesForApplication

which also verifies the behavior of selectExections when cursor is null

---------

Co-authored-by: David Byron <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit fc072b3)

# Conflicts:
#	orca-sql/src/test/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/SqlExecutionRepositoryTest.kt
@mergify mergify bot added the conflicts label Apr 15, 2024
Copy link
Contributor Author

mergify bot commented Apr 15, 2024

Cherry-pick of fc072b3 has failed:

On branch mergify/bp/release-1.32.x/pr-4697
Your branch is up to date with 'origin/release-1.32.x'.

You are currently cherry-picking commit fc072b3a9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/SqlExecutionRepository.kt
	modified:   orca-sql/src/test/groovy/com/netflix/spinnaker/orca/sql/cleanup/OldPipelineCleanupPollingNotificationAgentSpec.groovy

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   orca-sql/src/test/kotlin/com/netflix/spinnaker/orca/sql/pipeline/persistence/SqlExecutionRepositoryTest.kt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

since compression was added after cutting the release-1.32.x branch
@dbyron-sf dbyron-sf added the ready to merge Approved and ready for merge label Apr 15, 2024
@mergify mergify bot added the auto merged Merged automatically by a bot label Apr 15, 2024
@mergify mergify bot merged commit c64ed7f into release-1.32.x Apr 15, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/release-1.32.x/pr-4697 branch April 15, 2024 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto merged Merged automatically by a bot conflicts ready to merge Approved and ready for merge target-release/1.32
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants