From ad8f7a568187b4b8f8afde9be90770af6899aac1 Mon Sep 17 00:00:00 2001 From: Devashishbasu Date: Thu, 18 Jan 2024 09:36:56 +0530 Subject: [PATCH] updating changes --- .../eclipse/jkube/kit/config/image/ImageName.java | 12 +++++------- .../image/ImageNameDistributionReferenceTest.java | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/jkube-kit/config/image/src/main/java/org/eclipse/jkube/kit/config/image/ImageName.java b/jkube-kit/config/image/src/main/java/org/eclipse/jkube/kit/config/image/ImageName.java index c9aa1c16d5..8d0d810651 100644 --- a/jkube-kit/config/image/src/main/java/org/eclipse/jkube/kit/config/image/ImageName.java +++ b/jkube-kit/config/image/src/main/java/org/eclipse/jkube/kit/config/image/ImageName.java @@ -292,13 +292,11 @@ private void doValidate() { checks[i], value, checkPattern.pattern())); } } - - // Additional validation for repository length - if (repository != null) { - int repositoryLength = repository.length(); - if (repositoryLength > 255) { - errors.add(String.format("Repository name '%s' has a length of %d characters, which exceeds the maximum of 255 characters.", repository, repositoryLength)); - } + // Additional validation for total image name length + String fullNameWithoutTagAndDigest = getNameWithoutTag(null); + int fullNameLength = fullNameWithoutTagAndDigest.length(); + if (fullNameLength > 255) { + errors.add(String.format("Total image name '%s' has a length of %d characters, which exceeds the maximum of 255 characters.", fullNameWithoutTagAndDigest, fullNameLength)); } if (!errors.isEmpty()) { diff --git a/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameDistributionReferenceTest.java b/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameDistributionReferenceTest.java index 30f5851d18..5cf329116b 100644 --- a/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameDistributionReferenceTest.java +++ b/jkube-kit/config/image/src/test/java/org/eclipse/jkube/kit/config/image/ImageNameDistributionReferenceTest.java @@ -95,7 +95,7 @@ void validNames(String name) { ":justtag", "@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a:tag", // https://github.com/eclipse/jkube/issues/2542 - //"repo@sha256:ffffffffffffffffffffffffffffffffff", // https://github.com/eclipse/jkube/issues/2543 + "repo@sha256:ffffffffffffffffffffffffffffffffff", // https://github.com/eclipse/jkube/issues/2543 "validname@invaliddigest:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "Uppercase:tag", "test:5000/Uppercase/lowercase:tag",