add storage-image command line option and script test

Author: brettfo

cmd/dependabot/internal/cmd/root.go

@@ -31,6 +31,7 @@ var (
 	updaterImage   string
 	proxyImage     string
 	collectorImage string
+	storageImage   string
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -59,4 +60,5 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&updaterImage, "updater-image", "", "container image to use for the updater")
 	rootCmd.PersistentFlags().StringVar(&proxyImage, "proxy-image", infra.ProxyImageName, "container image to use for the proxy")
 	rootCmd.PersistentFlags().StringVar(&collectorImage, "collector-image", infra.CollectorImageName, "container image to use for the OpenTelemetry collector")
+	rootCmd.PersistentFlags().StringVar(&storageImage, "storage-image", infra.StorageImageName, "container image to use for the storage service")
 }

cmd/dependabot/internal/cmd/test.go

@@ -50,6 +50,7 @@ func NewTestCommand() *cobra.Command {
 				ProxyCertPath:       flags.proxyCertPath,
 				ProxyImage:          proxyImage,
 				PullImages:          flags.pullImages,
+				StorageImage:        storageImage,
 				Timeout:             flags.timeout,
 				UpdaterImage:        updaterImage,
 				Volumes:             flags.volumes,

cmd/dependabot/internal/cmd/update.go

@@ -96,6 +96,7 @@ func NewUpdateCommand() *cobra.Command {
 				ProxyCertPath:       flags.proxyCertPath,
 				ProxyImage:          proxyImage,
 				PullImages:          flags.pullImages,
+				StorageImage:        storageImage,
 				Timeout:             flags.timeout,
 				UpdaterImage:        updaterImage,
 				Volumes:             flags.volumes,

internal/infra/run.go

@@ -68,6 +68,8 @@ type RunParams struct {
 	CollectorImage string
 	// CollectorConfigPath is the path to the OpenTelemetry collector configuration file
 	CollectorConfigPath string
+	// StorageImage is the image to use for the storage service
+	StorageImage string
 	// Writer is where API calls will be written to
 	Writer    io.Writer
 	InputName string
@@ -369,6 +371,11 @@ func runContainers(ctx context.Context, params RunParams) (err error) {
 		if err != nil {
 			return err
 		}
+
+		err = pullImage(ctx, cli, params.StorageImage)
+		if err != nil {
+			return err
+		}
 	}
 
 	networks, err := NewNetworks(ctx, cli)

internal/infra/updater.go

@@ -43,7 +43,7 @@ const (
 	caseInsensitiveContainerRoot    = "/nocase"
 	caseInsensitiveRepoContentsPath = "/nocase/repo"
 
-	storageImageName = "ghcr.io/dependabot/dependabot-storage"
+	StorageImageName = "ghcr.io/dependabot/dependabot-storage"
 	storageUser      = "dpduser"
 	storagePass      = "dpdpass"
 )
@@ -102,7 +102,7 @@ func NewUpdater(ctx context.Context, cli *client.Client, net *Networks, params *
 	storageContainerID := ""
 	storageVolumes := []string{}
 	if params.Job.UseCaseInsensitiveFileSystem() {
-		storageContainerID, storageVolumes, err = createStorageVolumes(hostCfg, ctx, cli, net)
+		storageContainerID, storageVolumes, err = createStorageVolumes(hostCfg, ctx, cli, net, params.StorageImage)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create storage volumes: %w", err)
 		}
@@ -141,7 +141,7 @@ func NewUpdater(ctx context.Context, cli *client.Client, net *Networks, params *
 	return updater, nil
 }
 
-func createStorageVolumes(hostCfg *container.HostConfig, ctx context.Context, cli *client.Client, net *Networks) (storageContainerID string, volumeNames []string, err error) {
+func createStorageVolumes(hostCfg *container.HostConfig, ctx context.Context, cli *client.Client, net *Networks, storageImageName string) (storageContainerID string, volumeNames []string, err error) {
 	log.Printf("Preparing case insensitive filesystem")
 
 	// create container hosting the storage

testdata/scripts/smb-mount.txt

@@ -0,0 +1,46 @@
+# Build the dummy Dockerfile
+exec docker build -qt dummy-nocase-updater .
+
+# Run the dependabot command
+dependabot update -f job.yml --updater-image dummy-nocase-updater
+
+# assert the dummy is working
+stderr 'case-insensitive value is set'
+
+exec docker rmi -f dummy-nocase-updater
+
+-- Dockerfile --
+FROM ubuntu:22.04
+
+RUN useradd dependabot
+
+COPY --chown=dependabot --chmod=755 update-ca-certificates /usr/bin/update-ca-certificates
+COPY --chown=dependabot --chmod=755 run bin/run
+
+-- update-ca-certificates --
+#!/usr/bin/env bash
+
+echo "Updated those certificates for ya"
+
+-- run --
+#!/usr/bin/env bash
+
+if [ "$1" = "fetch_files" ]; then
+  exit 0
+fi
+
+if [ "$DEPENDABOT_CASE_INSENSITIVE_REPO_CONTENTS_PATH" != "" ]; then
+  echo "case-insensitive value is set"
+else
+  echo "case-insensitive value is not set"
+fi
+
+-- job.yml --
+job:
+  experiments:
+    use_case_insensitive_filesystem: true
+  source:
+    provider: github
+    repo: test/repo
+    directory: /
+  package-manager: nuget