pact_broker 2.77.0 → 2.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caab9fa9fc2bef074e4523e89122015a55d85572df00564956dc25553273f095
-  data.tar.gz: aa1638d95186e934c08cac4d5842c8e10c762b95e9db1f5f9e3ca3c4533dbde4
+  metadata.gz: 4260e4320105662bc678b63a94054f7485609557b2e967e58ac59512fca69f81
+  data.tar.gz: 4d40a31b9f93c9e08a67e2b1e50cff0fc0c59e0344d3a8672b629d425a93444a
 SHA512:
-  metadata.gz: 82a534408c7557f0dd8b5a605d3c68da1d79d8dabaefb721608ff99a4fcb16e6e04815d5b2286fc50d87dce99c8170eebcef653e46d4b423f4048ffeccce0075
-  data.tar.gz: fdb5a29c0ccdb0dce1d60ea7853925154a1d82384fd2c720a46a612b2a20f173ce65f08f67349d6095e6f2ca8f14721d660c2b4a35ca77a3ce3e7e8c9fb12269
+  metadata.gz: b2dec2c3934c80e7edf5d85370aecf511e8ce8e403486c964182b8f2f397f91bdad7ac886c1dd2955f6d4c9cac52bbac81c22b89d824d7d19fe57d224715ecb5
+  data.tar.gz: 8d60c2beaa8719efe9bfd7551ddda158d4c4f06cdf92884fdbb1312e8a7a306b5fc5754f5f467bd922e688eb37c899ea60c1758de48fce7696553ee57b84fd32

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v2.78.0"></a>
+### v2.78.0 (2021-02-15)
+
+#### Features
+
+* support create, update and delete of environment resources (#379)	 ([410f2e80](/../../commit/410f2e80))
+* allow version to be created with tags	 ([798afce9](/../../commit/798afce9))
+* Follow up for #239 + adding list of success codes to SAVABLE_SETTING_NAMES variable (#388)	 ([08c0ad09](/../../commit/08c0ad09))
+
 <a name="v2.77.0"></a>
 ### v2.77.0 (2021-02-11)
 

data/db/migrations/20210210_create_environments_table.rb

@@ -0,0 +1,16 @@
+Sequel.migration do
+  change do
+    create_table(:environments, charset: 'utf8') do
+      primary_key :id
+      String :uuid, nullable: false
+      String :name, nullable: false
+      String :display_name
+      Boolean :production, nullable: false
+      String :contacts
+      DateTime :created_at, nullable: false
+      DateTime :updated_at, nullable: false
+      index [:uuid], unique: true, name: "environments_uuid_index"
+      index [:name], unique: true, name: "environments_name_index"
+    end
+  end
+end

data/lib/pact_broker/api.rb

@@ -105,6 +105,11 @@ module PactBroker
         add ['dashboard', 'provider', :provider_name, 'consumer', :consumer_name ], Api::Resources::Dashboard, {resource_name: "integration_dashboard"}
         add ['test','error'], Api::Resources::ErrorTest, {resource_name: "error_test"}
 
+        if PactBroker.feature_enabled?(:environments)
+          add ['environments'], Api::Resources::Environments, { resource_name: "environments" }
+          add ['environments', :environment_uuid], Api::Resources::Environment, { resource_name: "environment" }
+        end
+
         add ['integrations'], Api::Resources::Integrations, {resource_name: "integrations"}
         add ['integrations', 'provider', :provider_name, 'consumer', :consumer_name], Api::Resources::Integration, {resource_name: "integration"}
         add ['metrics'], Api::Resources::Metrics, {resource_name: 'metrics'}

data/lib/pact_broker/api/contracts/dry_validation_predicates.rb

@@ -13,6 +13,14 @@ module PactBroker
         predicate(:not_blank?) do | value |
           value && value.is_a?(String) && value.strip.size > 0
         end
+
+        predicate(:single_line?) do | value |
+          value && value.is_a?(String) && !value.include?("\n")
+        end
+
+        predicate(:no_spaces?) do | value |
+          value && value.is_a?(String) && !value.include?(" ")
+        end
       end
     end
   end

data/lib/pact_broker/api/contracts/environment_schema.rb

@@ -0,0 +1,49 @@
+require 'dry-validation'
+require 'pact_broker/api/contracts/dry_validation_workarounds'
+require 'pact_broker/api/contracts/dry_validation_predicates'
+require 'pact_broker/messages'
+
+module PactBroker
+  module Api
+    module Contracts
+      class EnvironmentSchema
+        extend DryValidationWorkarounds
+        extend PactBroker::Messages
+        using PactBroker::HashRefinements
+
+        SCHEMA = Dry::Validation.Schema do
+          configure do
+            predicates(DryValidationPredicates)
+            config.messages_file = File.expand_path("../../../locale/en.yml", __FILE__)
+          end
+          required(:name).filled(:str?, :single_line?, :no_spaces?)
+          required(:displayName).filled(:str?, :single_line?)
+          required(:production).filled(included_in?: [true, false])
+          optional(:contacts).each do
+            schema do
+              required(:name).filled(:str?, :single_line?)
+              optional(:details).schema do
+              end
+            end
+          end
+        end
+
+        def self.call(params_with_string_keys)
+          params = params_with_string_keys&.symbolize_keys
+          results = select_first_message(flatten_indexed_messages(SCHEMA.call(params).messages(full: true)))
+          validate_name(params, results)
+          results
+        end
+
+        def self.validate_name(params, results)
+          if (environment_with_same_name = PactBroker::Deployments::EnvironmentService.find_by_name(params[:name]))
+            if environment_with_same_name.uuid != params[:uuid]
+              results[:name] ||= []
+              results[:name] << message('errors.validation.environment_name_must_be_unique', name: params[:name])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/decorators/base_decorator.rb

@@ -3,6 +3,7 @@ require 'roar/json/hal'
 require 'pact_broker/api/pact_broker_urls'
 require 'pact_broker/api/decorators/decorator_context'
 require 'pact_broker/api/decorators/format_date_time'
+require 'pact_broker/string_refinements'
 
 module PactBroker
   module Api
@@ -12,6 +13,16 @@ module PactBroker
         include Roar::JSON::HAL::Links
         include PactBroker::Api::PactBrokerUrls
         include FormatDateTime
+        using PactBroker::StringRefinements
+
+        def self.property(name, options={}, &block)
+          if options.delete(:camelize)
+            camelized_name = name.to_s.camelcase(false).to_sym
+            super(name, { as: camelized_name }.merge(options), &block)
+          else
+            super
+          end
+        end
       end
     end
   end

data/lib/pact_broker/api/decorators/environment_decorator.rb

@@ -0,0 +1,30 @@
+require_relative 'base_decorator'
+require_relative 'timestamps'
+
+module PactBroker
+  module Api
+    module Decorators
+      class EnvironmentDecorator < BaseDecorator
+        property :uuid, writeable: false
+        property :name
+        property :display_name, camelize: true
+        property :production
+
+        collection :contacts, class: OpenStruct do
+          property :name
+          property :details
+        end
+
+        include Timestamps
+
+        link :self do | options |
+          {
+            title: 'Environment',
+            name: represented.name,
+            href: environment_url(represented, options[:base_url])
+          }
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/decorators/environments_decorator.rb

@@ -0,0 +1,21 @@
+require 'pact_broker/api/decorators/base_decorator'
+require 'pact_broker/api/decorators/environment_decorator'
+require 'pact_broker/deployments/environment'
+
+module PactBroker
+  module Api
+    module Decorators
+      class EnvironmentsDecorator < BaseDecorator
+
+        collection :entries, :as => :environments, :class => PactBroker::Deployments::Environment, :extend => PactBroker::Api::Decorators::EnvironmentDecorator, embedded: true
+
+        link :self do | options |
+          {
+            title: 'Environments',
+            href: options[:resource_url]
+          }
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -10,7 +10,7 @@ module PactBroker
         property :branch
         property :build_url, as: :buildUrl
 
-        collection :tags, embedded: true, writeable: false, :extend => PactBroker::Api::Decorators::EmbeddedTagDecorator
+        collection :tags, embedded: true, :extend => PactBroker::Api::Decorators::EmbeddedTagDecorator, class: OpenStruct
 
         include Timestamps
 
@@ -63,6 +63,17 @@ module PactBroker
           }]
         end
 
