Automatically retry with correct content-type #569

trevor-vaughan · 2021-01-15T22:38:55Z

The podman socket will return a note about the correct content-type that
should be used for a given type of message if it is incorrect.

This is a workaround to automatically correct the content-type and
resubmit the call.

A full correction would be to update all of the different connection
entries but this appears to work correctly in the short term.

Fixes #568

trevor-vaughan · 2021-01-16T20:39:47Z

The errors in Travis appear to be related to the busybox image and not the code changes as far as I can tell.

* Fixed * Validated support for podman in root and rootless mode * Requires upserve/docker-api#569 * Changed the acceptance nodesets to centos so that testing on both podman and docker will function properly * No longer start containers in privileged mode by default for safety reasons * Updated the README * Fixed support for connections to socket files * Added a check for detection of SSH ports < 1024 if operating in rootless mode * Ensure that the IP is set to 127.0.0.1 instead of 0.0.0.0 for better SSH connections * Override host.reboot so that containers are not accidentally destroyed * Fixed PAM session entries due to known pam_loginuid issues * Override enable_root_login since it is already performed by this plugin * Override ssh_service retart if the init process is set as sshd since that causes container termination * Added * Migrated to support docker-api 2.X * Set container names as `beaker-<uniquehash>` for easy cleanup if a name is not otherwise specified * Ensure that the underlying container object can be accessed at any time through `host[:docker_container]` for selective optimization * May want to override the archive_to and scp_to/from methods to call the underlying docker-api commands at some point

* Fixed * Validated support for podman in root and rootless mode * Requires upserve/docker-api#569 * Changed the acceptance nodesets to centos so that testing on both podman and docker will function properly * No longer start containers in privileged mode by default for safety reasons * Updated the README * Fixed support for connections to socket files * Added a check for detection of SSH ports < 1024 if operating in rootless mode * Ensure that the IP is set to 127.0.0.1 instead of 0.0.0.0 for better SSH connections * Override host.reboot so that containers are not accidentally destroyed * Fixed PAM session entries due to known pam_loginuid issues * Override enable_root_login since it is already performed by this plugin * Override ssh_service retart if the init process is set as sshd since that causes container termination * Added * Migrated to support docker-api 2.X * Set container names as `beaker-<hostname>-<uniquehash>` for easy cleanup if a name is not otherwise specified and easy identification when debuggin * Ensure that the underlying container object can be accessed at any time through `host[:docker_container]` for selective optimization * May want to override the archive_to and scp_to/from methods to call the underlying docker-api commands at some point

* Fixed: * Allow all methods that can safely take SUT arrays to do so * Ensure thta pfact_on returns a Hash if appropriate * Fix container support in copy_to * Added: * Explicitly support podman local and remote in copy_to For full podman support, the following are required: * voxpupuli/beaker-docker#29 * upserve/docker-api#569 SIMP-9131 #close SIMP-9129 #close

* Fixed: * Allow all methods that can safely take SUT arrays to do so * Ensure that pfact_on returns a Hash, if appropriate * Fix container support in copy_to * Added: * Explicitly support podman local and remote in copy_to For full podman support, the following are required: * voxpupuli/beaker-docker#29 * upserve/docker-api#569 SIMP-9131 #close SIMP-9129 #close Co-authored-by: op-ct <chris.tessmer@onyxpoint.com>

trevor-vaughan · 2021-02-01T13:11:56Z

Sorry folks, the different ruby versions are being troublesome. Will update again once I have the GitHub Actions working properly.

trevor-vaughan · 2021-02-01T21:54:53Z

Ok, this is now correctly passing in GitHub Actions and should be ready for review.

trevor-vaughan · 2021-02-02T16:32:25Z

@phaelyn @tlunter Hi folks. Sorry for the bother, but I just wanted to check and see if you're still maintaining the gem and/or open to contributions. The PR list seems pretty extensive and hasn't really shifted much from what I can tell.

* Fixed * Validated support for podman in root and rootless mode * Requires upserve/docker-api#569 * Changed the acceptance nodesets to centos so that testing on both podman and docker will function properly * No longer start containers in privileged mode by default for safety reasons * Updated the README * Fixed support for connections to socket files * Added a check for detection of SSH ports < 1024 if operating in rootless mode * Ensure that the IP is set to 127.0.0.1 instead of 0.0.0.0 for better SSH connections * Override host.reboot so that containers are not accidentally destroyed * Fixed PAM session entries due to known pam_loginuid issues * Override enable_root_login since it is already performed by this plugin * Override ssh_service retart if the init process is set as sshd since that causes container termination * Added * Migrated to support docker-api 2.X * Set container names as `beaker-<hostname>-<uniquehash>` for easy cleanup if a name is not otherwise specified and easy identification when debuggin * Ensure that the underlying container object can be accessed at any time through `host[:docker_container]` for selective optimization * May want to override the archive_to and scp_to/from methods to call the underlying docker-api commands at some point

