pact_broker-client 1.38.2 → 1.42.0

data/lib/pact_broker/client/can_i_deploy.rb

@@ -3,6 +3,7 @@ require 'pact_broker/client/pact_broker_client'
 require 'pact_broker/client/retry'
 require 'pact_broker/client/matrix/formatter'
 require 'term/ansicolor'
+require 'pact_broker/client/colorize_notices'
 
 module PactBroker
   module Client
@@ -32,7 +33,7 @@ module PactBroker
       def call
         create_result(fetch_matrix_with_retries)
       rescue PactBroker::Client::Error => e
-        Result.new(false, e.message)
+        Result.new(false, Term::ANSIColor.red(e.message))
       rescue StandardError => e
         Result.new(false, "Error retrieving matrix. #{e.class} - #{e.message}\n#{e.backtrace.join("\n")}")
       end
@@ -52,7 +53,7 @@ module PactBroker
       def success_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says yes \o/ ' + message + "\n\n" + Term::ANSIColor.green(matrix.reason)
+          message = warning(matrix) + Term::ANSIColor.green('Computer says yes \o/ ') + message + "\n\n" + notice_or_reason(matrix, :green)
         end
         message
       end
@@ -60,11 +61,19 @@ module PactBroker
       def failure_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says no ¯\_(ツ)_/¯ ' + message + "\n\n" + Term::ANSIColor.red(matrix.reason)
+          message = warning(matrix) + Term::ANSIColor.red('Computer says no ¯\_(ツ)_/¯ ') + message + "\n\n" + notice_or_reason(matrix, :red)
         end
         message
       end
 
+      def notice_or_reason(matrix, reason_color)
+        if matrix.notices
+          PactBroker::Client::ColorizeNotices.call(matrix.notices).join("\n")
+        else
+          Term::ANSIColor.send(reason_color, matrix.reason)
+        end
+      end
+
       def format_matrix(matrix)
         formatted_matrix = Matrix::Formatter.call(matrix, format)
         if format != 'json' && formatted_matrix.size > 0
@@ -131,6 +140,14 @@ module PactBroker
           raise PactBroker::Client::Error.new("This version of the Pact Broker does not provide a count of the unknown verification results. Please upgrade your Broker to >= v2.23.4")
         end
       end
+
+      def warning(matrix)
+        if matrix_options[:ignore_selectors] && matrix_options[:ignore_selectors].any? && !matrix.supports_ignore?
+          Term::ANSIColor.yellow("WARN: This version of the Pact Broker does not support ignoring pacticipants. Please upgrade your Broker to >= 2.80.0") + "\n\n"
+        else
+          ""
+        end
+      end
     end
   end
 end

data/lib/pact_broker/client/cli/broker.rb

@@ -1,6 +1,8 @@
 require 'pact_broker/client/cli/custom_thor'
 require 'pact_broker/client/hash_refinements'
 require 'thor/error'
+require 'pact_broker/client/cli/environment_commands'
+require 'pact_broker/client/cli/pacticipant_commands'
 
 module PactBroker
   module Client
@@ -13,12 +15,20 @@ module PactBroker
 
       class Broker < CustomThor
         using PactBroker::Client::HashRefinements
+        if ENV.fetch("PACT_BROKER_FEATURES", "").include?("deployments")
+          include PactBroker::Client::CLI::EnvironmentCommands
+        end
+        include PactBroker::Client::CLI::PacticipantCommands
 
         desc 'can-i-deploy', ''
-        long_desc File.read(File.join(File.dirname(__FILE__), 'can_i_deploy_long_desc.txt'))
+        long_desc File.read(File.join(__dir__, 'can_i_deploy_long_desc.txt'))
 
         method_option :pacticipant, required: true, aliases: "-a", desc: "The pacticipant name. Use once for each pacticipant being checked."
         method_option :version, required: false, aliases: "-e", desc: "The pacticipant version. Must be entered after the --pacticipant that it relates to."
