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.

Sign up for GitHub

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

Jump to bottom

Add support for docker compose v2 in TestFixturesPlugin #16049

Merged
merged 5 commits into from
Sep 24, 2024
Merged

Add support for docker compose v2 in TestFixturesPlugin #16049

merged 5 commits into from
Sep 24, 2024

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Sep 23, 2024 •
edited
Loading

Description

While looking into upgrading google dependencies to v2, I ran into an issue where docker compose related gradle tasks were being skipped on my Mac due to docker-compose not being present. This PR adds support for Docker Compose V2 (docker compose - without the hyphen)

Related Issues

Resolves: #16050

Dependabot updates have been failing for google related dependencies due to major version upgrade. Example: #16043

opensearch-api-specification repo did a similar update: opensearch-project/opensearch-api-specification#457

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@cwperks
Update references for docker-compose to docker compose
7f1dace 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions github-actions bot added bug Something isn't working Other labels Sep 23, 2024
@cwperks
Support both
e871dbb 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Check if V2 is available
c82faba 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks marked this pull request as ready for review September 23, 2024 23:56
@cwperks
Add to CHANGELOG
5ab9fe3 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks changed the title Update references for docker-compose to docker compose Add support for docker compose v2 in TestFixturePlugin Sep 24, 2024
@cwperks cwperks changed the title Add support for docker compose v2 in TestFixturePlugin Add support for docker compose v2 in TestFixturesPlugin Sep 24, 2024
@cwperks
Update CHANGELOG text
4b6ecf8 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@opensearch-ci-bot opensearch-ci-bot mentioned this pull request Sep 24, 2024
Open
@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for 4b6ecf8: SUCCESS

@codecov Codecov
Copy link

codecov bot commented Sep 24, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 9 lines in your changes missing coverage. Please review.

Project coverage is 71.89%. Comparing base (2b670cc) to head (4b6ecf8).
Report is 11 commits behind head on main.

Files with missing lines Patch % Lines
...search/gradle/testfixtures/TestFixturesPlugin.java 0.00% 6 Missing ⚠️
...opensearch/gradle/docker/DockerSupportService.java 0.00% 3 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #16049      +/-   ##
============================================
- Coverage     71.99%   71.89%   -0.11%     
+ Complexity    64408    64362      -46     
============================================
  Files          5281     5281              
  Lines        301003   301010       +7     
  Branches      43483    43486       +3     
============================================
- Hits         216721   216413     -308     
- Misses        66522    66798     +276     
- Partials      17760    17799      +39

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

dblock
dblock approved these changes Sep 24, 2024
View reviewed changes
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

This works, but ideally it should be figuring out which version of compose is available then using a map to run a different commend, avoids if's ;)

@dblock dblock added skip-changelog backport 2.x Backport to 2.x branch labels Sep 24, 2024
@dblock dblock merged commit 6a29119 into opensearch-project:main Sep 24, 2024
40 of 42 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 24, 2024
@github-actions
Add support for docker compose v2 in TestFixturesPlugin (#16049)
f65c0a1 
* Update references for docker-compose to docker compose

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Support both

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check if V2 is available

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG text

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 6a29119)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Sep 24, 2024
Merged
This was referenced Sep 24, 2024
Open
Open
Open
Open
Open
Open
Open
dblock pushed a commit that referenced this pull request Sep 26, 2024
@opensearch-trigger-bot @github-actions
Add support for docker compose v2 in TestFixturesPlugin (#16049) (#16066
36ee41c 
)

* Update references for docker-compose to docker compose



* Support both



* Check if V2 is available



* Add to CHANGELOG



* Update CHANGELOG text



---------


(cherry picked from commit 6a29119)

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ruai0511 pushed a commit to ruai0511/OpenSearch that referenced this pull request Oct 4, 2024
@cwperks @ruai0511
Add support for docker compose v2 in TestFixturesPlugin (opensearch-p…
2b532ce 
…roject#16049)

* Update references for docker-compose to docker compose

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Support both

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check if V2 is available

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG text

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 16, 2024
@cwperks @dk2k
Add support for docker compose v2 in TestFixturesPlugin (opensearch-p…
1a0f395 
…roject#16049)

* Update references for docker-compose to docker compose

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Support both

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check if V2 is available

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG text

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 17, 2024
@cwperks @dk2k
Add support for docker compose v2 in TestFixturesPlugin (opensearch-p…
01142d0 
…roject#16049)

* Update references for docker-compose to docker compose

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Support both

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check if V2 is available

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG text

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 21, 2024
@cwperks @dk2k
Add support for docker compose v2 in TestFixturesPlugin (opensearch-p…
e3fa8f5 
…roject#16049)

* Update references for docker-compose to docker compose

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Support both

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check if V2 is available

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update CHANGELOG text

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@BrewTestBot BrewTestBot mentioned this pull request Nov 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dblock dblock dblock approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

Assignees
No one assigned
Labels
backport 2.x Backport to 2.x branch bug Something isn't working Other skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[BUG] TestFixturesPlugin is still referencing docker-compose which has been replaced by docker compose
2 participants
@cwperks @dblock