chef-apply 0.2.8 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6864dda8a850df2456f60ff1da1e5af0a8048029e613770f3bdee6c2966594
-  data.tar.gz: b230d38e36589c760c4e1c0ea6f622ae008ee5eb10a88cdc7ce1189c3879296b
+  metadata.gz: 07ef8ad757564bff3e3578079d19bbb8b50ec44e3f58ac627046a54b9b26e92e
+  data.tar.gz: 26cd6927e33f4c97f1809518c69455517570983b4f493c6fe99af8ebd43b2952
 SHA512:
-  metadata.gz: 0354d5f36e4d3ade6b14bb1e9c51977ef7edca3d4b24eaeba3537d97deb04935777103b808c024ee331783ad1f7556c7363ad30ec3acfd1d2eae6ba34028466e
-  data.tar.gz: 31f026633caba71bff6cf99395b3605a45049f14b7b4605a625c7539d196f29771312c36554b8e16e0c7c8c119d6ca9d18da6282bc6420f6a9cddd81e158261f
+  metadata.gz: 38c85c8f263f8d0c6a1546bc1d6ad96cdd6d4ca4ab2bc94dd6dad26b2d8ab1c52a740fbae0384a846d668a4c52cda165966534f9c49d87e22e49cefd0ee2727e
+  data.tar.gz: 82c8fad2e537f69bd539c757522e5aee9315d727391233538b3870eff4b2302fc93a4240ca9c04d801320f97472e999029e59d5650855b367ec616cde7e4bfff

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    chef-apply (0.2.8)
+    chef-apply (0.2.13)
       chef (>= 14.0)
       chef-dk (>= 3.0)
       chef-telemetry
+      license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-cli
       mixlib-config
       mixlib-install
@@ -21,28 +22,20 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    aws-sdk (2.11.212)
-      aws-sdk-resources (= 2.11.212)
-    aws-sdk-core (2.11.212)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.11.212)
-      aws-sdk-core (= 2.11.212)
-    aws-sigv4 (1.0.3)
-    azure_graph_rbac (0.17.0)
+    azure_graph_rbac (0.17.1)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_key_vault (0.17.2)
+    azure_mgmt_key_vault (0.17.4)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_resources (0.17.2)
+    azure_mgmt_resources (0.17.4)
       ms_rest_azure (~> 0.11.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (10.0.2)
-    chef (14.9.13)
+    byebug (11.0.1)
+    chef (14.12.9)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.9.13)
+      chef-config (= 14.12.9)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -52,9 +45,9 @@ GEM
       iniparse (~> 1.4)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 2.0, >= 2.0.3)
-      mixlib-shellout (~> 2.4)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-log (>= 2.0.3, < 4.0)
+      mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
       net-ssh (~> 4.2)
       net-ssh-multi (~> 1.2, >= 1.2.1)
@@ -69,13 +62,13 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.9.13)
+    chef-config (14.12.9)
       addressable
       fuzzyurl
-      mixlib-config (>= 2.2.12, < 3.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-dk (3.6.57)
+    chef-dk (3.8.14)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 14.0)
       chef-provisioning (~> 2.0)
@@ -87,7 +80,7 @@ GEM
       mixlib-shellout (~> 2.0)
       paint (~> 1.0)
       solve (> 2.0, < 5.0)
-    chef-provisioning (2.7.4)
+    chef-provisioning (2.7.6)
       cheffish (>= 4.0, < 15.0)
       inifile (>= 2.0.2)
       mixlib-install (>= 1.0)
@@ -102,10 +95,10 @@ GEM
       concurrent-ruby (~> 1.0)
       ffi-yajl (~> 2.2)
       http (~> 2.2)
-    chef-zero (14.0.11)
+    chef-zero (14.0.12)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 2.0)
+      mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
     cheffish (14.0.4)
