pact_broker 2.81.0 → 2.82.0

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

@@ -3,11 +3,23 @@ require "pact_broker/config/load"
 module PactBroker
   module Config
     describe Load do
-
       describe ".call" do
 
-        class MockConfig
-          attr_accessor :foo, :bar, :nana, :meep, :lalala, :meow, :peebo, :whitelist, :blah
+        class MockConfig < Anyway::Config
+          attr_config(
+            foo: "default",
+            bar: "default",
+            nana: "default",
+            meep: "default",
+            lalala: "default",
+            meow: "default",
+            peebo: "default",
+            whitelist: "default",
+            blah: "default",
+            setting_with_override: "default"
+          )
+          attr_config(:setting_with_no_default)
+          config_name :foo
         end
 
         before do
@@ -21,9 +33,14 @@ module PactBroker
           Setting.create(name: "unknown", type: "string", value: nil)
           Setting.create(name: "whitelist", type: "space_delimited_string_list", value: "foo bar")
           Setting.create(name: "blah", type: "symbol", value: "boop")
+          Setting.create(name: "setting_with_no_default", type: "string", value: "boop")
+          Setting.create(name: "setting_with_override", type: "string", value: "meep")
+
+          allow(Load.logger).to receive(:warn)
+          allow(Load.logger).to receive(:debug)
         end
 
-        let(:configuration) { MockConfig.new }
+        let(:configuration) { MockConfig.new(setting_with_override: "overridden") }
 
         subject { Load.call(configuration) }
 
@@ -72,9 +89,19 @@ module PactBroker
           expect(configuration.whitelist).to eq ["foo", "bar"]
         end
 
+        it "loads settings where there is no default" do
+          subject
+          expect(configuration.setting_with_no_default).to eq "boop"
+        end
+
+        it "does not overwrite settings that did not come from the default class" do
+          expect(Load.logger).to receive(:debug).with(/Ignoring.*setting_with_override/)
+          subject
+          expect(configuration.setting_with_override).to eq "overridden"
+        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")
+          expect(Load.logger).to receive(:warn).with("Could not load configuration setting \"unknown\" as there is no matching attribute on the PactBroker::Config::MockConfig class")
           subject
         end
       end

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

@@ -0,0 +1,22 @@
+require "pact_broker/config/runtime_configuration_logging_methods"
+
+module PactBroker
+  module Config
+    describe RuntimeConfigurationLoggingMethods do
+      let(:string_io) { StringIO.new }
+      let(:logger) { Logger.new(string_io) }
+      let(:initial_values) { { database_password: "foo", database_url: "protocol://username:password@host/database"} }
+      let(:runtime_configuration) { RuntimeConfiguration.new(initial_values) }
+
+      subject do
+        runtime_configuration.log_configuration(logger)
+        string_io.string
+      end
+
+      it "redacts the sensitive values" do
+        expect(subject).to include "database_password=*****"
+        expect(subject).to include "database_url=protocol://username:*****@host/database"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+require "pact_broker/config/runtime_configuration"
+
+module PactBroker
+  module Config
+    describe RuntimeConfiguration do
+      describe "base_url" do
+        it "does not expose base_url for delegation" do
+          expect(RuntimeConfiguration.getter_and_setter_method_names).to_not include :base_url
+        end
+
+        it "does not support the method base_url as base_urls should be used instead" do
+          expect { RuntimeConfiguration.new.base_url }.to raise_error NotImplementedError
+        end
+      end
+
+      context "with a base_url and base_urls as strings" do
+        subject do
+          runtime_configuration = RuntimeConfiguration.new
+          runtime_configuration.base_url = "foo blah"
+          runtime_configuration.base_urls = "bar wiffle"
+          runtime_configuration
+        end
+
+        its(:base_urls) { is_expected.to eq %w[bar wiffle foo blah] }
+      end
+
+      context "with a base_url and base_urls as the same strings" do
+        subject do
+          runtime_configuration = RuntimeConfiguration.new
+          runtime_configuration.base_url = "foo blah"
+          runtime_configuration.base_urls = "foo meep"
+          runtime_configuration
+        end
+
+        its(:base_urls) { is_expected.to eq %w[foo meep blah] }
+      end
+
+      context "with just base_url as a string" do
+        subject do
+          runtime_configuration = RuntimeConfiguration.new
+          runtime_configuration.base_url = "foo blah"
+          runtime_configuration
+        end
+
+        its(:base_urls) { is_expected.to eq %w[foo blah] }
+      end
+
+      context "with just base_urls as a string" do
+        subject do
+          runtime_configuration = RuntimeConfiguration.new
+          runtime_configuration.base_url = nil
+          runtime_configuration.base_urls = "bar wiffle"
+          runtime_configuration
+        end
+
+        its(:base_urls) { is_expected.to eq %w[bar wiffle] }
+      end
+
+      context "with base_url and base_urls as arrays" do
+        subject do
+          runtime_configuration = RuntimeConfiguration.new
+          runtime_configuration.base_url = %w[foo blah]
+          runtime_configuration.base_urls = %w[bar wiffle]
+          runtime_configuration
+        end
+
+        its(:base_urls) { is_expected.to eq %w[bar wiffle foo blah] }
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/configuration_spec.rb

@@ -5,7 +5,6 @@ require "pact_broker/config/setting"
 
 module PactBroker
   describe Configuration do
-
     describe "show_backtrace_in_error_response?" do
       before do
         allow(ENV).to receive(:[]).and_call_original
@@ -36,7 +35,54 @@ module PactBroker
       end
     end
 
-    context "default configuration" do
+    describe "with_runtime_configuration_overrides" do
+      before do
+        allow(PactBroker.configuration).to receive(:logger).and_return(logger)
+      end
+      let(:logger) { double("logger", debug?: true, debug: nil, warn: nil) }
+
+      it "overrides the specified runtime configuration attributes within the block" do
+        attribute_in_block = nil
+        PactBroker.with_runtime_configuration_overrides(disable_ssl_verification: "true") do
+          attribute_in_block = PactBroker.configuration.disable_ssl_verification
+        end
+        expect(attribute_in_block).to eq true
+        expect(PactBroker.configuration.disable_ssl_verification).to eq false
+      end
+
+      it "logs the overrides at debug level" do
+        expect(logger).to receive(:debug).with("Overridding runtime configuration", payload: hash_including(overrides: { disable_ssl_verification: true }))
+        PactBroker.with_runtime_configuration_overrides(disable_ssl_verification: "true") do
+          "foo"
+        end
+      end
+
+      it "does not override the other runtime configuration attributes within the block" do
+        attribute_in_block = nil
+        PactBroker.with_runtime_configuration_overrides(disable_ssl_verification: "true") do
+          attribute_in_block = PactBroker.configuration.webhook_scheme_whitelist
+        end
+        expect(PactBroker.configuration.webhook_scheme_whitelist).to eq attribute_in_block
+      end
+
+      it "returns the results of the block" do
+        return_value = PactBroker.with_runtime_configuration_overrides(disable_ssl_verification: "true") do
+          "foo"
+        end
+        expect(return_value).to eq "foo"
+      end
+
+      context "when the specified runtime attribute does not exist" do
+        it "logs that it has ignored those attributes" do
+          expect(logger).to receive(:debug).with("Overridding runtime configuration", payload: hash_including(ignoring: { no_existy: true }))
+          PactBroker.with_runtime_configuration_overrides(no_existy: "true") do
+            "foo"
+          end
+        end
+      end
+    end
+
+    describe "default configuration" do
       describe ".html_pact_renderer" do
 
         let(:pact) { double("pact") }
@@ -55,8 +101,8 @@ module PactBroker
         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
+          PactBroker.configuration.webhook_http_method_whitelist = ["foo", "/.*/"]
+          expect(PactBroker.configuration.webhook_http_method_whitelist).to eq ["foo", /.*/]
         end
       end
 
@@ -68,7 +114,7 @@ module PactBroker
 
         it "allows setting the 'webhook_http_code_success' by an array" do
           PactBroker.configuration.webhook_http_code_success = [200, 201, 202]
-          expect(PactBroker.configuration.webhook_http_code_success).to be_a Config::SpaceDelimitedIntegerList
+          expect(PactBroker.configuration.webhook_http_code_success).to eq [200, 201, 202]
         end
       end
 
@@ -86,26 +132,6 @@ module PactBroker
         end
       end
 
-      describe "SETTING_NAMES" do
-        let(:configuration) { PactBroker::Configuration.new}
-
-        Configuration::SAVABLE_SETTING_NAMES.each do | setting_name |
-          describe setting_name do
-            it "exists as a method on a PactBroker::Configuration instance" do
-              expect(configuration).to respond_to(setting_name)
-            end
-          end
-        end
-      end
-
-      describe "save_to_database" do
-        let(:configuration) { PactBroker::Configuration.default_configuration }
-
-        it "saves the configuration to the database" do
-          expect { configuration.save_to_database }.to change { PactBroker::Config::Setting.count }.by(Configuration::SAVABLE_SETTING_NAMES.size)
-        end
-      end
-
       describe "load_from_database!" do
         let(:configuration) { PactBroker::Configuration.new }
 

data/spec/lib/pact_broker/errors/error_logger_spec.rb

@@ -18,6 +18,9 @@ module PactBroker
       subject { ErrorLogger.call(error, error_reference, env) }
 
       context "when the error class is in the warning_error_classes list" do
+        before do
+          allow(PactBroker.configuration).to receive(:warning_error_classes).and_return([Sequel::ForeignKeyConstraintViolation])
+        end
         let(:error) { Sequel::ForeignKeyConstraintViolation.new }
 
         it "logs at warn so as not to wake everyone up in the middle of the night" do

data/spec/lib/pact_broker/feature_toggle_spec.rb

@@ -1,32 +1,31 @@
 require "pact_broker/feature_toggle"
+require "anyway/testing/helpers"
 
 module PactBroker
   describe FeatureToggle do
     describe "enabled?" do
-      before do
-        allow(ENV).to receive(:[]).and_call_original
-      end
+      include Anyway::Testing::Helpers
 
       let(:ignore_env) { false }
 
       subject { FeatureToggle.enabled?(:foo, ignore_env) }
 
       context "when RACK_ENV is not production" do
-        before do
-          allow(ENV).to receive(:[]).with("RACK_ENV").and_return("development")
+        around do | example |
+          with_env("RACK_ENV" => "development", &example)
         end
 
         context "when PACT_BROKER_FEATURES includes the given string" do
-          before do
-            allow(ENV).to receive(:[]).with("PACT_BROKER_FEATURES").and_return("foo bar")
+          around do | example |
+            with_env("PACT_BROKER_FEATURES" => "foo bar", &example)
           end
 
           it { is_expected.to be true }
         end
 
         context "when PACT_BROKER_FEATURES does not include the given string" do
-          before do
-            allow(ENV).to receive(:[]).with("PACT_BROKER_FEATURES").and_return(nil)
+          around do | example |
+            with_env("PACT_BROKER_FEATURES" => "", &example)
           end
 
           it { is_expected.to be true }
@@ -40,37 +39,37 @@ module PactBroker
       end
 
       context "when RACK_ENV is production" do
-        before do
-          allow(ENV).to receive(:[]).with("RACK_ENV").and_return("production")
+        around do | example |
+          with_env("RACK_ENV" => "production", &example)
         end
 
         context "when PACT_BROKER_FEATURES includes the given string" do
-          before do
-            allow(ENV).to receive(:[]).with("PACT_BROKER_FEATURES").and_return("foo bar")
+          around do | example |
+            with_env("PACT_BROKER_FEATURES" => "foo bar", &example)
           end
 
           it { is_expected.to be true }
         end
 
         context "when PACT_BROKER_FEATURES includes the given string inside another word" do
