some small refactoring

Author: ycohen278

cli_tools/common/utils/storage/scratch_bucket_creator.go

@@ -128,7 +128,7 @@ func (c *ScratchBucketCreator) getBucketAttrsOnFallbackZone(project string, fall
 
 func (c *ScratchBucketCreator) createBucketIfNotExisting(project string,
 	bucketAttrs *storage.BucketAttrs) (string, error) {
-
+	bucketLocation := bucketAttrs.Location
 	foundBucketAttrs, err := c.getBucketAttrsIfInProject(project, bucketAttrs.Name)
 	if err != nil {
 		return "", err
@@ -139,15 +139,16 @@ func (c *ScratchBucketCreator) createBucketIfNotExisting(project string,
 		if err := c.StorageClient.CreateBucket(bucketAttrs.Name, project, bucketAttrs); err != nil {
 			return "", err
 		}
+	} else {
+		bucketLocation = foundBucketAttrs.Location
 	}
+
 	log.Printf("Updating soft delete property of scratch bucket `%v` in %v region", bucketAttrs.Name, bucketAttrs.Location)
 	if err = c.removeSoftDeleteFromBucket(bucketAttrs.Name); err != nil {
 		return "", err
 	}
-	if foundBucketAttrs != nil {
-		return foundBucketAttrs.Location, nil
-	}
-	return bucketAttrs.Location, nil
+
+	return bucketLocation, nil
 }
 
 func (c *ScratchBucketCreator) removeSoftDeleteFromBucket(bucketName string) error {