api_six_client 1.2.11 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01ce06723b2cf886512fcb0ce13a0d66d6bb0cade9e9702456a6285f9bfb869
-  data.tar.gz: 2839a44a8533e8f76d6cd2af9b1f19b9f59b2e387a998a5782567a5ebbaae06a
+  metadata.gz: 1981a4778c9a65d39d53c02a21b5194a459f00bfa07eeb9dd6853d31b290b35b
+  data.tar.gz: e0d48db9fe20e42a52446428a7884f4cfedf93dd44a0e5a2d6ba30a434a78979
 SHA512:
-  metadata.gz: 710996bcb16a2a030bf60acc5c6cc580cd86e8549fe40c03d8500714abcbb599a2ee5dde9f9792fc4c074ce819806c30a1bff59dc130ad9d05ba76de71ee2e88
-  data.tar.gz: fad27ce4c99f9a947f2635d108c5219b7167e2d023c7d306ffa924468b4c293dd33334175f755e003f1cb56f52c16bacbb4b9d58a8caa1185e2ac0cc131a6b82
+  metadata.gz: e00680c65f4a3763da3cf87b9c481f44d3f4d883005858f88498dc09e092b009403ee5ff2fbd2c0fc4c173db79b6cdc61922285689f9ffd0ea23390150f9e7e3
+  data.tar.gz: f4c47e96e42bb719f59b2bb94da70276b2c77778d79ba548a98ae8e783e1fc8ff17fe76cae1101ca56cc7f5f73080782923c2ce965c3fbb369477ad2d404e3fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_six_client (1.2.11)
+    api_six_client (1.2.13)
       faraday (~> 1)
 
 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.2.11"
+  VERSION = "1.2.13"
 end

data/lib/api_six_client.rb

@@ -43,6 +43,9 @@ module ApiSixClient
   class LyrInt < BaseInt; end
   class GbkInt < BaseInt; end
   class Val < BaseInt; end
+  class StataInt < 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.2.11
+  version: 1.2.13
 platform: ruby
 authors:
 - Eugene Dobrorodnov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday