clowder-common-ruby 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721b0528d52ef01fc735043e255337628b98196ed3c8f216c6436f9c34ad3c55
-  data.tar.gz: 4db1236e8ac887664834d7048d69f927896dd69da5f7a221cdaa09dc41782cb1
+  metadata.gz: 504fdf9231ba7057b9e220a7518944d8dc444b3bdbbadbe1aace5660ab180b35
+  data.tar.gz: 7f0e02df8a474d37117914f82126f68bb6499b39df7c4e8264f07b27210831d5
 SHA512:
-  metadata.gz: ae4425e74de30e9935ec3e52f7669658535b9ea9b2b14284cf18a8c19f331a1b88ea28959b41b7ea1097a45503c5c2941f179000f24e0fb6ea5cb02d2c5254b6
-  data.tar.gz: ab698201f0268a255e6337cbf51c3a7a2f67121837137a998806b9d5ef00dc11084c855802bc5e5feec6505df523ec73d20c9ee0c67acf213ab8a32867b2106f
+  metadata.gz: 568524b67420a393a594bebc98d1ade386857b2d0b95299b4637b154533020ad32dee96640ee20c9c79dcc02b5cf07f7c5ae8057e440ad9a91aa2a998439d3a8
+  data.tar.gz: fff83d793494bdc4b4329b6202520b3550696f846c7b225c4174e74fd03eeabed88ec90a374b51fc7747e5b09231dd84e7a5147682de07fe547ab691e7c7e931

data/lib/clowder-common-ruby/rails_config.rb

@@ -1,4 +1,5 @@
 require 'clowder-common-ruby'
+require 'uri'
 
 module ClowderCommonRuby
   class RailsConfig
@@ -13,6 +14,8 @@ module ClowderCommonRuby
           redis: configure_redis(config),
           endpoints: configure_endpoints(config, :dependency_endpoints),
           private_endpoints: configure_endpoints(config, :private_dependency_endpoints),
+          v2_endpoints: configure_v2_endpoints(config, :v2_dependency_endpoints),
+          v2_private_endpoints: configure_v2_endpoints(config, :v2_private_dependency_endpoints),
           database: configure_database(config),
           prometheus_exporter_port: config&.metricsPort,
           tls_ca_path: config.tlsCAPath,
@@ -115,6 +118,46 @@ module ClowderCommonRuby
         }
       end
 
+      # V2 uses the same app -> deployment nesting as V1 but has a different
+      # endpoint object. Keep its Settings separate so consumers can fall back
+      # to the V1 endpoint when needed.
+      def configure_v2_endpoints(config, field)
+        config.try(field)&.each_with_object({}) do |(name, endpoint), obj|
+          key = name.underscore.to_sym
+          obj[key] = {}
+          endpoint.each do |deployment_name, service|
+            service = build_v2_endpoint(service)
+            next unless service
+
+            deployment_key = deployment_name.underscore.to_sym
+            obj[key][deployment_key] = service
+          end
+
+          obj.delete(key) if obj[key].empty?
+        end
+      end
+
+      # V2 endpoints provide a complete URI and endpoint-specific TLS/auth data.
+      # Return nil for absent or malformed URIs so the legacy endpoint remains
+      # available as a migration fallback.
+      def build_v2_endpoint(endpoint)
+        return unless endpoint&.uri.present?
+
+        uri = URI.parse(endpoint.uri)
+        return unless %w[http https].include?(uri.scheme) && uri.host
+
+        {
+          scheme: uri.scheme,
+          host: "#{uri.host}:#{uri.port}",
+          url: endpoint.uri,
+          ca_certificate: endpoint.ca_certificate.presence,
+          authenticated: endpoint.authenticated,
+          source: :v2
+        }
+      rescue URI::InvalidURIError
+        nil
+      end
+
       # All endpoints' configuration hash
       def configure_endpoints(config, field)
         config.try(field)&.each_with_object({}) do |(name, endpoint), obj|
@@ -136,7 +179,10 @@ module ClowderCommonRuby
         {
           scheme: scheme,
           host: host,
-          url: "#{scheme}://#{host}"
+          url: "#{scheme}://#{host}",
+          ca_certificate: nil,
+          authenticated: false,
+          source: :v1
         }
       end
 

data/lib/clowder-common-ruby/version.rb

@@ -1,3 +1,3 @@
 module ClowderCommonRuby
-  VERSION = '0.5.7'.freeze # Patch version is being automatically bumped
+  VERSION = '0.5.8'.freeze # Patch version is being automatically bumped
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clowder-common-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Red Hat Developers