Fix comments from vankata and kris

cloudfoundry · Oct 30, 2024 · e9061c1 · e9061c1
1 parent 1319b66
commit e9061c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...troller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java b/...troller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java
@@ -711,6 +711,7 @@ public class Messages {
     public static final String ERROR_WAITING_FOR_OPERATION_TO_FINISH = "Error waiting for operation to finish";
     public static final String OPERATION_OF_SERVICE_BINDING_OR_KEY_IS_IN_PROGRESS = "Operation of service binding or key is in progress";
     public static final String ARCHIVE_WAS_NOT_SPLIT_TOTAL_SIZE_IN_BYTES_0 = "Archive was not split! Total size in bytes: {0}";
+    public static final String SIZE_OF_MTAR_IS_AND_SIZE_OF_EXTENSION_DESCRIPTOR_ID = "Size of mtars is {0} and size of extension descriptors is {1}";
     public static final String ARCHIVE_IS_SPLIT_TO_0_PARTS_TOTAL_SIZE_IN_BYTES_1_UPLOADING = "Archive was split to: {0} parts. Total size in bytes: {1}. Uploading started...";
     public static final String SIZE_OF_APP_0_IS_1_BYTES = "Size of app {0} is {1} bytes";
     public static final String SHOULD_UPDATE_SERVICE_KEY = "Service keys should be updated";

diff --git a/...ava/org/cloudfoundry/multiapps/controller/process/steps/ValidateDeployParametersStep.java b/...ava/org/cloudfoundry/multiapps/controller/process/steps/ValidateDeployParametersStep.java
@@ -61,13 +61,13 @@ protected String getStepErrorMessage(ProcessContext context) {
     private void validateParameters(ProcessContext context) {
         List<FileEntry> extensionDescriptors = validateExtensionDescriptorFileIds(context);
         List<FileEntry> archivePartEntries = getArchivePartEntries(context);
+        validateFilesSizeLimit(context, archivePartEntries, extensionDescriptors);
 
-        if (archivePartEntries.size() > 1) {
-            validateFilesSizeLimit(context, archivePartEntries, extensionDescriptors);
-            mergeArchive(context, archivePartEntries);
-        } else {
+        if (archivePartEntries.size() == 1) {
             getStepLogger().infoWithoutProgressMessage(Messages.ARCHIVE_WAS_NOT_SPLIT_TOTAL_SIZE_IN_BYTES_0, archivePartEntries.get(0)
                                                                                                                                .getSize());
+        } else {
+            mergeArchive(context, archivePartEntries);
         }
     }
 
@@ -130,8 +130,12 @@ private void checkFileSizeOfAllFiles(ProcessContext context, List<FileEntry> arc
         long sizeOfExtensionDescriptorsEntries = getSizeOfAllFiles(extensionDescriptors);
         long sizeOfAllFileEntries = sizeOfAllArchivePartEntries + sizeOfExtensionDescriptorsEntries;
 
+        getStepLogger().infoWithoutProgressMessage(Messages.SIZE_OF_MTAR_IS_AND_SIZE_OF_EXTENSION_DESCRIPTOR_ID,
+                                                   sizeOfAllArchivePartEntries, sizeOfExtensionDescriptorsEntries);
+
         if (sizeOfAllFileEntries > maxFileSizeLimit) {
             deleteFiles(context, archivePartEntries);
+            deleteFiles(context, extensionDescriptors);
             throw new ContentException(Messages.SIZE_OF_ALL_OPERATIONS_FILES_0_EXCEEDS_MAX_UPLOAD_SIZE_1,
                                        sizeOfAllFileEntries,
                                        maxFileSizeLimit);