pact_broker 2.21.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e08f85dd95e1f881127b7592ac697e7b327e0ab
-  data.tar.gz: c13635638b9768858e0fd87c46a593d440586ba8
+  metadata.gz: 107e0313842be2bc851feb80d62920c27f320509
+  data.tar.gz: d411b036f55dc4d75544d13f607bcdd156485daf
 SHA512:
-  metadata.gz: daff9fab78dd9a83bd51f0010c6c3b754c4aeb30eb6bdc40cb22772c7d654de4d7af91882c3e5429d687c63c9464ef326e6c4d095e58cf379b8e3a807f04448d
-  data.tar.gz: 1b305e38c05e8d2395260f4909439aa354c7ebd4b555a36fe38531b306a612b1a05bcce611880b8a17d0db1652dffd9847271f4eebe8d7e080daba2a98da6f83
+  metadata.gz: c00e5f4e37da0f499641550cae06a874ae384065ab7afe3e0b44901e5ea87218b69715936d704b4701e3d310d1f66239395319ca111bbdca6ba488c57828e78c
+  data.tar.gz: 2beb39b0a6fabee40acd5d7259437262f120ae8c0bf5273c32e79ad66be3fa32fd13b18629cfd94b9877f470c7a6ff2f62c71a478ac9a1a2fcee1baf1e02c123

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v2.22.0"></a>
+### v2.22.0 (2018-06-11)
+
+
+#### Features
+
+* allow whitelist configurations to be loaded from database	 ([19cb83f](/../../commit/19cb83f))
+
+
 <a name="v2.21.0"></a>
 ### v2.21.0 (2018-06-10)
 

data/lib/pact_broker/config/load.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/configuration'
 require 'pact_broker/logging'
 require 'pact_broker/config/setting'
+require 'pact_broker/config/space_delimited_string_list'
 
 module PactBroker
   module Config
@@ -49,6 +50,8 @@ module PactBroker
           Integer(setting.value)
         when 'float'
           Float(setting.value)
+        when 'space_delimited_string_list'
+          SpaceDelimitedStringList.parse(setting.value)
         when 'boolean'
           setting.value == "1"
         end

data/lib/pact_broker/config/save.rb

@@ -49,6 +49,8 @@ module PactBroker
             'boolean'
           when String, nil
             'string'
+          when SpaceDelimitedStringList
+            'space_delimited_string_list'
           when Array, Hash
             'json'
           when Integer
@@ -69,6 +71,8 @@ module PactBroker
           "1"
         when FalseClass
           "0"
+        when SpaceDelimitedStringList
+          val.to_s
         when Array, Hash
           val.to_json
         else

data/lib/pact_broker/config/space_delimited_string_list.rb

@@ -0,0 +1,31 @@
+module PactBroker
+  module Config
+    class SpaceDelimitedStringList < Array
+
+      def initialize list
+        super(list)
+      end
+
+      def self.parse(string)
+        array = (string || '').split(' ').collect do | word |
+          if word[0] == '/' and word[-1] == '/'
+            Regexp.new(word[1..-2])
+          else
+            word
+          end
+        end
+        SpaceDelimitedStringList.new(array)
+      end
+
+      def to_s
+        collect do | word |
+          if word.is_a?(Regexp)
+            "/#{word.source}/"
+          else
+            word
+          end
+        end.join(' ')
+      end
+    end
+  end
+end

data/lib/pact_broker/configuration.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/error'
+require 'pact_broker/config/space_delimited_string_list'
 
 module PactBroker
 
@@ -23,15 +24,19 @@ module PactBroker
       :check_for_potential_duplicate_pacticipant_names,
       :webhook_retry_schedule,
       :semver_formats,
-      :disable_ssl_verification
+      :disable_ssl_verification,
+      :webhook_http_method_whitelist,
+      :webhook_scheme_whitelist,
+      :webhook_host_whitelist,
+      :base_equality_only_on_content_that_affects_verification_results
     ]
 
     attr_accessor :log_dir, :database_connection, :auto_migrate_db, :use_hal_browser, :html_pact_renderer
     attr_accessor :validate_database_connection_config, :enable_diagnostic_endpoints, :version_parser, :sha_generator
     attr_accessor :use_case_sensitive_resource_names, :order_versions_by_date
     attr_accessor :check_for_potential_duplicate_pacticipant_names
-    attr_accessor :webhook_http_method_whitelist, :webhook_scheme_whitelist, :webhook_host_whitelist
     attr_accessor :webhook_retry_schedule
+    attr_reader :webhook_http_method_whitelist, :webhook_scheme_whitelist, :webhook_host_whitelist
     attr_accessor :semver_formats
     attr_accessor :enable_public_badge_access, :shields_io_base_url
     attr_accessor :disable_ssl_verification
@@ -68,8 +73,7 @@ module PactBroker
       config.version_parser = PactBroker::Versions::ParseSemanticVersion
       config.sha_generator = PactBroker::Pacts::GenerateSha
       config.base_equality_only_on_content_that_affects_verification_results = false
-      # Not recommended to set this to true unless there is no way to
-      # consistently extract an orderable object from the consumer application version number.
+      # TODO change this to true
       config.order_versions_by_date = false
       config.semver_formats = ["%M.%m.%p%s%d", "%M.%m", "%M"]
       config.webhook_retry_schedule = [10, 60, 120, 300, 600, 1200] #10 sec, 1 min, 2 min, 5 min, 10 min, 20 min => 38 minutes
@@ -171,8 +175,29 @@ module PactBroker
       PactBroker::Config::Load.call(self)
     end
 
+    def webhook_http_method_whitelist= webhook_http_method_whitelist
+      @webhook_http_method_whitelist = parse_space_delimited_string_list_property('webhook_http_method_whitelist', webhook_http_method_whitelist)
+    end
+
+    def webhook_scheme_whitelist= webhook_scheme_whitelist
+      @webhook_scheme_whitelist = parse_space_delimited_string_list_property('webhook_scheme_whitelist', webhook_scheme_whitelist)
+    end
+
+    def webhook_host_whitelist= webhook_host_whitelist
+      @webhook_host_whitelist = parse_space_delimited_string_list_property('webhook_host_whitelist', webhook_host_whitelist)
+    end
+
     private
 
+    def parse_space_delimited_string_list_property property_name, property_value
+      case property_value
+      when String then Config::SpaceDelimitedStringList.parse(property_value)
+      when Array then Config::SpaceDelimitedStringList.new(property_value)
+      else
+        raise ConfigurationError.new("Pact Broker configuration property `#{property_name}` must be a space delimited String or an Array")
+      end
+    end
+
     def create_logger path
       FileUtils::mkdir_p File.dirname(path)
       logger = Logger.new(path)

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '2.21.0'
+  VERSION = '2.22.0'
 end

data/spec/lib/pact_broker/config/load_spec.rb

@@ -7,7 +7,7 @@ module PactBroker
       describe ".call" do
 
         class MockConfig
-          attr_accessor :foo, :bar, :nana, :meep, :lalala, :meow, :peebo
+          attr_accessor :foo, :bar, :nana, :meep, :lalala, :meow, :peebo, :whitelist
         end
 
         before do
@@ -19,6 +19,7 @@ module PactBroker
           Setting.create(name: 'meow', type: 'boolean', value: "0")
           Setting.create(name: 'peebo', type: 'string', value: nil)
           Setting.create(name: 'unknown', type: 'string', value: nil)
+          Setting.create(name: 'whitelist', type: 'space_delimited_string_list', value: 'foo bar')
         end
 
         let(:configuration) { MockConfig.new }
@@ -60,6 +61,11 @@ module PactBroker
           expect(configuration.peebo).to eq nil
         end
 
+        it "loads a space_delimited_string_list" do
+          subject
+          expect(configuration.whitelist).to eq ["foo", "bar"]
+        end
+
         it "does not load a setting where the Configuration object does not have a matching property" do
           allow(Load.logger).to receive(:warn)
           expect(Load.logger).to receive(:warn).with("Could not load configuration setting \"unknown\" as there is no matching attribute on the Configuration class")

data/spec/lib/pact_broker/config/save_spec.rb

@@ -1,12 +1,13 @@
 require 'pact_broker/config/save'
 require 'pact_broker/configuration'
+require 'pact_broker/config/space_delimited_string_list'
 
 module PactBroker
   module Config
     describe Save do
 
       describe "#call" do
-        let(:setting_names) { [:foo, :bar, :wiffle, :meep, :flop, :peebo, :lalala, :meow] }
+        let(:setting_names) { [:foo, :bar, :wiffle, :meep, :flop, :peebo, :lalala, :meow, :whitelist] }
         let(:configuration) do
           double("PactBroker::Configuration",
             foo: true,
@@ -16,7 +17,8 @@ module PactBroker
             flop: nil,
             peebo: 1,
             lalala: 1.2,
-            meow: Object.new)
+            meow: Object.new,
+            whitelist: SpaceDelimitedStringList.parse("foo bar"))
         end
 
         subject { Save.call(configuration, setting_names) }
