chef-apply 0.6.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c0e574b583d84f08985d61344c65598b0c7610f1d865f384efc8892cfdc101
-  data.tar.gz: 78ebe1fcea394135f0d634d4fffe5117c61f82d0ea019962cb1179eb67254c22
+  metadata.gz: 63379d32f224c7837c6b5bdef6ae3113f91b772e2438ff13ab19a9e8dee6c0b2
+  data.tar.gz: a78cfaf8135f28c6ba2c0ed2d81c302a3a2cf35064a9354fe982680b1f72c4b3
 SHA512:
-  metadata.gz: de1291f967fb645e50efc5383688fdaef256dd0829241e35b2b357caac2325853d630684f5a69184a61eb5986701a78a5036bd932f36195741e9d944573c41d0
-  data.tar.gz: df183fca89151abb786bc49bc9aaac0d980430baba4235b9098452e4c9a0d7e4f6c20d82995689405c9b35b5f155f7589eff9eb4c5cbbc8c381f922dec0e5e3d
+  metadata.gz: 4985434b6d8c25d897f6c98e2abff60b79cb18510b86d61e445991fccec43dc6688be44d7ffe5bc68716f0132c8fd7c483a8490c964fb87e3db1c4a467b1bda2
+  data.tar.gz: 3c22ed6535c0f193b40f3202fae6bcf8a0f7021ac61f95989ba56c4330a1d56ea2ed4f8a11caa0df5eb0e3e8edf0690b804808d2e1216ed0c2ec615e9d9fb2ff

data/Gemfile

@@ -19,7 +19,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.7.4"
+  gem "chefstyle", "2.2.0"
   gem "rake", ">= 10.1.0"
   gem "rspec", "~> 3.0"
   gem "simplecov"

data/chef-apply.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Ad-hoc management of individual nodes and devices."
   spec.homepage      = "https://github.com/chef/chef-apply"
   spec.license       = "Apache-2.0"
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks

data/i18n/en.yml

@@ -17,18 +17,11 @@
 
 cli:
   telemetry_enabled: |
-    Telemetry has been enabled by default for this beta release
-    of chef-run. The anonymous data we gather is used to
-    determine how we can impove your chef-run experience.
+    Telemetry is enabled by default in chef-run. The anonymous data we gather
+    is used to determine how we can impove your chef-run experience.
 
-    To disable it, add the following entry to
-    %1:
-
-    [telemetry]
-    enabled=false
-
-    For more information about what we data gather and additional opt-out
-    options, visit https://docs.chef.io/workstation/privacy/
+    For more information about what we data gather and opt-out options,
+    visit https://docs.chef.io/workstation/privacy/
 
   description: |
     Chef Run is a tool to execute ad-hoc tasks using Chef Infra.

data/lib/chef_apply/action/base.rb

@@ -41,17 +41,17 @@ module ChefApply
       def run(&block)
         @notification_handler = block
         Telemeter.timed_action_capture(self) do
-          begin
-            perform_action
-          rescue StandardError => e
-            # Give the caller a chance to clean up - if an exception is
-            # raised it'll otherwise get routed through the executing thread,
-            # providing no means of feedback for the caller's current task.
-            notify(:error, e)
-            @error = e
-          end
+
+          perform_action
+        rescue StandardError => e
+          # Give the caller a chance to clean up - if an exception is
+          # raised it'll otherwise get routed through the executing thread,
+          # providing no means of feedback for the caller's current task.
+          notify(:error, e)
+          @error = e
+
         end
-        # Raise outside the block to ensure that the telemetry cpature completes
+        # Raise outside the block to ensure that the telemetry capture completes
         raise @error unless @error.nil?
       end
 

data/lib/chef_apply/action/converge_target.rb

@@ -197,7 +197,7 @@ module ChefApply::Action
           "exit $LASTEXITCODE"
       else
         # cd is shell a builtin, so we'll invoke bash. This also means all commands are executed
-        # with sudo (as long as we are hardcoding our sudo use)
+        # with sudo (as long as we are hard coding our sudo use)
         "bash -c 'cd #{working_dir}; /opt/chef/bin/chef-client -z --config #{File.join(working_dir, config_file)} --recipe-url #{File.join(working_dir, policy)}'"
       end
     end

data/lib/chef_apply/action/generate_temp_cookbook/temp_cookbook.rb

@@ -69,7 +69,7 @@ module ChefApply
 
         def from_resource(resource_type, resource_name, properties)
           # Generate a cookbook containing a single default recipe with the specified
-          # resource in it. Incloud the resource type in the cookbook name so hopefully
+          # resource in it. Include the resource type in the cookbook name so hopefully
           # this gives us better reporting info in the future.
           @descriptor = "#{resource_type}[#{resource_name}]"
           @from = "resource"

data/lib/chef_apply/action/install_chef/minimum_chef_version.rb

@@ -36,6 +36,10 @@ module ChefApply
             13 => Gem::Version.new("13.10.4"),
             14 => Gem::Version.new("14.1.1"),
           },
+          solaris: {
+              13 => Gem::Version.new("13.10.4"),
+              14 => Gem::Version.new("14.1.1"),
+          },
         }.freeze
 
         def self.check!(target, check_only)

data/lib/chef_apply/action/install_chef.rb

@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 require_relative "base"
 require_relative "install_chef/minimum_chef_version"
 require "fileutils" unless defined?(FileUtils)
@@ -98,6 +97,10 @@ module ChefApply
           opts[:platform] = "el"
         when "suse"
           opts[:platform] = "sles"
+        when "solaris"
+          opts[:platform] = "solaris2"
+        when "aix"
+          opts[:platform] = "aix"
         when "amazon"
           opts[:platform] = "el"
           if platform.release.to_i > 2010 # legacy Amazon version 1

data/lib/chef_apply/cli/options.rb

@@ -50,7 +50,7 @@ module ChefApply
 
         # Special note:
         # config_path is pre-processed in startup.rb, and is shown here only
-        # for purpoess of rendering help text.
+        # for the purpose of rendering help text.
         klass.option :config_path,
           short: "-c PATH",
           long: "--config PATH",
@@ -138,7 +138,7 @@ module ChefApply
       end
 
       # I really don't like that mixlib-cli refers to the parsed command line flags in
-      # a hash accesed via the `config` method. Thats just such an overloaded word.
+      # a hash accessed via the `config` method. Thats just such an overloaded word.
       def parsed_options
         config
       end

data/lib/chef_apply/cli.rb

@@ -69,11 +69,11 @@ module ChefApply
       # they will be captured in the same telemetry session.
 
       Chef::Telemeter.timed_run_capture([:redacted]) do
-        begin
-          perform_run(enforce_license: enforce_license)
-        rescue Exception => e
-          @rc = handle_run_error(e)
-        end
+
+        perform_run(enforce_license: enforce_license)
+      rescue Exception => e
+        @rc = handle_run_error(e)
+
       end
     rescue => e # can occur if exception thrown in error handling
       @rc = handle_run_error(e)
@@ -211,7 +211,7 @@ module ChefApply
       end
     end
 
-    # Runs a GenerateCookbook action based on recipe/resource infoprovided
+    # Runs a GenerateCookbook action based on recipe/resource info provided
     # and renders UI updates as the action reports back
     def generate_temp_cookbook(arguments, reporter)
       opts = if arguments.length == 1

data/lib/chef_apply/file_fetcher.rb

@@ -44,25 +44,25 @@ module ChefApply
         file = open(temp_path, "wb")
         ChefApply::Log.debug "Downloading: #{temp_path}"
         Net::HTTP.start(url.host) do |http|
-          begin
-            http.request_get(url.path) do |resp|
-              resp.read_body do |segment|
-                file.write(segment)
-              end
-            end
-          rescue e
-            @error = true
-            raise
-          ensure
-            file.close
-            # If any failures occurred, don't risk keeping
-            # an incomplete download that we'll see as 'cached'
-            if @error
-              FileUtils.rm_f(temp_path)
-            else
-              FileUtils.mv(temp_path, local_path)
+
+          http.request_get(url.path) do |resp|
+            resp.read_body do |segment|
+              file.write(segment)
             end
           end
+        rescue e
+          @error = true
+          raise
+        ensure
+          file.close
+          # If any failures occurred, don't risk keeping
+          # an incomplete download that we'll see as 'cached'
+          if @error
+            FileUtils.rm_f(temp_path)
+          else
+            FileUtils.mv(temp_path, local_path)
+          end
+
         end
       end
     end

data/lib/chef_apply/startup.rb

@@ -43,7 +43,7 @@ module ChefApply
 
       # Call this every time, so that if we add or change ~/.chef-workstation
       # directory structure, we can be sure that it exists. Even with a
-      # custom configuration, the .chef-workstation directory and subdirs
+      # custom configuration, the .chef-workstation directory and sub-dirs
       # are required.
       setup_workstation_user_directories
 
@@ -65,7 +65,7 @@ module ChefApply
       start_chef_apply(enforce_license: enforce_license)
 
     # NOTE: Because these exceptions occur outside of the
-    #       CLI handling, they won't be tracked in telemtry.
+    #       CLI handling, they won't be tracked in telemetry.
     #       We can revisit this once the pending error handling rework
     #       is underway.
     rescue ConfigPathInvalid => e
@@ -149,7 +149,7 @@ module ChefApply
     end
 
     def setup_error_handling
-      # In Ruby 2.5+ threads print out to stdout when they raise an exception. This is an agressive
+      # In Ruby 2.5+ threads print out to stdout when they raise an exception. This is an aggressive
       # attempt to ensure debugging information is not lost, but in our case it is not necessary
       # because we handle all the errors ourself. So we disable this to keep output clean.
       # See https://ruby-doc.org/core-2.5.0/Thread.html#method-c-report_on_exception
@@ -168,7 +168,7 @@ module ChefApply
     # Look for a user-supplied config path by  manually parsing the option.
     # Note that we can't use Mixlib::CLI for this.
     # To ensure that ChefApply::CLI initializes with correct
-    # option defaults, we need to have configuraton loaded before initializing it.
+    # option defaults, we need to have configuration loaded before initializing it.
     def custom_config_path
       argv.each_with_index do |arg, index|
         if arg == "--config-path" || arg == "-c"

data/lib/chef_apply/target_host/aix.rb

@@ -0,0 +1,55 @@
+module ChefApply
+  class TargetHost
+    module Aix
+
+      def omnibus_manifest_path
+        # Note that we can't use File::Join, because that will render for the
+        # CURRENT platform - not the platform of the target.
+        "/opt/chef/version-manifest.json"
+      end
+
+      def mkdir(path)
+        run_command!("mkdir -p #{path}")
+      end
+
+      def chown(path, owner)
+        # owner ||= user
+        # run_command!("chown #{owner} '#{path}'")
+        nil
+      end
+
+      def make_temp_dir
+        # We will cache this so that we only run this once
+        @tempdir ||= begin
+          res = run_command!("bash -c '#{MKTEMP_COMMAND}'")
+          res.stdout.chomp.strip
+        end
+      end
+
+      def install_package(target_package_path)
+        command = "installp -aXYgd #{target_package_path} all"
+        run_command!(command)
+      end
+
+      def del_file(path)
+        run_command!("rm -rf #{path}")
+      end
+
+      def del_dir(path)
+        del_file(path)
+      end
+
+      def ws_cache_path
+        "/var/chef-workstation"
+      end
+
+      # Nothing to escape in a unix-based path
+      def normalize_path(path)
+        path
+      end
+
+      MKTEMP_COMMAND = "d=$(mktemp -d -p${TMPDIR:-/tmp} chef_XXXXXX); echo $d".freeze
+
+    end
+  end
+end

data/lib/chef_apply/target_host/solaris.rb

@@ -0,0 +1,55 @@
+module ChefApply
+  class TargetHost
+    module Solaris
+
+      def omnibus_manifest_path
+        # Note that we can't use File::Join, because that will render for the
+        # CURRENT platform - not the platform of the target.
+        "/opt/chef/version-manifest.json"
+      end
+
+      def mkdir(path)
+        run_command!("mkdir -p #{path}")
+      end
+
+      def chown(path, owner)
+        owner ||= user
+        run_command!("chown #{owner} '#{path}'")
+        nil
+      end
+
+      def make_temp_dir
+        # We will cache this so that we only run this once
+        @tempdir ||= begin
+          res = run_command!("bash -c '#{MKTEMP_COMMAND}'")
+          res.stdout.chomp.strip
+        end
+      end
+
+      def install_package(target_package_path)
+        command = "pkg install -g #{target_package_path} chef"
+        run_command!(command)
+      end
+
+      def del_file(path)
+        run_command!("rm -rf #{path}")
+      end
+
+      def del_dir(path)
+        del_file(path)
+      end
+
+      def ws_cache_path
+        "/var/chef-workstation"
+      end
+
+      # Nothing to escape in a unix-based path
+      def normalize_path(path)
+        path
+      end
+
+      MKTEMP_COMMAND = "d=$(mktemp -d -p${TMPDIR:-/tmp} chef_XXXXXX); echo $d".freeze
+
+    end
+  end
+end

data/lib/chef_apply/target_host.rb

@@ -18,7 +18,6 @@
 require_relative "log"
 require_relative "error"
 require "train"
