vagrant-proxyconf 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29246610a402d179b8e3ac8f2d4f5761ffa37a0d
-  data.tar.gz: d35190d33063c461b8a4cf5551493b5d9c7d3673
+  metadata.gz: 89c3334da0f5ca851a92f23dc388327d47dee03a
+  data.tar.gz: 743404cd2300188be2c8fccf0dda4894b2ba8523
 SHA512:
-  metadata.gz: ca2472979189cd4471b56e2a350796d496323616e1dff2cff864a6a8f092096a385556f999eea8dc418d23e71a56dd55cb738d47ca3973bc4bddc26cb9418737
-  data.tar.gz: '049c14499abe8e93de88abee505026e6a68c0ca7f062a5d9ad370a51c296684b7e17d647d0205db43b84c270b50aee2c29bfda1e624fa9f0edb63d627c398d08'
+  metadata.gz: 2298453a51c191d77e4b927ac5be44d4d15aff00fce6a14a4c532dfb85587f7686966ae374f538583fb3ece529724990e902be06af337979f54b0cf3af5c70af
+  data.tar.gz: 375908939f9f242efcd9d4e3b41a610017be5b9e55680d4e09b71620561f55750d0de9508b257c7c8c271881835f28703d3ecfb6113bdbd9922ffd6f14bec728

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle
 /.yardoc
+.vagrant
 /Gemfile.lock
 /doc
 /tmp

data/.travis.yml

@@ -17,10 +17,6 @@ matrix:
     - env: VAGRANT_VERSION=v2.0.4
     - env: VAGRANT_VERSION=v1.9.8
       rvm: 2.3.4
-    - env:
-        - VAGRANT_VERSION=v1.8.7
-        - BUNDLER_VERSION=1.12.5
-      rvm: 2.2.5
     - env: VAGRANT_VERSION=master
   allow_failures:
     - env: VAGRANT_VERSION=master

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 2.0.2 / _Not released yet_
+
+# 2.0.1 / 2019-03-31
+
+Improvements:
+
+  - Check for existence of HTTP_PROXY and HTTPS_PROXY environment variables.
+    If neither are set this plugin is automatically disabled.
+  - Correctly uses the Tempfile pattern now via commit. 8ee2a2bb146aeb9fb1b27c80814e9000eff34aa1
+
+Bug fixes:
+  - Docker proxy conf not set the first time the provisioner is used (trusty64) - #155
+  - Proxy doesn't work for Docker with systemd - #172
+  - Provisioning of docker fails - #180
+  - Docker provider: Guest-specific operations were attempted on a machine that is not ready for guest communication. - #181
+  - Provisioning of docker fails issue 180. - #182
+  - vagrant-proxyconf running on Win10 and provisioning with Docker. - #186
+  - Cannot force to write but without configuration. - #188
+
 # 2.0.0 / 2019-01-03
 
 Improvements:

data/Gemfile

@@ -27,7 +27,10 @@ gem 'rspec-its', '~> 1.0'
 
 group :development do
   gem 'guard-rspec'
+  gem 'pry'
+  gem 'rb-readline'
   gem 'redcarpet'
+  gem 'serverspec'
   gem 'yard', '~> 0.9.11'
 end
 

data/README.md

@@ -267,6 +267,36 @@ VAGRANT_APT_HTTP_PROXY="http://proxy.example.com:8080" vagrant up
   An excellent Vagrant plugin that shares various cache directories among similar VM instances. Should work fine together with vagrant-proxyconf.
 
 
+## Installing a pre-release version
+
+* A [released](https://rubygems.org/gems/vagrant-proxyconf) pre-release version:
+
+  ```
+  vagrant plugin install --plugin-source https://rubygems.org/ --plugin-prerelease vagrant-proxyconf
+  ```
+
+* Development version from git repository:
+
+  ```
+  git clone https://github.com/tmatilai/vagrant-proxyconf.git
+  cd vagrant-proxyconf
+
+  # Optionally check out other than the master branch
+  git checkout <branch>
+
+  # If you don't have Ruby installed, you can use <path/to/vagrant>/embedded/bin/gem>.
+  # If you have Docker you can use the Ruby image:
+  # docker run -it --rm -v ${PWD}:/usr/src/myapp -w /usr/src/myapp ruby:2.6 gem build vagrant-proxyconf.gemspec
+  gem build vagrant-proxyconf.gemspec
+
+  vagrant plugin install vagrant-proxyconf-*.gem
+  ```
+
+  Paths to Vagrant's embedded gem:
+  * Linux: `/opt/vagrant/embedded/bin/gem`
+  * OS X: `/Applications/Vagrant/embedded/bin/gem`
+
+
 ## Development Known Issues
 
 

data/development/Dockerfile

@@ -9,13 +9,15 @@ RUN yum clean all && \
       curl \
       device-mapper-persistent-data \
       git \
+      initscripts \
       lvm2 \
       openssh-clients \ 
       openssh-server \ 
       rsync \ 
       sudo \
       wget \
-      yum-utils && \ 
+      yum-utils \ 
+      xfsprogs && \
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
     yum clean expire-cache && \
     yum install -y docker-ce && \
@@ -31,10 +33,13 @@ RUN yum clean all && \
     mkdir -p /home/vagrant/.ssh && \
     touch /home/vagrant/.ssh/authorized_keys
 
+VOLUME [ "/sys/fs/cgroup" ]
+
 RUN grep -q 'OHlnVYCzRdK8jlqm8tehUc9c9WhQ==' /home/vagrant/.ssh/authorized_keys || echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==" >> /home/vagrant/.ssh/authorized_keys && \
     chmod 0600 /home/vagrant/.ssh/authorized_keys && \
     chown vagrant:vagrant /home/vagrant/.ssh/authorized_keys
 
 # -e write logs to stderr
 # -D run in foreground
-CMD ["/usr/sbin/sshd", "-e", "-D"]
+# CMD ["/usr/sbin/sshd", "-e", "-D"]
+CMD ["/usr/sbin/init"]

data/development/Vagrantfile.example

@@ -133,9 +133,6 @@ Vagrant.configure('2') do |config|
   config.vm.define "default" do |default|
     # set this to true, if you want to use a global proxy
     default.proxy.enabled = false if !GLOBAL_PROXY_HOST
-    default.proxy.enabled = {
-      :apt => false
-    }
 
     default.vm.box = BOX
 
@@ -143,6 +140,17 @@ Vagrant.configure('2') do |config|
     default.vm.provision :shell, path: 'install-debian.sh'
 
     default.vm.network "private_network", ip: "70.70.70.10"
+
+    default.vm.provider :virtualbox do |vb, override|
+      # override.proxy.enabled = ENABLE_PROXY
+      vb.cpus = 1
+      vb.memory = 1024
+
+      vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ] if config.vm.box =~ /xenial|bionic/
+
+      vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+      vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+    end
   end
 
   config.vm.define "centos7-client" do |centos7|
@@ -152,16 +160,37 @@ Vagrant.configure('2') do |config|
     centos7.vm.network "private_network", ip: "70.70.70.20"
 
     centos7.vm.provision :shell, path: 'install-c7.sh'
-  end
 
-  config.vm.provider :virtualbox do |vb, override|
-    # override.proxy.enabled = ENABLE_PROXY
-    vb.cpus = 1
-    vb.memory = 1024
+    config.vm.provider :virtualbox do |vb, override|
+      # override.proxy.enabled = ENABLE_PROXY
+      vb.cpus = 1
+      vb.memory = 1024
 
-    vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ] if config.vm.box =~ /xenial|bionic/
+      vb.customize [ "modifyvm", :id, "--uartmode1", "disconnected" ] if config.vm.box =~ /xenial|bionic/
 
-    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+      vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+      vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+    end
   end
+
+  # config.vm.define "centos7-client" do |centos7|
+  #   centos7.proxy.enabled = config.proxy.enabled
+  #
+  #   centos7.vm.provider :docker do |d|
+  #     d.build_dir = '.'
+  #     d.dockerfile = 'Dockerfile'
+  #     d.has_ssh = true
+  #     # d.pull = true
+  #
+  #     if SUPPORTS_DOCKER_IN_DOCKER
+  #       d.volumes = [
+  #         "#{DOCKER_SOCKET}:#{DOCKER_SOCKET}",
+  #       ]
+  #       d.create_args = [
+  #         '--privileged',
+  #       ]
+  #     end
+  #   end
+  # end
+
 end

data/lib/vagrant-proxyconf/action/configure_docker_proxy.rb

@@ -41,17 +41,18 @@ module VagrantPlugins
           return @docker_client_config_path if @docker_client_config_path
           return if !supports_config_json?
 
-          @docker_client_config_path = "/tmp/vagrant-proxyconf-docker-config.json"
+          @docker_client_config_path = tempfile(Hash.new)
 
           @machine.communicate.tap do |comm|
             if comm.test("[ -f /etc/docker/config.json ]")
