pact_broker 2.89.0 → 2.89.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2a319d08e394deac2b0ddab3c97cb09e3ef17025daebe82e54a30577a049b6
-  data.tar.gz: b3767941da7f343cff6b14ddeca1398bb86e492b84d2447d03e59658c7d1ae31
+  metadata.gz: 4932100e3772127c1bccbb90c5db0e943678d14577bf163e90e61a0cd32f8685
+  data.tar.gz: 9b136a90d19d213f7a28c10ad518dabf0a974be80e11f6d06e199584bef2ca28
 SHA512:
-  metadata.gz: 4373701434b40c1529c20469d860e352ffb32a100b22a2ea6774c7579ddc4a30956fc7879b1fb3f58d0e6676116cbb7ac504648178a28513b684056918e3818a
-  data.tar.gz: a2f2b2d4b5ffb90e4ed31394d47a8a05aa75e90d2329f22cad4092930097f5958f6ccbd53ebb499c05d375bc980de62ddaf31252bd58d22ed9ff09911da106c7
+  metadata.gz: d6820acb97cc28b5a94e7ae939b0ee5c87e96e626956c721b19484407771735fa33f07ae61bf3d4e4cab3bb17176d348a804715a670e925ffb47d5ece07efccc
+  data.tar.gz: 947e0f04cd880ee4dec65eceaf1bd0d82c0975338bcf0ed1efe309f3716b70d3e666be7b36814ce0382fcf462a0cf38156b22611332ee56135622cdbf6c4ef0e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v2.89.1"></a>
+### v2.89.1 (2021-10-28)
+
+#### Bug Fixes
+
+* **clean**
+  * honour max_age when set in clean selector	 ([828420d4](/../../commit/828420d4))
+
+* null safe navigation in case a branch head does not exist for a branch version	 ([4b259a81](/../../commit/4b259a81))
+
 <a name="v2.89.0"></a>
 ### v2.89.0 (2021-10-15)
 

data/lib/pact_broker/api/resources/publish_contracts.rb

@@ -68,13 +68,17 @@ module PactBroker
         end
 
         def schema
-          PactBroker::Api::Contracts::PublishContractsSchema
+          api_contract_class(:publish_contracts_schema)
         end
 
         def decode_and_parse_content(contract)
-          contract["decodedContent"] = Base64.strict_decode64(contract["content"]) rescue nil
+          contract["decodedContent"] = base64_decode(contract["content"])
           if contract["decodedContent"]
-            contract["decodedParsedContent"] = PactBroker::Pacts::Parse.call(contract["decodedContent"]) rescue nil
+            if contract["contentType"]&.include?("json")
+              contract["decodedParsedContent"] = parse_json(contract["decodedContent"])
+            elsif contract["contentType"]&.include?("yml")
+              contract["decodedParsedContent"] = parse_yaml(contract["decodedContent"])
+            end
           end
         end
 
@@ -98,6 +102,19 @@ module PactBroker
         def conflict_notices
           @conflict_notices ||= contract_service.conflict_notices(parsed_contracts)
         end
+
+        def base64_decode(content)
+          Base64.strict_decode64(content) rescue nil
+        end
+
+        # TODO put this somewhere shareable
+        def parse_yaml(content)
+          YAML.safe_load(content, [Time, Date, DateTime]) rescue nil
+        end
+
+        def parse_json(content)
+          PactBroker::Pacts::Parse.call(content) rescue nil
+        end
       end
     end
   end

data/lib/pact_broker/db/clean/selector.rb

@@ -33,7 +33,7 @@ module PactBroker
         end
         alias_method :to_h, :to_hash
 
-        def to_json
+        def to_json(_opts = nil)
           (@source_hash || to_hash).to_json
         end
 

data/lib/pact_broker/doc/views/provider-pacts-for-verification.markdown

@@ -42,7 +42,7 @@ Example: This data structure represents the way a user might specify "I want to
 
 `consumerVersionSelectors.environment`: the name of the environment containing the consumer versions for which to return the pacts. Used to further qualify `{ "deployed": true }` or `{ "released": true }`. Normally, this would not be needed, as it is recommended to verify the pacts for all currently deployed/currently supported released versions.
 
-`consumerVersionSelectors.latest`: true. Used in conjuction with the `tag` and `branch` properties. When used with a `branch`, it may be `true` or the key ommitted (in which case it will be inferred to be `true`). This is because it only makes sense to verify the latest pact for a branch. If a `tag` is specified, and `latest` is `true`, then the latest pact for each of the consumers with that tag will be returned. If a `tag` is specified and the latest flag is *not* set to `true`, *all* the pacts with the specified tag will be returned. (This might seem a bit weird, but it's done this way to match the syntax used for the matrix query params. See https://docs.pact.io/selectors). 
+`consumerVersionSelectors.latest`: true. Used in conjuction with the tag property. If a tag is specified, and latest is true, then the latest pact for each of the consumers with that tag will be returned. If a tag is specified and the latest flag is not set to true, all the pacts with the specified tag will be returned. (This might seem a bit weird, but it's done this way to match the syntax used for the matrix query params. See https://docs.pact.io/selectors).
 
 `consumerVersionSelectors.consumer`: allows a selector to only be applied to a certain consumer.
 

data/lib/pact_broker/pacts/service.rb

@@ -156,7 +156,7 @@ module PactBroker
 
       # Overwriting an existing pact with the same consumer/provider/consumer version number
       def create_pact_revision params, existing_pact
-        logger.info "Updating existing pact publication with params #{params.reject{ |k, _v| k == :json_content}}"
+        logger.info "Updating existing pact publication", payload: params.reject{ |k, _v| k == :json_content }
         logger.debug "Content #{params[:json_content]}"
         pact_version_sha = generate_sha(params[:json_content])
         json_content = add_interaction_ids(params[:json_content])

data/lib/pact_broker/tasks/clean_task.rb

@@ -17,9 +17,9 @@ module PactBroker
       end
 
       def keep_version_selectors=(keep_version_selectors)
-        require "pact_broker/matrix/unresolved_selector"
+        require "pact_broker/db/clean/selector"
         @keep_version_selectors = [*keep_version_selectors].collect do | hash |
-          PactBroker::Matrix::UnresolvedSelector.from_hash(hash)
+          PactBroker::DB::Clean::Selector.from_hash(hash)
         end
       end
 

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = "2.89.0"
+  VERSION = "2.89.1"
 end

data/lib/pact_broker/versions/branch_version.rb

@@ -27,7 +27,8 @@ module PactBroker
       end
 
       def latest?
-        branch_head.branch_version_id == id
+        # Should not be possible, not to have a branch head, but have seen this error in the logs
+        branch_head&.branch_version_id == id
       end
 
       def version_number

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.89.0
+  version: 2.89.1
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -1836,7 +1836,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.2.30
 signing_key: 
 specification_version: 4
 summary: See description