From fe6cb80d7bc5a586cf6baf9e62ac249cea311ce5 Mon Sep 17 00:00:00 2001 From: Daniel Garnier-Moiroux Date: Fri, 17 Oct 2025 15:16:10 +0200 Subject: [PATCH 1/2] load-test project --- .../cloudfoundry/reactor/util/Operator.java | 4 + loadtest/.gitattributes | 2 + loadtest/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + loadtest/mvnw | 295 ++++++++++++++++++ loadtest/mvnw.cmd | 189 +++++++++++ loadtest/pom.xml | 53 ++++ .../cf/loadtest/LoadtestApplication.java | 228 ++++++++++++++ .../src/main/resources/application.properties | 2 + .../cf/loadtest/LoadtestApplicationTests.java | 14 + pom.xml | 38 ++- 11 files changed, 858 insertions(+), 3 deletions(-) create mode 100644 loadtest/.gitattributes create mode 100644 loadtest/.gitignore create mode 100644 loadtest/.mvn/wrapper/maven-wrapper.properties create mode 100755 loadtest/mvnw create mode 100644 loadtest/mvnw.cmd create mode 100644 loadtest/pom.xml create mode 100644 loadtest/src/main/java/wf/garnier/cf/loadtest/LoadtestApplication.java create mode 100644 loadtest/src/main/resources/application.properties create mode 100644 loadtest/src/test/java/wf/garnier/cf/loadtest/LoadtestApplicationTests.java diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java index bc06912326..7acb0801c2 100644 --- a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java +++ b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java @@ -34,6 +34,8 @@ import org.cloudfoundry.reactor.HttpClientResponseWithConnection; import org.cloudfoundry.reactor.HttpClientResponseWithParsedBody; import org.reactivestreams.Publisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.util.UriComponentsBuilder; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -50,6 +52,7 @@ public class Operator extends OperatorContextAware { + private static final Logger log = LoggerFactory.getLogger(Operator.class); private final HttpClient httpClient; public Operator(OperatorContext context, HttpClient httpClient) { @@ -316,6 +319,7 @@ private Flux invalidateToken( return inbound.doOnNext( response -> { if (isUnauthorized(response)) { + log.info("āœ‹ UNAUTHORIZED {}", response.getResponse().requestHeaders()); this.context .getTokenProvider() .ifPresent( diff --git a/loadtest/.gitattributes b/loadtest/.gitattributes new file mode 100644 index 0000000000..3b41682ac5 --- /dev/null +++ b/loadtest/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/loadtest/.gitignore b/loadtest/.gitignore new file mode 100644 index 0000000000..667aaef0c8 --- /dev/null +++ b/loadtest/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/loadtest/.mvn/wrapper/maven-wrapper.properties b/loadtest/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..c0bcafe984 --- /dev/null +++ b/loadtest/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/loadtest/mvnw b/loadtest/mvnw new file mode 100755 index 0000000000..bd8896bf22 --- /dev/null +++ b/loadtest/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/loadtest/mvnw.cmd b/loadtest/mvnw.cmd new file mode 100644 index 0000000000..92450f9327 --- /dev/null +++ b/loadtest/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/loadtest/pom.xml b/loadtest/pom.xml new file mode 100644 index 0000000000..2ba8474ddc --- /dev/null +++ b/loadtest/pom.xml @@ -0,0 +1,53 @@ + + + + org.cloudfoundry + cloudfoundry-java-client + 5.15.0.BUILD-SNAPSHOT + + 4.0.0 + wf.garnier.cf + loadtest + 0.0.1-SNAPSHOT + loadtest + loadtest + + 17 + + + + org.springframework.boot + spring-boot-starter + + + org.cloudfoundry + cloudfoundry-client-reactor + 5.15.0.BUILD-SNAPSHOT + + + org.cloudfoundry + cloudfoundry-operations + 5.15.0.BUILD-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + false + + + + + + diff --git a/loadtest/src/main/java/wf/garnier/cf/loadtest/LoadtestApplication.java b/loadtest/src/main/java/wf/garnier/cf/loadtest/LoadtestApplication.java new file mode 100644 index 0000000000..16cd05a86a --- /dev/null +++ b/loadtest/src/main/java/wf/garnier/cf/loadtest/LoadtestApplication.java @@ -0,0 +1,228 @@ +package wf.garnier.cf.loadtest; + +import java.time.Duration; +import java.time.Instant; +import java.util.List; +import java.util.stream.IntStream; + +import org.cloudfoundry.client.CloudFoundryClient; +import org.cloudfoundry.client.v2.info.GetInfoRequest; +import org.cloudfoundry.client.v3.Relationship; +import org.cloudfoundry.client.v3.ToOneRelationship; +import org.cloudfoundry.client.v3.organizations.CreateOrganizationRequest; +import org.cloudfoundry.client.v3.organizations.CreateOrganizationResponse; +import org.cloudfoundry.client.v3.organizations.DeleteOrganizationRequest; +import org.cloudfoundry.client.v3.organizations.ListOrganizationsRequest; +import org.cloudfoundry.client.v3.spaces.CreateSpaceRequest; +import org.cloudfoundry.client.v3.spaces.ListSpacesRequest; +import org.cloudfoundry.client.v3.spaces.ListSpacesResponse; +import org.cloudfoundry.client.v3.spaces.SpaceRelationships; +import org.cloudfoundry.client.v3.spaces.SpaceResource; +import org.cloudfoundry.operations.CloudFoundryOperations; +import org.cloudfoundry.operations.DefaultCloudFoundryOperations; +import org.cloudfoundry.reactor.ConnectionContext; +import org.cloudfoundry.reactor.DefaultConnectionContext; +import org.cloudfoundry.reactor.ProxyConfiguration; +import org.cloudfoundry.reactor.client.ReactorCloudFoundryClient; +import org.cloudfoundry.reactor.tokenprovider.ClientCredentialsGrantTokenProvider; +import org.cloudfoundry.reactor.tokenprovider.PasswordGrantTokenProvider; +import org.cloudfoundry.reactor.uaa.ReactorUaaClient; +import org.cloudfoundry.uaa.identityzones.ListIdentityZonesRequest; +import org.cloudfoundry.util.PaginationUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.util.StringUtils; + +@SpringBootApplication(proxyBeanMethods = true) +public class LoadtestApplication { + + private static final String ORG_PREFIX = "test-load-"; + + public static void main(String[] args) { + SpringApplication.run(LoadtestApplication.class, args); + } + + private final Logger logger = LoggerFactory.getLogger("load-test"); + + @Bean + DefaultConnectionContext connectionContext( + @Value("${test.apiHost}") String apiHost, + @Value("${test.proxy.host:}") String proxyHost, + @Value("${test.proxy.password:}") String proxyPassword, + @Value("${test.proxy.port:8080}") Integer proxyPort, + @Value("${test.proxy.username:}") String proxyUsername, + @Value("${test.skipSslValidation:false}") Boolean skipSslValidation) { + + DefaultConnectionContext.Builder connectionContext = + DefaultConnectionContext.builder() + .apiHost(apiHost) + .skipSslValidation(skipSslValidation) + .sslHandshakeTimeout(Duration.ofSeconds(30)); + + if (StringUtils.hasText(proxyHost)) { + ProxyConfiguration.Builder proxyConfiguration = + ProxyConfiguration.builder().host(proxyHost).port(proxyPort); + + if (StringUtils.hasText(proxyUsername)) { + proxyConfiguration.password(proxyPassword).username(proxyUsername); + } + + connectionContext.proxyConfiguration(proxyConfiguration.build()); + } + + return connectionContext.build(); + } + + + @Bean + ReactorCloudFoundryClient cfClient( + ConnectionContext connectionContext, + @Value("${test.admin.password}") String password, + @Value("${test.admin.username}") String username) { + return ReactorCloudFoundryClient.builder() + .connectionContext(connectionContext) + .tokenProvider( + PasswordGrantTokenProvider.builder() + .password(password) + .username(username) + .build()) + .build(); + } + + @Bean + CloudFoundryOperations cfOps(CloudFoundryClient cfClient) { + return DefaultCloudFoundryOperations.builder() + .cloudFoundryClient(cfClient) + .build(); + } + + @Bean + @Qualifier("admin") + ReactorUaaClient adminUaaClient( + ConnectionContext connectionContext, + @Value("${test.admin.clientId}") String clientId, + @Value("${test.admin.clientSecret}") String clientSecret) { + return ReactorUaaClient.builder() + .connectionContext(connectionContext) + .tokenProvider( + ClientCredentialsGrantTokenProvider.builder() + .clientId(clientId) + .clientSecret(clientSecret) + .build()) + .build(); + } + + @Bean + ApplicationRunner appRunner(CloudFoundryClient client, CloudFoundryOperations ops, ReactorUaaClient uaaClient) { + return args -> { + // Ensure that refresh tokens are revocable and do rotate (eyeballing it) + var identityZones = uaaClient.identityZones().list(ListIdentityZonesRequest.builder().build()).block().getIdentityZones(); + System.out.println(identityZones); + + System.out.println("šŸ‘‹ hiiiii\n\n"); + System.out.println(client.info().get(GetInfoRequest.builder().build()).block()); + System.out.println("\n\nšŸ‘‹ hooo\n\n"); + var deletedOrgs = cleanOrgs(client).count().block(); + System.out.printf("Deleted %s orgs.%n%n", deletedOrgs); + // Delete is not fully synchronous / consistent, so we wait for a bit + for (int i = 0; i < 5; i++) { + Thread.sleep(1000); + + Long remainingOrgs = countMatchingOrgs(ops).block(); + System.out.printf("Waiting for org deletion... %s remaining.%n", remainingOrgs); + if (remainingOrgs == 0) break; + } + var createdOrgs = seedOrgs(client).collectList().block(); + System.out.println(createdOrgs); + + var startTime = Instant.now(); + var waitDuration = Duration.ofMinutes(5).plusSeconds(10); + var cutoffTime = startTime.plus(waitDuration); + + while (Instant.now().isBefore(cutoffTime)) { + System.out.printf("Waiting for token to expire, %s left%n", Duration.between(Instant.now(), cutoffTime)); + Thread.sleep(10_000); + } + + var spaces = listSpaces(client, createdOrgs).collectList().block(); + System.out.println(spaces); + System.out.printf("Deleted %s orgs.%n%n", deletedOrgs); + }; + } + + static Flux listSpaces(CloudFoundryClient client, List orgIds) { + return Flux.fromIterable(orgIds) + .flatMap(id -> client.spacesV3().list(ListSpacesRequest.builder() + .organizationIds(id) + .build()) + ) + .flatMapIterable(ListSpacesResponse::getResources) + .map(SpaceResource::getName); + } + + static Flux cleanOrgs(CloudFoundryClient client) { + return PaginationUtils.requestClientV3Resources(page -> client.organizationsV3() + .list( + ListOrganizationsRequest.builder() + .page(page) + .build() + )) + .filter(org -> org.getName().startsWith(ORG_PREFIX)) + .doOnNext(r -> System.out.printf("Deleting ... %s%n", r.getName())) + .flatMap(o -> + client.organizationsV3().delete( + DeleteOrganizationRequest.builder() + .organizationId(o.getId()) + .build() + ) + .doOnNext(r -> System.out.printf("Deleted org %s%n", o.getName())) + ) + .switchIfEmpty(Mono.just("No orgs found, no deletion required")); + } + + static Mono countMatchingOrgs(CloudFoundryOperations ops) { + return ops.organizations() + .list() + .filter(o -> o.getName().startsWith(ORG_PREFIX)) + .count(); + } + + + static Flux seedOrgs(CloudFoundryClient client) { + return Flux.fromStream(IntStream.range(1, 21).boxed()) + .flatMap(i -> client.organizationsV3().create( + CreateOrganizationRequest.builder() + .name(ORG_PREFIX + i) + .build() + )) + .doOnNext(o -> System.out.printf("Created org: %s%n", o.getName())) + // + .flatMap(o -> client.spacesV3().create( + CreateSpaceRequest.builder() + .relationships( + SpaceRelationships.builder() + .organization(ToOneRelationship.builder() + .data(Relationship.builder().id(o.getId()).build()) + .build() + ) + .build() + ) + .name("space-" + o.getName()) + .build() + ) + .doOnNext(s -> System.out.printf(" Created space %s%n", s.getName())) + .then(Mono.just(o)) + ) + .map(CreateOrganizationResponse::getId); + } + +} diff --git a/loadtest/src/main/resources/application.properties b/loadtest/src/main/resources/application.properties new file mode 100644 index 0000000000..c357770e92 --- /dev/null +++ b/loadtest/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.application.name=loadtest +logging.level.cloudfoundry-client.token=DEBUG \ No newline at end of file diff --git a/loadtest/src/test/java/wf/garnier/cf/loadtest/LoadtestApplicationTests.java b/loadtest/src/test/java/wf/garnier/cf/loadtest/LoadtestApplicationTests.java new file mode 100644 index 0000000000..353bc50908 --- /dev/null +++ b/loadtest/src/test/java/wf/garnier/cf/loadtest/LoadtestApplicationTests.java @@ -0,0 +1,14 @@ +package wf.garnier.cf.loadtest; + +import org.junit.jupiter.api.Test; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class LoadtestApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/pom.xml b/pom.xml index e8bd2cb83a..6d51c676fd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ ~ limitations under the License. --> - + 4.0.0 @@ -240,7 +241,8 @@ {{ARTIFACTORY_USERNAME}} {{ARTIFACTORY_PASSWORD}} {{ARTIFACTORY_REPO_KEY|"libs-release-local"}} - {{ARTIFACTORY_SNAPSHOT_REPO_KEY|"libs-snapshot-local"}} + {{ARTIFACTORY_SNAPSHOT_REPO_KEY|"libs-snapshot-local"}} + *-tests.jar @@ -282,7 +284,7 @@ true false - + @@ -301,6 +303,36 @@ + + load-test + + loadtest + + + 17 + 3.2.1 + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${dependencies.version} + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + integration-test From e30ff2ff0b9f3f6e86e182edbe8be9463a80e194 Mon Sep 17 00:00:00 2001 From: Daniel Garnier-Moiroux Date: Mon, 20 Oct 2025 21:55:36 +0200 Subject: [PATCH 2/2] Do not reuse the same refresh token multiple times --- .../AbstractUaaTokenProvider.java | 64 +++++++++++-------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/AbstractUaaTokenProvider.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/AbstractUaaTokenProvider.java index 09c23487c0..6cfc85a486 100644 --- a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/AbstractUaaTokenProvider.java +++ b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/tokenprovider/AbstractUaaTokenProvider.java @@ -80,7 +80,7 @@ public abstract class AbstractUaaTokenProvider implements TokenProvider { private final ConcurrentMap refreshTokenStreams = new ConcurrentHashMap<>(1); - private final ConcurrentMap> refreshTokens = + private final ConcurrentMap refreshTokens = new ConcurrentHashMap<>(1); /** @@ -116,7 +116,10 @@ public final Mono getToken(ConnectionContext connectionContext) { @Override public void invalidate(ConnectionContext connectionContext) { - this.accessTokens.put(connectionContext, token(connectionContext)); + String refreshToken = this.refreshTokens.remove(connectionContext); + if (refreshToken != null) { + this.accessTokens.put(connectionContext, token(connectionContext, refreshToken)); + } } /** @@ -133,6 +136,30 @@ public void invalidate(ConnectionContext connectionContext) { */ abstract void tokenRequestTransformer(HttpClientRequest request, HttpClientForm form); + private Mono token(ConnectionContext connectionContext) { + Mono token = + primaryToken(connectionContext) + .doOnSubscribe(s -> LOGGER.debug("Negotiating using token provider")); + + return cacheResult(connectionContext, token); + } + + private Mono token(ConnectionContext connectionContext, String refreshToken) { + Mono token = + refreshToken(connectionContext, refreshToken) + .doOnSubscribe(s -> LOGGER.debug("Negotiating using refresh token")) + // fall back to primary token in case the refresh_token grant fails + // (expired, revoked, ...) + .switchIfEmpty( + primaryToken(connectionContext) + .doOnSubscribe( + s -> + LOGGER.debug( + "Falling back to token provider"))); + + return cacheResult(connectionContext, token); + } + private static String extractAccessToken(Map payload) { String accessToken = payload.get(ACCESS_TOKEN); @@ -227,8 +254,7 @@ private Consumer> extractRefreshToken(ConnectionContext conn }); } - this.refreshTokens.put( - connectionContext, Mono.just(refreshToken)); + this.refreshTokens.put(connectionContext, refreshToken); getRefreshTokenStream(connectionContext) .sink .emitNext(refreshToken, FAIL_FAST); @@ -297,30 +323,16 @@ private void setAuthorization(HttpHeaders headers) { headers.set(AUTHORIZATION, String.format("Basic %s", encoded)); } - private Mono token(ConnectionContext connectionContext) { - Mono cached = - this.refreshTokens - .getOrDefault(connectionContext, Mono.empty()) - .flatMap( - refreshToken -> - refreshToken(connectionContext, refreshToken) - .doOnSubscribe( - s -> - LOGGER.debug( - "Negotiating using refresh" - + " token"))) - .switchIfEmpty( - primaryToken(connectionContext) - .doOnSubscribe( - s -> - LOGGER.debug( - "Negotiating using token" - + " provider"))); - + /** + * Cache the given mono. If {@link ConnectionContext#getCacheDuration()} is not null, use that + * as the cache TTL. Otherwise, cache indefinitely. + */ + private static Mono cacheResult( + ConnectionContext connectionContext, Mono token) { return connectionContext .getCacheDuration() - .map(cached::cache) - .orElseGet(cached::cache) + .map(token::cache) + .orElseGet(token::cache) .checkpoint(); }