-              comm.download("/etc/docker/config.json", @docker_client_config_path)
-            else
-              File.write(@docker_client_config_path, Hash.new)
+              logger.info('Downloading file /etc/docker/config.json')
+              comm.sudo("chmod 0644 /etc/docker/config.json")
+              comm.download("/etc/docker/config.json", @docker_client_config_path.path)
+              logger.info("Downloaded /etc/docker/config.json to #{@docker_client_config_path.path}")
             end
           end
 
-          @docker_client_config_path
+          @docker_client_config_path = @docker_client_config_path.path
         end
 
         def update_docker_client_config
@@ -65,24 +66,39 @@ module VagrantPlugins
               'default' => {}
             }
           else
-            data['proxies'] = {
-              'default' => {
-                'httpProxy'  => config.http,
-                'httpsProxy' => config.https,
-                'noProxy'    => config.no_proxy,
-              }
-            }
+
+            data['proxies'] = {} unless data.key?('proxies')
+            data['proxies']['default'] = {} unless data['proxies'].key?('default')
+
+            data['proxies']['default'].delete('httpProxy')
+            data['proxies']['default'].delete('httpsProxy')
+            data['proxies']['default'].delete('noProxy')
+
+            unless config.http == false || config.http == "" || config.http.nil?
+              data['proxies']['default']['httpProxy'] = config.http
+            end
+
+            unless config.https == false || config.https == "" || config.https.nil?
+              data['proxies']['default']['httpsProxy'] = config.https
+            end
+
+            unless config.no_proxy == false || config.no_proxy == "" || config.no_proxy.nil?
+              data['proxies']['default']['noProxy'] = config.no_proxy
+            end
+
           end
 
           config_json = JSON.pretty_generate(data)
 
-          File.write(@docker_client_config_path, config_json)
+          @docker_client_config_path = tempfile(config_json)
 
           @machine.communicate.tap do |comm|
-            comm.upload(@docker_client_config_path, @docker_client_config_path)
-            comm.sudo("mv #{@docker_client_config_path} /etc/docker/config.json")
+            comm.upload(@docker_client_config_path.path, "/tmp/vagrant-proxyconf-docker-config.json")
+            comm.sudo("mkdir -p /etc/docker")
+            comm.sudo("chown root:root /etc/docker")
+            comm.sudo("mv /tmp/vagrant-proxyconf-docker-config.json /etc/docker/config.json")
             comm.sudo("chown root:root /etc/docker/config.json")
-            comm.sudo("rm -f #{@docker_client_config_path}")
+            comm.sudo("rm -f /tmp/vagrant-proxyconf-docker-config.json")
 
             comm.sudo("sed -i.bak -e '/^DOCKER_CONFIG/d' /etc/environment")
             if !disabled?
@@ -90,8 +106,6 @@ module VagrantPlugins
             end
           end
 
-          File.unlink(@docker_client_config_path) if File.exists?(@docker_client_config_path)
-
           config_json
         end
 
@@ -164,9 +178,12 @@ module VagrantPlugins
         end
 
         def service_restart_command
-          ["systemctl restart #{docker}",
+          [
+            "kill -HUP `pgrep -f '#{docker}'`",
+            "systemctl restart #{docker}",
             "service #{docker} restart",
-            "/etc/init.d/#{docker} restart"].join(' || ')
+            "/etc/init.d/#{docker} restart",
+          ].join(' || ')
         end
 
         def docker_sed_script

data/lib/vagrant-proxyconf/action/is_enabled.rb

@@ -15,8 +15,25 @@ module VagrantPlugins
 
         private
 
+        def has_proxy_env_var?(var='HTTP_PROXY')
+          var_not_in_env = ENV[var].nil? || ENV[var] == ''
+          return false if var_not_in_env
+
+          true
+        end
+
+        def plugin_disabled?(config)
+          config.enabled == false || config.enabled == '' || config.enabled.nil? || config.enabled == {}
+        end
+
         def plugin_enabled?(config)
-          config.enabled != false && config.enabled != ''
+          return false if plugin_disabled?(config)
+
+          # check for existence of HTTP_PROXY and HTTPS_PROXY environment variables
+          has_proxy_var = has_proxy_env_var?('HTTP_PROXY') || has_proxy_env_var?('HTTPS_PROXY')
+          return false if has_proxy_var == false
+
+          true
         end
       end
     end

data/lib/vagrant-proxyconf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProxyConf
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/spec/unit/vagrant-proxyconf/action/configure_docker_proxy_spec.rb

@@ -12,17 +12,19 @@ def mock_write_docker_config(machine)
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/default/docker.new")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/default/docker.new")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("mv -f /etc/default/docker.new /etc/default/docker")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("systemctl restart docker || service docker restart || /etc/init.d/docker restart")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("kill -HUP `pgrep -f 'docker'` || systemctl restart docker || service docker restart || /etc/init.d/docker restart")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf /etc/default/docker.new")
 end
 
-def mock_update_docker_client_config(machine, config_path)
-  allow(machine).to receive_message_chain(:communicate, :upload).with(config_path, config_path)
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("mv #{config_path} /etc/docker/config.json")
+def mock_update_docker_client_config(machine)
+  allow(machine).to receive_message_chain(:communicate, :upload)
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("mv /tmp/vagrant-proxyconf-docker-config.json /etc/docker/config.json")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/docker/config.json")
-  allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f #{config_path}")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("rm -f /tmp/vagrant-proxyconf-docker-config.json")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("sed -i.bak -e '/^DOCKER_CONFIG/d' /etc/environment")
   allow(machine).to receive_message_chain(:communicate, :sudo).with("echo DOCKER_CONFIG=/etc/docker >> /etc/environment")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("mkdir -p /etc/docker")
+  allow(machine).to receive_message_chain(:communicate, :sudo).with("chown root:root /etc/docker")
 end
 
 
@@ -87,7 +89,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         allow(machine).to receive_message_chain(:config, :public_send).with(:docker_proxy).and_return(config)
 
         mock_write_docker_config(machine)
-        mock_update_docker_client_config(machine, fixture)
+        mock_update_docker_client_config(machine)
 
         # update_docker_client_config mock
         allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
@@ -95,7 +97,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
         @docker_proxy = docker_proxy
       end
 
-      context 'when /etc/docker/config.json has proxy configuration' do
+      context 'and when /etc/docker/config.json has proxy configuration' do
         before :each do
           fixture = fixture_file("docker_client_config_json_enabled_proxy")
           configure_docker_proxy(fixture)
@@ -140,12 +142,13 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
 
           allow(machine).to receive_message_chain(:communicate, :test).with("[ -f /etc/docker/config.json ]").and_return(true)
-          allow(machine).to receive_message_chain(:communicate, :download).with("/etc/docker/config.json", "/tmp/vagrant-proxyconf-docker-config.json")
+          allow(machine).to receive_message_chain(:communicate, :sudo).with("chmod 0644 /etc/docker/config.json")
+          allow(machine).to receive_message_chain(:communicate, :download)
 
           docker_proxy.send(:docker_client_config_path)
         end
 
-        it { is_expected.to eq "/tmp/vagrant-proxyconf-docker-config.json" }
+        it { expect(File.exists?(subject)).to eq true }
       end
 
       context "when /etc/docker/config.json does not exist" do
@@ -161,10 +164,9 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           docker_proxy.send(:docker_client_config_path)
         end
 
-        it { is_expected.to eq "/tmp/vagrant-proxyconf-docker-config.json" }
         it do
-          expect(File.exists?("/tmp/vagrant-proxyconf-docker-config.json")).to eq true
-          expect(File.read("/tmp/vagrant-proxyconf-docker-config.json")).to eq "{}"
+          expect(File.exists?(subject)).to eq true
+          expect(File.read(subject)).to eq "{}"
         end
       end
     end
@@ -226,7 +228,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
           allow(docker_proxy).to receive(:disabled?).and_return(true)
 
-          mock_update_docker_client_config(machine, config_path)
+          mock_update_docker_client_config(machine)
 
           expected = JSON.pretty_generate(
             {
@@ -265,7 +267,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(docker_proxy).to receive(:supports_config_json?).and_return(true)
           allow(docker_proxy).to receive(:disabled?).and_return(false)
 
-          mock_update_docker_client_config(machine, config_path)
+          mock_update_docker_client_config(machine)
           expected = JSON.pretty_generate(
             {
               "proxies" => {
@@ -339,7 +341,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           mock_write_docker_config(machine)
 
           # mock update_docker_client_config
-          mock_update_docker_client_config(machine, config_path)
+          mock_update_docker_client_config(machine)
 
           docker_proxy.send(:unconfigure_machine)
         end
@@ -380,7 +382,7 @@ describe VagrantPlugins::ProxyConf::Action::ConfigureDockerProxy do
           allow(docker_proxy).to receive(:disabled?).and_return(true)
 
           mock_write_docker_config(machine)
-          mock_update_docker_client_config(machine, config_path)
+          mock_update_docker_client_config(machine)
 
           docker_proxy.send(:unconfigure_machine)
         end