Address Snyk issues

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.2
 MAINTAINER CyberArk Software Ltd.
 
 RUN apt-get update && \

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.2
 MAINTAINER CyberArk Software Ltd.
 
 # This is a Dockerfile for the Service Broker image that is used in

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM ruby:3.1
+FROM ruby:3.2
 MAINTAINER CyberArk Software Ltd.
 
 # This is a Dockerfile for a Service Broker test client image. The repository

Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     actionpack (6.1.7.3)
       actionview (= 6.1.7.3)
       activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.9)
+      rack (~> 3.0.6)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
@@ -130,9 +130,9 @@ GEM
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (3.0.6)
     rack-test (2.0.2)
-      rack (>= 1.3)
+      rack (~> 3.0.6)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -214,7 +214,7 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.2)
   pry-byebug
   puma (= 5.6.4)
-  rack (~> 2.2.6)
+  rack (~> 3.0.6)
   railties (~> 6.1)
   rest-client
   rspec (~> 3)

buildpack-health-check/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-stretch
+FROM golang:1.20
 MAINTAINER CyberArk Software, Inc.
 
 ENV GOOS=linux \

buildpack-health-check/go.mod

@@ -1,12 +1,18 @@
 module github.com/cyberark/conjur-service-broker/buildpack-health-check
 
-go 1.17
+go 1.20
 
 require github.com/cyberark/conjur-api-go v0.10.2
 
 require (
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
-	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
+
+replace golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 => golang.org/x/sys v0.8.0
+
+replace golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d => golang.org/x/sys v0.8.0
+
+replace golang.org/x/sys v0.8.0 => golang.org/x/sys v0.8.0

buildpack-health-check/go.sum

@@ -2,24 +2,18 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1U
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/cyberark/conjur-api-go v0.10.2 h1:V2zip069ybE1ubAi2xsay4WGdXG4vIQZ1z7GXPRt7IY=
 github.com/cyberark/conjur-api-go v0.10.2/go.mod h1:8+qYC7L6wPY1e56hoZmHSdGa2fHALck8PtS+cUky75Y=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

tests/integration/test-app/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '~> 3.1'
 
-gem 'sinatra', ">= 2.0.2"
+gem 'roda'
 gem 'rack', ">= 2.0.6"
 gem 'conjur-api'
 gem 'conjur-cli'

tests/integration/test-app/Gemfile.lock

@@ -43,7 +43,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     public_suffix (5.0.1)
-    rack (2.2.6.4)
+    rack (3.0.6)
     rack-protection (3.0.5)
       rack
     rest-client (2.1.0)
@@ -52,16 +52,13 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ruby2_keywords (0.0.5)
-    sinatra (3.0.5)
-      mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.5)
-      tilt (~> 2.0)
+    roda (3.68.0)
+      rack (~> 3.0.6)
     table_print (1.5.7)
     thin (1.8.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
+      rack (~> 3.0.6)
     tilt (2.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -77,8 +74,8 @@ PLATFORMS
 DEPENDENCIES
   conjur-api
   conjur-cli
-  rack (>= 2.0.6)
-  sinatra (>= 2.0.2)
+  rack (>= 3.0.6)
+  roda (>= 3.68.0)
   thin
 
 RUBY VERSION

tests/integration/test-app/test_app.rb

@@ -1,19 +1,15 @@
-require 'sinatra/base'
+require 'roda'
 
-# The TestApp class returns several secrets to verify
-# functionality with Conjur
-class TestApp < Sinatra::Application
+class TestApp < Roda
+  plugin :default_headers, 'Content-Type'=>'text/html'
 
-  configure do
-    set :bind, '0.0.0.0'
-  end
-
-  get '/' do
-    "
+  route do |r|
+    r.root do
+      "
       <p>Org Secret: #{ENV['ORG_SECRET']}</p>
       <p>Space Secret: #{ENV['SPACE_SECRET']}</p>
       <p>App Secret: #{ENV['APP_SECRET']}</p>
     "
+    end
   end
-
 end