diff --git a/.codeclimate.yml b/.codeclimate.yml
index 5b103c9..3c67fd1 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -102,25 +102,6 @@ plugins:
# ACTION uncomment eslint below if JavaScript already exists and .eslintrc
# file exists in repo
- # PHP
- phan:
- enabled: true
- config:
- file_extensions: "php"
- phpcodesniffer:
- enabled: true
- config:
- file_extensions: "php,inc,lib"
- # Using Wordpress standards as our one PHP repo is a Wordpress theme
- standards: "PSR1,PSR2,WordPress,WordPress-Core,WordPress-Extra"
- phpmd:
- enabled: true
- config:
- file_extensions: "php,inc,lib"
- rulesets: "cleancode,codesize,controversial,naming,unusedcode"
- sonar-php:
- enabled: true
-
# Python
bandit:
enabled: true
diff --git a/.rubocop.yml b/.rubocop.yml
index 1f68b52..c5214bb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,2 +1,2 @@
AllCops:
- TargetRubyVersion: 2.5
+ TargetRubyVersion: 3.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40c80ca..ca1cdab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased]
+
+## [2.2.7] - 2023-03-02
### Security
+- Upgdate spring-boot and Golang dependencies. Upgrade test app to Ruby 3 and update ruby dependencies.
+ [cyberark/cloudfoundry-conjur-buildpack#164](https://github.com/cyberark/cloudfoundry-conjur-buildpack/pull/164)
- Upgrade sinatra to 2.2.3 in /tests/integration/apps/ruby to resolve CVE-2022-45442
- [cyberark/cloudfoundry-conjur-buildpack](https://github.com/cyberark/cloudfoundry-conjur-buildpack/pull/159)
+ [cyberark/cloudfoundry-conjur-buildpack#159](https://github.com/cyberark/cloudfoundry-conjur-buildpack/pull/159)
## [2.2.6] - 2022-11-23
### Changed
@@ -197,7 +201,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- The first tagged version.
-[Unreleased]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.6...HEAD
+[Unreleased]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.7...HEAD
+[2.2.7]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.6...v2.2.7
[2.2.6]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.5...v2.2.6
[2.2.5]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.4...v2.2.5
[2.2.4]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.3...v2.2.4
diff --git a/NOTICES.txt b/NOTICES.txt
index db5504b..148b8d7 100644
--- a/NOTICES.txt
+++ b/NOTICES.txt
@@ -10,14 +10,14 @@ of the license associated with each component.
SECTION 1: Apache License 2.0
->>> github.com/cyberark/conjur-api-go-0.10.1
+>>> github.com/cyberark/conjur-api-go-0.11.0
>>> gopkg.in/yaml.v2-2.4.0
>>> gopkg.in/yaml.v3-3.0.1
SECTION 2: BSD 3-clause "New" or "Revised" License
>>> github.com/pmezard/go-difflib-1.0.0
->>> golang.org/x/sys-0.0.0-20220728004956-3c1f35247d10
+>>> golang.org/x/sys-0.3.0
SECTION 3: MIT License
@@ -26,7 +26,7 @@ SECTION 3: MIT License
>>> github.com/sirupsen/logrus-1.8.1
>>> github.com/stretchr/testify v1.8.0
>>> gopkg.in/yaml.v2-2.4.0
->>> gopkg.in/yaml.v3-3.0.1-20210107192922-496545a6307b
+>>> gopkg.in/yaml.v3-3.0.1
SECTION 4: ISC License
@@ -47,7 +47,7 @@ APPENDIX: Standard License Files and Templates
Apache License 2.0 is applicable to the following component(s).
->>> github.com/cyberark/conjur-api-go-0.10.1
+>>> github.com/cyberark/conjur-api-go-0.11.0
Copyright 2020 CyberArk Software Ltd.
@@ -110,7 +110,7 @@ limitations under the License.
BSD 3-clause "New" or "Revised" License is applicable to the following component(s).
->>> golang.org/x/sys-0.0.0-20220728004956-3c1f35247d10
+>>> golang.org/x/sys-0.3.0
Copyright (c) 2009 The Go Authors. All rights reserved.
@@ -300,7 +300,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
->>> gopkg.in/yaml.v3-3.0.1-20210107192922-496545a6307b
+>>> gopkg.in/yaml.v3-3.0.1
#### MIT License ####
diff --git a/README.md b/README.md
index 4a98574..ed6873c 100755
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ applications:
- conjur
buildpacks:
- conjur_buildpack
- - php_buildpack
+ - ruby_buildpack
env:
SECRETS_YAML_PATH: lib/secrets.yml
```
@@ -202,7 +202,7 @@ applications:
- conjur
buildpacks:
- conjur_buildpack
- - php_buildpack
+ - ruby_buildpack
env:
SECRETS_YAML_PATH: lib/secrets.yml
SECRETS_YAML_ENVIRONMENT: staging
diff --git a/VERSION b/VERSION
index bda8fbe..5bc1cc4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.6
+2.2.7
diff --git a/conjur-env/Dockerfile b/conjur-env/Dockerfile
index 49f576e..789f9f6 100644
--- a/conjur-env/Dockerfile
+++ b/conjur-env/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.9-stretch
+FROM golang:1.20
MAINTAINER CyberArk Software, Inc.
ENV GOOS=linux \
diff --git a/conjur-env/go.mod b/conjur-env/go.mod
index eda051b..b804a27 100644
--- a/conjur-env/go.mod
+++ b/conjur-env/go.mod
@@ -1,19 +1,23 @@
module github.com/cyberark/cloudfoundry-conjur-buildpack/conjur-env
require (
- github.com/cyberark/conjur-api-go v0.10.1
+ github.com/cyberark/conjur-api-go v0.11.0
github.com/cyberark/summon v0.9.5
github.com/stretchr/testify v1.8.0
)
require (
+ github.com/alessio/shellescape v1.4.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+ github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
- golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
+ github.com/zalando/go-keyring v0.2.2 // indirect
+ golang.org/x/sys v0.3.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/conjur-env/go.sum b/conjur-env/go.sum
index f0fbdd7..8347ccb 100644
--- a/conjur-env/go.sum
+++ b/conjur-env/go.sum
@@ -1,39 +1,73 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
+github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyberark/conjur-api-go v0.10.1 h1:3gaKBINNyz9KGaY8SWatODVziINHYVmz+uAXKYujwIA=
-github.com/cyberark/conjur-api-go v0.10.1/go.mod h1:8+qYC7L6wPY1e56hoZmHSdGa2fHALck8PtS+cUky75Y=
+github.com/cyberark/conjur-api-go v0.11.0 h1:LIkdS0zSi2o9AlOwqrIAowxg26kyPFG+XOZSK0dq9dc=
+github.com/cyberark/conjur-api-go v0.11.0/go.mod h1:AbU7bDVW6ygUdgTDCKkh4wyfIVrOtdEeE/r01OE1EYo=
github.com/cyberark/summon v0.9.5 h1:xV/bbI4G9wBOAhtcLCZEFF9ER/3AaTKSPRQyeumpwiI=
github.com/cyberark/summon v0.9.5/go.mod h1:kT7+4i+d5xvv6HyBQfc2bAexaaZEyOF0XsmNlA/0jWQ=
+github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
+github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
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/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
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/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
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/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/zalando/go-keyring v0.2.2 h1:f0xmpYiSrHtSNAVgwip93Cg8tuF45HJM6rHq/A5RI/4=
+github.com/zalando/go-keyring v0.2.2/go.mod h1:sI3evg9Wvpw3+n4SqplGSJUMwtDeROfD4nsFz4z9PG0=
+golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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=
diff --git a/tests/integration/apps/java/pom.xml b/tests/integration/apps/java/pom.xml
index 595fbe2..d42b0e8 100755
--- a/tests/integration/apps/java/pom.xml
+++ b/tests/integration/apps/java/pom.xml
@@ -10,7 +10,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.7.5
+ 2.7.9
diff --git a/tests/integration/apps/php/index.php b/tests/integration/apps/php/index.php
deleted file mode 100644
index 7080a2d..0000000
--- a/tests/integration/apps/php/index.php
+++ /dev/null
@@ -1,5 +0,0 @@
-Visit us @ www.conjur.org!
-
-Space-wide Secrets
-Database Username:
-Database Password:
diff --git a/tests/integration/apps/php/lib/secrets.yml b/tests/integration/apps/php/lib/secrets.yml
deleted file mode 100644
index dce3b5a..0000000
--- a/tests/integration/apps/php/lib/secrets.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-SPACE_USERNAME: space_username #!var secrets/username
-SPACE_PASSWORD: space_password #!var secrets/password
diff --git a/tests/integration/apps/php/manifest-env.yml.template b/tests/integration/apps/php/manifest-env.yml.template
deleted file mode 100644
index edd652c..0000000
--- a/tests/integration/apps/php/manifest-env.yml.template
+++ /dev/null
@@ -1,10 +0,0 @@
----
-applications:
-- name: php-app
- env:
- CONJUR_BUILDPACK_BYPASS_SERVICE_CHECK: true
- SECRETS_YAML_PATH: lib/secrets.yml
- SECRETS_YAML_ENVIRONMENT: staging
- buildpacks:
- - {conjur_buildpack}
- - php_buildpack
diff --git a/tests/integration/apps/php/manifest.yml.template b/tests/integration/apps/php/manifest.yml.template
deleted file mode 100644
index 63b9648..0000000
--- a/tests/integration/apps/php/manifest.yml.template
+++ /dev/null
@@ -1,9 +0,0 @@
----
-applications:
-- name: php-app
- env:
- CONJUR_BUILDPACK_BYPASS_SERVICE_CHECK: true
- SECRETS_YAML_PATH: lib/secrets.yml
- buildpacks:
- - {conjur_buildpack}
- - php_buildpack
diff --git a/tests/integration/apps/ruby/Gemfile b/tests/integration/apps/ruby/Gemfile
index ee11b60..84f0142 100644
--- a/tests/integration/apps/ruby/Gemfile
+++ b/tests/integration/apps/ruby/Gemfile
@@ -1,9 +1,10 @@
source 'https://rubygems.org'
-ruby '~> 2.5'
+ruby '~> 3.2'
gem 'sinatra', ">= 2.2.0"
gem 'rack', ">= 2.2.4"
gem 'conjur-api'
gem 'conjur-cli'
+gem 'thin'
diff --git a/tests/integration/apps/ruby/Gemfile.lock b/tests/integration/apps/ruby/Gemfile.lock
index 8adda97..7e13ad8 100644
--- a/tests/integration/apps/ruby/Gemfile.lock
+++ b/tests/integration/apps/ruby/Gemfile.lock
@@ -1,73 +1,88 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.0.3.1)
+ activesupport (6.1.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- concurrent-ruby (1.1.10)
- conjur-api (5.0.0)
- activesupport
+ zeitwerk (~> 2.3)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
+ concurrent-ruby (1.2.2)
+ conjur-api (5.4.0)
+ activesupport (>= 4.2)
+ addressable (~> 2.0)
rest-client
- conjur-cli (6.0.0)
- activesupport
- conjur-api (~> 5.0.0.beta)
+ conjur-cli (6.2.6)
+ activesupport (~> 6.0)
+ conjur-api (~> 5.3)
deep_merge (~> 1.0)
gli (>= 2.8.0)
- highline (~> 1.7)
+ highline (~> 2.0)
netrc (~> 0.10)
table_print (~> 1.5)
- xdg (~> 2.2)
- deep_merge (1.2.1)
- domain_name (0.5.20170404)
+ xdg (= 2.2.3)
+ daemons (1.4.1)
+ deep_merge (1.2.2)
+ domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
- gli (2.17.1)
- highline (1.7.8)
- http-cookie (1.0.3)
+ eventmachine (1.2.7)
+ gli (2.21.0)
+ highline (2.1.0)
+ http-accept (1.7.0)
+ http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
- mime-types (3.1)
+ mime-types (3.4.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0521)
- minitest (5.16.2)
- mustermann (2.0.2)
+ mime-types-data (3.2023.0218.1)
+ minitest (5.17.0)
+ mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
netrc (0.11.0)
- rack (2.2.4)
- rack-protection (2.2.3)
+ public_suffix (5.0.1)
+ rack (2.2.6.2)
+ rack-protection (3.0.5)
rack
- rest-client (2.0.2)
+ rest-client (2.1.0)
+ http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ruby2_keywords (0.0.5)
- sinatra (2.2.3)
- mustermann (~> 2.0)
- rack (~> 2.2)
- rack-protection (= 2.2.3)
+ sinatra (3.0.5)
+ mustermann (~> 3.0)
+ rack (~> 2.2, >= 2.2.4)
+ rack-protection (= 3.0.5)
tilt (~> 2.0)
- table_print (1.5.6)
- tilt (2.0.11)
- tzinfo (2.0.5)
+ table_print (1.5.7)
+ thin (1.8.1)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0, >= 1.0.4)
+ rack (>= 1, < 3)
+ tilt (2.1.0)
+ tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.4)
+ unf_ext (0.0.8.2)
xdg (2.2.3)
+ zeitwerk (2.6.7)
PLATFORMS
- ruby
+ x86_64-linux
DEPENDENCIES
conjur-api
conjur-cli
rack (>= 2.2.4)
sinatra (>= 2.2.0)
+ thin
RUBY VERSION
- ruby 2.6.3p62
+ ruby 3.2.1p31
BUNDLED WITH
- 1.17.3
+ 2.4.6
diff --git a/tests/integration/features/integration.feature b/tests/integration/features/integration.feature
index 3de3a87..d27e8c8 100644
--- a/tests/integration/features/integration.feature
+++ b/tests/integration/features/integration.feature
@@ -22,10 +22,6 @@ Feature: Integrations Tests for remote TAS foundation
When I push a "ruby" app with the "offline" buildpack
Then the secrets.yml values are available in the app
- Scenario: PHP offline buildpack integration
- When I push a "php" app with the "offline" buildpack
- Then the secrets.yml values are available in the app
-
Scenario: Java offline buildpack integration
When I push a "java" app with the "offline" buildpack
Then the secrets.yml values are available in the app
@@ -40,10 +36,6 @@ Feature: Integrations Tests for remote TAS foundation
When I push a "ruby" app with the "online" buildpack
Then the secrets.yml values are available in the app
- Scenario: PHP online buildpack integration
- When I push a "php" app with the "online" buildpack
- Then the secrets.yml values are available in the app
-
Scenario: Java online buildpack integration
When I push a "java" app with the "online" buildpack
Then the secrets.yml values are available in the app
diff --git a/tests/retrieve-secrets/Dockerfile b/tests/retrieve-secrets/Dockerfile
index 8ca67e2..2280102 100644
--- a/tests/retrieve-secrets/Dockerfile
+++ b/tests/retrieve-secrets/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.9-stretch
+FROM golang:1.20
MAINTAINER CyberArk Software, Inc.
ENV GOOS=linux \