@@ -115,9 +108,9 @@ GEM
       rubocop (= 0.62.0)
     citrus (3.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
-    cookbook-omnifetch (0.8.0)
-      mixlib-archive (~> 0.4)
+    concurrent-ruby (1.1.5)
+    cookbook-omnifetch (0.8.1)
+      mixlib-archive (>= 0.4, < 2.0)
     debug_inspector (0.0.3)
     declarative (0.0.10)
     declarative-option (0.1.0)
@@ -130,7 +123,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
     erubis (2.7.0)
-    excon (0.62.0)
+    excon (0.64.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -155,7 +148,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    gssapi (1.2.0)
+    gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
@@ -175,10 +168,14 @@ GEM
     iniparse (1.4.4)
     ipaddress (0.8.3)
     jaro_winkler (1.5.2)
-    jmespath (1.4.0)
-    json (2.1.0)
+    json (2.2.0)
     jwt (2.1.0)
     libyajl2 (1.2.0)
+    license-acceptance (1.0.11)
+      pastel (~> 0.7)
+      tomlrb (~> 1.2)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -187,33 +184,35 @@ GEM
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     minitar (0.8)
-    mixlib-archive (0.4.19)
+    mixlib-archive (1.0.1)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.18)
+    mixlib-config (3.0.1)
       tomlrb
-    mixlib-install (3.11.5)
+    mixlib-install (3.11.18)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (2.0.9)
+    mixlib-log (3.0.1)
     mixlib-shellout (2.4.4)
     mixlib-versioning (1.2.7)
     molinillo (0.6.6)
-    ms_rest (0.7.3)
+    ms_rest (0.7.4)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
-      timeliness (~> 0.3)
-    ms_rest_azure (0.11.0)
+      timeliness (~> 0.3.10)
+    ms_rest_azure (0.11.1)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
       faraday-cookie_jar (~> 0.0.6)
-      ms_rest (~> 0.7.2)
+      ms_rest (~> 0.7.4)
+      unf_ext (= 0.0.7.2)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
+    necromancer (0.4.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -226,22 +225,22 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     nori (2.6.0)
-    ohai (14.8.10)
+    ohai (14.8.12)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 2.0, >= 2.0.1)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    os (1.0.0)
+    os (1.0.1)
     paint (1.0.1)
-    parallel (1.13.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -252,8 +251,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
@@ -262,7 +261,7 @@ GEM
     r18n-core (3.2.0)
     r18n-desktop (3.2.0)
       r18n-core (= 3.2.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rainbow (3.0.0)
     rake (12.3.2)
     representable (3.0.4)
@@ -276,10 +275,10 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-its (1.2.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-mocks (3.8.0)
@@ -320,20 +319,25 @@ GEM
     solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.76.9)
+    specinfra (2.77.2)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
+      unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.20.3)
-    timeliness (0.3.8)
+    timeliness (0.3.10)
+    timers (4.3.0)
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.2.8)
-    train (1.7.1)
-      aws-sdk (~> 2)
+    train (2.1.2)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
       azure_mgmt_resources (~> 0.15)
@@ -342,22 +346,38 @@ GEM
       googleauth (~> 0.6.6)
       inifile
       json (>= 1.8, < 3.0)
-      mixlib-shellout (>= 2.0)
-      net-scp (~> 1.2)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 3.0)
       net-ssh (>= 2.9, < 6.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
+    tty-box (0.3.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.4)
+      tty-cursor (~> 0.6.0)
     tty-color (0.4.3)
-    tty-cursor (0.6.0)
+    tty-cursor (0.6.1)
+    tty-prompt (0.18.1)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.0)
+      timers (~> 4.0)
+      tty-cursor (~> 0.6.0)
+      tty-reader (~> 0.5.0)
+    tty-reader (0.5.0)
+      tty-cursor (~> 0.6.0)
+      tty-screen (~> 0.6.4)
+      wisper (~> 2.0.0)
+    tty-screen (0.6.5)
     tty-spinner (0.9.0)
       tty-cursor (~> 0.6.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.2)
     unicode-display_width (1.4.1)
+    unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    winrm (2.3.1)
+    winrm (2.3.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -374,6 +394,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
+    wisper (2.0.0)
     wmi-lite (1.0.2)
 
 PLATFORMS

data/README.md

@@ -3,6 +3,12 @@
 
 The ad-hoc execution tool for the Chef ecosystem.
 
+**Umbrella Project**: [Workstation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-workstation.md)
+
+* **[Project State](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md):** Active
+* **Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md):** 14 days
+* **Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md):** 14 days
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/chef-apply.gemspec

@@ -54,6 +54,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "chef", ">= 14.0" # Needed to load cookbooks
   spec.add_dependency "chef-dk", ">= 3.0"
   spec.add_dependency "chef-telemetry"
+  spec.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/i18n/errors/en.yml

@@ -58,6 +58,14 @@ errors:
     display: { stack: true, log: true }
     text: An unknown error has occurred.
 
