oci-logging-analytics-kubernetes-discovery 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1199ab8d0ac81fc5f30f69f908205ae7e8a7e1eb1142310eb8532a581a8036c
-  data.tar.gz: 02131efa98c4ce38ec97c9e32c28942be9357720e1c894914c6630b4dd8062db
+  metadata.gz: cbe8ec23d60bcc04c315d7961b841fd7f0ccd7ba3c2133e1fd7db537dcbc4e3c
+  data.tar.gz: a02f9f5241b9ab760b9f9c6cf6eb8a29f8667c3dbfd23ae0a761195e9eee69b2
 SHA512:
-  metadata.gz: 50726236669da194d7bb92fccb9d1aa77cfbfba6f181d194485050d8475457d3f4046e87fbc4a87a52e4e263ebf3cf837390f8e34fa271599a2910e3a8cf0aa8
-  data.tar.gz: 01bcb89ce5ddea1f0a3ca4ae365bf7f337c597d5256243709234215aaf49a1ba0488d2baaca0f0f394eceefeb752a016dece5581866235afd9e4984932fbd63c
+  metadata.gz: d086d772a3f91bddd8f85d1627cbb825cb2373aff0e55cbef28a9d28dabded567170df1a778f176682812f693a6baf49067631f510eace5e2de5a44500b119f2
+  data.tar.gz: 1dcd772179a5c037c23924f685d23716f788cd78db2d254c64b77ccacd2528b87132ab726e95c109ddd33d6d7e3ce94c5ef825f7aa8f918ece96880d5a5fada6

data/.ruby-gemset

@@ -0,0 +1 @@
+logan-kubernetes-discovery

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.1.5

data/bin/oci-loganalytics-kubernetes-discovery

@@ -115,6 +115,13 @@ begin
     end
   end
 
+  # Valid oci_domain format check
+  unless auth_config[:oci_domain].nil?
+    unless auth_config[:oci_domain].match?(/^[a-z0-9-]+\.oci\.[a-z0-9.]+[a-z0-9]$/i)
+      raise OptionParser::InvalidOption, "--oci_domain '#{auth_config[:oci_domain]}' | " \
+            "expected format: <region>.oci.<domain> (e.g., us-ashburn-1.oci.oraclecloud.com)"
+    end
+  end
   # If threads are enabled, thread count and queue size should be provided as arguments.
   if app_config[:enable_threading] && app_config[:thread_count].nil?
     raise OptionParser::MissingArgument, '--thread_count'
@@ -164,10 +171,12 @@ cluster_config[:oci_la_cluster_entity_id] = cluster_config[:oci_la_cluster_entit
 cluster_config[:kubernetes_resourcename_prefix] = cluster_config[:kubernetes_resourcename_prefix] ||= 'oci-onm'
 
 # OCI Auth Type
-if !auth_config[:config_file_location].nil?
-  auth_config[:auth_type] = auth_config[:auth_type] ||=  Enum::AuthTypeEnum::CONFIG
-else
-  auth_config[:auth_type] = auth_config[:auth_type] ||=  Enum::AuthTypeEnum::INSTANCE_PRINCIPAL
+if auth_config[:auth_type].nil?
+  if !auth_config[:config_file_location].nil?
+    auth_config[:auth_type] = Enum::AuthTypeEnum::CONFIG
+  else
+    auth_config[:auth_type] = Enum::AuthTypeEnum::INSTANCE_PRINCIPAL
+  end
 end
 
 # OCI Domain

data/lib/enum/auth_type_enum.rb

@@ -5,6 +5,6 @@ module Enum
   module AuthTypeEnum
     CONFIG = 'config'.freeze
     INSTANCE_PRINCIPAL = 'instance_principal'.freeze
-    # OKE_WORKLOAD_IDENTITY = 'oke_workload_identity'.freeze
+    OKE_WORKLOAD_IDENTITY = 'oke_workload_identity'.freeze
   end
 end

data/lib/util/oci_clients.rb

@@ -14,7 +14,7 @@ module Util
     module_function
 
     attr_accessor :oci_clients, :ce_client, :id_client, :lb_client, :la_client, :rs_client,
-                  :vcn_client, :oci_config, :instance_principals_signer, :la_endpoint,
+                  :vcn_client, :oci_config, :instance_principals_signer, :workload_identity_signer , :la_endpoint,
                   :auth_type, :auth_config_object, :oci_domain, :oci_retry_config, :oci_region
 
     # This must be the first method called before any other method
@@ -56,8 +56,38 @@ module Util
             )
           end
           @oci_region = @instance_principals_signer.region
-        # elsif @auth_type == Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
-        #   @workload_identity_signer = OCI::Auth::Signers::oke_workload_resource_principal_signer
+        elsif @auth_type == Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          @oci_config = OCI::Config.new
+          @workload_identity_signer = OCI::Auth::Signers.oke_workload_resource_principal_signer
+          if !@oci_domain.nil?
+            region_match = @oci_domain.match(/^([a-z0-9-]+)\.oci\./i)
+            if region_match
+                @oci_region = region_match[1]
+                logger.info("Extracted region from domain: #{@oci_region}")
+            else
+                raise StandardError, "Invalid oci_domain format: '#{@oci_domain}'. " \
+                          "Expected: <region>.oci.<domain> (e.g., us-ashburn-1.oci.oraclecloud.com)"
+            end
+          else
+            begin
+                tmp_signer = OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
+                if tmp_signer.region
+                    @oci_region = tmp_signer.region
+                    logger.info("extracted region from IMDS: #{@oci_region}")
+                else
+                    raise StandardError, "IMDS returned nil region. " \
+                                  "Provide --oci_domain parameter (e.g., us-ashburn-1.oci.oraclecloud.com)."
+                end
+            rescue StandardError => e
+                raise
+            rescue => e
+                raise StandardError, "Unable to determine region. " \
+                          "IMDS not available: #{e.message}. " \
+                          "Provide --oci_domain parameter (e.g., us-ashburn-1.oci.oraclecloud.com)."
+            end
+          end
+          @oci_config.region = @oci_region
+
         elsif @auth_type == Enum::AuthTypeEnum::CONFIG
           @oci_config = OCI::ConfigFileLoader.load_config(config_file_location: auth_config_hash[:config_file_location],
           profile_name: auth_config_hash[:profile_name])
