octocatalog-diff 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e2cf0a922da25cff91452ca8e2a3631cc1d97c
-  data.tar.gz: 6fbf668920f43516ccae0cd58095187e9d78f8d9
+  metadata.gz: c315a978c543c665c37c9e3d8baee4cd51bd8ad0
+  data.tar.gz: b3ea77a256af869d688f3792aee560f9f582979c
 SHA512:
-  metadata.gz: 616ac7fe5586015dd0afa7511074db94358ae09150e183392ab68aba81d1ade9750594ec3d4d7a62ad333b088ef758aa094bfa4392457f800a41dbf3d1a78b51
-  data.tar.gz: afaa669b726b5f983be6fefd0ded47e14fc649c25e459a2d286a7b28d378908c1081309f788ce9d45e7674b590295b4562a93ac7b3c5d27538c30cd10431f1f5
+  metadata.gz: eb2810e2f011003b2cf5a99ea043936a990e97311de88d401142965a34450c1b29147bc2d151f8bf7f410a168758b4b10a97700a2ec5cafa354fe8f7d5f0fe6e
+  data.tar.gz: 2977a910bd86d03b634178b5333d33f3694d6a90b97890cfaaa7351169c84b1da83d6c3858a12c7d27c31597deb6c483a847e28f1bd9b88aa7873ddb9f2fda69

data/.version

@@ -1 +1 @@
-1.0.0
+1.0.1

data/doc/CHANGELOG.md

@@ -8,6 +8,15 @@
 </tr>
 </thead><tbody>
 <tr valign=top>
+<td>1.0.1</td>
+<td>2017-02-14</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/84">#84</a>: Add JSON equivalence filter</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/83">#83</a>: Retries for Puppet Master retrieval</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/82">#82</a>: Command line option for Puppet Master timeout</li>
+</td>
+</tr>
+<tr valign=top>
 <td>1.0.0</td>
 <td>2017-02-06</td>
 <td>

data/doc/advanced-filter.md

@@ -10,6 +10,7 @@ Please note that there are other options to ignore specified diffs, including:
 Here is the list of available filters and an explanation of each:
 
 - [Absent File](/doc/advanced-filter.md#absent-file) - Ignore parameter changes of a file that is declared to be absent
+- [JSON](/doc/advanced-filter.md#json) - Ignore whitespace differences if JSON parses to the same object
 - [YAML](/doc/advanced-filter.md#yaml) - Ignore whitespace/comment differences if YAML parses to the same object
 
 ## Absent File
@@ -69,6 +70,20 @@ Wouldn't it be nice if the meaningless information didn't appear, and all you sa
       + absent
 ```
 
+## JSON
+
+#### Usage
+
+```
+--filters JSON
+```
+
+#### Description
+
+If a file resource has extension `.json` and a difference in its content is observed, JSON objects are constructed from the previous and new values. If these JSON objects are identical, the difference is ignored.
+
+This allows you to ignore changes in whitespace, comments, etc., that are not meaningful to a machine parsing the file. Note that changes to files may still trigger Puppet to restart services even though these changes are not displayed in the octocatalog-diff output.
+
 ## YAML
 
 #### Usage
@@ -81,4 +96,4 @@ Wouldn't it be nice if the meaningless information didn't appear, and all you sa
 
 If a file resource has extension `.yml` or `.yaml` and a difference in its content is observed, YAML objects are constructed from the previous and new values. If these YAML objects are identical, the difference is ignored.
 
-This allows you to ignore changes in whitespace, comments, etc., that are not meaningful to a machine parsing the file. Please note that by filtering these changes, you are ignoring changes to comments, which may be meaningful to humans.
+This allows you to ignore changes in whitespace, comments, etc., that are not meaningful to a machine parsing the file. Please note that by filtering these changes, you are ignoring changes to comments, which may be meaningful to humans. Also, changes to files may still trigger Puppet to restart services even though these changes are not displayed in the octocatalog-diff output.

data/doc/optionsref.md

@@ -124,6 +124,12 @@ Usage: octocatalog-diff [command line options]
                                      Override parameter from ENC for the to branch
         --from-enc-override STRING1[,STRING2[,...]]
                                      Override parameter from ENC for the from branch
+        --puppet-master-timeout STRING
+                                     Puppet Master catalog retrieval timeout in seconds globally
+        --to-puppet-master-timeout STRING
+                                     Puppet Master catalog retrieval timeout in seconds for the to branch
+        --from-puppet-master-timeout STRING
+                                     Puppet Master catalog retrieval timeout in seconds for the from branch
         --pe-enc-url URL             Base URL for Puppet Enterprise ENC endpoint
         --pe-enc-token TOKEN         Token to access the Puppet Enterprise ENC API
         --pe-enc-token-file PATH     Path containing token for PE node classifier, relative or absolute

data/lib/octocatalog-diff/catalog-diff/filter.rb

@@ -1,6 +1,7 @@
 require_relative '../api/v1/diff'
 require_relative 'filter/absent_file'
 require_relative 'filter/compilation_dir'
+require_relative 'filter/json'
 require_relative 'filter/yaml'
 
 require 'stringio'
@@ -12,7 +13,7 @@ module OctocatalogDiff
       attr_accessor :logger
 
       # List the available filters here (by class name) for use in the validator method.
-      AVAILABLE_FILTERS = %w(AbsentFile CompilationDir YAML).freeze
+      AVAILABLE_FILTERS = %w(AbsentFile CompilationDir JSON YAML).freeze
 
       # Public: Determine whether a particular filter exists. This can be used to validate
       # a user-submitted filter.

data/lib/octocatalog-diff/catalog-diff/filter/json.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative '../filter'
+
+require 'json'
+
+module OctocatalogDiff
+  module CatalogDiff
+    class Filter
+      # Filter based on equivalence of JSON objects for file resources with named extensions.
+      class JSON < OctocatalogDiff::CatalogDiff::Filter
+        # Public: Actually do the comparison of JSON objects for appropriate resources.
+        # Return true if the JSON objects are known to be equivalent. Return false if they
+        # are not equivalent, or if equivalence cannot be determined.
+        #
+        # @param diff_in [OctocatalogDiff::API::V1::Diff] Difference
+        # @param _options [Hash] Additional options (there are none for this filter)
+        # @return [Boolean] true if this difference is a JSON file with identical objects, false otherwise
+        def filtered?(diff, _options = {})
+          # Skip additions or removals - focus only on changes
+          return false unless diff.change?
+
+          # Make sure we are comparing file content for a file ending in .json extension
+          return false unless diff.type == 'File' && diff.structure == %w(parameters content)
+          return false unless diff.title =~ /\.json\z/i
+
+          # Attempt to convert the old value and new value into JSON objects. Assuming
+          # that doesn't error out, the return value is whether or not they're equal.
+          obj_old = ::JSON.parse(diff.old_value)
+          obj_new = ::JSON.parse(diff.new_value)
+          obj_old == obj_new
+        rescue # Rescue everything - if something failed, we aren't sure what's going on, so we'll return false.
+          false
+        end
+      end
+    end
+  end
+end

data/lib/octocatalog-diff/catalog/puppetmaster.rb

@@ -13,7 +13,7 @@ module OctocatalogDiff
     # Represents a Puppet catalog that is obtained by contacting the Puppet Master.
     class PuppetMaster
       attr_accessor :node
-      attr_reader :error_message, :catalog, :catalog_json, :convert_file_resources, :options
+      attr_reader :error_message, :catalog, :catalog_json, :convert_file_resources, :options, :retries
 
       # Defaults
       DEFAULT_PUPPET_PORT_NUMBER = 8140
@@ -22,7 +22,7 @@ module OctocatalogDiff
 
       # Constructor
       # @param :node [String] Node name
-      # @param :retry [Fixnum] Number of retries, if fetch fails
+      # @param :retry_failed_catalog [Fixnum] Number of retries, if fetch fails
       # @param :branch [String] Environment to fetch from Puppet Master
       # @param :puppet_master [String] Puppet server and port number (assumed to be DEFAULT_PUPPET_PORT_NUMBER if not given)
       # @param :puppet_master_api_version [Fixnum] Puppet server API (default DEFAULT_PUPPET_SERVER_API)
@@ -47,7 +47,8 @@ module OctocatalogDiff
         @catalog = nil
         @error_message = nil
         @retries = nil
-        @timeout = options.fetch(:timeout, PUPPET_MASTER_TIMEOUT)
+        @timeout = options.fetch(:puppet_master_timeout, options.fetch(:timeout, PUPPET_MASTER_TIMEOUT))
+        @retry_failed_catalog = options.fetch(:retry_failed_catalog, 0)
 
         # Cannot convert file resources from this type of catalog right now.
         # FIXME: This is possible with additional API calls but is current unimplemented.
@@ -103,13 +104,20 @@ module OctocatalogDiff
         api = puppet_catalog_api[api_version]
         raise ArgumentError, "Unsupported or invalid API version #{api_version}" unless api.is_a?(Hash)
 
-        logger.debug "Retrieve catalog from #{api[:url]} environment #{@options[:branch]}"
-
         more_options = { headers: { 'Accept' => 'text/pson' }, timeout: @timeout }
         post_hash = api[:parameters]
-        response = OctocatalogDiff::Util::HTTParty.post(api[:url], @options.merge(more_options), post_hash, 'puppet_master')
 
-        logger.debug "Response from #{api[:url]} environment #{@options[:branch]} was #{response[:code]}"
+        response = nil
+        0.upto(@retry_failed_catalog) do |retry_num|
+          @retries = retry_num
+          logger.debug "Retrieve catalog from #{api[:url]} environment #{@options[:branch]}"
+
+          response = OctocatalogDiff::Util::HTTParty.post(api[:url], @options.merge(more_options), post_hash, 'puppet_master')
+
+          logger.debug "Response from #{api[:url]} environment #{@options[:branch]} was #{response[:code]}"
+
+          break if response[:code] == 200
+        end
 
         unless response[:code] == 200
           @error_message = "Failed to retrieve catalog from #{api[:url]}: #{response[:code]} #{response[:body]}"

data/lib/octocatalog-diff/cli/options/puppet_master_timeout.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Specify a timeout for retrieving a catalog from a Puppet master / Puppet server.
+# This timeout is specified in seconds.
+# @param parser [OptionParser object] The OptionParser argument
+# @param options [Hash] Options hash being constructed; this is modified in this method.
+OctocatalogDiff::Cli::Options::Option.newoption(:puppet_master_timeout) do
+  has_weight 329
+
+  def parse(parser, options)
+    OctocatalogDiff::Cli::Options.option_globally_or_per_branch(
+      parser: parser,
+      options: options,
+      cli_name: 'puppet-master-timeout',
+      option_name: 'puppet_master_timeout',
+      desc: 'Puppet Master catalog retrieval timeout in seconds',
+      validator: ->(x) { x.to_i > 0 || raise(ArgumentError, 'Specify timeout as a integer greater than 0') },
+      translator: ->(x) { x.to_i }
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - GitHub, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -290,6 +290,7 @@ files:
 - lib/octocatalog-diff/catalog-diff/filter.rb
 - lib/octocatalog-diff/catalog-diff/filter/absent_file.rb
 - lib/octocatalog-diff/catalog-diff/filter/compilation_dir.rb
+- lib/octocatalog-diff/catalog-diff/filter/json.rb
 - lib/octocatalog-diff/catalog-diff/filter/yaml.rb
 - lib/octocatalog-diff/catalog-util/bootstrap.rb
 - lib/octocatalog-diff/catalog-util/builddir.rb
@@ -366,6 +367,7 @@ files:
 - lib/octocatalog-diff/cli/options/puppet_master_ssl_ca.rb
 - lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb
 - lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb
+- lib/octocatalog-diff/cli/options/puppet_master_timeout.rb
 - lib/octocatalog-diff/cli/options/puppetdb_api_version.rb
 - lib/octocatalog-diff/cli/options/puppetdb_ssl_ca.rb
 - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_cert.rb