+  # Failure to accept the chef license
+  CHEFLIC001:
+    display: { log: true, stack: true }
+    text: |
+      You must accept the Chef Infra Client license locally in order
+      to manage a remote host. Accepting the license locally will pass
+      through the acceptance to the remote host.
+
   # Installer action errors
   CHEFINS002:
     text: |
@@ -114,18 +122,11 @@ errors:
     text: |
       Could not determine reason for converge failure.
 
-      STDOUT (may be blank)
-
-        %1
-
-      STDERR (may be blank)
-
-        %2
-
       An error occurred while converging the remote host.
       I was unable to retrieve the log file which would allow
-      me to provide more information.  Above is the output
-      that occurred while trying to retrieve the remote log file.
+      me to provide more information.  Here's where I looked:
+
+        %1
 
   CHEFCCR002:
     text: |

data/lib/chef_apply/action/base.rb

@@ -38,77 +38,6 @@ module ChefApply
         @config = c
       end
 
-      run_report = "$env:APPDATA/chef-workstation/cache/run-report.json"
-      PATH_MAPPING = {
-        chef_client: {
-          windows: "cmd /c C:/opscode/chef/bin/chef-client",
-          other: "/opt/chef/bin/chef-client",
-        },
-        cache_path: {
-          windows: '#{ENV[\'APPDATA\']}/chef-workstation',
-          other: "/var/chef-workstation",
-        },
-        read_chef_report: {
-          windows: "type #{run_report}",
-          other: "cat /var/chef-workstation/cache/run-report.json",
-        },
-        delete_chef_report: {
-          windows: "If (Test-Path #{run_report}){ Remove-Item -Force -Path #{run_report} }",
-          other: "rm -f /var/chef-workstation/cache/run-report.json",
-        },
-        tempdir: {
-          windows: "%TEMP%",
-          other: "$TMPDIR",
-        },
-        delete_folder: {
-          windows: "Remove-Item -Recurse -Force –Path",
-          other: "rm -rf",
-        },
-      }.freeze
-
-      # TODO - I'd like to consider PATH_MAPPING in action::base
-      #        to platform subclasses/mixins for target_host.  This way our 'target host'
-      #        which reprsents a node, the data and actions we can perform on it
-      #        knows how to `read_chef_report`, `mkdir`, etc.
-      #        -mp 2018-10-17
-
-      PATH_MAPPING.keys.each do |m|
-        define_method(m) { PATH_MAPPING[m][family] }
-      end
-
-      # Chef will try 'downloading' the policy from the internet unless we pass it a valid, local file
-      # in the working directory. By pointing it at a local file it will just copy it instead of trying
-      # to download it.
-      #
-      # Chef 13 on Linux requires full path specifiers for --config and --recipe-url while on Chef 13 and 14 on
-      # Windows must use relative specifiers to prevent URI from causing an error
-      # (https://github.com/chef/chef/pull/7223/files).
-      def run_chef(working_dir, config_file, policy)
-        case family
-        when :windows
-          "Set-Location -Path #{working_dir}; " +
-            # We must 'wait' for chef-client to finish before changing directories and Out-Null does that
-            "chef-client -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)} | Out-Null; " +
-            # We have to leave working dir so we don't hold a lock on it, which allows us to delete this tempdir later
-            "Set-Location C:/; " +
-            "exit $LASTEXITCODE"
-        else
-          # cd is shell a builtin, so much call bash. This also means all commands are executed
-          # with sudo (as long as we are hardcoding our sudo use)
-          "bash -c 'cd #{working_dir}; chef-client -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)}'"
-        end
-      end
-
-      # Trying to perform File or Pathname operations on a Windows path with '\'
-      # characters in it fails. So lets convert them to '/' which these libraries
-      # handle better.
-      def escape_windows_path(p)
-        if family == :windows
-          p = p.tr("\\", "/")
-        end
-        p
-      end
-
       def run(&block)
         @notification_handler = block
         Telemeter.timed_action_capture(self) do
@@ -139,19 +68,6 @@ module ChefApply
         ChefApply::Log.debug("[#{self.class.name}] Action: #{action}, Action Data: #{args}")
         @notification_handler.call(action, args) if @notification_handler
       end
-
-      private
-
-      def family
-        @family ||= begin
-          f = target_host.platform.family
-          if f == "windows"
-            :windows
-          else
-            :other
-          end
-        end
-      end
     end
   end
 end