Skip to content

Commit daad504

Browse files
authored
Merge pull request #4737 from laureanobrs/laureanobrs-cherry-pick-4712
Cherry Pick #4712,#4671 To Release 26
2 parents b9b0671 + e684c54 commit daad504

8 files changed

Lines changed: 41 additions & 36 deletions

File tree

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828

2929
steps:
3030
- name: Checkout repository
31-
uses: actions/checkout@v6
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3232
- name: Setup Java
33-
uses: actions/setup-java@v5
33+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
3434
with:
3535
distribution: 'temurin'
3636
java-version: 17.0.x
3737
# Initializes the CodeQL tools for scanning.
3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@v4
39+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4
4040
with:
4141
languages: ${{ matrix.language }}
4242

@@ -46,4 +46,4 @@ jobs:
4646
run: ./mvnw clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Dspotbugs.skip -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true
4747

4848
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@v4
49+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4

‎.github/workflows/generate-crd.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v6
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3232
- name: Run CRD Model Generation
3333
run: |
3434
read CRD_SRC_ARGS < <(echo '${{ github.event.inputs.crds }}' | perl -ne 'print join " ", map {"-u $_"} split /,/')
@@ -48,7 +48,7 @@ jobs:
4848
-p ${{ github.event.inputs.generatingJavaPackage }} \
4949
-o "$(pwd)/${GEN_DIR}"
5050
ls -lh ${GEN_DIR}
51-
- uses: actions/upload-artifact@v7
51+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
5252
with:
5353
name: generated-java-crd-model
5454
path: |

‎.github/workflows/generate.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- name: Checkout Java
38-
uses: actions/checkout@v6
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3939
with:
4040
token: ${{ secrets.PAT_TOKEN }}
4141
- name: Setup Java
42-
uses: actions/setup-java@v5
42+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
4343
with:
4444
distribution: 'temurin'
4545
java-version: 17.0.x
4646
- name: Checkout Gen
47-
uses: actions/checkout@v6
47+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4848
with:
4949
path: gen
5050
repository: kubernetes-client/gen
@@ -124,7 +124,7 @@ jobs:
124124
git push origin "$BRANCH"
125125
- name: Pull Request
126126
if: ${{ github.event.inputs.dry_run != 'true' }}
127-
uses: repo-sync/pull-request@v2
127+
uses: repo-sync/pull-request@7e79a9f5dc3ad0ce53138f01df2fad14a04831c5 # v2
128128
with:
129129
source_branch: ${{ env.BRANCH }}
130130
destination_branch: ${{ github.ref_name }}