@@ -70,6 +72,13 @@ module PactBroker
           expect(setting.value).to eq '1.2'
         end
 
+        it "saves a SpaceDelimitedStringList" do
+          subject
+          setting = Setting.find(name: 'whitelist')
+          expect(setting.type).to eq 'space_delimited_string_list'
+          expect(setting.value).to eq 'foo bar'
+        end
+
         it "does not save an arbitrary object to the database" do
           allow(Save.logger).to receive(:warn)
           expect(Save.logger).to receive(:warn).with("Could not save configuration setting \"meow\" to database as the class Object is not supported.")

data/spec/lib/pact_broker/config/space_delimited_string_list_spec.rb

@@ -0,0 +1,45 @@
+require 'pact_broker/config/space_delimited_string_list'
+
+module PactBroker
+  module Config
+    describe SpaceDelimitedStringList do
+      describe "parse" do
+        subject { SpaceDelimitedStringList.parse(input) }
+
+        context "when input is ''" do
+          let(:input) { "" }
+
+          it { is_expected.to eq [] }
+
+          its(:to_s) { is_expected.to eq input }
+        end
+
+        context "when input is 'foo bar'" do
+          let(:input) { "foo bar" }
+
+          it { is_expected.to eq ["foo", "bar"] }
+
+          it { is_expected.to be_a SpaceDelimitedStringList }
+
+          its(:to_s) { is_expected.to eq input }
+        end
+
+        context "when input is '/foo.*/'" do
+          let(:input) { "/foo.*/" }
+
+          it { is_expected.to eq [/foo.*/] }
+
+          its(:to_s) { is_expected.to eq input }
+        end
+
+        context "when input is '/foo\\.*/' (note double backslash)" do
+          let(:input) { "/foo\\.*/" }
+
+          it { is_expected.to eq [/foo\.*/] }
+
+          its(:to_s) { is_expected.to eq input }
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/configuration_spec.rb

@@ -16,7 +16,32 @@ module PactBroker
           expect(PactBroker::Api::Renderers::HtmlPactRenderer).to receive(:call).with(pact, options)
           PactBroker.configuration.html_pact_renderer.call pact, options
         end
+      end
+
+      describe "webhook_http_method_whitelist" do
+        it "allows setting the whitelist by a string" do
+          PactBroker.configuration.webhook_http_method_whitelist = "foo"
+          expect(PactBroker.configuration.webhook_http_method_whitelist).to be_a Config::SpaceDelimitedStringList
+        end
+
+        it "allows setting the whitelist by an array" do
+          PactBroker.configuration.webhook_http_method_whitelist = ["foo"]
+          expect(PactBroker.configuration.webhook_http_method_whitelist).to be_a Config::SpaceDelimitedStringList
+        end
+      end
 
+      describe "webhook_scheme_whitelist" do
+        it "allows setting the whitelist by a string" do
+          PactBroker.configuration.webhook_scheme_whitelist = "foo"
+          expect(PactBroker.configuration.webhook_scheme_whitelist).to be_a Config::SpaceDelimitedStringList
+        end
+      end
+
+      describe "webhook_host_whitelist" do
+        it "allows setting the whitelist by a string" do
+          PactBroker.configuration.webhook_host_whitelist = "foo"
+          expect(PactBroker.configuration.webhook_host_whitelist).to be_a Config::SpaceDelimitedStringList
+        end
       end
 
       describe "SETTING_NAMES" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -764,6 +764,7 @@ files:
 - lib/pact_broker/config/load.rb
 - lib/pact_broker/config/save.rb
 - lib/pact_broker/config/setting.rb
+- lib/pact_broker/config/space_delimited_string_list.rb
 - lib/pact_broker/configuration.rb
 - lib/pact_broker/constants.rb
 - lib/pact_broker/dashboard/service.rb
@@ -1092,6 +1093,7 @@ files:
 - spec/lib/pact_broker/config/load_spec.rb
 - spec/lib/pact_broker/config/save_and_load_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
+- spec/lib/pact_broker/config/space_delimited_string_list_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
@@ -1383,6 +1385,7 @@ test_files:
 - spec/lib/pact_broker/config/load_spec.rb
 - spec/lib/pact_broker/config/save_and_load_spec.rb
 - spec/lib/pact_broker/config/save_spec.rb
+- spec/lib/pact_broker/config/space_delimited_string_list_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb