TW-85243: S3 Storage new UI: unnecessary patch is generated after sav…

…ing S3 settings using UI after TeamCity update

fix: review comments

fix: TW-85243 S3 Storage new UI: unnecessary patch is generated after saving S3 settings using UI after TeamCity update


Merge-request: TC-MR-8722
Merged-by: Andrei Efimov <Andrei.Efimov@jetbrains.com>

s3-artifact-storage-server/kotlin-dsl/S3CommonSettings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dsl-add-on kind="projectFeature">
   <extends>
-    <dsl type="storage_settings" applicable="params['storage.type'] == 'S3_storage'" />
     <dsl type="storage_settings" applicable="params['storage.type'] == 'S3_storage_compatible'" />
   </extends>
   <params>

s3-artifact-storage-server/kotlin-dsl/S3StorageSettings.xml

@@ -23,11 +23,49 @@
   </function>
 
   <params>
+    <param name="storage.name" dslName="storageName">
+      <description>
+        Storage name
+      </description>
+    </param>
+    <param name="storage.s3.bucket.name" dslName="bucketName" mandatory="true">
+      <description>
+        Bucket name
+      </description>
+    </param>
+    <param name="storage.s3.bucket.prefix" dslName="bucketPrefix">
+      <description>
+        Bucket path prefix
+      </description>
+    </param>
+    <param name="storage.s3.upload.presignedUrl.enabled" dslName="enablePresignedURLUpload" type="boolean" trueValue="true" falseValue="">
+      <description>
+        Whether to use Pre-Signed URLs to upload
+      </description>
+    </param>
+    <param name="storage.s3.forceVirtualHostAddressing" dslName="forceVirtualHostAddressing" type="boolean">
+      <description>
+        Whether to force Virtual Host Addressing
+      </description>
+    </param>
     <param name="storage.s3.accelerateModeEnabled" dslName="enableTransferAcceleration" type="boolean">
       <description>
         Whether to enable Transfer Acceleration
       </description>
     </param>
+    <param name="storage.s3.upload.multipart_threshold" dslName="multipartThreshold">
+      <description>
+        Initiates multipart upload for files larger than the specified value.
+        Minimum value is 5MB. Allowed suffixes: KB, MB, GB, TB.
+        Leave empty to use the default value.
+      </description>
+    </param>
+    <param name="storage.s3.upload.multipart_chunksize" dslName="multipartChunksize">
+      <description>
+        Specify the maximum allowed part size. Minimum value is 5MB.
+        Allowed suffixes: KB, MB, GB, TB. Leave empty to use the default value.
+      </description>
+    </param>
     <param name="storage.s3.cloudfront.enabled" dslName="cloudFrontEnabled" type="boolean" trueValue="true" falseValue="">
       <description>
         Whether to use CloudFront for artifact transport
@@ -53,6 +91,11 @@
         Private key that corresponds to chosen public key
       </description>
     </param>
+    <param name="storage.s3.verifyIntegrityAfterUpload" dslName="verifyIntegrityAfterUpload" type="boolean">
+      <description>
+        Whether to verify integrity of artifacts after upload
+      </description>
+    </param>
   </params>
 
   <examples>