tlunter · 2021-02-18T21:59:33Z

@trevor-vaughan can i ask why you decided to add github actions to the PR? we are already using travis for the testing of the repo.

trevor-vaughan · 2021-02-18T22:02:49Z

@tlunter Well, the main reason is that I couldn't get them to work in Travis. I (and everyone else at this point) can guarantee that they will be run in GitHub. Once I did the work, I figured I should go ahead and submit it.

Also, I'm not sure if you were hit by this (yet) but Travis' support of FOSS projects is now severely lacking with no apparent exit plan.

If you don't like it, I can certainly back it out, but it works quite well (particularly for contributors).

lib/docker/image.rb

lib/docker/connection.rb

trevor-vaughan · 2021-02-18T22:10:02Z

@tlunter Would you also be OK with just leaving it and re-adding the travis stuff? You can change what you pay attention to in the project settings.

I literally couldn't get anything to run in Travis so I'd have to ping-pong it back and forth to figure out if it's still working.

trevor-vaughan · 2021-02-18T22:17:47Z

@tlunter Do you prefer lots of little pushes with a merge/squash at the end or rebase with force push?

tlunter · 2021-02-18T22:22:00Z

The former, typically with a standard merge, no squash. Would prefer squashing only when pushing to test something. Those can merged/rebased together.

trevor-vaughan · 2021-02-18T22:24:19Z

OK, this obviously isn't making anyone's life hard but mine right now so I can fix things up this weekend if you're good with the general implementation.

I can split the github stuff into a separate commit as well if you'd like so it gets separated away from the actual code update.

tlunter · 2021-02-18T22:31:21Z

That would be appreciated. We had done some work to fix the busybox issue in travis towards the end of last year, and now it's back... Going to see if I can dig up what our theory was there.

The podman socket will return a note about the correct content-type that should be used for a given type of message if it is incorrect. This is a workaround to automatically correct the content-type and resubmit the call. A full correction would be to update all of the different connection entries but this appears to work correctly in the short term. Updated the spec tests to use debian:stable instead of wheezy since wheezy is no longer widely supported Added podman-specific skips to spec tests for running on podman systems. Explicitly use URI.open in image pulls to work around potential issues with Ruby 2.7+. Fixes upserve#568

Added GitHub Actions to test both the Docker and Podman code paths since I was unable to get the Travis tests to work properly.

trevor-vaughan · 2021-02-20T05:07:25Z

@tlunter Everything appears to be good to go now.

I went ahead and updated the rest of the tests to work with Podman and added podman tests to the GitHub Actions.

lib/docker.rb

trevor-vaughan · 2021-02-23T00:59:27Z

@tlunter Should be good to go. You might want to consider adding some of the other items in there as well. Things like version() and info() are good candidates.

trevor-vaughan · 2021-02-23T01:17:30Z

@tlunter So, I seem to be getting some cane issues but I didn't touch anything that it's referring to. Should I just bump up the values? I didn't see any way to do line-by-line exclusions like you can in rubocop.

tlunter · 2021-02-23T01:33:47Z

@trevor-vaughan I don't actually know where to look for the failures you're seeing since I only see travis on this PR, but yea, can just increase the limit for cane for now.

trevor-vaughan · 2021-02-23T01:54:32Z

@tlunter Sorry about the flipping. Everything looks good now though. https://github.com/trevor-vaughan/docker-api/actions/runs/591109632

trevor-vaughan · 2021-02-25T19:54:43Z

@tlunter Does this work for you now or did I miss something (pretty sure I got it all)?

lib/docker.rb

trevor-vaughan · 2021-02-28T00:05:33Z

@tlunter Well, in theory this is caching in the connection, not globally, across the board now. Unfortunately, I'm having a bit of fun with GitHub Actions not being able to decide which version of Ubuntu it wants to provide at the moment. The tests worked fine in my branch.

.github/workflows/unit_test.yml

trevor-vaughan · 2021-03-03T21:19:05Z

@tlunter Awesome! Is there anything else you need me to do before a merge (and hopefully release) is possible?

tlunter · 2021-03-03T21:31:27Z

Released as v2.1.0. Thanks a lot @trevor-vaughan

trevor-vaughan · 2021-03-03T21:40:39Z

@tlunter Thanks for putting up with all the noise and working it through with me!