-
 module ChefApply
   class TargetHost
     attr_reader :config, :reporter, :backend, :transport_type
@@ -30,7 +29,7 @@ module ChefApply
     # We're borrowing a page from train here - because setting up a
     # reliable connection for testing is a multi-step process,
     # we'll provide this method which instantiates a TargetHost connected
-    # to a train mock backend. If the family/name provided resolves to a suported
+    # to a train mock backend. If the family/name provided resolves to a supported
     # OS, this instance will mix-in the supporting methods for the given platform;
     # otherwise those methods will raise NotImplementedError.
     def self.mock_instance(url, family: "unknown", name: "unknown",
@@ -142,6 +141,12 @@ module ChefApply
       when :macos
         require_relative "target_host/macos"
         class << self; include ChefApply::TargetHost::MacOS; end
+      when :solaris
+        require_relative "target_host/solaris"
+        class << self; include ChefApply::TargetHost::Solaris; end
+      when :aix
+        require_relative "target_host/aix"
+        class << self; include ChefApply::TargetHost::Aix; end
       when :other
         raise ChefApply::TargetHost::UnsupportedTargetOS.new(platform.name)
       end
@@ -174,12 +179,16 @@ module ChefApply
         :linux
       elsif platform.darwin?
         :macos
+      elsif platform.solaris?
+        :solaris
+      elsif platform.aix?
+        :aix
       else
         :other
       end
     end
 
-    # TODO 2019-01-29  not expose this, it's internal implemenation. Same with #backend.
+    # TODO 2019-01-29  not expose this, it's internal implementation. Same with #backend.
     def platform
       backend.platform
     end
@@ -312,7 +321,7 @@ module ChefApply
           case original_exception.message # original_exception.reason
           when /Sudo requires a password/ # :sudo_password_required
             "CHEFTRN003"
-          when /Wrong sudo password/ #:bad_sudo_password
+          when /Wrong sudo password/ # :bad_sudo_password
             "CHEFTRN004"
           when /Can't find sudo command/, /No such file/, /command not found/ # :sudo_command_not_found
             # NOTE: In the /No such file/ case, reason will be nil - we still have

data/lib/chef_apply/target_resolver.rb

@@ -59,7 +59,7 @@ module ChefApply
       if target =~ /(.*)@(.*)/
         inline_credentials = $1
         host = $2
-        # We'll use a non-greedy match to grab everthinmg up to the first ':'
+        # We'll use a non-greedy match to grab everything up to the first ':'
         # as username if there is no :, credentials is just the username
         if inline_credentials =~ /(.+?):(.*)/
           inline_user = $1
@@ -111,7 +111,7 @@ module ChefApply
     # POSTFIX can contain further ranges itself
     # This uses a greedy match (.*) to get include every character
     # up to the last "[" in PREFIX
-    # $1 - prefix; $2 - x, $3 - y, $4 unproccessed/remaining text
+    # $1 - prefix; $2 - x, $3 - y, $4 unprocessed/remaining text
     TARGET_WITH_RANGE = /^(.*)\[([\p{Alnum}]+):([\p{Alnum}]+)\](.*)/.freeze
 
     def do_parse(targets, depth = 0)

data/lib/chef_apply/text.rb

@@ -24,7 +24,7 @@ require_relative "text/error_translation"
 module ChefApply
   module Text
     def self._error_table
-      # Though ther may be several translations, en.yml will be the only one with
+      # Though there may be several translations, en.yml will be the only one with
       # error metadata.
       path = File.join(_translation_path, "errors", "en.yml")
       raw_yaml = File.read(path)

data/lib/chef_apply/ui/terminal.rb

@@ -22,7 +22,6 @@ require_relative "../config"
 require_relative "../log"
 require_relative "plain_text_element"
 require_relative "plain_text_header"
-
 module ChefApply
   module UI
     class Terminal

data/lib/chef_apply/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefApply
-  VERSION = "0.6.3".freeze
+  VERSION = "0.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-apply
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -250,8 +250,10 @@ files:
 - lib/chef_apply/startup.rb
 - lib/chef_apply/status_reporter.rb
 - lib/chef_apply/target_host.rb
+- lib/chef_apply/target_host/aix.rb
 - lib/chef_apply/target_host/linux.rb
 - lib/chef_apply/target_host/macos.rb
+- lib/chef_apply/target_host/solaris.rb
 - lib/chef_apply/target_host/windows.rb
 - lib/chef_apply/target_resolver.rb
 - lib/chef_apply/telemeter.rb
@@ -281,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="