From 3b128bcdf61d502aa99a96236042c89156fac810 Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Mon, 22 Jul 2024 13:16:38 -0400 Subject: [PATCH 1/6] CNJR-5642: Update Go version in buildpack-health-check --- buildpack-health-check/Dockerfile | 2 +- buildpack-health-check/go.mod | 9 +++++++-- buildpack-health-check/go.sum | 29 ++++++++++++++++++++++++++--- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/buildpack-health-check/Dockerfile b/buildpack-health-check/Dockerfile index 0ba8a39..5dd3110 100644 --- a/buildpack-health-check/Dockerfile +++ b/buildpack-health-check/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine +FROM golang:1.22-alpine MAINTAINER CyberArk Software, Inc. ENV GOOS=linux \ diff --git a/buildpack-health-check/go.mod b/buildpack-health-check/go.mod index 70bdaaf..5299701 100644 --- a/buildpack-health-check/go.mod +++ b/buildpack-health-check/go.mod @@ -1,12 +1,17 @@ module github.com/cyberark/conjur-service-broker/buildpack-health-check -go 1.20 +go 1.22 -require github.com/cyberark/conjur-api-go v0.10.2 +require github.com/cyberark/conjur-api-go v0.12.3 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/godbus/dbus/v5 v5.1.0 // indirect + github.com/kr/text v0.2.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect + github.com/zalando/go-keyring v0.2.3-0.20230503081219-17db2e5354bd // indirect golang.org/x/sys v0.8.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/buildpack-health-check/go.sum b/buildpack-health-check/go.sum index 55bb613..0d49233 100644 --- a/buildpack-health-check/go.sum +++ b/buildpack-health-check/go.sum @@ -1,19 +1,42 @@ +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/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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cyberark/conjur-api-go v0.12.3 h1:LzSXJBKO36WJEcFceXYyb3y9lxHwx5WMhx/YH+RW88M= +github.com/cyberark/conjur-api-go v0.12.3/go.mod h1:FnzNn6mPwTOyBueSDnu1J4K47J0sYHXTMehaqIV/GxY= +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/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 h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= 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/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= +github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/zalando/go-keyring v0.2.3-0.20230503081219-17db2e5354bd h1:D+eeEnOlWcMXbwZ5X3oy68nHafBtGcj1jMKFHtVdybY= +github.com/zalando/go-keyring v0.2.3-0.20230503081219-17db2e5354bd/go.mod h1:sI3evg9Wvpw3+n4SqplGSJUMwtDeROfD4nsFz4z9PG0= +golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/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/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/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.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 816fc490deb5a75cf244158e347a23d3ac5943b8 Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Mon, 22 Jul 2024 13:30:02 -0400 Subject: [PATCH 2/6] Remove deprecated 'version' from docker-compose.yml files --- buildpack-health-check/docker-compose.yml | 1 - docker-compose.dev-override.yml | 2 -- docker-compose.yml | 2 -- 3 files changed, 5 deletions(-) diff --git a/buildpack-health-check/docker-compose.yml b/buildpack-health-check/docker-compose.yml index ba98162..f9c0996 100644 --- a/buildpack-health-check/docker-compose.yml +++ b/buildpack-health-check/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.1' services: buildpack-health-check-builder: build: . diff --git a/docker-compose.dev-override.yml b/docker-compose.dev-override.yml index 7ff3c04..9af6cc4 100644 --- a/docker-compose.dev-override.yml +++ b/docker-compose.dev-override.yml @@ -1,5 +1,3 @@ -version: "2" - services: conjur-service-broker: diff --git a/docker-compose.yml b/docker-compose.yml index 47b9299..8a01f41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "2" - services: pg: image: postgres:15 From ddab04945b355c2b53ef38ad11b22ee4bc09ac47 Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Mon, 22 Jul 2024 13:31:10 -0400 Subject: [PATCH 3/6] Upgrade to Ruby 3.3 --- CHANGELOG.md | 5 ++++- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.test | 2 +- Gemfile | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d864f8..7a15ac0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -## [1.2.11] - 2024-02-09 +## [1.2.11] - 2024-07-22 + ### Security +- Upgrade Ruby to 3.3 and Go to 1.22 + [cyberark/conjur-service-broker#340](https://github.com/cyberark/conjur-service-broker/pull/340) - Upgrade Puma to 6.4.2 [cyberark/conjur-service-broker#339](https://github.com/cyberark/conjur-service-broker/pull/339) diff --git a/Dockerfile b/Dockerfile index b818096..9eeec96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2 +FROM ruby:3.3 MAINTAINER CyberArk Software Ltd. RUN apt-get update && \ diff --git a/Dockerfile.dev b/Dockerfile.dev index c56d5d8..e5e7528 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ruby:3.2 +FROM ruby:3.3 MAINTAINER CyberArk Software Ltd. # This is a Dockerfile for the Service Broker image that is used in diff --git a/Dockerfile.test b/Dockerfile.test index fe0a397..7ecd847 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -FROM ruby:3.2 +FROM ruby:3.3 MAINTAINER CyberArk Software Ltd. # This is a Dockerfile for a Service Broker test client image. The repository diff --git a/Gemfile b/Gemfile index 7d47f9c..fad1c1c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -ruby '~> 3.1' +ruby '~> 3.3' gem 'conjur-api', '~> 5.3.4' gem 'activesupport', '~> 6.1' From 26a205406454495d1ee283ce31d46dcb57f1ba28 Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Tue, 23 Jul 2024 11:11:18 -0400 Subject: [PATCH 4/6] Upgrade gems --- CHANGELOG.md | 4 +-- Gemfile.lock | 86 +++++++++++++++++++++++++++------------------------- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a15ac0..296ec46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -## [1.2.11] - 2024-07-22 +## [1.2.11] - 2024-07-23 ### Security -- Upgrade Ruby to 3.3 and Go to 1.22 +- Upgrade Ruby to 3.3, Go to 1.22, and various other dependencies [cyberark/conjur-service-broker#340](https://github.com/cyberark/conjur-service-broker/pull/340) - Upgrade Puma to 6.4.2 [cyberark/conjur-service-broker#339](https://github.com/cyberark/conjur-service-broker/pull/339) diff --git a/Gemfile.lock b/Gemfile.lock index cb0f53b..58061d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.7.6) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aruba (2.1.0) bundler (>= 1.17, < 3.0) childprocess (>= 2.0, < 5.0) @@ -29,7 +29,7 @@ GEM cucumber (>= 4.0, < 9.0) rspec-expectations (~> 3.4) thor (~> 1.0) - builder (3.2.4) + builder (3.3.0) bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) @@ -42,13 +42,14 @@ GEM ci_reporter (~> 2.0) rspec (>= 2.14, < 4) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) conjur-api (5.3.7) activesupport (>= 4.2) addressable (~> 2.0) rest-client contracts (0.17) crass (1.0.6) + csv (3.3.0) cucumber (7.1.0) builder (~> 3.2, >= 3.2.4) cucumber-core (~> 10.1, >= 10.1.0) @@ -81,20 +82,21 @@ GEM cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) diff-lcs (1.5.1) domain_name (0.6.20240107) - erubi (1.12.0) - ffi (1.16.3) + erubi (1.13.0) + ffi (1.17.0-x86_64-linux-gnu) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) json-schema (2.8.0) addressable (>= 2.4) json_spec (1.1.5) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) - license_finder (7.1.0) + license_finder (7.2.1) bundler + csv (~> 3.2) rubyzip (>= 1, < 3) thor (~> 1.2) tomlrb (>= 1.3, < 2.1) @@ -106,16 +108,16 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) + method_source (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0206) - minitest (5.22.2) + mime-types-data (3.2024.0702) + minitest (5.24.1) multi_json (1.15.0) multi_test (0.1.2) netrc (0.11.0) - nio4r (2.7.0) - nokogiri (1.16.2-x86_64-linux) + nio4r (2.7.3) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) pry (0.14.2) coderay (~> 1.1) @@ -123,11 +125,11 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - public_suffix (5.0.4) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.0) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -137,43 +139,44 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source rake (>= 12.2) thor (~> 1.0) - rake (13.1.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) 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) - rexml (3.2.6) + rexml (3.3.2) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.1) + rspec-rails (6.1.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) - rspec-support (3.13.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubyzip (2.3.2) @@ -181,16 +184,17 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sys-uname (1.2.3) + strscan (3.1.0) + sys-uname (1.3.0) ffi (~> 1.1) - thor (1.3.0) + thor (1.3.1) tomlrb (2.0.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) with_env (1.1.0) xml-simple (1.1.9) rexml - zeitwerk (2.6.13) + zeitwerk (2.6.16) PLATFORMS x86_64-linux @@ -220,7 +224,7 @@ DEPENDENCIES spring-watcher-listen (~> 2.0.0) RUBY VERSION - ruby 3.2.3p157 + ruby 3.3.4p94 BUNDLED WITH 2.5.6 From a5334de30f8f083a28591346c5b8375b16429c6f Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Fri, 26 Jul 2024 09:42:33 -0400 Subject: [PATCH 5/6] Disable E2E tests - Broadcom CI integration broken --- Jenkinsfile | 41 ++++++++++++++++++++++------------------- config/puma.rb | 4 ++-- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 35a953d..675003b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,26 +70,29 @@ pipeline { // tests because both use the default docker compose network, and // both cause this network to be deleted when they clean up with // 'docker compose down ...'. - stage('End-to-End Testing') { - steps { - allocateTas('isv_ci_tas_srt_5_0') - sh 'cd dev && summon ./test_e2e' - junit 'features/reports/**/*.xml, spec/reports/*.xml' - } - post { - always { - destroyTas() - } - success { - script { - if (env.BRANCH_NAME == 'main') { - archiveArtifacts artifacts: '*.zip', fingerprint: true - } - } - } - } - } + // Note: Temporarily disabled due to issues with the ISV CI integration. + // These tests must be run manually until the issues are resolved. + // stage('End-to-End Testing') { + // steps { + // allocateTas('isv_ci_tas_srt_5_0') + // sh 'cd dev && summon ./test_e2e' + // junit 'features/reports/**/*.xml, spec/reports/*.xml' + // } + + // post { + // always { + // destroyTas() + // } + // success { + // script { + // if (env.BRANCH_NAME == 'main') { + // archiveArtifacts artifacts: '*.zip', fingerprint: true + // } + // } + // } + // } + // } stage('Push Docker Image') { steps { sh './dev/push-image' } diff --git a/config/puma.rb b/config/puma.rb index 6a16725..69f068d 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -7,9 +7,9 @@ threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } threads threads_count, threads_count -# Specifies the `port` that Puma will listen on to receive requests; default is 3030. +# Specifies the `port` that Puma will listen on to receive requests; default is 8080. # -port ENV.fetch("PORT") { 3030 } +port ENV.fetch("PORT") { 8080 } # Specifies the `environment` that Puma will run in. # From bba186fffb68eba078e093dc77f621a6b6d61bcc Mon Sep 17 00:00:00 2001 From: Shlomo Heigh Date: Fri, 26 Jul 2024 10:02:58 -0400 Subject: [PATCH 6/6] Document running e2e tests manually --- CHANGELOG.md | 2 +- CONTRIBUTING.md | 11 +++++++++++ config/puma.rb | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 296ec46..761616c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -## [1.2.11] - 2024-07-23 +## [1.2.11] - 2024-07-26 ### Security - Upgrade Ruby to 3.3, Go to 1.22, and various other dependencies diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c62d62..476ead0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -128,6 +128,17 @@ cd dev summon ./test_e2e ``` +#### Running End-to-End (E2E) Tests With a Custom TAS Instance + +To run the end-to-end tests with a custom TAS instance, such as one created via the VMWare ISV Dashboard, follow these steps: + +- Download the Hammer File from the VMWare ISV Dashboard and place it in the root of the repository, named `hammerfile.json`. +- In `./dev/test_e2e`, comment out the line `bl_retry_constant 5 30 ipmanager add "${compute_ip}"` + and replace it with `echo "Add IP $compute_ip to IPManager"`. When the command runs, copy the printed IP + and add it manually to IPManager () +- Comment out the `IPMANAGER_TOKEN` variable in `./dev/secrets.yml`. +- Run `summon ./dev/test_e2e` + ## Updating Dependencies ### Finding and Fixing Security Vulnerabilities diff --git a/config/puma.rb b/config/puma.rb index 69f068d..74e6bee 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -8,6 +8,7 @@ threads threads_count, threads_count # Specifies the `port` that Puma will listen on to receive requests; default is 8080. +# Note: Use the default port so the TAS health check can find the app. # port ENV.fetch("PORT") { 8080 }