+
+        if ENV.fetch("PACT_BROKER_FEATURES", "").include?("ignore")
+          method_option :ignore, required: false, desc: "The pacticipant name to ignore. Use once for each pacticipant being ignored. A specific version can be ignored by also specifying a --version."
+        end
         method_option :latest, required: false, aliases: "-l", banner: '[TAG]', desc: "Use the latest pacticipant version. Optionally specify a TAG to use the latest version with the specified tag."
         method_option :to, required: false, banner: 'TAG', desc: "This is too hard to explain in a short sentence. Look at the examples.", default: nil
         method_option :to_environment, required: false, banner: 'ENVIRONMENT', desc: "The environment into which the pacticipant(s) are to be deployed", default: nil, hide: true
@@ -34,10 +44,15 @@ module PactBroker
           require 'pact_broker/client/can_i_deploy'
 
           validate_credentials
-          selectors = VersionSelectorOptionsParser.call(ARGV)
+          selectors = VersionSelectorOptionsParser.call(ARGV).select { |s| !s[:ignore] }
+          ignore_selectors = if ENV.fetch("PACT_BROKER_FEATURES", "").include?("ignore")
+            VersionSelectorOptionsParser.call(ARGV).select { |s| s[:ignore] }
+          else
+            []
+          end
           validate_can_i_deploy_selectors(selectors)
           can_i_deploy_options = { output: options.output, retry_while_unknown: options.retry_while_unknown, retry_interval: options.retry_interval }
-          result = CanIDeploy.call(options.broker_base_url, selectors, { to_tag: options.to, to_environment: options.to_environment, limit: options.limit }, can_i_deploy_options, pact_broker_client_options)
+          result = CanIDeploy.call(options.broker_base_url, selectors, { to_tag: options.to, to_environment: options.to_environment, limit: options.limit, ignore_selectors: ignore_selectors }, can_i_deploy_options, pact_broker_client_options)
           $stdout.puts result.message
           $stdout.flush
           exit(can_i_deploy_exit_status) unless result.success
@@ -51,14 +66,16 @@ module PactBroker
         method_option :tag_with_git_branch, aliases: "-g", type: :boolean, default: false, required: false, desc: "Tag consumer version with the name of the current git branch. Default: false"
         method_option :build_url, desc: "The build URL that created the pact"
         method_option :merge, type: :boolean, default: false, require: false, desc: "If a pact already exists for this consumer version and provider, merge the contents. Useful when running Pact tests concurrently on different build nodes."
+        output_option_json_or_text
         shared_authentication_options
 
         def publish(*pact_files)
           require 'pact_broker/client/error'
           validate_credentials
           validate_pact_files(pact_files)
-          success = publish_pacts(pact_files)
-          raise PactPublicationError, "One or more pacts failed to be published" unless success
+          result = publish_pacts(pact_files)
+          $stdout.puts result.message
+          exit(1) unless result.success
         rescue PactBroker::Client::Error => e
           raise PactPublicationError, "#{e.class} - #{e.message}"
         end
@@ -146,22 +163,9 @@ module PactBroker
           puts SecureRandom.uuid
         end
 
-        desc 'create-or-update-pacticipant', 'Create or update pacticipant by name'
-        method_option :name, type: :string, required: true, desc: "Pacticipant name"
-        method_option :repository_url, type: :string, required: false, desc: "The repository URL of the pacticipant"
-        shared_authentication_options
-        verbose_option
-        def create_or_update_pacticipant(*required_but_ignored)
-          raise ::Thor::RequiredArgumentMissingError, "Pacticipant name cannot be blank" if options.name.strip.size == 0
-          require 'pact_broker/client/pacticipants/create'
-          result = PactBroker::Client::Pacticipants2::Create.call({ name: options.name, repository_url: options.repository_url }, options.broker_base_url, pact_broker_client_options)
-          $stdout.puts result.message
-          exit(1) unless result.success
-        end
-
         desc 'list-latest-pact-versions', 'List the latest pact for each integration'
         shared_authentication_options
