api_six_client 1.4.16 → 1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e88afd1d5176f679edff83faae5afbf5f6948c66979c88502fdfed66f5df202
-  data.tar.gz: fb6759241f0bcfd6d9f2c8cbbfbb189a973e6d5fe3f92b4da2a720f5d00856f8
+  metadata.gz: b189d81e839dbb2a9a26192da8f801c63d9c435210ce22064a40c229875cc100
+  data.tar.gz: 4c70d91525ec16bf8aec13e5d21d178fce3492396d74675dbcff305765ed68d4
 SHA512:
-  metadata.gz: 1ca5d61b16457d733628e2cbebbaddb58514b3d65232e319351633a87a511f359d1626d26bc8725d0279e12abf852b045bd6b3d5373ed45ce753cfdcae3b7e15
-  data.tar.gz: b908e85def0e685510aafdbc72d99db8d3a87833cdab3bedcc10d8ada3709e3582da9b4e164996f1cdc5953235cbe26535caeb5e2b561935184da375a7907db3
+  metadata.gz: 106ac55ca45e0b0e132aed0b7d2fc020fbca63f1206acb73cbb920ccb24613da4769eed70160ea707188a8587b15845c16b8be282e033f43dad60ec133fdec7f
+  data.tar.gz: e4167af44078f638de5d69f75cb365e1ffef905a7c6a9b72940e0a1f2bce8cafdf4588b6a5908e9377fe762093f6cdc4b2d5baf10cfabd65859b9703d2adf594

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_six_client (1.4.16)
+    api_six_client (1.4.17)
       faraday (~> 2)
 
 GEM

data/lib/api_six_client/base.rb

@@ -47,6 +47,10 @@ module ApiSixClient
       @auth_token ||= ApiSixClient.config.auth_token
     end
 
+    def service_path
+      self.class.name.demodulize.underscore
+    end
+
     private
 
     def validate_config!
@@ -54,10 +58,6 @@ module ApiSixClient
       raise Errors::AuthTokenIsEmpty unless @auth_token
     end
 
-    def service_path
-      self.class.name.demodulize.underscore
-    end
-
     def request(method, path, params = {}, headers = {})
       deprecation_msg
 

data/lib/api_six_client/base_int.rb

@@ -2,6 +2,23 @@
 
 module ApiSixClient
   class BaseInt < Base
+    APP_OUTSIDE_K8S = %w[Grunnbok Brreg Projects]
+    SERVICES_OUTSIDE_K8S = %w[gbk_int prj_int brg_int]
+    DEFAULT_INTRANET_MAPPING = ->(service_name) {
+      { k8s_service: "http://#{service_name.gsub('_int', '-api')}", api_int_path: 'api_int'}
+    }
+    INTRANET_MAPPING = {
+      'olc_int' => { k8s_service: 'http://core-web:3000', api_int_path: 'api_hiden' },
+      'cad_int' => { k8s_service: 'http://core-web:3000', api_int_path: 'api_int' },
+      'val' => { k8s_service: 'http://val:8000', api_int_path: 'api' },
+    }.freeze
+
+    def endpoint
+      return super unless intranet_connection?
+
+      current_service[:k8s_service]
+    end
+
     protected
 
     def deprecation_msg
@@ -11,5 +28,26 @@ module ApiSixClient
       @endpoint = ApiSixClient.config.endpoint_int
       @auth_token = ApiSixClient.config.auth_token_int
     end
+
+    def service_path
+      return super unless intranet_connection?
+
+      current_service[:api_int_path]
+    end
+
+    def intranet_connection?
+      return false if Rails.application.class.to_s.split('::').first.in?(APP_OUTSIDE_K8S)
+      return false if ENV['RAILS_ENV'] == 'development'
+
+      current_service.present?
+    end
+
+    private
+    def current_service
+      service_name = self.class.name.demodulize.underscore
+      return nil if service_name.in?(SERVICES_OUTSIDE_K8S)
+
+      INTRANET_MAPPING[service_name] || DEFAULT_INTRANET_MAPPING.call(service_name)
+    end
   end
 end

data/lib/api_six_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiSixClient
-  VERSION = "1.4.16"
+  VERSION = "1.4.17"
 end

data/lib/api_six_client.rb

@@ -44,6 +44,8 @@ module ApiSixClient
   class GbkInt < BaseInt; end
   class StataInt < BaseInt; end
   class Val < BaseInt; end
+  class ParaInt < BaseInt; end
+  class CunaInt < BaseInt; end
 end
 
 A6C = ApiSixClient

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_six_client
 version: !ruby/object:Gem::Version
-  version: 1.4.16
+  version: 1.4.17
 platform: ruby
 authors:
 - Eugene Dobrorodnov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday