Merge branch 'build_74.31.0_176478613' into gds_main

alphagov · Feb 3, 2021 · 71a03b6 · 71a03b6
2 parents 83cc951 + ddbfd3d
commit 71a03b6
Show file tree

Hide file tree

Showing 25 changed files with 378 additions and 317 deletions.
diff --git a/.final_builds/jobs/uaa/index.yml b/.final_builds/jobs/uaa/index.yml
@@ -31,6 +31,10 @@ builds:
     version: 1612ea06ebd2c24f54924af32c38ec6672b142f6
     blobstore_id: 0640fdc3-02a5-4267-8a47-8764c0a55c36
     sha1: 46d7a7c7fe9e1670ff0b0564404fc48031e642c6
+  1ad29cae71c7223472ea52d9fef99ef65687a0281600697677fa49fa9d673ff9:
+    version: 1ad29cae71c7223472ea52d9fef99ef65687a0281600697677fa49fa9d673ff9
+    blobstore_id: f434a7b1-bbe1-4e76-5e66-565b8cdae6b1
+    sha1: sha256:3394b226671d1e1b1d2421ecc93c83da974e42d0253a74dbec6bcae4b826cb23
   213b061b7d7f80520927b52ebbca11788aaf98c9:
     version: 213b061b7d7f80520927b52ebbca11788aaf98c9
     blobstore_id: 86c0c902-481a-40e3-a38e-2454a36e7db1
@@ -75,6 +79,10 @@ builds:
     version: 3e25b3e9f94f0cc08be0bd81b1c5659eb17ce134
     blobstore_id: 9214e07c-464f-4b22-9c5c-1348edb1e086
     sha1: 836d691d1de2561ebf3369cf1e089e4c4382750a
+  42c6766467c1d1b272ae56c121bb473ec9f7782e38d468f86afed81d4934d544:
+    version: 42c6766467c1d1b272ae56c121bb473ec9f7782e38d468f86afed81d4934d544
+    blobstore_id: 15363baa-6845-4aa3-628f-05febad8b42d
+    sha1: sha256:77536cd3956500a1faf7176c678c812e6b1220ec3c0b6d247831a33b3d4af3c9
   43bb344e0d2f090ac3842a8744a7e8b0ecbd0e0b:
     version: 43bb344e0d2f090ac3842a8744a7e8b0ecbd0e0b
     blobstore_id: cbbfe8b0-092a-437a-4345-e20b1ce2e727
@@ -123,6 +131,10 @@ builds:
     version: 613e1c42c2b62160752d79642181f8dd29aa3fff
     blobstore_id: 32ccfa57-961d-4d58-7f30-0c1ead3555c6
     sha1: b3964a58ac1746f7cda1794d5d20df7ee89bc3b9
+  65e873a045b70548b952382b657533e1e906da4ed9fb85769afebbbddf2d6801:
+    version: 65e873a045b70548b952382b657533e1e906da4ed9fb85769afebbbddf2d6801
+    blobstore_id: 4b595fcf-638e-46dc-4d69-ab36c1be57f9
+    sha1: sha256:9b5db212cb269919a3cce9a9847628c46569f9cacb7513e8f2007231edc4ec4e
   66fe0204991582bbeea5a58c2f3fa0a44c1fb7fe:
     version: 66fe0204991582bbeea5a58c2f3fa0a44c1fb7fe
     blobstore_id: 76b2b73a-f179-4f8c-b9f1-33c883b872e6

diff --git a/.final_builds/packages/uaa/index.yml b/.final_builds/packages/uaa/index.yml
@@ -27,6 +27,10 @@ builds:
     version: 0b2b84bc51350e4c469c539a7646b939081cf945
     blobstore_id: 28c0ae73-e0b6-404b-5079-82f9eb63cec8
     sha1: bf05a31497ff5e55533251cad84cdb622a460378
+  0e10eec92f47560f55f9d3790eca733943ca27d544f610286bb6e3f8128d76ff:
+    version: 0e10eec92f47560f55f9d3790eca733943ca27d544f610286bb6e3f8128d76ff
+    blobstore_id: 6500a205-3ecc-451f-4a9c-847efa8936a1
+    sha1: sha256:0adc64ed210b30b4db035185b3a45fa1d8a7fcdd4b8ff0b5b411e165f0f92319
   0f4cbf914b444a2bba8d947bb614082b8d2d8400:
     version: 0f4cbf914b444a2bba8d947bb614082b8d2d8400
     blobstore_id: 8d9e6217-9e21-4aa6-4290-dae645894b0e
