ref: check bucket before delete and populate

mattermost · Apr 11, 2024 · 5ae9c7e · 5ae9c7e
1 parent f79d11a
commit 5ae9c7e
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/comparison/loadtest.go b/comparison/loadtest.go
@@ -313,20 +313,23 @@ func initLoadTest(t *terraform.Terraform, buildCfg BuildConfig, dumpFilename str
 	defer resetBucketCancel()
 	resetBucketErrCh := make(chan error, 1)
 	go func() {
-		mlog.Info("Emptying S3 bucket")
+		if s3BucketURI != "" && tfOutput.HasS3Bucket() {
 
-		err := emptyBucket(resetBucketCtx, &bucket, tfOutput.S3Bucket.Id)
-		if err != nil {
-			resetBucketErrCh <- fmt.Errorf("failed to empty s3 bucket: %w", err)
-			return
-		}
+			mlog.Info("Emptying S3 bucket")
 
-		mlog.Info("Pre-populating S3 bucket")
-		srcBucketName := strings.TrimPrefix(s3BucketURI, "s3://")
-		err = populateBucket(resetBucketCtx, &bucket, tfOutput.S3Bucket.Id, srcBucketName)
-		if err != nil {
-			resetBucketErrCh <- fmt.Errorf("failed to populate bucket: %w", err)
-			return
+			err := emptyBucket(resetBucketCtx, &bucket, tfOutput.S3Bucket.Id)
+			if err != nil {
+				resetBucketErrCh <- fmt.Errorf("failed to empty s3 bucket: %w", err)
+				return
+			}
+
+			mlog.Info("Pre-populating S3 bucket")
+			srcBucketName := strings.TrimPrefix(s3BucketURI, "s3://")
+			err = populateBucket(resetBucketCtx, &bucket, tfOutput.S3Bucket.Id, srcBucketName)
+			if err != nil {
+				resetBucketErrCh <- fmt.Errorf("failed to populate bucket: %w", err)
+				return
+			}
 		}
 
 		resetBucketErrCh <- nil