prefer TrimPrefix to checking HasPrefix first

hashicorp · Jan 22, 2021 · a26e83e · a26e83e
1 parent 1c5a5cd
commit a26e83e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/drivers/docker/config.go b/drivers/docker/config.go
@@ -662,10 +662,7 @@ func (d *Driver) SetConfig(c *base.Config) error {
 	}
 
 	d.config = &config
-	// Remove any http
-	if strings.HasPrefix(d.config.InfraImage, "https://") {
-		d.config.InfraImage = strings.Replace(d.config.InfraImage, "https://", "", 1)
-	}
+	d.config.InfraImage = strings.TrimPrefix(d.config.InfraImage, "https://")
 
 	if len(d.config.GC.ImageDelay) > 0 {
 		dur, err := time.ParseDuration(d.config.GC.ImageDelay)

diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go
@@ -251,10 +251,7 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
 		return nil, nil, fmt.Errorf("image name required for docker driver")
 	}
 
-	// Remove any http
-	if strings.HasPrefix(driverConfig.Image, "https://") {
-		driverConfig.Image = strings.Replace(driverConfig.Image, "https://", "", 1)
-	}
+	driverConfig.Image = strings.TrimPrefix(driverConfig.Image, "https://")
 
 	handle := drivers.NewTaskHandle(taskHandleVersion)
 	handle.Config = cfg