fix: only use repo mode in cache probe mode

Author: mafredri

envbuilder.go

@@ -861,61 +861,30 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
 
 	buildTimeWorkspaceFolder := opts.WorkspaceFolder
 	var fallbackErr error
-	var cloned bool
-	if opts.GitURL != "" {
-		cloneOpts, err := git.CloneOptionsFromOptions(opts)
-		if err != nil {
-			return nil, fmt.Errorf("git clone options: %w", err)
-		}
-
-		endStage := startStage("📦 Cloning %s to %s...",
-			newColor(color.FgCyan).Sprintf(opts.GitURL),
-			newColor(color.FgCyan).Sprintf(cloneOpts.Path),
-		)
-
-		w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
-		defer w.Close()
-		cloneOpts.Progress = w
 
-		cloned, fallbackErr = git.CloneRepo(ctx, cloneOpts)
-		if fallbackErr == nil {
-			if cloned {
-				endStage("📦 Cloned repository!")
-			} else {
-				endStage("📦 The repository already exists!")
-			}
-		} else {
-			opts.Logger(log.LevelError, "Failed to clone repository: %s", fallbackErr.Error())
-			opts.Logger(log.LevelError, "Falling back to the default image...")
-		}
-
-		// Always clone the repo in remote repo build mode into a location that
-		// we control that isn't affected by the users changes.
-		if opts.RemoteRepoBuildMode {
-			cloneOpts, err := git.CloneOptionsFromOptions(opts)
-			if err != nil {
-				return nil, fmt.Errorf("git clone options: %w", err)
-			}
-			cloneOpts.Path = constants.MagicRemoteRepoDir
+	// Cache probing only supports repo mode.
+	cloneOpts, err := git.CloneOptionsFromOptions(opts)
+	if err != nil {
+		return nil, fmt.Errorf("git clone options: %w", err)
+	}
+	cloneOpts.Path = constants.MagicRemoteRepoDir
 
-			endStage := startStage("📦 Remote repo build mode enabled, cloning %s to %s for build context...",
-				newColor(color.FgCyan).Sprintf(opts.GitURL),
-				newColor(color.FgCyan).Sprintf(cloneOpts.Path),
-			)
+	endStage := startStage("📦 Remote repo build mode enabled, cloning %s to %s for build context...",
+		newColor(color.FgCyan).Sprintf(opts.GitURL),
+		newColor(color.FgCyan).Sprintf(cloneOpts.Path),
+	)
 
-			w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
-			defer w.Close()
-			cloneOpts.Progress = w
+	w := git.ProgressWriter(func(line string) { opts.Logger(log.LevelInfo, "#%d: %s", stageNumber, line) })
+	defer w.Close()
+	cloneOpts.Progress = w
 
-			fallbackErr = git.ShallowCloneRepo(ctx, cloneOpts)
-			if fallbackErr == nil {
-				endStage("📦 Cloned repository!")
-				buildTimeWorkspaceFolder = cloneOpts.Path
-			} else {
-				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", err.Error())
-				opts.Logger(log.LevelError, "Falling back to the default image...")
-			}
-		}
+	fallbackErr = git.ShallowCloneRepo(ctx, cloneOpts)
+	if fallbackErr == nil {
+		endStage("📦 Cloned repository!")
+		buildTimeWorkspaceFolder = cloneOpts.Path
+	} else {
+		opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", err.Error())
+		opts.Logger(log.LevelError, "Falling back to the default image...")
 	}
 
 	defaultBuildParams := func() (*devcontainer.Compiled, error) {