Merge branch 'bump-to-74.31' into gds_main

.final_builds/jobs/uaa/index.yml

@@ -79,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
@@ -127,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

.final_builds/packages/uaa/index.yml

@@ -447,6 +447,10 @@ 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
@@ -623,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

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'
 

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.2)
-    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.4.0)
+    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

config/blobs.yml

@@ -2,11 +2,11 @@ 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.40.tar.gz:
-  size: 11437266
-  object_id: 098ee019-420b-4539-5f11-67467928f331
-  sha: sha256:bb52b10b500f113dc4b504e34f4ac0a5f48f31d93ea261c721459a4b7e72ca52
+uaa/apache-tomcat-9.0.41.tar.gz:
+  size: 11442169
+  object_id: 6fbf7620-10d1-4d67-5189-181b3551cc60
+  sha: sha256:6a5fc1f79f002f25480e3a50daa1fb16fdb2f0a969bc2f806c88bc550002cf71
 uaa/newrelic.jar:
-  size: 16677788
-  object_id: c9c2d02c-2bc3-48b8-4c2b-e5f1d230965a
-  sha: sha256:1a3b38132867ce700461cbbfdc3d7dee3d91fc852423d0e0e4bef38c88fdf60d
+  size: 16756070
+  object_id: f78a2aa2-f822-4317-5d6d-a1782e829aac
+  sha: sha256:90dbdbfff6f42e4c348ea0a31500cd4a4452a5320d77c8045f50120127f00c35

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)"

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 {

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.29.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

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:
@@ -281,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:

releases/uaa/uaa-74.30.0.yml

@@ -0,0 +1,26 @@
+name: uaa
+version: 74.30.0
+commit_hash: 7438e7f
+uncommitted_changes: false
+jobs:
+- name: bbr-uaadb
+  version: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
+  fingerprint: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
+  sha1: sha256:d1ed1f3056979fdac54590424d9be63ba9e9b03eaf6292984d1028de7dae96a9
+  packages: []
+- name: uaa
+  version: 42c6766467c1d1b272ae56c121bb473ec9f7782e38d468f86afed81d4934d544
+  fingerprint: 42c6766467c1d1b272ae56c121bb473ec9f7782e38d468f86afed81d4934d544
+  sha1: sha256:77536cd3956500a1faf7176c678c812e6b1220ec3c0b6d247831a33b3d4af3c9
+  packages:
+  - uaa
+packages:
+- name: uaa
+  version: a71f88aaf5f6f214596190edbf931f2c1b28dcb5c577a36e4f144a4fd9d18aba
+  fingerprint: a71f88aaf5f6f214596190edbf931f2c1b28dcb5c577a36e4f144a4fd9d18aba
+  sha1: sha256:ce2460298c062d17524a35938043a2d3c4f0e4bc3fd42d0669d62c11a3cef830
+  dependencies: []
+license:
+  version: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
+  fingerprint: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
+  sha1: sha256:f98289619ac04578182dd62ac10ea1e940d05c35a045d87287ea8183af4e0315

releases/uaa/uaa-74.31.0.yml

@@ -0,0 +1,26 @@
+name: uaa
+version: 74.31.0
+commit_hash: "9382169"
+uncommitted_changes: false
+jobs:
+- name: bbr-uaadb
+  version: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
+  fingerprint: b10586c070c07129cd8f62188cd4754c403fb163812607dce31985e8e61781f0
+  sha1: sha256:d1ed1f3056979fdac54590424d9be63ba9e9b03eaf6292984d1028de7dae96a9
+  packages: []
+- name: uaa
+  version: 65e873a045b70548b952382b657533e1e906da4ed9fb85769afebbbddf2d6801
+  fingerprint: 65e873a045b70548b952382b657533e1e906da4ed9fb85769afebbbddf2d6801
+  sha1: sha256:9b5db212cb269919a3cce9a9847628c46569f9cacb7513e8f2007231edc4ec4e
+  packages:
+  - uaa
+packages:
+- name: uaa
+  version: e07f637e9c03a33d2c5f653dc4851b5d4789ddd3e5fcbf5f87957b7eeb5f3b82
+  fingerprint: e07f637e9c03a33d2c5f653dc4851b5d4789ddd3e5fcbf5f87957b7eeb5f3b82
+  sha1: sha256:b922dd1b32d805771d233b37234847b63450ff869841b46a5d92fa01fabdc5bd
+  dependencies: []
+license:
+  version: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
+  fingerprint: cc48a230dddf0499912777ce8ccf63b8ed7c22a4106f30b6934679272826f430
+  sha1: sha256:f98289619ac04578182dd62ac10ea1e940d05c35a045d87287ea8183af4e0315

spec/compare/bosh-lite-uaa.yml

@@ -364,3 +364,10 @@ servlet:
   idle-timeout: 1800
   session-cookie:
     max-age: -1
+
+rest:
+  template:
+    timeout: 10000
+    maxTotal: 20
+    maxPerRoute: 5
+    maxKeepAlive: 0

spec/compare/deprecated-properties-still-work-uaa.yml

@@ -243,4 +243,11 @@ servlet:
   session-store: memory
   idle-timeout: 1800
   session-cookie:
-    max-age: -1
+    max-age: -1
+
+rest:
+  template:
+    timeout: 10000
+    maxTotal: 20
+    maxPerRoute: 5
+    maxKeepAlive: 0

spec/compare/test-defaults-uaa.yml

@@ -254,3 +254,10 @@ servlet:
   idle-timeout: 1800
   session-cookie:
     max-age: -1
+
+rest:
+  template:
+    timeout: 10000
+    maxTotal: 20
+    maxPerRoute: 5
+    maxKeepAlive: 0

src/acceptance_tests/go.mod

@@ -6,17 +6,16 @@ require (
 	code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect
 	github.com/bmatcuk/doublestar v1.1.5 // indirect
 	github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
-	github.com/cloudfoundry/bosh-cli v6.4.0+incompatible
+	github.com/cloudfoundry/bosh-cli v6.4.1+incompatible
 	github.com/cloudfoundry/bosh-utils v0.0.0-20190921100139-64e3370c6fb0
 	github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
 	github.com/cloudfoundry/socks5-proxy v0.2.0 // indirect
 	github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
 	github.com/onsi/ginkgo v1.14.2
-	github.com/onsi/gomega v1.10.1
+	github.com/onsi/gomega v1.10.4
 	github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 // indirect
 	github.com/square/certstrap v1.2.0 // indirect
 	github.com/stretchr/testify v1.5.1 // indirect
 	github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc // indirect
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 )