@@ -132,6 +162,11 @@ module Util
                 config: @oci_config, endpoint: endpoint,
                 signer: @instance_principals_signer,
                 retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::ContainerEngine::ContainerEngineClient.new(
+                config: @oci_config, endpoint: endpoint,
+                signer: @workload_identity_signer,
+                retry_config: retry_config)
         else
           logger.warn("Unknown auth_type '#{@auth_type}' provided for container engine client.")
         end
@@ -159,6 +194,8 @@ module Util
           client = OCI::Identity::IdentityClient.new(config: @oci_config, endpoint: endpoint, retry_config: retry_config)
         when Enum::AuthTypeEnum::INSTANCE_PRINCIPAL
           client = OCI::Identity::IdentityClient.new(config: @oci_config, endpoint: endpoint, signer: @instance_principals_signer, retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::Identity::IdentityClient.new(config: @oci_config, endpoint: endpoint, signer: @workload_identity_signer, retry_config: retry_config)
         else
           logger.warn("Unknown auth_type '#{@auth_type}' provided for identity client.")
         end
@@ -186,6 +223,8 @@ module Util
           client = OCI::LoadBalancer::LoadBalancerClient.new(config: @oci_config, endpoint: endpoint, retry_config: retry_config)
         when Enum::AuthTypeEnum::INSTANCE_PRINCIPAL
           client = OCI::LoadBalancer::LoadBalancerClient.new(config: @oci_config, endpoint: endpoint, signer: @instance_principals_signer, retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::LoadBalancer::LoadBalancerClient.new(config: @oci_config, endpoint: endpoint, signer: @workload_identity_signer, retry_config: retry_config)
         else
           logger.warn("Unknown auth_type '#{@auth_type}' provided for load balancer client.")
         end
@@ -221,6 +260,11 @@ module Util
                                                              endpoint: endpoint,
                                                              signer: @instance_principals_signer,
                                                              retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::LogAnalytics::LogAnalyticsClient.new(config: @oci_config,
+                                                             endpoint: endpoint,
+                                                             signer: @workload_identity_signer,
+                                                             retry_config: retry_config)
         else
           logger.warn("Unknown auth_type while creating log analytics client: #{@auth_type}")
           raise StandardError, 'Unknown auth_type for log analytics client.'
@@ -252,6 +296,8 @@ module Util
           client = OCI::ResourceSearch::ResourceSearchClient.new(config: @oci_config, endpoint: endpoint, retry_config: retry_config)
         when Enum::AuthTypeEnum::INSTANCE_PRINCIPAL
           client = OCI::ResourceSearch::ResourceSearchClient.new(config: @oci_config, endpoint: endpoint, signer: @instance_principals_signer, retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::ResourceSearch::ResourceSearchClient.new(config: @oci_config, endpoint: endpoint, signer: @workload_identity_signer, retry_config: retry_config)
         else
           logger.warn("Unknown auth_type '#{@auth_type}' provided for resource search client.")
         end
@@ -284,6 +330,8 @@ module Util
           client = OCI::Core::VirtualNetworkClient.new(config: @oci_config, endpoint: endpoint, retry_config: retry_config)
         when Enum::AuthTypeEnum::INSTANCE_PRINCIPAL
           client = OCI::Core::VirtualNetworkClient.new(config: @oci_config, endpoint: endpoint, signer: @instance_principals_signer, retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::Core::VirtualNetworkClient.new(config: @oci_config, endpoint: endpoint, signer: @workload_identity_signer, retry_config: retry_config)
         else
           logger.warn("Unknown auth_type '#{@auth_type}' provided for virtual network client.")
         end
@@ -317,6 +365,11 @@ module Util
                                                                    endpoint: endpoint,
                                                                    signer: @instance_principals_signer,
                                                                    retry_config: retry_config)
+        when Enum::AuthTypeEnum::OKE_WORKLOAD_IDENTITY
+          client = OCI::ResourceManager::ResourceManagerClient.new(config: @oci_config,
+                                                                   endpoint: endpoint,
+                                                                   signer: @workload_identity_signer,
+                                                                   retry_config: retry_config)
         else
           logger.warn("Unknown auth_type '#{auth_object[:auth_type]}' provided for resource manager client.")
         end
@@ -338,7 +391,7 @@ module Util
         oci_config: @oci_config,
         la_endpoint: @la_endpoint,
         instance_principals_signer: @instance_principals_signer,
-        # workload_identity_signer: @workload_identity_signer,
+        workload_identity_signer: @workload_identity_signer,
         auth_type: @auth_type,
         oci_domain: @oci_domain
       }.compact

data/lib/version.rb

@@ -2,5 +2,5 @@
 ## The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 module Discovery
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/ocibuild.conf

@@ -22,11 +22,8 @@ steps:
 		type: publishgeneric
 		dependsOn: ruby_install
 		repository: logan-release-gems-local
-        filePathsToPublish [
-            { 
-                localFile: "*.gem", 
-                targetDir: "gem/" 
-            }
-        ]
+		filesToPublish: [
+			      "*.gem"
+		]
 	}
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oci-logging-analytics-kubernetes-discovery
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Oracle
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-11 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -271,6 +271,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt