gitlab-cloud-connector 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2561683322a95d6bc39cd443dd05a9da52d3e68af94c618720944a8f6be3879
-  data.tar.gz: ab54fe6abd39b2b287acb07097110dc6c9a86abbac8e5a78680bac0d48cf27d6
+  metadata.gz: a799818f88f7e618976e9cdaddaf37d9e1e44204e94b98f37d7454725066f2db
+  data.tar.gz: 21b818d8a78eddde6fd1987c3f75162407782eef12d78732561ec3c2e0f5f879
 SHA512:
-  metadata.gz: d71e3bfabb8607f2bfdfc0afcca62101a80800ed4659b60912a448b80a788849f2b5f55f279628f5de163a6070590fd9d009fefb0e03d48300773bb41eee4c6b
-  data.tar.gz: 50549c2ff8accfa95a8cdf25728d5e216d77eb66877e4e14dd3b272602d31971bec3795210fee85ac9024cc2051f0769d40200de6fd517c5dbbc01e25e560225
+  metadata.gz: a7f6ac2d65dc4421f0f96ba321fd1d90eb77c3ac1caab2302c1d13a0378f256b77cba20c417c7e04986abeaedbd271a898386d010a9caad212902b4604d567d9
+  data.tar.gz: ccc4a1b97987a3817ff1fb7d4e46acc374544aabcc5d854737b733064abf20524b811b82e2fef042c74a4f0d155f571995a4e9d21d263f64292a6531363fd934

data/lib/gitlab/cloud_connector/configuration.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'data_model/yaml_data_loader'
-require_relative 'data_model/abstract_data_loader'
-
 module Gitlab
   module CloudConnector
     module Configuration
       DEFAULT_DATA_LOADER_CLASS = Gitlab::CloudConnector::DataModel::YamlDataLoader
       INVALID_LOADER_MESSAGE = "Data loader must inherit from Gitlab::CloudConnector::DataModel::AbstractDataLoader"
+      INVALID_CONFIG_MESSAGE = "Override configuration must be a Hash or respond to :call"
 
       InvalidDataLoaderError = Class.new(StandardError)
+      InvalidConfigError = Class.new(StandardError)
 
       class << self
         attr_writer :config_dir, :memoize_data
+        attr_reader :override_config
 
         def config_dir
           @config_dir ||= File.expand_path("../../../config", __dir__).freeze
@@ -27,10 +27,15 @@ module Gitlab
           @data_loader_class = klass
         end
 
+        def override_config=(value)
+          validate_override_config!(value)
+          @override_config = value
+        end
+
         def memoize_data?
           return @memoize_data unless @memoize_data.nil?
 
-          (data_loader_class == DEFAULT_DATA_LOADER_CLASS)
+          data_loader_class == DEFAULT_DATA_LOADER_CLASS
         end
 
         def configure
@@ -44,6 +49,12 @@ module Gitlab
 
           raise InvalidDataLoaderError, INVALID_LOADER_MESSAGE
         end
+
+        def validate_override_config!(value)
+          return if value.nil? || value.is_a?(Hash) || value.respond_to?(:call)
+
+          raise InvalidConfigError, INVALID_CONFIG_MESSAGE
+        end
       end
     end
   end

data/lib/gitlab/cloud_connector/data_model/overridable.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module CloudConnector
+    module DataModel
+      module Overridable
+        OverrideLoadError = Class.new(StandardError)
+
+        extend ActiveSupport::Concern
+
+        def apply_overrides(base_data, model_class)
+          overrides = fetch_relevant_overrides(base_data, model_class)
+          return base_data unless overrides
+
+          base_data.merge(overrides)
+        end
+
+        private
+
+        def fetch_relevant_overrides(base_data, model_class)
+          data = load_override_data
+          return unless data
+
+          model_name = base_data[:name]&.to_sym
+          return unless model_name
+
+          model_type = model_class.model_name.tableize.to_sym
+          data.dig(model_type, model_name)
+        end
+
+        def load_override_data
+          config = Gitlab::CloudConnector::Configuration.override_config
+
+          data = config.respond_to?(:call) ? config.call : config
+          unless data.is_a?(Hash) || data.nil?
+            raise OverrideLoadError, "Invalid override config type: #{data.class}. Expected Hash or nil."
+          end
+
+          data
+        rescue StandardError => e
+          raise e if e.is_a?(OverrideLoadError)
+
+          raise OverrideLoadError, "Failed to load override config: #{e.class}: #{e.message}"
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/cloud_connector/data_model/yaml_data_loader.rb

@@ -2,11 +2,14 @@
 
 require 'yaml'
 require_relative 'abstract_data_loader'
+require_relative 'overridable'
 
 module Gitlab
   module CloudConnector
     module DataModel
       class YamlDataLoader < AbstractDataLoader
+        include Overridable
+
         def load!
           Dir.glob(data_files_path).map { |file| load_model_from_file(file) }
         end
@@ -18,16 +21,21 @@ module Gitlab
         end
 
         def load_model_from_file(file_path)
-          data = YAML.safe_load(
-            File.read(file_path),
-            permitted_classes: [Time],
-            symbolize_names: true
-          ).deep_symbolize_keys!
+          raw_data = load_yaml_file(file_path)
+          data = apply_overrides(raw_data, model_class)
 
           model_class.new(**data)
         rescue StandardError => e
           raise "Error loading file #{file_path}: #{e.message}"
         end
+
+        def load_yaml_file(file_path)
+          YAML.safe_load(
+            File.read(file_path),
+            permitted_classes: [Time],
+            symbolize_names: true
+          ) || {}
+        end
       end
     end
   end

data/lib/gitlab/cloud_connector/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module CloudConnector
-    VERSION = '1.7.0'
+    VERSION = '1.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-cloud-connector
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Nikola Milojevic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -169,6 +169,7 @@ files:
 - lib/gitlab/cloud_connector/data_model/abstract_data_loader.rb
 - lib/gitlab/cloud_connector/data_model/associations.rb
 - lib/gitlab/cloud_connector/data_model/base.rb
+- lib/gitlab/cloud_connector/data_model/overridable.rb
 - lib/gitlab/cloud_connector/data_model/yaml_data_loader.rb
 - lib/gitlab/cloud_connector/json_web_token.rb
 - lib/gitlab/cloud_connector/version.rb