pact_broker-client 1.61.0 → 1.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d724c27e98c131d955d07160fc82b162fd16b53b8f2df9e7b8f43a43967876
-  data.tar.gz: f1128e525285066f9ed81641368f07dd64a806de10d8d501dbf626d411fc2a2a
+  metadata.gz: 5b538507a19176ca7164ac025f35358738e9d49ab61a41a20d560fee5478cd2f
+  data.tar.gz: 7e562c453ead13f3bceba18f99ff2ed1fd556e9b07de3088038759514ed95a35
 SHA512:
-  metadata.gz: 38f5ff3fe01ff74f462744e9cc6363eff0a62189a8561f524c24042bfd3ea1b9eea2249ed2d3508201d833bf7e08c8c69f9ad56eb8d14777cda33e3092ae4d4b
-  data.tar.gz: e0b5e788bfb8053429ba735c135c175b4ac5048d2a382c12dd4c424fc9cbdd4b6370167c57791a6978e684e9a1a778197530f05d331541d8bffe18bea4e683fa
+  metadata.gz: 18e472c85e88525ef6c3b7714953db64c14bdc55ba6a80f1eb985b50f5c16dcc3f3d743d900b4ed06d7125581e382e10ddf4b8c6df760582b41f5d5b84b28dd7
+  data.tar.gz: 58bac0fbb0772d36cfe57e085ab465a3ff191f0bfb383428d30476a86b44e9ec0514dc77ee6d9f90cf9d4672c0377a8e46e0c324f825375a0aa63674ce0da613

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+<a name="v1.62.1"></a>
+### v1.62.1 (2022-05-10)
+
+#### Bug Fixes
+
+* set exit on failure to true for new pactflow command	 ([429dfbd](/../../commit/429dfbd))
+
+<a name="v1.62.0"></a>
+### v1.62.0 (2022-05-10)
+
+#### Features
+
+* add command to publish provider contracts to pactflow (feature toggle required) (#107)	 ([80cc10e](/../../commit/80cc10e))
+
+#### Bug Fixes
+
+* use ruby < 2.3 syntax. (#108)	 ([20f1e01](/../../commit/20f1e01))
+
+<a name="v1.61.1"></a>
+### v1.61.1 (2022-05-09)
+
+#### Bug Fixes
+
+* Aushm use ruby 2.2 syntax (#110)	 ([b006ad7](/../../commit/b006ad7))
+
 <a name="v1.61.0"></a>
 ### v1.61.0 (2022-05-06)
 

data/bin/pactflow

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require "pactflow/client/cli/pactflow"
+
+Pactflow::Client::CLI::Pactflow.start

data/doc/pacts/markdown/Pact Broker Client - Pactflow.md

@@ -4,6 +4,8 @@
 
 * [A request for the index resource](#a_request_for_the_index_resource)
 
+* [A request to create a provider contract](#a_request_to_create_a_provider_contract)
+
 * [A request to create a webhook for a team](#a_request_to_create_a_webhook_for_a_team_given_a_team_with_UUID_2abbc12a-427d-432a-a521-c870af1739d9_exists) given a team with UUID 2abbc12a-427d-432a-a521-c870af1739d9 exists
 
 #### Interactions
@@ -41,6 +43,40 @@ Pactflow will respond with:
   }
 }
 ```
+<a name="a_request_to_create_a_provider_contract"></a>
+Upon receiving **a request to create a provider contract** from Pact Broker Client, with
+```json
+{
+  "method": "put",
+  "path": "/contracts/provider/Bar/version/1",
+  "headers": {
+    "Content-Type": "application/json",
+    "Accept": "application/hal+json"
+  },
+  "body": {
+    "content": "LS0tCjpzb21lOiBjb250cmFjdAo=",
+    "contractType": "oas",
+    "contentType": "application/yaml",
+    "verificationResults": {
+      "success": true,
+      "content": "c29tZSByZXN1bHRz",
+      "contentType": "text/plain",
+      "format": "text",
+      "verifier": "my custom tool",
+      "verifierVersion": "1.0"
+    }
+  }
+}
+```
+Pactflow will respond with:
+```json
+{
+  "status": 201,
+  "headers": {
+    "Content-Type": "application/hal+json;charset=utf-8"
+  }
+}
+```
 <a name="a_request_to_create_a_webhook_for_a_team_given_a_team_with_UUID_2abbc12a-427d-432a-a521-c870af1739d9_exists"></a>
 Given **a team with UUID 2abbc12a-427d-432a-a521-c870af1739d9 exists**, upon receiving **a request to create a webhook for a team** from Pact Broker Client, with
 ```json

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

@@ -34,12 +34,6 @@ module PactBroker
           require "pact_broker/client/version"
           $stdout.puts PactBroker::Client::VERSION
         end
-
-        no_commands do
-          def self.exit_on_failure?
-            true
-          end
-        end
       end
     end
   end

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

@@ -15,6 +15,10 @@ module PactBroker
         using PactBroker::Client::HashRefinements
 
         no_commands do
+          def self.exit_on_failure?
+            true
+          end
+
           def self.start given_args = ARGV, config = {}
             super(massage_args(given_args))
           end

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

@@ -48,8 +48,8 @@ module PactBroker
               params = {
                 pacticipant_name: options.pacticipant.strip,
                 version_number: options.version.strip,
-                branch_name: options.branch&.strip,
-                tags: options.tag&.collect(&:strip)
+                branch_name: options.branch && options.branch.strip,
+                tags: options.tag && options.tag.collect(&:strip)
               }
 
               execute_version_command(params, "Create")

data/lib/pact_broker/client/hal_client_methods.rb

@@ -8,6 +8,10 @@ module PactBroker
         PactBroker::Client::Hal::EntryPoint.new(pact_broker_base_url, create_http_client(pact_broker_client_options))
       end
 
+      def create_entry_point(entry_point, pact_broker_client_options)
+        PactBroker::Client::Hal::EntryPoint.new(entry_point, create_http_client(pact_broker_client_options))
+      end
+
       def create_http_client(pact_broker_client_options)
         PactBroker::Client::Hal::HttpClient.new(pact_broker_client_options.merge(pact_broker_client_options[:basic_auth] || {}))
       end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.61.0'
+    VERSION = '1.62.1'
   end
 end

data/lib/pactflow/client/cli/pactflow.rb

@@ -0,0 +1,12 @@
+require "pactflow/client/cli/provider_contract_commands"
+require "pact_broker/client/cli/custom_thor"
+
+module Pactflow
+  module Client
+    module CLI
+      class Pactflow < PactBroker::Client::CLI::CustomThor
+        include ::Pactflow::Client::CLI::ProviderContractCommands
+      end
+    end
+  end
+end

data/lib/pactflow/client/cli/provider_contract_commands.rb

@@ -0,0 +1,68 @@
+require "pact_broker/client/hash_refinements"
+
+module Pactflow
+  module Client
+    module CLI
+      module ProviderContractCommands
+        using PactBroker::Client::HashRefinements
+
+        def self.included(thor)
+          thor.class_eval do
+
+            if ENV.fetch("PACTFLOW_FEATURES", "").include?("publish-provider-contract")
+
+              desc 'publish-provider-contract CONTRACT_FILE ...', "Publish provider contract to Pactflow"
+              method_option :provider, required: true, desc: "The provider name"
+              method_option :provider_app_version, required: true, aliases: "-a", desc: "The provider application version"
+              method_option :branch, aliases: "-h", desc: "Repository branch of the provider version"
+              #method_option :auto_detect_version_properties, hidden: true, type: :boolean, default: false, desc: "Automatically detect the repository branch from known CI environment variables or git CLI."
+              method_option :tag, aliases: "-t", type: :array, banner: "TAG", desc: "Tag name for provider version. Can be specified multiple times."
+              #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 :specification, default: "oas", desc: "The contract specification"
+              method_option :content_type, desc: "The content type. eg. application/yml"
+              method_option :verification_success, type: :boolean
+              method_option :verification_results, desc: "The path to the file containing the output from the verification process"
+              method_option :verification_results_content_type, desc: "The content type of the verification output eg. text/plain, application/yaml"
+              method_option :verification_results_format, desc: "The format of the verification output eg. junit, text"
+              method_option :verifier, desc: "The tool used to verify the provider contract"
+              method_option :verifier_version, desc: "The version of the tool used to verify the provider contract"
+              #method_option :build_url, desc: "The build URL that created the pact"
+
+              output_option_json_or_text
+              shared_authentication_options
+
+              def publish_provider_contract(provider_contract_path)
+                require "pactflow/client/provider_contracts/publish"
+
+                params = params = {
+                  provider_name: options.provider.strip,
+                  provider_version_number: options.provider_app_version.strip,
+                  branch_name: options.branch && options.branch.strip,
+                  tags: (options.tag && options.tag.collect(&:strip)) || [],
+                  contract: {
+                    content: File.read(provider_contract_path),
+                    content_type: options.content_type,
+                    specification: options.specification
+                  },
+                  verification_results: {
+                    success: options.verification_success,
+                    content: options.verification_results ? File.read(options.verification_results) : nil,
+                    content_type: options.verification_results_content_type,
+                    format: options.verification_results_format,
+                    verifier: options.verifier,
+                    verifier_version: options.verifier_version
+                  }
+                }
+
+                command_options = { verbose: options.verbose, output: options.output }
+                result = ::Pactflow::Client::ProviderContracts::Publish.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/pactflow/client/provider_contracts/publish.rb

@@ -0,0 +1,79 @@
+require "pact_broker/client/base_command"
+require "pact_broker/client/versions/create"
+require "base64"
+
+module Pactflow
+  module Client
+    module ProviderContracts
+      class Publish < PactBroker::Client::BaseCommand
+        attr_reader :branch_name, :tags, :provider_name, :provider_version_number, :contract, :verification_results
+
+        def initialize(params, options, pact_broker_client_options)
+          super
+          @provider_name = params[:provider_name]
+          @provider_version_number = params[:provider_version_number]
+          @branch_name = params[:branch_name]
+          @tags = params[:tags] || []
+          @contract = params[:contract]
+          @verification_results = params[:verification_results]
+        end
+
+        private
+
+        def do_call
+          create_branch_version_and_tags
+          create_contract
+          PactBroker::Client::CommandResult.new(true, green("Successfully published provider contract for #{provider_name} version #{provider_version_number}"))
+        end
+
+        def create_branch_version_and_tags
+          if branch_name || tags.any?
+            pacticipant_version_params = {
+              pacticipant_name: provider_name,
+              version_number: provider_version_number,
+              branch_name: branch_name,
+              tags: tags
+            }
+            result = PactBroker::Client::Versions::Create.call(pacticipant_version_params, options, pact_broker_client_options)
+            if !result.success
+              raise PactBroker::Client::Error.new(result.message)
+            end
+          end
+        end
+
+        def create_contract
+          contract_path = "#{pact_broker_base_url}/contracts/provider/{provider}/version/{version}"
+          entrypoint = create_entry_point(contract_path, pact_broker_client_options)
+          entrypoint.expand(provider: provider_name, version: provider_version_number).put!(contract_params)
+        end
+
+        def contract_params
+          verification_results_params = {
+                                          success: verification_results[:success],
+                                          content:  verification_results[:content] ? encode_content(verification_results[:content]) : nil,
+                                          contentType: verification_results[:content_type],
+                                          format: verification_results[:format],
+                                          verifier: verification_results[:verifier],
+                                          verifierVersion: verification_results[:verifier_version]
+                                        }.compact
+
+          body_params = {
+                    content: encode_content(contract[:content]),
+                    contractType: contract[:specification],
+                    contentType: contract[:content_type],
+                  }.compact
+
+          if verification_results_params.any?
+            body_params[:verificationResults] = verification_results_params
+          end
+
+          body_params
+        end
+
+        def encode_content oas
+          Base64.strict_encode64(oas)
+        end
+      end
+    end
+  end
+end

data/pact-broker-client.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'conventional-changelog', '~>1.3'
   gem.add_development_dependency 'pact', '~> 1.16'
   gem.add_development_dependency 'pact-support', '~> 1.16'
-  gem.add_development_dependency 'approvals', '0.0.24'
+  gem.add_development_dependency 'approvals', '0.0.18' 
   gem.add_development_dependency 'rspec-its', '~> 1.3'
 end

data/script/oas.yml

@@ -0,0 +1,49 @@
+openapi: 3.0.0
+info:
+  title: Sample API
+  description: Optional multiline or single-line description in [CommonMark](http://commonmark.org/help/) or HTML.
+  version: 0.1.9
+servers:
+  - url: https://test.pactflow.io
+    description: Prod
+  - url: https://test.test.pactflow.io
+    description: Test
+paths:
+  /admin/teams/{uuid}:
+    get:
+      summary: Returns a team
+      parameters:
+        - name: uuid
+          in: path
+          description: The UUID of the team to return
+          required: true
+          example: 85ad09f5-e014-4e0f-a146-4377fa64b5ef
+          schema:
+            type: string
+      responses:
+        '200':
+          description: A JSON team
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties: false
+                properties:
+                  name:
+                    type: string
+                    example: Team Awesome
+                  uuid:
+                    type: string
+                    example: 85ad09f5-e014-4e0f-a146-4377fa64b5ef
+                  numberOfMembers:
+                    type: integer
+                    example: 4
+                  _links:
+                    type: object
+                    properties:
+                      self:
+                        type: object
+                        properties:
+                          href:
+                            type: string
+                            example: http://test.pactflow.io/admin/teams/85ad09f5-e014-4e0f-a146-4377fa64b5ef

data/script/publish-provider-contract.sh

@@ -0,0 +1,27 @@
+export PACT_BROKER_BASE_URL="http://localhost:9292"
+export PACTFLOW_FEATURES=publish-provider-contract
+# bundle exec bin/pactflow publish-provider-contract  \
+#   script/oas.yml \
+#   --provider Foo \
+#   --provider-app-version 1013b5650d61214e19f10558f97fb5a3bb082d44 \
+#   --branch main \
+#   --tag dev \
+#   --specification oas \
+#   --content-type application/yml \
+#   --no-verification-success \
+#   --verification-results script/verification-results.txt \
+#   --verification-results-content-type text/plain \
+#   --verification-results-format text \
+#   --verifier my-custom-tool \
+#   --verifier-version "1.0" \
+#   --verbose
+
+
+  bundle exec bin/pactflow publish-provider-contract  \
+    script/oas.yml \
+    --provider Foo \
+    --provider-app-version 1013b5650d61214e19f10558f97fb5a3bb082d44 \
+    --branch main \
+    --tag dev \
+    --specification oas \
+    --content-type application/yml

data/script/verification-results.txt

@@ -0,0 +1 @@
+These are some results.

data/spec/pacts/pact_broker_client-pactflow.json

@@ -6,6 +6,36 @@
     "name": "Pactflow"
   },
   "interactions": [
+    {
+      "description": "a request to create a provider contract",
+      "request": {
+        "method": "put",
+        "path": "/contracts/provider/Bar/version/1",
+        "headers": {
+          "Content-Type": "application/json",
+          "Accept": "application/hal+json"
+        },
+        "body": {
+          "content": "LS0tCjpzb21lOiBjb250cmFjdAo=",
+          "contractType": "oas",
+          "contentType": "application/yaml",
+          "verificationResults": {
+            "success": true,
+            "content": "c29tZSByZXN1bHRz",
+            "contentType": "text/plain",
+            "format": "text",
+            "verifier": "my custom tool",
+            "verifierVersion": "1.0"
+          }
+        }
+      },
+      "response": {
+        "status": 201,
+        "headers": {
+          "Content-Type": "application/hal+json;charset=utf-8"
+        }
+      }
+    },
     {
       "description": "a request for the index resource",
       "request": {

data/spec/service_providers/pactflow_publish_provider_contract_spec.rb

@@ -0,0 +1,92 @@
+require_relative "pact_helper"
+require "pactflow/client/provider_contracts/publish"
+require "yaml"
+
+RSpec.describe "publishing a provider contract to Pactflow", pact: true do
+  before do
+    # no point re-testing this
+    allow(PactBroker::Client::Versions::Create).to receive(:call).and_return(double("result", success: true))
+  end
+
+  include_context "pact broker"
+  include PactBrokerPactHelperMethods
+
+  let(:command_params) do
+    {
+      provider_name: "Bar",
+      provider_version_number: "1",
+      branch_name: "main",
+      tags: ["dev"],
+      contract: {
+        content: { some: "contract" }.to_yaml,
+        content_type: "application/yaml",
+        specification: "oas"
+      },
+      verification_results: {
+        success: true,
+        content: "some results",
+        content_type: "text/plain",
+        format: "text",
+        verifier: "my custom tool",
+        verifier_version: "1.0"
+      }
+    }
+  end
+
+  let(:body) { { some: "body" }.to_json }
+
+  let(:request_body) do
+     {
+        "content" => "LS0tCjpzb21lOiBjb250cmFjdAo=",
+        "contractType" => "oas",
+        "contentType" => "application/yaml",
+        "verificationResults" => {
+          "success" => true,
+          "content" => "c29tZSByZXN1bHRz",
+          "contentType" => "text/plain",
+          "format" => "text",
+          "verifier" => "my custom tool",
+          "verifierVersion" => "1.0"
+        }
+     }
+  end
+
+  let(:response_status) { 201 }
+  let(:success_response) do
+    {
+      status: response_status,
+      headers: pact_broker_response_headers
+    }
+  end
+
+  let(:options) do
+    {
+      verbose: false
+    }
+  end
+
+  let(:pact_broker_client_options) do
+    { pact_broker_base_url: pactflow.mock_service_base_url }
+  end
+
+  subject { Pactflow::Client::ProviderContracts::Publish.call(command_params, options, pact_broker_client_options) }
+
+  context "creating a provider contract with valid parameters" do
+    before do
+      pactflow
+        .upon_receiving("a request to create a provider contract")
+        .with(
+            method: :put,
+            path: "/contracts/provider/Bar/version/1",
+            headers: put_request_headers,
+            body: request_body)
+        .will_respond_with(success_response)
+    end
+
+    it "returns a CommandResult with success = true" do
+      expect(subject).to be_a PactBroker::Client::CommandResult
+      expect(subject.success).to be true
+      expect(subject.message).to include "Successfully published provider contract for Bar version 1"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.61.0
+  version: 1.62.1
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ email:
 - beth@bethesque.com
 executables:
 - pact-broker
+- pactflow
 extensions: []
 extra_rdoc_files: []
 files:
@@ -220,6 +221,7 @@ files:
 - Rakefile
 - appveyor.yml
 - bin/pact-broker
+- bin/pactflow
 - ci.sh
 - doc/CAN_I_DEPLOY_USAGE_WITH_TAGS.md
 - doc/pacts/markdown/Pact Broker Client - Pact Broker.md
@@ -314,17 +316,23 @@ files:
 - lib/pact_broker/client/webhooks/create.rb
 - lib/pact_broker/client/webhooks/test.rb
 - lib/pact_broker_client.rb
+- lib/pactflow/client/cli/pactflow.rb
+- lib/pactflow/client/cli/provider_contract_commands.rb
+- lib/pactflow/client/provider_contracts/publish.rb
 - pact-broker-client.gemspec
 - script/approve-all.sh
 - script/can-i-deploy.sh
 - script/create-pacticipant.sh
+- script/oas.yml
 - script/publish-pact.sh
+- script/publish-provider-contract.sh
 - script/record-deployment.sh
 - script/record-deployments-and-releases.sh
 - script/record-undeployment.sh
 - script/release.sh
 - script/trigger-release.sh
 - script/update-cli-usage-in-readme.rb
+- script/verification-results.txt
 - script/webhook-commands.sh
 - spec/fixtures/approvals/can_i_deploy_failure_dry_run.approved.txt
 - spec/fixtures/approvals/can_i_deploy_ignore.approved.txt
@@ -389,6 +397,7 @@ files:
 - spec/service_providers/pact_broker_client_tags_spec.rb
 - spec/service_providers/pact_broker_client_versions_spec.rb
 - spec/service_providers/pact_helper.rb
+- spec/service_providers/pactflow_publish_provider_contract_spec.rb
 - spec/service_providers/pactflow_webhooks_create_spec.rb
 - spec/service_providers/pacticipants_create_spec.rb
 - spec/service_providers/publish_pacts_spec.rb
@@ -497,6 +506,7 @@ test_files:
 - spec/service_providers/pact_broker_client_tags_spec.rb
 - spec/service_providers/pact_broker_client_versions_spec.rb
 - spec/service_providers/pact_helper.rb
+- spec/service_providers/pactflow_publish_provider_contract_spec.rb
 - spec/service_providers/pactflow_webhooks_create_spec.rb
 - spec/service_providers/pacticipants_create_spec.rb
 - spec/service_providers/publish_pacts_spec.rb