trevor-vaughan mentioned this pull request Jan 17, 2021

Add Podman Support voxpupuli/beaker-docker#29

Merged

trevor-vaughan mentioned this pull request Jan 19, 2021

Add option to run containers with podman instead of docker actions/runner#505

Open

trevor-vaughan mentioned this pull request Jan 20, 2021

(SIMP-9131) Fix container support simp/rubygem-simp-beaker-helpers#144

Merged

trevor-vaughan force-pushed the podman-compat branch 7 times, most recently from ddca4be to 26b7de2 Compare January 31, 2021 22:35

trevor-vaughan force-pushed the podman-compat branch from 26b7de2 to 9b9d3d5 Compare February 1, 2021 21:53

trevor-vaughan mentioned this pull request Feb 2, 2021

Set the content type header on build #563

Open

trevor-vaughan force-pushed the podman-compat branch from 9b9d3d5 to d8de40f Compare February 4, 2021 13:51

tlunter reviewed Feb 18, 2021

View reviewed changes

lib/docker/image.rb Show resolved Hide resolved

tlunter reviewed Feb 18, 2021

View reviewed changes

lib/docker/image.rb Show resolved Hide resolved

tlunter reviewed Feb 18, 2021

View reviewed changes

lib/docker/connection.rb Show resolved Hide resolved

trevor-vaughan force-pushed the podman-compat branch from d8de40f to 8c833dd Compare February 20, 2021 04:30

trevor-vaughan added 2 commits February 19, 2021 23:33

Add GitHub Actions

535a59e

Added GitHub Actions to test both the Docker and Podman code paths since I was unable to get the Travis tests to work properly.

trevor-vaughan force-pushed the podman-compat branch from 8c833dd to 535a59e Compare February 20, 2021 04:33

tlunter reviewed Feb 23, 2021

View reviewed changes

lib/docker.rb Show resolved Hide resolved

cache podman and rootless queries

29a324a

trevor-vaughan added 2 commits February 22, 2021 20:35

update cane

e600a41

additional cane updates

48c9a9d

tlunter reviewed Feb 27, 2021

View reviewed changes

lib/docker.rb Outdated Show resolved Hide resolved

tlunter reviewed Feb 27, 2021

View reviewed changes

lib/docker.rb Show resolved Hide resolved

cache in connection

cc66ed1

trevor-vaughan mentioned this pull request Feb 28, 2021

Update to the next release of docker-api when it has podman support voxpupuli/beaker-docker#35

Closed

more flexible docker install test

0ddf338

tlunter reviewed Mar 1, 2021

View reviewed changes

.github/workflows/unit_test.yml Show resolved Hide resolved

tlunter merged commit dca8a0c into upserve:master Mar 3, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Automatically retry with correct content-type #569

Automatically retry with correct content-type #569

trevor-vaughan commented Jan 15, 2021

trevor-vaughan commented Jan 16, 2021

trevor-vaughan commented Feb 1, 2021

trevor-vaughan commented Feb 1, 2021

trevor-vaughan commented Feb 2, 2021

tlunter commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

tlunter commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

tlunter commented Feb 18, 2021

trevor-vaughan commented Feb 20, 2021

trevor-vaughan commented Feb 23, 2021

trevor-vaughan commented Feb 23, 2021

tlunter commented Feb 23, 2021

trevor-vaughan commented Feb 23, 2021

trevor-vaughan commented Feb 25, 2021

trevor-vaughan commented Feb 28, 2021

trevor-vaughan commented Mar 3, 2021

tlunter commented Mar 3, 2021

trevor-vaughan commented Mar 3, 2021

Automatically retry with correct content-type #569

Automatically retry with correct content-type #569

Conversation

trevor-vaughan commented Jan 15, 2021

trevor-vaughan commented Jan 16, 2021

trevor-vaughan commented Feb 1, 2021

trevor-vaughan commented Feb 1, 2021

trevor-vaughan commented Feb 2, 2021

tlunter commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

tlunter commented Feb 18, 2021

trevor-vaughan commented Feb 18, 2021

tlunter commented Feb 18, 2021

trevor-vaughan commented Feb 20, 2021

trevor-vaughan commented Feb 23, 2021

trevor-vaughan commented Feb 23, 2021

tlunter commented Feb 23, 2021

trevor-vaughan commented Feb 23, 2021

trevor-vaughan commented Feb 25, 2021

trevor-vaughan commented Feb 28, 2021

trevor-vaughan commented Mar 3, 2021

tlunter commented Mar 3, 2021

trevor-vaughan commented Mar 3, 2021