@@ -411,6 +415,10 @@ builds:
     version: 9b74b5180bfa08abfff7b380b6d58f97dfa0d087
     blobstore_id: abe011b6-9e04-488a-858d-f67e35f2bcfe
     sha1: f4614f4072a6d273a3645818b00ecf7af7654a03
+  9efb813afe8cfb8cd69a72e6aea9d3fcf63bdf7183daa420b399a2c9ec2176f8:
+    version: 9efb813afe8cfb8cd69a72e6aea9d3fcf63bdf7183daa420b399a2c9ec2176f8
+    blobstore_id: b0cc5159-7ad8-4458-7cd7-e76bb6c1a916
+    sha1: sha256:1edce14dc61662ab5a503fa90474c2ca64038805bb8a0f942bde9561d8487da1
   9ffe2be390f7667346373405e688b217167dca77:
     version: 9ffe2be390f7667346373405e688b217167dca77
     blobstore_id: f8a94543-e446-4422-a3e8-7fa1e65b5526
@@ -439,6 +447,14 @@ builds:
     version: a6eb9903a46b9991c33b0d9a4345a5b33bc5e3ea
     blobstore_id: 5d155c50-7f99-4cca-6a39-6d14e59191f6
     sha1: 9424d3ee301ecdadd7d40518d74da3376387d199
+  a71f88aaf5f6f214596190edbf931f2c1b28dcb5c577a36e4f144a4fd9d18aba:
+    version: a71f88aaf5f6f214596190edbf931f2c1b28dcb5c577a36e4f144a4fd9d18aba
+    blobstore_id: 1ab637b8-9424-4396-7992-852e5d3b2539
+    sha1: sha256:ce2460298c062d17524a35938043a2d3c4f0e4bc3fd42d0669d62c11a3cef830
+  a7ca5a6dcf5bd8a4750c294b939e7b3da380030e4f6d24f8ab07ce1f7e56fc23:
+    version: a7ca5a6dcf5bd8a4750c294b939e7b3da380030e4f6d24f8ab07ce1f7e56fc23
+    blobstore_id: 67394596-09ff-4794-499a-54f79320553f
+    sha1: sha256:e3cbeba10e1d7b90a38eaeca5428d9345131a93f840d95eaf6f49603fada4222
   a8b8a6b67f6e09b088f295b9a3460326821b29bd:
     version: a8b8a6b67f6e09b088f295b9a3460326821b29bd
     blobstore_id: ecd0ee15-bc94-4289-8bb8-15e9df30b13c
@@ -455,6 +471,10 @@ builds:
     version: ab6f8deb99c86b40a8daba7995df63f3d8ddcd92
     blobstore_id: ada89ae4-b71e-420c-9616-72c5e5295ef2
     sha1: 9ff88778d92c265c5daec7d584c72a79a8c58cdd
+  ae03cb7ab932ece3845490cc4a25bdf0aac6bfe317c0c5e59ceb52a90fd543c3:
+    version: ae03cb7ab932ece3845490cc4a25bdf0aac6bfe317c0c5e59ceb52a90fd543c3
+    blobstore_id: 800377a5-b503-45bd-59fa-7313e2ce1aca
+    sha1: sha256:bad4ad67e0b5dfea42db1008781706b0c2fef1b3a69de0c2cd8d4b3693661c71
   af17a1d37d665421678c2cc70ad7ae57f2e96736:
     version: af17a1d37d665421678c2cc70ad7ae57f2e96736
     blobstore_id: c8d84348-21f1-4617-be4d-3be364f9de10
@@ -523,6 +543,10 @@ builds:
     version: c447cdd967d46827f3ae5907b764059fd5b8985c
     blobstore_id: 0dd31763-e7ee-43ed-b7f4-424c74c6da6f
     sha1: d307e20866e88e5961924a094fa7e0667a21890a
+  c5a4a5f2ff4e456ab105e55797b46794eec76f4fcd5227cca0a0c997f4ca700e:
+    version: c5a4a5f2ff4e456ab105e55797b46794eec76f4fcd5227cca0a0c997f4ca700e
+    blobstore_id: 118effa5-0652-4c9d-62aa-b32dd9fb91e6
+    sha1: sha256:b6c87530ecbcee99c18e2b8a760ad2991ea76716f8c3042c90ea26eb3ec1a39e
   c92032a156641e3607a4d792d03aa48278a36ce9:
     version: c92032a156641e3607a4d792d03aa48278a36ce9
     blobstore_id: 19738b8c-12d5-4917-b9f6-c60fa300781b
