Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions cmd/dependabot/internal/cmd/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,27 @@ func NewGraphCommand() *cobra.Command {
}

if err := infra.Run(infra.RunParams{
CacheDir: flags.cache,
CollectorConfigPath: flags.collectorConfigPath,
CollectorImage: collectorImage,
Creds: input.Credentials,
Debug: flags.debugging,
Flamegraph: flags.flamegraph,
Expected: nil, // graph subcommand doesn't use expectations
ExtraHosts: flags.extraHosts,
InputName: flags.file,
Job: &input.Job,
LocalDir: flags.local,
Output: flags.output,
ProxyCertPath: flags.proxyCertPath,
ProxyImage: proxyImage,
PullImages: flags.pullImages,
Timeout: flags.timeout,
UpdaterImage: updaterImage,
Volumes: flags.volumes,
Writer: writer,
ApiUrl: flags.apiUrl,
CacheDir: flags.cache,
CollectorConfigPath: flags.collectorConfigPath,
CollectorImage: collectorImage,
Creds: input.Credentials,
Debug: flags.debugging,
Flamegraph: flags.flamegraph,
Expected: nil, // graph subcommand doesn't use expectations
ExtraHosts: flags.extraHosts,
InputName: flags.file,
Job: &input.Job,
LocalDir: flags.local,
Output: flags.output,
ProxyCertPath: flags.proxyCertPath,
ProxyImage: proxyImage,
PullImages: flags.pullImages,
Timeout: flags.timeout,
UpdaterImage: updaterImage,
Volumes: flags.volumes,
Writer: writer,
ApiUrl: flags.apiUrl,
UpdaterEnvironmentVariables: flags.updaterEnvironmentVariables,
}); err != nil {
if errors.Is(err, context.DeadlineExceeded) {
log.Fatalf("update timed out after %s", flags.timeout)
Expand Down Expand Up @@ -122,6 +123,7 @@ func NewGraphCommand() *cobra.Command {
cmd.Flags().DurationVarP(&flags.timeout, "timeout", "t", 0, "max time to run an update")
cmd.Flags().IntVar(&flags.inputServerPort, "input-port", 0, "port to use for securely passing input to the updater")
cmd.Flags().StringVarP(&flags.apiUrl, "api-url", "a", "", "the api dependabot should connect to.")
cmd.Flags().StringArrayVarP(&flags.updaterEnvironmentVariables, "updater-env", "e", nil, "additional environment variables to set in the update container")

return cmd
}
39 changes: 20 additions & 19 deletions cmd/dependabot/internal/cmd/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,26 @@ func NewTestCommand() *cobra.Command {
processInput(&smokeTest.Input, nil)

if err := executeTestJob(infra.RunParams{
CacheDir: flags.cache,
CollectorConfigPath: flags.collectorConfigPath,
CollectorImage: collectorImage,
Creds: smokeTest.Input.Credentials,
Debug: flags.debugging,
Expected: smokeTest.Output,
ExtraHosts: flags.extraHosts,
InputName: flags.file,
InputRaw: inputRaw,
Job: &smokeTest.Input.Job,
LocalDir: flags.local,
Output: flags.output,
ProxyCertPath: flags.proxyCertPath,
ProxyImage: proxyImage,
PullImages: flags.pullImages,
StorageImage: storageImage,
Timeout: flags.timeout,
UpdaterImage: updaterImage,
Volumes: flags.volumes,
CacheDir: flags.cache,
CollectorConfigPath: flags.collectorConfigPath,
CollectorImage: collectorImage,
Creds: smokeTest.Input.Credentials,
Debug: flags.debugging,
Expected: smokeTest.Output,
ExtraHosts: flags.extraHosts,
InputName: flags.file,
InputRaw: inputRaw,
Job: &smokeTest.Input.Job,
LocalDir: flags.local,
Output: flags.output,
ProxyCertPath: flags.proxyCertPath,
ProxyImage: proxyImage,
PullImages: flags.pullImages,
StorageImage: storageImage,
Timeout: flags.timeout,
UpdaterImage: updaterImage,
Volumes: flags.volumes,
UpdaterEnvironmentVariables: flags.updaterEnvironmentVariables,
}); err != nil {
log.Fatal(err)
}
Expand Down