-        method_option :output, aliases: "-o", desc: "json or table", default: 'table'
+        output_option_json_or_table
         def list_latest_pact_versions(*required_but_ignored)
           require 'pact_broker/client/pacts/list_latest_versions'
           result = PactBroker::Client::Pacts::ListLatestVersions.call(options.broker_base_url, options.output, pact_broker_client_options)
@@ -170,14 +174,13 @@ module PactBroker
         end
 
         if ENV.fetch("PACT_BROKER_FEATURES", "").include?("deployments")
-
           ignored_and_hidden_potential_options_from_environment_variables
-          desc "record-deployment", "Record deployment of a pacticipant version to an environment"
+          desc "record-deployment", "Record deployment of a pacticipant version to an environment. See https://docs.pact.io/go/record_deployment for more information."
           method_option :pacticipant, required: true, aliases: "-a", desc: "The name of the pacticipant that was deployed."
           method_option :version, required: true, aliases: "-e", desc: "The pacticipant version number that was deployed."
           method_option :environment, required: true, desc: "The name of the environment that the pacticipant version was deployed to."
-          method_option :replaced_previous_deployed_version, type: :boolean, default: true, required: false, desc: "Whether or not this deployment replaced the previous deployed version. If it did, the previous deployed version of this pacticipant will be marked as undeployed in the Pact Broker."
-          method_option :output, aliases: "-o", desc: "json or text", default: 'text'
+          method_option :target, default: nil, required: false, desc: "Optional. The target of the deployment - a logical identifer required to differentiate deployments when there are multiple instances of the same application in an environment."
+          output_option_json_or_text
           shared_authentication_options
 
           def record_deployment
@@ -186,7 +189,7 @@ module PactBroker
               pacticipant_name: options.pacticipant,
               version_number: options.version,
               environment_name: options.environment,
-              replaced_previous_deployed_version: options.replaced_previous_deployed_version,
+              target: options.target,
               output: options.output
             }
             result = PactBroker::Client::Versions::RecordDeployment.call(
@@ -203,7 +206,7 @@ module PactBroker
           method_option :pacticipant, required: true, aliases: "-a", desc: "The name of the pacticipant that was deployed."
           method_option :version, required: true, aliases: "-e", desc: "The pacticipant version number that was deployed."
           method_option :environment, required: true, desc: "The name of the environment that the pacticipant version was deployed to."
-          method_option :output, aliases: "-o", desc: "json or text", default: 'text'
+          output_option_json_or_text
           shared_authentication_options
 
           def record_undeployment
@@ -282,6 +285,7 @@ module PactBroker
               options.broker_base_url,
               file_list(pact_files),
               consumer_version_params,
+              { merge: options[:merge], output: options.output }.compact,
               pact_broker_client_options.merge(write_options)
             )
           end
@@ -290,13 +294,26 @@ module PactBroker
             require 'rake/file_list'
 
             correctly_separated_pact_files = pact_files.collect{ |path| path.gsub(/\\+/, '/') }
-            Rake::FileList[correctly_separated_pact_files].collect do | path |
+            paths = Rake::FileList[correctly_separated_pact_files].collect do | path |
               if File.directory?(path)
                 Rake::FileList[File.join(path, "*.json")]
               else
                 path
               end
             end.flatten
+            validate_pact_path_list(paths)
+          end
+
+          def validate_pact_path_list(paths)
+            paths.collect do | path |
+              if File.exist?(path)
+                path
+              elsif path.start_with?("-")
+                raise Thor::Error.new("ERROR: pact-broker publish was called with invalid arguments #{[path]}")
+              else
+                raise Thor::Error.new("Specified pact file '#{path}' does not exist. This sometimes indicates one of the arguments has been specified with the wrong name and has been incorrectly identified as a file path.")
+              end
+            end
           end
 
           def tags
@@ -322,7 +339,7 @@ module PactBroker
           end
 
           def pact_broker_client_options
-            client_options = { verbose: options.verbose }
+            client_options = { verbose: options.verbose, pact_broker_base_url: options.broker_base_url }
             client_options[:token] = options.broker_token || ENV['PACT_BROKER_TOKEN']
             if options.broker_username || ENV['PACT_BROKER_USERNAME']
               client_options[:basic_auth] = {
@@ -379,7 +396,6 @@ module PactBroker
               provider: options.provider,
               events: events
             }
-
           end
 
           def run_webhook_commands webhook_url

data/lib/pact_broker/client/cli/custom_thor.rb

@@ -110,6 +110,18 @@ module PactBroker
           def self.verbose_option
             method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
           end
+
+          def self.output_option_json_or_text
+            method_option :output, aliases: "-o", desc: "json or text", default: 'text'
+          end
+
+          def self.output_option_json_or_table
+            method_option :output, aliases: "-o", desc: "json or table", default: 'table'
+          end
+
+          def params_from_options(keys)
+            keys.each_with_object({}) { | key, p | p[key] = options[key] }
+          end
         end
       end
     end

data/lib/pact_broker/client/cli/environment_commands.rb

@@ -0,0 +1,70 @@
+module PactBroker
+  module Client
+    module CLI
+      module EnvironmentCommands
+        ENVIRONMENT_PARAM_NAMES = [:name, :display_name, :production, :contact_name, :contact_email_address]
+
+        def self.included(thor)
+          thor.class_eval do
+            def self.shared_environment_options(name_required: false)
+              method_option :name, required: name_required, desc: "The uniquely identifying name of the environment as used in deployment code"
+              method_option :display_name, desc: "The display name of the environment"
+              method_option :production, type: :boolean, default: false, desc: "Whether or not this environment is a production environment. Default: false"
+              method_option :contact_name, required: false, desc: "The name of the team/person responsible for this environment"
+              method_option :contact_email_address, required: false, desc: "The email address of the team/person responsible for this environment"
+              output_option_json_or_text
+            end
+
+            desc "create-environment", "Create an environment resource in the Pact Broker to represent a real world deployment or release environment."
+            shared_environment_options(name_required: true)
+            shared_authentication_options
+            def create_environment
+              execute_environment_command(params_from_options(ENVIRONMENT_PARAM_NAMES), "CreateEnvironment")
+            end
+
+            desc "update-environment", "Update an environment resource in the Pact Broker."
+            method_option :uuid, required: true, desc: "The UUID of the environment to update"
+            shared_environment_options(name_required: false)
+            shared_authentication_options
+            def update_environment
+              execute_environment_command(params_from_options(ENVIRONMENT_PARAM_NAMES + [:uuid]), "UpdateEnvironment")
+            end
+
+            desc "describe-environment", "Describe an environment"
+            method_option :uuid, required: true, desc: "The UUID of the environment to describe"
+            method_option :output, aliases: "-o", desc: "json or text", default: 'text'
+            shared_authentication_options
+            def describe_environment
+              execute_environment_command(params_from_options([:uuid]), "DescribeEnvironment")
+            end
+
+            desc "list-environments", "List environment"
+            method_option :output, aliases: "-o", desc: "json or text", default: 'text'
+            shared_authentication_options
+            def list_environments
+              execute_environment_command({}, "ListEnvironments")
+            end
+
+            desc "delete-environment", "Delete an environment"
+            method_option :uuid, required: true, desc: "The UUID of the environment to delete"
+            method_option :output, aliases: "-o", desc: "json or text", default: 'text'
+            shared_authentication_options
+            def delete_environment
+              execute_environment_command(params_from_options([:uuid]), "DeleteEnvironment")
+            end
+
+            no_commands do
+              def execute_environment_command(params, command_class_name)
+                require 'pact_broker/client/environments'
+                command_options = { verbose: options.verbose, output: options.output }
+                result = PactBroker::Client::Environments.const_get(command_class_name).call(params, command_options, pact_broker_client_options)
+                $stdout.puts result.message
+                exit(1) unless result.success
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/client/cli/pacticipant_commands.rb

@@ -0,0 +1,44 @@
+module PactBroker
+  module Client
+    module CLI
+      module PacticipantCommands
+        PACTICIPANT_PARAM_NAMES = [:name, :display_name, :repository_url]
+
+        def self.included(thor)
+          thor.class_eval do
+            desc 'create-or-update-pacticipant', 'Create or update pacticipant by name'
+            method_option :name, type: :string, required: true, desc: "Pacticipant name"
+            method_option :display_name, type: :string, desc: "Display name"
+            method_option :repository_url, type: :string, required: false, desc: "The repository URL of the pacticipant"
+            output_option_json_or_text
+            shared_authentication_options
+            verbose_option
+
+            def create_or_update_pacticipant(*required_but_ignored)
+              raise ::Thor::RequiredArgumentMissingError, "Pacticipant name cannot be blank" if options.name.strip.size == 0
+              execute_pacticipant_command(params_from_options(PACTICIPANT_PARAM_NAMES), 'Create')
+            end
+
+            desc 'list-pacticipants', 'List pacticipants'
+            output_option_json_or_text
+            shared_authentication_options
+            verbose_option
+            def list_pacticipants
+              execute_pacticipant_command(params_from_options(PACTICIPANT_PARAM_NAMES), 'List')
+            end
+
+            no_commands do
+              def execute_pacticipant_command(params, command_class_name)
+                require 'pact_broker/client/pacticipants'
+                command_options = { verbose: options.verbose, output: options.output }
+                result = PactBroker::Client::Pacticipants2.const_get(command_class_name).call(params, command_options, pact_broker_client_options)
+                $stdout.puts result.message
+                exit(1) unless result.success
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/client/cli/version_selector_options_parser.rb

@@ -12,6 +12,8 @@ module PactBroker
             case word
             when "--pacticipant", "-a"
               selectors << {}
+            when "--ignore"
+              selectors << { ignore: true }
             when "--latest", "-l"
               selectors << { pacticipant: nil } if selectors.empty?
               selectors.last[:latest] = true
@@ -21,6 +23,8 @@ module PactBroker
               case previous_option
               when "--pacticipant", "-a"
                 selectors.last[:pacticipant] = word
+              when "--ignore"
+                selectors.last[:pacticipant] = word
               when "--version", "-e"
                 selectors << { pacticipant: nil } if selectors.empty?
                 selectors.last[:version] = word

data/lib/pact_broker/client/colorize_notices.rb

@@ -0,0 +1,31 @@
+require 'term/ansicolor'
+
+module PactBroker
+  module Client
+    class ColorizeNotices
+      def self.call(notices)
+        notices.collect do | notice |
+          colorized_message(notice)
+        end
+      end
+
+      def self.colorized_message(notice)
+        color = color_for_type(notice.type)
+        if color
+          ::Term::ANSIColor.color(color, notice.text || '')
+        else
+          notice.text
+        end
+      end
+
+      def self.color_for_type(type)
+        case type
+        when "warning", "prompt" then "yellow"
+        when "error", "danger" then :red
+        when "success" then :green
+        else nil
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/client/environments.rb

@@ -0,0 +1,3 @@
+Dir.glob(File.join(__FILE__.gsub(".rb", "/**/*.rb"))).sort.each do | path |
+  require path
+end

data/lib/pact_broker/client/environments/create_environment.rb

@@ -0,0 +1,31 @@
+require 'pact_broker/client/environments/environment_command'
+
+module PactBroker
+  module Client
+    module Environments
+      class CreateEnvironment < PactBroker::Client::Environments::EnvironmentCommand
+
+        private
+
+        attr_reader :created_environment_resource
+
+        def do_call
+          @created_environment_resource = environments_link.post!(new_environment_body)
+          PactBroker::Client::CommandResult.new(created_environment_resource.success?, result_message)
+        end
+
+        def result_message
+          if json_output?
+            created_environment_resource.response.raw_body
+          else
+            ::Term::ANSIColor.green("Created #{params[:name]} environment in #{pact_broker_name} with UUID #{uuid}")
+          end
+        end
+
+        def uuid
+          created_environment_resource.uuid
+        end
+      end
+    end
+  end
+end