‎.github/workflows/maven.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: Verify Source Format
1616
steps:
17-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1818
- name: Setup Java
19-
uses: actions/setup-java@v5
19+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
2020
with:
2121
distribution: 'temurin'
2222
java-version: 17
@@ -30,14 +30,14 @@ jobs:
3030
os: [ macos-latest, windows-latest, ubuntu-latest ]
3131
runs-on: ${{ matrix.os }}
3232
steps:
33-
- uses: actions/checkout@v6
33+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3434
- name: Setup Java
35-
uses: actions/setup-java@v5
35+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
3636
with:
3737
distribution: 'temurin'
3838
java-version: ${{ matrix.java }}
3939
- name: Cache local Maven repository
40-
uses: actions/cache@v5
40+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
4141
with:
4242
path: ~/.m2/repository
4343
key: ${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('pom.xml', '**/pom.xml') }}
@@ -55,8 +55,8 @@ jobs:
5555
runs-on: ubuntu-latest
5656
name: GraalVM Maven Test
5757
steps:
58-
- uses: actions/checkout@v6
59-
- uses: graalvm/setup-graalvm@v1
58+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
59+
- uses: graalvm/setup-graalvm@03e8abf916fd0e281b2efe7b2da3378bb0a1d085 # v1
6060
with:
6161
version: '22.3.0'
6262
java-version: '17'
@@ -67,11 +67,11 @@ jobs:
6767
runs-on: ubuntu-latest
6868
name: End-to-End Test Against Real Cluster
6969
steps:
70-
- uses: actions/checkout@v6
70+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
7171
- name: Create k8s Kind Cluster
72-
uses: helm/kind-action@v1.14.0
72+
uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0
7373
- name: Setup Java
74-
uses: actions/setup-java@v5
74+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
7575
with:
7676
distribution: 'temurin'
7777
java-version: 17.0.x
@@ -92,14 +92,14 @@ jobs:
9292
runs-on: ubuntu-latest
9393
name: Examples smoke test
9494
steps:
95-
- uses: actions/checkout@v6
95+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
9696
- name: Setup Java
97-
uses: actions/setup-java@v5
97+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
9898
with:
9999
distribution: 'temurin'
100100
java-version: 17.0.x
101101
- name: Cache local Maven repository
102-
uses: actions/cache@v5
102+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
103103
with:
104104
path: ~/.m2/repository
105105
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -142,9 +142,9 @@ jobs:
142142
- 5000:5000
143143
name: CRD Java Models Code Generation
144144
steps:
145-
- uses: actions/checkout@v6
145+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
146146
- name: Publish to Registry
147-
uses: elgohr/Publish-Docker-Github-Action@v5
147+
uses: elgohr/Publish-Docker-Github-Action@1c2f28ccd9476e8a936ac9a1f287405504c93304 # v5
148148
with:
149149
name: kubernetes-client/java/crd-model-gen
150150
tags: gh-action-tmp

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
echo "${{ github.event.inputs.releaseVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+$/'
2828
echo "${{ github.event.inputs.nextDevelopmentVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+-SNAPSHOT$/'
2929
- name: Checkout
30-
uses: actions/checkout@v6
30+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3131
with:
3232
token: ${{ secrets.PAT_TOKEN }}
3333
- name: Check Actor
3434
run: |
3535
# Release actor should be in the OWNER list
3636
cat OWNERS | grep ${{ github.actor }}
3737
- name: Setup Java
38-
uses: actions/setup-java@v5
38+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
3939
with:
4040
distribution: 'temurin'
4141
java-version: 17.0.x

‎.github/workflows/snapshot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1919
- name: Setup Java
20-
uses: actions/setup-java@v5
20+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: 17.0.x

‎kubernetes/.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
matrix:
2020
java: [ 17, 21 ]
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2323
- name: Set up JDK
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
2525
with:
2626
java-version: ${{ matrix.java }}
2727
distribution: 'temurin'

‎util/src/main/java/io/kubernetes/client/util/ModelMapper.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.net.JarURLConnection;
2727
import java.net.URI;
2828
import java.net.URL;
29-
import java.net.URLDecoder;
30-
import java.nio.charset.StandardCharsets;
3129
import java.time.Duration;
3230
import java.util.ArrayList;
3331
import java.util.Enumeration;
@@ -493,16 +491,23 @@ private static List<String> getClassNamesFromPackage(ClassLoader classLoader, St
493491
}
494492

495493
private static void processJarPackage(URL packageURL, String packageName, String pkg, ArrayList<String> names) throws IOException {
496-
String jarFileName = URLDecoder.decode(packageURL.getFile(), StandardCharsets.UTF_8);
494+
String jarFileName = packageURL.getFile();
497495
JarFile jf = null;
498496
// jar: client in repository; nested: client in a fat jar
499497
if (jarFileName.startsWith("jar:") || jarFileName.startsWith("nested:")) {
500498
jf = ((JarURLConnection) packageURL.openConnection()).getJarFile();
501499
}
502500
// file: client is a file in target (unit test)
503501
if (jarFileName.startsWith("file:") ) {
504-
jarFileName = jarFileName.substring(5, jarFileName.indexOf("!"));
505-
jf = new JarFile(jarFileName);
502+
int bangIndex = jarFileName.indexOf("!");
503+
if (bangIndex < 0) {
504+
logger.error("Loading classes from jar with error packageURL: {}", jarFileName);
505+
return;
506+
}
507+
// Use URI.create to properly decode percent-encoded characters without converting + to space
508+
// (URLDecoder.decode incorrectly converts + to space, breaking paths that contain literal +)
509+
String filePart = jarFileName.substring(0, bangIndex);
510+
jf = new JarFile(URI.create(filePart).getPath());
506511
}
507512
if (jf == null) {
508513
logger.error("Loading classes from jar with error packageURL: {}", jarFileName);

0 commit comments

Comments
 (0)