Update bucket attributes in order to disable soft delete

Author: ycohen278

cli_tools/common/utils/storage/scratch_bucket_creator.go

@@ -77,14 +77,15 @@ func (c *ScratchBucketCreator) getBucketAttrs(fileGcsPath string, project string
 		// if file is not provided, fallback to input / default zone.
 		bucketAttrs, err = c.getBucketAttrsOnFallbackZone(project, fallbackZone)
 	}
-
-	if err == nil {
-		// Enable Uniform-Bucket-Level-Access by default in image-import/export tools.
-		bucketAttrs.UniformBucketLevelAccess.Enabled = enableUniformBucketLevelAccess
-		// Disable soft delete.
-		bucketAttrs.SoftDeletePolicy = &storage.SoftDeletePolicy{RetentionDuration: 0}
+	if err != nil {
+		return nil, err
 	}
 
+	// Enable Uniform-Bucket-Level-Access by default in image-import/export tools.
+	bucketAttrs.UniformBucketLevelAccess.Enabled = enableUniformBucketLevelAccess
+	// Disable soft delete.
+	bucketAttrs.SoftDeletePolicy = &storage.SoftDeletePolicy{RetentionDuration: 0}
+
 	return bucketAttrs, err
 }