gitlab-cloud-connector 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c7db0c9954f05f5d443707897e0b65510833196d84fe0232b8ea683dbe54e4'
-  data.tar.gz: 2fab7c9d5729454622896fe48211341e993e27a1e924921de2358c9b38cccb8c
+  metadata.gz: 7b483b10874986b71ec2c3b91a53dfd4fdcbd78be20144aeb63e26fe521df83b
+  data.tar.gz: 50eaf9263b69b27d22a689be8943967a998a10c9944e17d0ea1ecc25b9c1d79a
 SHA512:
-  metadata.gz: bb6be93bbb1f0bd7e3808832618fc2f1532b06ab3cbab62cf9a05eac234f3ff0b2b0ac4dddeb2d5b57e5c7337d8d80d36167817bf418c0d0fbb3cb29c88b531f
-  data.tar.gz: e32d689a3358fd29e8fd7431f9a815b9fd9adb8056e102d1f8efd4918cd907f00a8e3ca0f84cbc89691c0903f27cbc9d1c272b4c96a9d68511ca560a37fe418c
+  metadata.gz: d0efcf11ce2879783ceb5d3a6027c8ab7f2e35e6b97690db1e6c7e366f1116765a09ee047ee3396bb7e94718a14eab7e20e2733e267ee934e9dce3fb72df03ea
+  data.tar.gz: 3d5ae9797a346b4d92fecbf8e5c8acc8f4a2136745ec4b5e138e5cb896a38972b87144f3fddd91620cd83bc347f7b7953be59d8a4ddd48a7910359fa4b585510

data/README.md

@@ -34,16 +34,18 @@ add_ons:
   - duo_enterprise
 ```
 
-### Working with DataModels
+### Working with DataModel
 
-`DataModels` are the core data structures in the Cloud Connector. Each model inherits from `DataModel::Base`. The data is loaded from YAML files into memory at runtime, making it efficient for read operations and relationship traversal.
+`DataModel` contains the core data structures in the Ruby library.
+Each model inherits from `DataModel::Base`. The data is loaded from YAML files into memory at runtime, making it efficient
+for read operations and relationship traversal.
 
 ```ruby
 require 'gitlab/cloud_connector'
 
 # Find unit primitive by name
 # Note:  value should be a symbol (e.g., `:duo_chat` instead of `'duo_chat'`).
-duo_chat = Gitlab::CloudConnector::DataModels::UnitPrimitive.find_by_name(:duo_chat)
+duo_chat = Gitlab::CloudConnector::DataModel::UnitPrimitive.find_by_name(:duo_chat)
 duo_chat.description
 duo_chat.cut_off_date
 

data/config/unit_primitives/ask_merge_request.yml

@@ -1,6 +1,6 @@
 ---
 name: ask_merge_request
-description: Ask questions about GitLab merge reuest.
+description: Ask questions about GitLab merge request.
 cut_off_date: 2024-10-17T00:00:00+00:00
 group: group::duo_chat
 feature_category: duo_chat

data/lib/gitlab/cloud_connector/available_services_generator.rb

@@ -44,7 +44,7 @@ module Gitlab
       def generate_services_config(gitlab_realm)
         services_config = {}
 
-        DataModels::Service.each do |service|
+        DataModel::Service.each do |service|
           next if service.gitlab_realm && !service.gitlab_realm&.include?(gitlab_realm)
 
           service_config = generate_service_config(service.unit_primitives, service.basic_unit_primitive)
@@ -55,7 +55,7 @@ module Gitlab
         end
 
         # Generate a stand-alone service for each unit primitive (except the ones in the ignore list)
-        unit_primitives = DataModels::UnitPrimitive.reject { |up| IGNORE_UNIT_PRIMITIVES.include?(up.name) }
+        unit_primitives = DataModel::UnitPrimitive.reject { |up| IGNORE_UNIT_PRIMITIVES.include?(up.name) }
         unit_primitives.each do |unit_primitive|
           next if services_config[unit_primitive.name]
 

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

@@ -23,7 +23,7 @@ module Gitlab
 
         def load_association_records(association_name)
           names = Array(self[association_name])
-          association_class = Gitlab::CloudConnector::DataModels.const_get(association_name.to_s.classify)
+          association_class = Gitlab::CloudConnector::DataModel.const_get(association_name.to_s.classify)
           association_class.select { |record| names.include?(record.name.to_s) }
         end
       end

data/lib/gitlab/cloud_connector/{data_models.rb → data_model.rb}

@@ -4,8 +4,10 @@ require_relative 'data_model/base'
 
 module Gitlab
   module CloudConnector
-    module DataModels
-      class UnitPrimitive < DataModel::Base
+    module DataModel
+      autoload(:YamlDataLoader, 'gitlab/cloud_connector/data_model/yaml_data_loader')
+
+      class UnitPrimitive < Base
         has_and_belongs_to_many :backend_services
         has_and_belongs_to_many :add_ons
         has_and_belongs_to_many :license_types
@@ -15,21 +17,21 @@ module Gitlab
           :min_gitlab_version_for_free_access, :name, :unit_primitive_issue_url
       end
 
-      class Service < DataModel::Base
+      class Service < Base
         has_and_belongs_to_many :unit_primitives
 
         attr_reader :basic_unit_primitive, :description, :gitlab_realm, :name
       end
 
-      class BackendService < DataModel::Base
+      class BackendService < Base
         attr_reader :description, :group, :jwt_aud, :name, :project_url
       end
 
-      class LicenseType < DataModel::Base
+      class LicenseType < Base
         attr_reader :description, :name
       end
 
-      class AddOn < DataModel::Base
+      class AddOn < Base
         attr_reader :description, :name
       end
     end

data/lib/gitlab/cloud_connector/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module CloudConnector
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/gitlab/cloud_connector.rb

@@ -7,7 +7,7 @@ module Gitlab
   module CloudConnector
     autoload(:JsonWebToken, 'gitlab/cloud_connector/json_web_token')
     autoload(:Configuration, 'gitlab/cloud_connector/configuration')
-    autoload(:DataModels, 'gitlab/cloud_connector/data_models')
+    autoload(:DataModel, 'gitlab/cloud_connector/data_model')
     autoload(:AvailableServicesGenerator, 'gitlab/cloud_connector/available_services_generator')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-cloud-connector
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Nikola Milojevic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,12 +163,11 @@ files:
 - lib/gitlab/cloud_connector.rb
 - lib/gitlab/cloud_connector/available_services_generator.rb
 - lib/gitlab/cloud_connector/configuration.rb
+- lib/gitlab/cloud_connector/data_model.rb
 - 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/data_loader.rb
 - lib/gitlab/cloud_connector/data_model/yaml_data_loader.rb
-- lib/gitlab/cloud_connector/data_models.rb
 - lib/gitlab/cloud_connector/json_web_token.rb
 - lib/gitlab/cloud_connector/version.rb
 homepage: https://gitlab.com/gitlab-org/cloud-connector/gitlab-cloud-connector

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-module Gitlab
-  module CloudConnector
-    module DataModel
-      class DataLoader
-        def initialize(model_class)
-          @model_class = model_class
-        end
-
-        def load!
-          Dir.glob(data_files_path).map { |file| load_model_from_file(file) }
-        end
-
-        private
-
-        attr_reader :model_class
-
-        def data_files_path
-          File.join(CloudConnector::Configuration.config_dir, model_class.model_name.tableize, '*.yml')
-        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!
-
-          model_class.new(**data)
-        rescue StandardError => e
-          raise "Error loading file #{file_path}: #{e.message}"
-        end
-      end
-    end
-  end
-end