-          before do
-            allow(ENV).to receive(:[]).with("PACT_BROKER_FEATURES").and_return("foowiffle bar")
+          around do | example |
+            with_env("PACT_BROKER_FEATURES" => "foowiffle bar", &example)
           end
 
           it { is_expected.to be false }
         end
 
         context "when PACT_BROKER_FEATURES includes the given string but the case doesn't match" do
-          before do
-            allow(ENV).to receive(:[]).with("PACT_BROKER_FEATURES").and_return("FOO bar")
+          around do | example |
+            with_env("PACT_BROKER_FEATURES" => "FOO bar", &example)
           end
 
           it { is_expected.to be true }
         end
 
         context "when PACT_BROKER_FEATURES does not include the given string" do
-          before do
-            allow(ENV).to receive(:[]).with("PACT_BROKER_FEATURES").and_return(nil)
+          around do | example |
+            with_env("PACT_BROKER_FEATURES" => nil, &example)
           end
 
           it { is_expected.to be false }

data/spec/lib/pact_broker/matrix/integration_environment_spec.rb

@@ -4,6 +4,10 @@ module PactBroker
   module Matrix
     describe Service do
       describe "find with environments" do
+        include MatrixQueryContentForApproval
+
+        ENVIRONMENT_APPROVALS = {}
+
         subject { Service.can_i_deploy(selectors, options) }
 
         # Useful for eyeballing the messages to make sure they read nicely
@@ -15,6 +19,14 @@ module PactBroker
         #   end
         # end
 
+        after do | example |
+          ENVIRONMENT_APPROVALS[example.full_description] = matrix_query_content_for_approval(subject)
+        end
+
+        after(:all) do
+          Approvals.verify(ENVIRONMENT_APPROVALS, :name => file_name_to_approval_name(__FILE__) , format: :json)
+        end
+
         context "when there is a successful verification between the provider in test environment and the consumer to be deployed" do
           before do
             td.create_environment("test")

data/spec/lib/pact_broker/matrix/integration_ignore_spec.rb

@@ -4,6 +4,10 @@ module PactBroker
   module Matrix
     describe Service do
       describe "find" do
+        include MatrixQueryContentForApproval
+
+        INTEGRATION_IGNORE_APPROVALS = {}
+
         subject { Service.can_i_deploy(selectors, options) }
 
         # Useful for eyeballing the messages to make sure they read nicely
@@ -15,6 +19,14 @@ module PactBroker
           # end
         end
 
+        after do | example |
+          INTEGRATION_IGNORE_APPROVALS[example.full_description] = matrix_query_content_for_approval(subject)
+        end
+
+        after(:all) do
+          Approvals.verify(INTEGRATION_IGNORE_APPROVALS, :name => file_name_to_approval_name(__FILE__) , format: :json)
+        end
+
         let(:options) { {} }
 
         shared_examples_for "without any ignore selectors" do
@@ -187,9 +199,9 @@ module PactBroker
 
             let(:ignore_selectors) { [] }
 
-            it "does allows the provider to be deployed even without ignoring anything because there is no connection between that version of the provider and the consumer" do
-              expect(subject.deployment_status_summary).to be_deployable
-              expect(subject.deployment_status_summary.reasons.collect(&:class)).to include(PactBroker::Matrix::NoDependenciesMissing)
+            it "does not allows the provider to be deployed" do
+              expect(subject.deployment_status_summary).to_not be_deployable
+              expect(subject.deployment_status_summary.reasons.collect(&:class)).to include(PactBroker::Matrix::PactNotEverVerifiedByProvider)
             end
           end
 

data/spec/lib/pact_broker/matrix/integration_spec.rb

@@ -4,6 +4,10 @@ module PactBroker
   module Matrix
     describe Service do
       describe "find" do
+        include MatrixQueryContentForApproval
+
+        INTEGRATION_APPROVALS = {}
+
         subject { Service.can_i_deploy(selectors, options) }
 
         # Useful for eyeballing the messages to make sure they read nicely
@@ -15,6 +19,14 @@ module PactBroker
         #   end
         # end
 
+        after do | example |
+          INTEGRATION_APPROVALS[example.full_description] = matrix_query_content_for_approval(subject)
+        end
+
+        after(:all) do
+          Approvals.verify(INTEGRATION_APPROVALS, :name => file_name_to_approval_name(__FILE__) , format: :json)
+        end
+
         let(:options) { {} }
 
         describe "find" do
@@ -69,12 +81,16 @@ module PactBroker
             [ UnresolvedSelector.new(pacticipant_name: "Foo", pacticipant_version_number: "1") ]
           end
 
+          let(:options) do
+            { latest: true, tag: "prod", latestby: "cvp" }
+          end
+
           it "returns 2 integrations" do
             expect(subject.integrations.size).to eq 2
           end
 
-          it "but cannot resolve selectors for the providers" do
-            expect(subject.resolved_selectors.size).to eq 1
+          it "it creates selectors for the providers" do
+            expect(subject.resolved_selectors.size).to eq 3
           end
 
           it "does not allow the consumer to be deployed" do
@@ -99,7 +115,7 @@ module PactBroker
             [ UnresolvedSelector.new(pacticipant_name: "Foo", pacticipant_version_number: "3.0.0") ]
           end
 
-          let(:options) { {latest: true, tag: "prod", latestby: "cvp"} }
+          let(:options) { { latest: true, tag: "prod", latestby: "cvp" } }
 
           it "returns 2 integrations" do
             expect(subject.integrations.size).to eq 2
@@ -121,7 +137,7 @@ module PactBroker
         describe "when deploying an old version of a consumer that has added a new provider since that version" do
           before do
             td.create_pact_with_hierarchy("Foo", "1", "Bar")
-              .create_verification(provider_version: "2")
+              .create_verification(provider_version: "2", tag_names: ["prod"])
               .create_consumer_version("2")
               .create_pact
               .create_verification(provider_version: "3")
@@ -134,6 +150,8 @@ module PactBroker
             [ UnresolvedSelector.new(pacticipant_name: "Foo", pacticipant_version_number: "1") ]
           end
 
+          let(:options) { { latest: true, tag: "prod", latestby: "cvp" } }
+
           it "allows the old version of the consumer to be deployed" do
             expect(subject.deployment_status_summary).to be_deployable
           end
@@ -408,13 +426,36 @@ module PactBroker
             ]
           end
 
-          let(:options) { { latestby: "cvpv"} }
+          let(:options) { { latestby: "cvpv" } }
 
-          it "should allow the consumer to be deployed" do
+          it "allows the consumer to be deployed" do
             expect(subject.deployment_status_summary).to be_deployable
           end
         end
 
+        # https://github.com/pact-foundation/pact_broker/issues/485
+        describe "when a provider version has no verification results with the consumer version already in the environment" do
+          before do
+            td.create_pact_with_verification("Foo", "1", "Bar", "1")
+              .create_pact_with_verification("NotInTest", "1", "Bar", "1")
+              .create_consumer_version_tag("test")
+              .create_provider_version("2")
+          end
+
+          let(:selectors) do
+            [
+              UnresolvedSelector.new(pacticipant_name: "Bar", pacticipant_version_number: "2"),
+            ]
+          end
+
+          let(:options) { { latestby: "cvp", tag: "test", latest: true } }
+
+          it "does not allow the provider to be deployed" do
+            expect(subject.deployment_status_summary).to_not be_deployable
+            expect(subject.deployment_status_summary.reasons.collect(&:class)).to eq [PactBroker::Matrix::PactNotEverVerifiedByProvider]
+          end
+        end
+
         describe "when verification results are published missing tests for some interactions" do
           let(:pact_content) do
             {