fix: TW-83919 S3 Integrity verification: If the "verifyIntegrityAfter…

…Upload" option isn't listed in kotlin DSL file, TC UI considers it as "not enabled" Merge-request: TC-MR-7291 Merged-by: Andrei Efimov <Andrei.Efimov@jetbrains.com>
JetBrains · Oct 13, 2023 · 2c75924 · 2c75924
1 parent 2382482
commit 2c75924
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/...er/src/main/java/jetbrains/buildServer/artifacts/s3/settings/S3CompatibleStorageType.java b/...er/src/main/java/jetbrains/buildServer/artifacts/s3/settings/S3CompatibleStorageType.java
@@ -79,6 +79,7 @@ public Map<String, String> getDefaultParameters() {
     Map<String, String> result = new HashMap<>(AWSCommonParams.getDefaults(myServerSettings.getServerUUID()));
     result.put(AWSCommonParams.REGION_NAME_PARAM, AWSRegions.DEFAULT_REGION);
     result.put(S3Constants.S3_USE_PRE_SIGNED_URL_FOR_UPLOAD, Boolean.toString(true));
+    result.put(S3Constants.S3_VERIFY_INTEGRITY_AFTER_UPLOAD, Boolean.toString(true));
     result.put(AWSCommonParams.ENVIRONMENT_NAME_PARAM, "Custom");
     return result;
   }

diff --git a/...rver/src/main/java/jetbrains/buildServer/artifacts/s3/settings/S3PropertiesProcessor.java b/...rver/src/main/java/jetbrains/buildServer/artifacts/s3/settings/S3PropertiesProcessor.java
@@ -4,7 +4,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import jetbrains.buildServer.artifacts.s3.S3Constants;
 import jetbrains.buildServer.artifacts.s3.S3Util;
 import jetbrains.buildServer.artifacts.s3.cloudfront.CloudFrontConstants;
 import jetbrains.buildServer.clouds.amazon.connector.featureDevelopment.ChosenAwsConnPropertiesProcessor;
@@ -43,10 +42,6 @@ public Collection<InvalidProperty> process(Map<String, String> params) {
       }
     }
 
-    if (StringUtil.isEmptyOrSpaces(params.get(S3Constants.S3_VERIFY_INTEGRITY_AFTER_UPLOAD))) {
-      params.put(S3Constants.S3_VERIFY_INTEGRITY_AFTER_UPLOAD, "false");
-    }
-
     return invalids;
   }
 }
diff --git a/...orage-server/src/main/java/jetbrains/buildServer/artifacts/s3/settings/S3StorageType.java b/...orage-server/src/main/java/jetbrains/buildServer/artifacts/s3/settings/S3StorageType.java
@@ -74,6 +74,7 @@ public String getEditStorageParametersPath() {
   public Map<String, String> getDefaultParameters() {
     Map<String, String> result = new HashMap<>();
     result.put(S3Constants.S3_USE_PRE_SIGNED_URL_FOR_UPLOAD, Boolean.toString(true));
+    result.put(S3Constants.S3_VERIFY_INTEGRITY_AFTER_UPLOAD, Boolean.toString(true));
     result.put(AWSCommonParams.EXTERNAL_ID_PARAM, "TeamCity-server-" + myServerSettings.getServerUUID());
     // Ensures backwards compatibility with old S3 configurations and fixes TW-81457
     result.put(AWSCommonParams.SERVICE_ENDPOINT_PARAM, "");

diff --git a/...t-storage-server/src/main/resources/buildServerResources/s3_storage_settings_react_ui.jsp b/...t-storage-server/src/main/resources/buildServerResources/s3_storage_settings_react_ui.jsp
@@ -129,7 +129,7 @@
 
     usePresignUrlsForUpload: "<bs:forJs>${propertiesBean.properties[params.usePresignUrlsForUpload]}</bs:forJs>" === "true",
     forceVirtualHostAddressing: "<bs:forJs>${propertiesBean.properties[params.forceVirtualHostAddressing]}</bs:forJs>" === "true",
-    verifyIntegrityAfterUpload: "<bs:forJs>${propertiesBean.properties[params.verifyIntegrityAfterUpload]}</bs:forJs>" === "true",
+    verifyIntegrityAfterUpload: "<bs:forJs>${propertiesBean.properties[params.verifyIntegrityAfterUpload]}</bs:forJs>" !== "false",
     transferAccelerationOn: "<bs:forJs>${Boolean.parseBoolean(transferAccelerationOn)}</bs:forJs>" === "true",
     enableAccelerateMode: "<bs:forJs>${propertiesBean.properties[params.enableAccelerateMode]}</bs:forJs>" === "true",
     multipartUploadThreshold: "<bs:forJs>${propertiesBean.properties[params.multipartUploadThreshold]}</bs:forJs>",