@@ -603,6 +627,10 @@ builds:
     version: e030fc1e90c6a3ca516f76032aab2bff4eec7deb
     blobstore_id: 8d7d119b-9ef0-4f23-802a-20195739667b
     sha1: 1cbdc0f15cc155f852076efb490b61fb7e23cdda
+  e07f637e9c03a33d2c5f653dc4851b5d4789ddd3e5fcbf5f87957b7eeb5f3b82:
+    version: e07f637e9c03a33d2c5f653dc4851b5d4789ddd3e5fcbf5f87957b7eeb5f3b82
+    blobstore_id: b84d0e87-9805-4292-4242-2f0e4f40e3a8
+    sha1: sha256:b922dd1b32d805771d233b37234847b63450ff869841b46a5d92fa01fabdc5bd
   e1ed9ee22023e34c6c6ae230a290787f7a83de17:
     version: e1ed9ee22023e34c6c6ae230a290787f7a83de17
     blobstore_id: 18969917-8f3f-4f96-8a15-adad84b5ea60

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gem 'rspec'
 gem 'rake'
-gem 'nokogiri', '1.10.10'
+gem 'nokogiri', '1.11.1'
 gem 'activesupport'
 gem 'bosh-template'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,58 +1,59 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     bosh-template (2.2.1)
       semi_semantic (~> 1.2.0)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
     diff-lcs (1.4.4)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    racc (1.5.2)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
     semi_semantic (1.2.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport
   bosh-template
-  nokogiri (= 1.10.10)
+  nokogiri (= 1.11.1)
   pry-byebug
   rake
   rspec

diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,12 +1,12 @@
-bellsoft-11.0.8+10.tar.gz:
-  size: 204709552
-  object_id: 2460aaf2-5138-49bf-56b1-68b0a1819880
-  sha: sha256:2e31cf143774a9b32f681dd34314202ac75aebe223297049c3ca55d0e1b70cbe
-uaa/apache-tomcat-9.0.37.tar.gz:
-  size: 11211292
-  object_id: 5de18d3c-8ef0-4792-7e0c-a04e1f1b6e99
-  sha: sha256:8fb4cfa459a3f027b855334fbdc7197fa5378e504853a98009281d8e149b1bc7
+bellsoft-11.0.9.1+1.tar.gz:
+  size: 206846079
+  object_id: 81788be0-a1a9-4e6f-48e1-a43554f5d442
+  sha: sha256:786c48fa6429d6a3f0afb189a65f0a43772e42afbab836852b9a1fdfdb8fc502
+uaa/apache-tomcat-9.0.41.tar.gz:
+  size: 11442169
+  object_id: 6fbf7620-10d1-4d67-5189-181b3551cc60
+  sha: sha256:6a5fc1f79f002f25480e3a50daa1fb16fdb2f0a969bc2f806c88bc550002cf71
 uaa/newrelic.jar:
-  size: 16578257
-  object_id: 7840ba36-b94d-43b8-5ab5-756ea23f60fd
-  sha: sha256:b27ddc8249e1bb38e3d8b4b2e07456e87105ae08233f093ed733970217ffd753
+  size: 16756070
+  object_id: f78a2aa2-f822-4317-5d6d-a1782e829aac
+  sha: sha256:90dbdbfff6f42e4c348ea0a31500cd4a4452a5320d77c8045f50120127f00c35
diff --git a/jobs/uaa/spec b/jobs/uaa/spec
@@ -211,6 +211,23 @@ properties:
       - HEAD
       - OPTIONS
 
+  uaa.rest.template.timeout:
+    description: "Timeout for the RestTemplates used by the UAA in ms"
+    example: 10000
+    default: 10000
+  uaa.rest.template.maxTotal:
+    description: "Size of the connection pool used by the RestTemplates in the UAA"
+    example: 20
+    default: 20
+  uaa.rest.template.maxPerRoute:
+    description: "Maximum number of connections to the same route that is used by the RestTemplates in the UAA"
+    example: 5
+    default: 5
+  uaa.rest.template.maxKeepAlive:
+    description: "Maximum time in ms that the connections of the RestTemplates are kept alive in the UAA"
+    example: 0
+    default: 0
+
   # SSL
   login.protocol:
     description: "Scheme to use for HTTP communication (http/https)"

diff --git a/jobs/uaa/templates/bin/pre-start.erb b/jobs/uaa/templates/bin/pre-start.erb
@@ -32,9 +32,27 @@ function build_new_cache_files {
     <% end %>
 
     log "Trying to run update-ca-certificates..."
-    # --certbundle is an undocumented flag in the update-ca-certificates script
-    # https://salsa.debian.org/debian/ca-certificates/blob/master/sbin/update-ca-certificates#L53
-    timeout --signal=KILL 180s /usr/sbin/update-ca-certificates -f -v --certbundle "$(basename "${OS_CERTS_FILE}")"
+    source /etc/os-release
+    case "${ID}" in
+      *ubuntu*)
+        # --certbundle is an undocumented flag in the update-ca-certificates script
+        # https://salsa.debian.org/debian/ca-certificates/blob/master/sbin/update-ca-certificates#L53
+        timeout --signal=KILL 180s /usr/sbin/update-ca-certificates -f -v --certbundle "$(basename "${OS_CERTS_FILE}")"
+      ;;
+
+      *suse|sles*)
+        timeout --signal=KILL 180s /usr/sbin/update-ca-certificates -f -v
+        # Note that per an upstream comment the move below may cause
+        # trouble should UAA be co-located with other jobs of the
+        # system. No details are currently available.
+        mv /var/lib/ca-certificates/ca-bundle.pem /etc/ssl/certs/"$(basename "${OS_CERTS_FILE}")"
+      ;;
+
+      *)
+        echo "Unsupported operating system: ${PRETTY_NAME}"
+        exit 42
+      ;;
+    esac
 }
 
 function new_cache_files_are_identical {

diff --git a/jobs/uaa/templates/config/uaa.yml.erb b/jobs/uaa/templates/config/uaa.yml.erb
@@ -673,6 +673,12 @@
     add_value(params, login_defaultIdentityProvider, 'login', 'defaultIdentityProvider')
   end
 
+  if_p('uaa.rest.template') do |rest_template|
+    rest_template.each do |key,val|
+      add_value(params, val, 'rest','template', key)
+    end
+  end
+
   if_p('login.links') do |login_links|
     login_links.each do |key,val|
       add_value(params, val, 'links', key)

diff --git a/packages/uaa/pre_packaging b/packages/uaa/pre_packaging
@@ -25,8 +25,8 @@ export PATH=$JAVA_HOME/bin:$PATH
 
 #build cloud foundry UAA war
 cd ${BUILD_DIR}/uaa
-export UAA_VERSION=v74.24.0
-GIT_DIR=$(find $RELEASE_DIR -path "*/modules/src/uaa") ./gradlew :clean :assemble -Pversion=${UAA_VERSION}
+export UAA_VERSION=v74.31.0
+GIT_DIR=$(find $RELEASE_DIR -path "*/modules/src/uaa") ./gradlew :clean :assemble --max-workers=4 -Pversion=${UAA_VERSION}
 cp uaa/build/libs/cloudfoundry-identity-uaa-${UAA_VERSION}.war ${BUILD_DIR}/uaa/cloudfoundry-identity-uaa.war
 cp statsd/build/libs/cloudfoundry-identity-statsd-${UAA_VERSION}.war ${BUILD_DIR}/uaa/cloudfoundry-identity-statsd.war
 cp server/build/libs/tomcat-listener-${UAA_VERSION}.jar ${BUILD_DIR}/uaa/tomcat-listener.jar
@@ -56,4 +56,3 @@ rm -f ${BUILD_DIR}/uaa/README.md
 rm -f ${BUILD_DIR}/uaa/settings.gradle
 rm -f ${BUILD_DIR}/uaa/shared_versions.gradle
 rm -rf ${BUILD_DIR}/uaa/uaa
-
diff --git a/releases/uaa/index.yml b/releases/uaa/index.yml
@@ -27,6 +27,8 @@ builds:
     version: "13.4"
   0dccae9c-82ad-4a0e-bd43-5e43b336ec38:
     version: "53.2"
+  0e139533-ce18-4312-5213-323e358de32a:
+    version: 74.30.0
   0e2f40fe-12fd-49bb-6240-aa13c1dbcd03:
     version: 73.3.0
   114c856b-5de1-4a36-513b-8459a77c7985:
@@ -57,6 +59,8 @@ builds:
     version: "64.0"
   272a6cea-3bdd-498c-8a34-ac932149d11b:
     version: "30.7"
+  2b12c9db-90ba-4f06-5032-244b72394ce0:
+    version: 74.28.0
   2b93ae1f-1d14-4d9b-4bfb-a75b71b13975:
     version: "52.10"
   2bc6ca5f-9b93-49a4-87dd-b4bbd30e1284:
@@ -65,6 +69,8 @@ builds:
     version: 74.24.0
   2d3726dc-71a5-4a44-8127-cdb1489ea9c5:
     version: "45.3"
+  31bd40e3-d144-4fae-4441-c86f48088e57:
+    version: 74.27.0
   31c3cc81-fe6e-4312-8900-b663c7677ae0:
     version: "24.4"
   33bb056b-7372-4f6c-7c33-9e39983e16fc:
@@ -171,6 +177,8 @@ builds:
     version: "9"
   71eacb66-ee2a-47ed-a8b1-484e1ef5dc03:
     version: "13.13"
+  7256e124-2795-413b-6f1b-aee260deb54e:
+    version: 74.25.0
   726829fb-fa82-4346-99c2-56f9026d1abd:
     version: "6"
   73b07490-db86-4597-6af7-e830b2c5a039:
@@ -251,6 +259,8 @@ builds:
     version: "30.1"
   9fabf160-6b32-44c0-b762-609124df582a:
     version: "30.8"
+  a1253109-0ef5-44c1-79e1-3e0fdc5f5af6:
+    version: 74.26.0
   a200b0e3-d7a0-4438-8b22-67b75a629cf9:
     version: "13.18"
   a424be4f-41b9-463b-9d69-28e3cb2f6b23:
@@ -261,6 +271,8 @@ builds:
     version: "30.3"
   a84d0443-4f3a-44e4-98ce-29c094a30783:
     version: "13"
+  a9d94e8e-4493-4c29-6bba-f6e32f705c9d:
+    version: 74.29.0
   aaa0ed51-2615-4cf6-6b18-83ab20ae51b9:
     version: 74.10.0
   ac212231-60ed-44ed-6d70-6ceb9d8b4ec9:
@@ -271,6 +283,8 @@ builds:
     version: "61.0"
   b0a9e92c-54c8-4996-6207-595e1462a0d5:
     version: 74.18.0
+  b12f50e8-c135-4224-4dc3-91ae68eb5c38:
+    version: 74.31.0
   b5e2c001-d7f9-439d-b7b7-0f7d2888688d:
     version: "13.10"
   b7eb6871-dfc2-4092-ae9f-076a8e75d931:

diff --git a/releases/uaa/uaa-74.25.0.yml b/releases/uaa/uaa-74.25.0.yml
@@ -0,0 +1,26 @@
+name: uaa
+version: 74.25.0
+commit_hash: 3a246ff
+uncommitted_changes: false
+jobs:
+- name: bbr-uaadb
+  version: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
+  fingerprint: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
+  sha1: sha256:d1ed1f3056979fdac54590424d9be63ba9e9b03eaf6292984d1028de7dae96a9
+  packages: []
+- name: uaa
+  version: d963aca33cc574a3716fe5febe68155b3861f48561af265962f1c742b952aa44
+  fingerprint: d963aca33cc574a3716fe5febe68155b3861f48561af265962f1c742b952aa44
+  sha1: sha256:53d73428d8044f422da78914b26071c7480593b425b560ecbf22056e9ac6b27a
+  packages:
+  - uaa
+packages:
+- name: uaa
+  version: 9efb813afe8cfb8cd69a72e6aea9d3fcf63bdf7183daa420b399a2c9ec2176f8
+  fingerprint: 9efb813afe8cfb8cd69a72e6aea9d3fcf63bdf7183daa420b399a2c9ec2176f8
+  sha1: sha256:1edce14dc61662ab5a503fa90474c2ca64038805bb8a0f942bde9561d8487da1
+  dependencies: []
+license:
+  version: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
+  fingerprint: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
+  sha1: sha256:f98289619ac04578182dd62ac10ea1e940d05c35a045d87287ea8183af4e0315