vagrant-proxyconf 2.0.4 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3fb0eb7149c9d6f2428429c1b9aa483c7441b05
-  data.tar.gz: 93ec0d7d278519991fa1e6e94ec9915926eea50a
+SHA256:
+  metadata.gz: 6d2ed9c11cdc9cd9649a6dab1f4916430deffd34d7beef9f60ec1d997d8248ba
+  data.tar.gz: 44b631d6aee2ad96dcb2acceb25ac5eb11ec948830d8003f24be2182f047ea83
 SHA512:
-  metadata.gz: da01327a34f53b3ba30471ebcbc0efa5de55005512b17bd20683721f051c1c350db7118fbd43b3ea7a18cf5cad98c8d44c36162d013bc453f6da4b30c2e88a4f
-  data.tar.gz: 671f0968893e0f819361846ef9338589e6cfbd614e37fa429c8e4d660e6455e974c969eecd7152d2bcaaa5596d84d38305f818108f91972c0904bb8afe6af939
+  metadata.gz: 76a5f3c7cd26ea510166d5757f3aa30f09befda31820fd0f1af02ff339964148314fcd8d686bf11cb8ee99b7ab4a49b2b7f7e1adde062766b9006e655f0130f0
+  data.tar.gz: c9e333a2a6f9306e71d0e7d2f5e2ef196cb4d8adde2864cb4d5bc8da54df348fddc21899291d176a7e28bb184094453da6759f4252e672b412dd9c7eac659a21

data/.travis.yml

@@ -1,24 +1,29 @@
+---
+
 language: ruby
 cache: bundler
 sudo: false
 
 before_install: ./travis/before_install
+install: make
+script: bundle exec rspec
 bundler_args: --without=development
 
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-rvm: 2.4.4
+rvm:
+  - 2.6.6
+
 matrix:
   include:
+    - env: VAGRANT_VERSION=v2.2.9
+    - env: VAGRANT_VERSION=v2.2.8
+    - env: VAGRANT_VERSION=v2.2.7
+    - env: VAGRANT_VERSION=v2.2.6
+    - env: VAGRANT_VERSION=v2.2.5
     - env: VAGRANT_VERSION=v2.2.4
-    - env: VAGRANT_VERSION=v2.2.3
-    - env: VAGRANT_VERSION=v2.2.2
-    - env: VAGRANT_VERSION=v2.1.5
-    - env: VAGRANT_VERSION=v2.0.4
-    - env: VAGRANT_VERSION=v1.9.8
-      rvm: 2.3.4
     - env: VAGRANT_VERSION=master
   allow_failures:
     - env: VAGRANT_VERSION=master

data/CHANGELOG.md

@@ -1,3 +1,158 @@
+# 2.0.10 / 2020-07-03
+
+This is a bug fix release when provisioning docker hosts inside of
+vagrant. This version removes the hard coded DOCKER_CONFIG environment
+variable in /etc/environment and hard codes the client config to
+/home/vagrant/.docker/config.json. This is a temporary work around until
+the this can be refactored.
+
+Existing values in /home/vagrant/.docker/config.json should be preserved
+and merged when the vagrant-proxy conf is being provisioned.
+
+#### Closed Issues
+
+- [Respect Existing Docker Config Location #218](https://github.com/tmatilai/vagrant-proxyconf/issues/218)
+
+
+# 2.0.9 / Not released
+
+A release tagging error caused this release to become a draft release
+and this will be re-released as 2.0.10.
+
+
+# 2.0.8 / 2020-06-10
+
+This is a bug fix release for windows users which fixes a bug with the
+tempfile creation when uploading and downloading files from the vagrant
+machine.
+
+
+
+#### Closed Issues
+
+- [tempfile implementation on windows doesn't always seem to work
+  #220](https://github.com/tmatilai/vagrant-proxyconf/issues/220)
+
+#### Credits
+
+Big thanks to @chucknelson for debugging and troubleshooting and getting
+to the bottom of this for windows users. Thank you!
+
+- @chucknelson
+
+# 2.0.7 / 2019-11-14
+
+This is a bug fix release.
+
+- Addresses issues with docker proxy configuration and permissions.
+
+#### Closed Issues
+
+- https://github.com/tmatilai/vagrant-proxyconf/milestone/3
+
+
+#### Credits
+
+Thank you to these folks how identified the bugs and provided
+workarounds.
+
+- @antoinetran
+- @tkang007
+
+
+# 2.0.6 / 2019-08-09
+
+This is a bug fix release addressing a permissions problem with the docker proxy client config.
+The fixes the permissions problem setting /etc/docker/config.json from 0600 to 0644 permissions.
+
+#### Credits
+
+- Credit to this release goes to @takuto-h.
+
+# 2.0.5 / 2019-07-27
+
+#### Deprecations:
+
+- Dropped support for vagrant 1.9.8 due to our tests failinging and it's more than 2 years old.
+
+#### Credits
+
+- Credit to this release goes to @greut. Thank you for your detailed information and for reporting a solution.
+
+This is a feature enhancement for the APT proxy configuration when using
+a proxy that is terminating SSL.  By default, these settings are left
+as-is and only enabled when a user wants to configure these settings.
+This feature supports enabling/disabling the follwoing settings
+
+#### file `/etc/apt/apt.conf.d/01proxy`
+
+```
+Acquire::https::Verify-Host
+Acquire::https::Verify-Peer
+```
+
+#### Configuration settings for `Acquire::https::Verify-Host` and `Acquire::https::Verify-Peer`
+
+  * The value for these settings must be a string.
+  * When `"true"` enable the setting
+  * When `"false"` disable the setting
+  * When `""` this setting is removed.
+
+#### Example Inside the Vagrantfile
+
+```
+Vagrant.configure("2") do |config|
+
+  config.vm.define 'apt_host' do |c|
+    c.vm.box = "bento/ubuntu-18.04"
+
+    if Vagrant.has_plugin?('vagrant-proxyconf')
+      c.proxy.http     = ENV['HTTP_PROXY']
+      c.proxy.https    = ENV['HTTPS_PROXY']
+      c.proxy.no_proxy = ENV['NO_PROXY']
+      c.apt_proxy.verify_host = "false"
+      c.apt_proxy.verify_peer = "false"
+
+      c.proxy.enabled = {
+        :apt => {
+          :enabled => true,
+          :skip    => false,
+        },
+        :env => {
+          :enabled => true,
+          :skip    => false,
+        },
+        :git => {
+          :enabled => true,
+          :skip    => false,
+        }
+      }
+    end
+  end
+
+end
+```
+
+#### Example setting the environment variables
+
+```
+export VAGRANT_APT_VERIFY_HOST="false"
+export VAGRANT_APT_VERIFY_PEER="false"
+vagrant up
+vagrant provision
+```
+
+**NOTE** If you change a setting in your `Vagrantfile` and the box is
+running, you can run `vagrant provision` or `vagrant reload` to adjust
+the settings.
+
+Supporting Issues:
+  - https://github.com/tmatilai/vagrant-proxyconf/issues/199
+
+Supporting Integration Tests:
+  - Look at the examples in directory [199](test/issues/199/)
+
+
 # 2.0.4 / 2019-07-24
 
 This is a bug fix release to address a logic issue for supporting docker

data/Gemfile

@@ -1,25 +1,8 @@
 source 'https://rubygems.org'
 
-#### Added due to https://groups.google.com/forum/#!topic/vagrant-up/J8J6LmhzBqM/discussion
-embedded_locations = %w(/Applications/Vagrant/embedded /opt/vagrant/embedded)
-
-embedded_locations.each do |p|
-    ENV['VAGRANT_INSTALLER_EMBEDDED_DIR'] = p if File.directory?(p)
-end
-
-unless ENV.key?('VAGRANT_INSTALLER_EMBEDDED_DIR')
-    $stderr.puts "Couldn't find a packaged install of vagrant, and we need this"
-    $stderr.puts 'in order to make use of the RubyEncoder libraries.'
-    $stderr.puts 'I looked in:'
-    embedded_locations.each do |p|
-        $stderr.puts "  #{p}"
-    end
-end
-#### End Added due to https://groups.google.com/forum/#!topic/vagrant-up/J8J6LmhzBqM/discussion
-
 gem 'vagrant',
     git: 'https://github.com/hashicorp/vagrant.git',
-    ref: ENV.fetch('VAGRANT_VERSION', 'v2.2.4')
+    tag: ENV.fetch('VAGRANT_VERSION', 'v2.2.9')
 
 gem 'rake'
 gem 'rspec', '~> 3.1'

data/Jenkinsfile

@@ -0,0 +1,60 @@
+pipeline {
+
+  agent { label 'virtualbox' }
+
+  options {
+    disableConcurrentBuilds()
+  }
+
+  parameters {
+
+    string(
+      name: 'VAGRANT_TEST_ISSUE',
+      defaultValue: '180',
+      description: 'The test/issues/# where "#" refers to the test environment to invoke'
+    )
+
+    string(
+      name: 'DEFAULT_RVM_RUBY',
+      defaultValue: '2.4.4',
+      description: 'The default ruby to use for RVM'
+    )
+
+  }
+
+  stages {
+
+    stage('test') {
+
+      environment {
+        VAGRANT_TEST_ISSUE = "${params.VAGRANT_TEST_ISSUE}"
+        DEFAULT_RVM_RUBY = "${params.DEFAULT_RVM_RUBY}"
+      }
+
+      steps {
+        timestamps {
+          ansiColor('xterm') {
+
+            dir("${WORKSPACE}") {
+
+              sh '''#!/usr/bin/env bash -l
+
+                set +x
+                tty
+                . jenkins/helper_functions
+
+                setup_test_env
+
+                set -e
+                run_all_tests
+
+              '''
+            }
+          }
+        }
+      }
+    }
+
+  } // stages
+
+}

data/Makefile

@@ -0,0 +1,33 @@
+.PHONY: clean
+.PHONY: help
+.PHONY: init
+.PHONY: patch_bundler
+
+
+all: clean init patch_bundler
+
+
+clean:
+	rm -f Gemfile.lock
+	rm -rf .bundle/
+
+
+help:
+	@echo "[Commands]"
+	@echo ""
+	@echo "  all           -> The default which runs all tasks"
+	@echo "  clean         -> Deletes Gemfile.lock and .bundle/"
+	@echo "  init          -> Creates the bundle for developing the next release"
+	@echo "  patch_bundler -> Attemps to patch vagrant bundler with known issues"
+	@echo ""
+
+init: clean
+	bundle config set path '.bundle/gems'
+	bundle install
+
+
+patch_bundler:
+	[ "$(VAGRANT_VERSION)" == "v2.2.5" ] && (patch -p0 --batch --backup -d "`bundle info --path vagrant`" < deps/patches/lib/vagrant/bundler.rb.patch) || true
+	[ "$(VAGRANT_VERSION)" == "v2.2.6" ] && (patch -p0 --batch --backup -d "`bundle info --path vagrant`" < deps/patches/lib/vagrant/bundler.rb.patch) || true
+	[ "$(VAGRANT_VERSION)" == "v2.2.7" ] && (patch -p0 --batch --backup -d "`bundle info --path vagrant`" < deps/patches/lib/vagrant/bundler.rb.patch) || true
+	[ "$(VAGRANT_VERSION)" == "v2.2.8" ] && (egrep -q 'cap/redhat' `bundle info --path vagrant`/plugins/provisioners/docker/plugin.rb && sed -i.bak -e 's/redhat/centos/g' `bundle info --path vagrant`/plugins/provisioners/docker/plugin.rb) || true

data/README.md

@@ -237,6 +237,8 @@ VAGRANT_APT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
 | apt       | `VAGRANT_APT_HTTP_PROXY`     | Configures APT http proxy     | Highest     |
 |           | `VAGRANT_APT_HTTPS_PROXY`    | Configures APT https proxy    | Highest     |
 |           | `VAGRANT_APT_FTP_PROXY`      | Configures APT ftp proxy      | Highest     |
+|           | `VAGRANT_APT_VERIFY_PEER`    | Configures APT Verify-Peer    | Highest     |
+|           | `VAGRANT_APT_VERIFY_HOST`    | Configures APT Verify-Host    | Highest     |
 | chef      | `VAGRANT_CHEF_HTTP_PROXY`    | Configures CHEF http proxy    | Highest     |
 |           | `VAGRANT_CHEF_HTTPS_PROXY`   | Configures CHEF https proxy   | Highest     |
 |           | `VAGRANT_CHEF_NO_PROXY`      | Configures CHEF no proxy      | Highest     |
@@ -330,3 +332,23 @@ unless ENV.key?('VAGRANT_INSTALLER_EMBEDDED_DIR')
     end
 end
 ```
+
+# Contributors
+
+* @tmatilai
+* @otahi
+* @jperville
+* @johnbellone
+* @SaschaGuenther
+* @mrsheepuk
+* @vboerchers
+* @rlaveycal
+* @pomeh
+* @mynamewastaken
+* @lawsonj2019
+* @jonekdahl
+* @hexmode
+* @craigmunro
+* @greut
+* @chucknelson
+* @codylane

data/deps/patches/lib/vagrant/bundler.rb.patch

@@ -0,0 +1,14 @@
+--- lib/vagrant/bundler.rb	2020-04-27 14:19:39.000000000 -0600
++++ lib/vagrant/bundler.rb	2020-04-27 14:20:01.000000000 -0600
+@@ -421,8 +421,9 @@
+     def vagrant_internal_specs
+       # activate any dependencies up front so we can always
+       # pin them when resolving
+-      Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }.
+-        runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
++      if (vs = Gem::Specification.find { |s| s.name == "vagrant" && s.activated? })
++        vs.runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
++      end
+       # discover all the gems we have available
+       list = {}
+       directories = [Gem::Specification.default_specifications_dir]

data/jenkins/helper_functions

@@ -0,0 +1,206 @@
+#!/usr/bin/env bash
+
+DEFAULT_RVM_RUBY="${DEFAULT_RVM_RUBY:-2.4.4}"
+
+RVM_HOME_DIR="${RVM_HOME_DIR:-${HOME}/.rvm/scripts/rvm}"
+
+VAGRANT_TEST_ISSUE="${VAGRANT_TEST_ISSUE:-180}"
+
+err() {
+
+  echo "ERR: $* exiting" >&2
+
+  reset_docker_perms || true
+
+  exit 1
+
+}
+
+
+bundle_exec() {
+
+  local run_dir="test/issues/${VAGRANT_TEST_ISSUE}"
+
+  pushd "${run_dir}" || err "The directory: '${run_dir}' does not exist" && true
+
+  bundle exec $@
+
+  popd >>/dev/null 2>&1
+
+}
+
+
+enable_rvm_ruby() {
+
+  local ruby_version="${1:-${DEFAULT_RVM_RUBY}}"
+
+  shift
+  local persist="${1:-persist}"
+
+
+  [ -f "${RVM_HOME_DIR}" ] && . "${RVM_HOME_DIR}" >> /dev/null || true
+
+  rvm use "ruby-${ruby_version}" || err "Unable to switch to ruby ${ruby_version}"
+
+  [ -z "${persist}" ] || echo "${DEFAULT_RVM_RUBY}" > .ruby-version
+
+}
+
+
+enable_rbenv_ruby() {
+
+  local ruby_version="${1:-${DEFAULT_RVM_RUBY}}"
+
+  shift
+  local persist="${1:-persist}"
+
+  eval "$(rbenv init -)"
+
+  rbenv_install "${DEFAULT_RVM_RUBY}"
+
+  if [ -n "${persist}" ]; then
+
+    echo "${DEFAULT_RVM_RUBY}" > .ruby-version
+
+    rbenv shell "${DEFAULT_RVM_RUBY}"
+
+  fi
+
+  rbenv versions
+
+}
+
+rbenv_install() {
+
+    rbenv versions | grep -q "${1}" || rbenv install "${1}"
+
+}
+
+vagrant_cmd() {
+
+  bundle_exec vagrant $@
+
+}
+
+
+install_gems() {
+
+  command -v bundle >>/dev/null 2>&1 || gem install bundler --no-doc
+  command -v rake >>/dev/null 2>&1 || gem install rake --no-doc
+
+  gem update --system --no-doc || err "Updating system gems"
+
+  rm -f Gemfile.lock
+  bundle install --path .bundle/gems
+
+}
+
+
+install_from_gemfile() {
+
+  [ -d ".bundle/gems" ] || install_gems
+
+}
+
+
+run_all_tests() {
+
+  set -e
+
+  vagrant_cmd status
+  bundle_exec rake spec
+
+  set +e
+
+}
+
+
+setup_test_env() {
+
+  set -e
+
+  whoami
+  env
+
+  ruby -v
+  gem list
+
+  install_from_gemfile
+
+  bundle show
+
+  update_docker_perms
+
+  vagrant_cmd plugin repair || true
+  vagrant_cmd status
+  vagrant_cmd up || err "Starting the virtual machine"
+  vagrant_cmd provision || err "Attempting to provision the virtual machine"
+
+  reset_docker_perms
+
+  set +e
+
+}
+
+
+reset_docker_perms() {
+
+  [ -L /var/run/docker.sock ] && sudo chmod 0770 "$(readlink /var/run/docker.sock)" || true
+
+}
+
+update_docker_perms() {
+
+  [ -L /var/run/docker.sock ] && sudo chmod 6770 "$(readlink /var/run/docker.sock)" || true
+
+}
+
+
+is_container_running() {
+
+  CONTAINER_ID=$(docker ps -a | grep ':8888' | awk '{print $1}')
+
+  [ -z "${CONTAINER_ID}" ] && return 0
+
+  echo "${CONTAINER_ID}"
+  return 1
+
+}
+
+
+initialize() {
+  reset_docker_perms
+
+  OS_TYPE="$(uname -s 2>>/dev/null)"
+
+  case "${OS_TYPE}" in
+
+    Darwin)
+      HOME_DIR_PREFIX="/Users"
+      ;;
+
+    *)
+      HOME_DIR_PREFIX="/home"
+      ;;
+
+  esac
+
+  [ -f ${HOME_DIR_PREFIX}/jenkins/.bash_profile ] && . ${HOME_DIR_PREFIX}/jenkins/.bash_profile || true
+  [ -f ${HOME_DIR_PREFIX}/jenkins/.bashrc ] && . ${HOME_DIR_PREFIX}/jenkins/.bashrc || true
+
+  command -v rvm >>/dev/null 2>&1 && enable_rvm_ruby "${DEFAULT_RVM_RUBY}" "persist" || true
+  command -v rbenv >>/dev/null 2>&1 && enable_rbenv_ruby "${DEFAULT_RVM_RUBY}" "persist" || true
+
+  command -v docker || err "Docker must be installed on this host."
+  command -v bsdtar || err "Please install bsdtar"
+
+  id
+  groups
+
+  CONTAINER_ID=$(is_container_running)
+  [ $? -ne 0 ] && docker rm -vf "${CONTAINER_ID}"
+
+  reset_docker_perms
+}
+
+initialize