Merge branch 'develop' into degroff/ENG-1/issue1

# Conflicts:
#	fusionauth-ruby-client.iml

Author: wied03

.github/workflows/deploy.yaml

@@ -1,10 +1,4 @@
-# Run locally with act:
-#
-# act pull_request [--input command=[command]] \
-#  --platform fusionauth-standard=[ecr-repo-name]/fusionauth-standard:latest] \
-#  --workflows ./.github/workflows/deploy.yaml \
-#  --env-file <(aws configure export-credentials --profile [aws-profile] --format env)
-
+---
 name: Deploy
 
 on:
@@ -26,39 +20,57 @@ on:
 
 permissions:
   contents: read
+  id-token: write
 
 jobs:
-  build:
-    if: |
-      github.event_name == 'pull_request' ||
-      github.event_name == 'push' ||
-      github.event_name == 'workflow_dispatch' && inputs.command == 'build'
-    runs-on: fusionauth-standard
+  deploy:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: /usr/bin/bash -l -e -o pipefail {0}
     steps:
       - name: checkout
         uses: actions/checkout@v4
 
+      - name: setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          java-package: jre
+
+      - name: install savant
+        run: |
+          curl -O https://repository.savantbuild.org/org/savantbuild/savant-core/2.0.0/savant-2.0.0.tar.gz
+          tar xzvf savant-2.0.0.tar.gz
+          savant-2.0.0/bin/sb --version
+          SAVANT_PATH=$(realpath -s "./savant-2.0.0/bin")
+          echo "${SAVANT_PATH}" >> $GITHUB_PATH
+          mkdir -p ~/.savant/plugins
+          cat << EOF > ~/.savant/plugins/org.savantbuild.plugin.java.properties
+          21=${JAVA_HOME}
+          EOF
+
+      # Installs the version specified in the .ruby-version file in the repo root.
+      - name: install ruby
+        uses: ruby/setup-ruby@v1
+
       - name: compile
         shell: bash -l {0}
         run: sb compile
 
-  deploy:
-    if: |
-      github.event_name == 'workflow_dispatch' &&
-      (inputs.command == 'release' || inputs.command == 'publish')
-    runs-on: fusionauth-standard
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
+      ### Everything below this line will only run on a workflow_dispatch
 
       - name: set aws credentials
+        if: inputs.command == 'release' || inputs.command == 'publish'
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: arn:aws:iam::752443094709:role/github-actions
+          role-to-assume: arn:aws:iam::752443094709:role/gha-fusionauth-ruby-client
           role-session-name: aws-auth-action
           aws-region: us-west-2
 
       - name: get secret
+        if: inputs.command == 'release' || inputs.command == 'publish'
         run: |
           while IFS=$'\t' read -r key value; do
             echo "::add-mask::${value}"
@@ -71,17 +83,16 @@ jobs:
             jq -r 'to_entries[] | [.key, .value] | @tsv')
 
       - name: set gem credentials
+        if: inputs.command == 'release' || inputs.command == 'publish'
         run: |
           mkdir -p ~/.gem
           echo ":rubygems_api_key: ${{ env.API_KEY }}" > ~/.gem/credentials
           chmod 600 ~/.gem/credentials
 
       - name: release to svn
         if: inputs.command == 'release'
-        shell: bash -l {0}
         run: sb release
 
       - name: publish to rubygems
         if: inputs.command == 'publish'
-        shell: bash -l {0}
         run: sb publish

.github/workflows/test.yml

@@ -3,10 +3,13 @@ name: Test Library
 on:
   push:
     branches:
+      - develop
       - main
   pull_request:
     branches:
+      - develop
       - main
+  workflow_dispatch:
 
 permissions:
   contents: read

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.4.2

Gemfile

@@ -13,10 +13,10 @@
 # language governing permissions and limitations under the License.
 
 source 'https://rubygems.org'
-ruby '2.7.5'
+ruby '3.4.2'
 
-gem 'minitest',      '~> 5.22', '>= 5.22.3'
-gem 'rake',          '~> 13.2', '>= 13.2.1'
+gem 'minitest',      '~> 5.25'
+gem 'rake',          '~> 13.2'
 gem 'rdoc-markdown', '~> 0.4.2'
 
 # Specify your gem's dependencies in fusionauth_client.gemspec

Gemfile.lock

@@ -1,27 +1,39 @@
 PATH
   remote: .
   specs:
-    fusionauth_client (1.56.0)
+    fusionauth_client (1.58.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cgi (0.4.1)
+    cgi (0.4.2)
+    date (3.4.1)
     erb (2.2.3)
       cgi
     extralite-bundle (1.27)
-    minitest (5.22.3)
-    nokogiri (1.15.6-aarch64-linux)
+    minitest (5.25.5)
+    nokogiri (1.18.6-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.15.6-arm64-darwin)
+    nokogiri (1.18.6-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.15.6-x86_64-linux)
+    nokogiri (1.18.6-arm-linux-gnu)
       racc (~> 1.4)
-    psych (5.1.2)
+    nokogiri (1.18.6-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.6-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.6-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.6-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.6-x86_64-linux-musl)
+      racc (~> 1.4)
+    psych (5.2.3)
+      date
       stringio
-    racc (1.7.3)
+    racc (1.8.1)
     rake (13.2.1)
-    rdoc (6.6.3.1)
+    rdoc (6.13.0)
       psych (>= 4.0.0)
     rdoc-markdown (0.4.2)
       erb (~> 2.0)
@@ -31,22 +43,27 @@ GEM
       unindent (~> 1.0)
     reverse_markdown (2.1.1)
       nokogiri
-    stringio (3.1.0)
+    stringio (3.1.6)
     unindent (1.0)
 
 PLATFORMS
-  aarch64-linux
-  arm64-darwin-23
-  x86_64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   fusionauth_client!
-  minitest (~> 5.22, >= 5.22.3)
-  rake (~> 13.2, >= 13.2.1)
+  minitest (~> 5.25)
+  rake (~> 13.2)
   rdoc-markdown (~> 0.4.2)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.4.2p28
 
 BUNDLED WITH
-   2.4.22
+   2.6.2

Rakefile

@@ -1,10 +1,10 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "minitest/test_task"
 
-Rake::TestTask.new(:test) do |t|
+Minitest::TestTask.create(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList['test/**/*test.rb']
+  t.test_globs = FileList['test/**/*test.rb']
 end
 
 task :default => :test

build.savant

@@ -15,7 +15,7 @@
  */
 
 pubVersion = ""
-project(group: "io.fusionauth", name: "fusionauth-ruby-client", version: "1.56.0", licenses: ["ApacheV2_0"]) {
+project(group: "io.fusionauth", name: "fusionauth-ruby-client", version: "1.58.0", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       cache()