Add: Support for Faraday 2.x

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Update: Version

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Fix: Header pattern

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Fix: Smoke tests

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Fix: Unit tests

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Fix: Switch to safe_load

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Update: Switch to CodeQL v3

Signed-off-by: Preetham Kamidi <preetham.kamidi@broadcom.com>

Author: preetham

.github/workflows/main.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.3
       - name: Install dependencies
         run: bundle install
       - name: Unit test
@@ -80,17 +80,17 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.3
       - name: Install dependencies
         run: bundle install
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           languages: ruby
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
 
   codacy-analysis-cli:
     name: Codacy Analysis CLI
@@ -125,25 +125,25 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.3
       - name: Install dependencies
         run: bundle install
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '8'
+          distribution: 'temurin'
+          java-version: '17'
       - name: Smoke Test
         run: |
           export PATH=${PATH/:\/usr\/local\/lib\/jvm\/openjdk11\/bin:/:}
           sudo apt-get update
-          sudo apt-get install -y openjdk-8-jdk
-          export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+          sudo apt-get install -y openjdk-17-jdk
+          export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
           git clone --branch=master https://github.com/vmware/singleton.git server
           git clone --branch=devops https://github.com/vmware/singleton.git devops
           cd $GITHUB_WORKSPACE/server/g11n-ws && ./gradlew build -x test
           cp $GITHUB_WORKSPACE/devops/deploy/i18n-service/Dockerfile $GITHUB_WORKSPACE/server/publish/
-          cd $GITHUB_WORKSPACE/server/publish && mv singleton-[0~9]*.jar i18n-service.jar
+          cd $GITHUB_WORKSPACE/server/publish && mv singleton-0.1.0.jar i18n-service.jar
           docker build -t singleton .
           docker run -d -p 8090:8090 -p 8091:8091 --name singleton singleton
           docker ps

lib/sgtn-client/loader/server.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# Copyright 2022 VMware, Inc.
+# Copyright 2025 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/gzip'
 require 'set'
 
 module SgtnClient
@@ -26,10 +26,10 @@ def initialize(config)
         @components_url = "#{product_root}/componentlist"
 
         @conn = Faraday.new(config.vip_server, request: REQUEST_ARGUMENTS) do |f|
-          f.response :json # decode response bodies as JSON
+          f.response :json
           f.response :raise_error
           f.response :logger, config.logger, { log_level: :debug, headers: false, bodies: true }
-          f.use :gzip
+          f.request :gzip
         end
       end
 

lib/sgtn-client/loader/source.rb

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 VMware, Inc.
+# Copyright 2025 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
 require 'pathname'
@@ -20,7 +20,7 @@ def load_bundle(component, locale = nil)
         total_messages = {}
 
         Pathname.glob(@source_bundle_path + component + '**/*.{yml, yaml}') do |f|
-          bundle = YAML.load(File.read(f))
+          bundle = YAML.safe_load(File.read(f), aliases: true)
           messages = bundle&.first&.last # TODO: Warn about inconsistent source locale
           if messages.is_a?(Hash)
             total_messages.merge!(messages)

lib/sgtn-client/sgtn-client.rb

@@ -1,4 +1,4 @@
-# Copyright 2022 VMware, Inc.
+# Copyright 2025 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
 require 'forwardable'
@@ -30,7 +30,7 @@ class << self
     def_delegators :config, :logger, :logger=
 
     def load(config_file, env, log_file = nil)
-      configurations = YAML.load(File.read(config_file))
+      configurations = YAML.safe_load(File.read(config_file), aliases: true)
       config_hash = configurations[env]
       raise "Configuration[#{env}] NotFound" unless config_hash
 

lib/version.rb

@@ -1,5 +1,5 @@
-# Copyright 2022 VMware, Inc.
+# Copyright 2025 VMware, Inc.
 # SPDX-License-Identifier: EPL-2.0
 
-    VERSION_INFO = [0, 2, 1].freeze
+    VERSION_INFO = [0, 8, 0].freeze
     VERSION = VERSION_INFO.map(&:to_s).join('.').freeze

singleton-client.gemspec

@@ -17,11 +17,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency('concurrent-ruby')
-  s.add_dependency('faraday')
-  s.add_dependency('faraday_middleware')
+  s.add_dependency 'faraday', '~> 2.7'
+  s.add_dependency 'faraday-gzip', '~> 3'
   s.add_dependency('i18n')
   s.add_dependency('logging')
   s.add_dependency('multi_json') # TODO
+  s.add_dependency 'observer'
   s.add_dependency('request_store')
   s.add_dependency('twitter_cldr')