+        def from_hash(hash, options = {})
+          if hash["tags"]
+            updated_hash = hash.dup
+            updated_hash["_embedded"] ||= {}
+            updated_hash["_embedded"]["tags"] = updated_hash.delete("tags")
+            super(updated_hash, options)
+          else
+            super
+          end
+        end
+
         private
 
         def sorted_pacts

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -307,6 +307,14 @@ module PactBroker
         "#{base_url}/groups/#{url_encode(pacticipant_name)}"
       end
 
+      def environments_url(base_url = '')
+        "#{base_url}/environments"
+      end
+
+      def environment_url(environment, base_url = '')
+        "#{environments_url(base_url)}/#{environment.uuid}"
+      end
+
       def hal_browser_url target_url, base_url = ''
         "#{base_url}/hal-browser/browser.html#" + target_url
       end

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

@@ -243,6 +243,15 @@ module PactBroker
         def decorator_class(name)
           application_context.decorator_configuration.class_for(name)
         end
+
+        def validation_errors_for_schema?(schema, params_to_validate = params)
+          if (errors = schema.call(params_to_validate)).any?
+            set_json_validation_error_messages(errors)
+            true
+          else
+            false
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,76 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/api/resources/environment'
+
+module PactBroker
+  module Api
+    module Resources
+      class Environment < BaseResource
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def content_types_accepted
+          [["application/json", :from_json]]
+        end
+
+        def allowed_methods
+          ["GET", "PUT", "DELETE", "OPTIONS"]
+        end
+
+        def resource_exists?
+          !!environment
+        end
+
+        def malformed_request?
+          if request.put? && environment
+            invalid_json? || validation_errors_for_schema?(schema, params.merge(uuid: uuid))
+          else
+            false
+          end
+        end
+
+        def from_json
+          if environment
+            @environment = update_environment
+            response.body = to_json
+          else
+            response.code = 404
+          end
+        end
+
+        def policy_name
+          :'deployments::environment'
+        end
+
+        def to_json
+          decorator_class(:environment_decorator).new(environment).to_json(decorator_options)
+        end
+
+        def parsed_environment
+          @parsed_environment ||= decorator_class(:environment_decorator).new(PactBroker::Deployments::Environment.new).from_json(request_body)
+        end
+
+        def environment
+          @environment ||= environment_service.find(uuid)
+        end
+
+        def delete_resource
+          environment_service.delete(uuid)
+          true
+        end
+
+        def uuid
+          identifier_from_path[:environment_uuid]
+        end
+
+        def update_environment
+          environment_service.update(uuid, parsed_environment)
+        end
+
+        def schema
+          PactBroker::Api::Contracts::EnvironmentSchema
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/api/resources/environment'
+require 'pact_broker/api/contracts/environment_schema'
+
+module PactBroker
+  module Api
+    module Resources
+      class Environments < BaseResource
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def content_types_accepted
+          [["application/json", :from_json]]
+        end
+
+        def allowed_methods
+          ["GET", "POST", "OPTIONS"]
+        end
+
+        def resource_exists?
+          true
+        end
+
+        def post_is_create?
+          true
+        end
+
+        def malformed_request?
+          if request.post?
+            invalid_json? || validation_errors_for_schema?(schema, params.merge(uuid: uuid))
+          else
+            false
+          end
+        end
+
+        def create_path
+          environment_url(OpenStruct.new(uuid: uuid), base_url)
+        end
+
+        def from_json
+          response.body = decorator_class(:environment_decorator).new(create_environment).to_json(decorator_options)
+        end
+
+        def policy_name
+          :'deployments::environment'
+        end
+
+        def to_json
+          decorator_class(:environments_decorator).new(environments).to_json(decorator_options)
+        end
+
+        def parsed_environment
+          @parsed_environment ||= decorator_class(:environment_decorator).new(PactBroker::Deployments::Environment.new).from_json(request_body)
+        end
+
+        def create_environment
+          environment_service.create(uuid, parsed_environment)
+        end
+
+        def uuid
+          @uuid ||= environment_service.next_uuid
+        end
+
+        def environments
+          @environments ||= environment_service.find_all
+        end
+
+        def schema
+          PactBroker::Api::Contracts::EnvironmentSchema
+        end
+      end
+    end
+  end
+end

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

@@ -150,6 +150,20 @@ module PactBroker
             }]
           }
 
+          if PactBroker.feature_enabled?(:environments)
+            links_hash['pb:environments'] = {
+              title: "Environments",
+              href: environments_url(base_url),
+              templated: false
+            }
+
+            links_hash['pb:environment'] = {
+              title: "Environment",
+              href: environments_url(base_url) + "/{uuid}",
+              templated: true
+            }
+          end
+
           if PactBroker.feature_enabled?('disable_pacts_for_verification', true)
             links_hash.delete('pb:provider-pacts-for-verification')
             links_hash.delete('beta:provider-pacts-for-verification')

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

@@ -24,8 +24,8 @@ module PactBroker
 
         def from_json
           response_code = version ? 200 : 201
-          parsed_version = Decorators::VersionDecorator.new(PactBroker::Domain::Version.new).from_json(request_body)
-          @version = version_service.create_or_update(pacticipant_name, pacticipant_version_number, parsed_version)
+          parsed_version = Decorators::VersionDecorator.new(OpenStruct.new).from_json(request_body)
+          @version = version_service.create_or_overwrite(pacticipant_name, pacticipant_version_number, parsed_version)
           response.body = to_json
           response_code
         end