From 7098aaf6fc06cfdcfff15eace55566af84328c3a Mon Sep 17 00:00:00 2001 From: MicahKimel Date: Sat, 15 Jun 2024 14:57:26 -0400 Subject: [PATCH] Add test parse env formatted badly with spaces fix container_run.md spacing Signed-off-by: MicahKimel --- docs/reference/commandline/container_run.md | 4 ++-- opts/envfile_test.go | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/reference/commandline/container_run.md b/docs/reference/commandline/container_run.md index 79b557d81d..918d83a32d 100644 --- a/docs/reference/commandline/container_run.md +++ b/docs/reference/commandline/container_run.md @@ -971,7 +971,7 @@ This starts an `ubuntu` container with access to the specified CDI device, - A valid CDI specification (JSON or YAML file) for the requested device is available on the system running the daemon, in one of the configured CDI specification directories. -- The CDI feature has been enabled in the daemon; see [Enable CDI +- The CDI feature has been enabled in the daemon. See [Enable CDI devices](https://docs.docker.com/reference/cli/dockerd/#enable-cdi-devices). ### Attach to STDIN/STDOUT/STDERR (-a, --attach) @@ -1587,4 +1587,4 @@ The `docker run` command is equivalent to the following API calls: - If that call returns a 404 (image not found), and depending on the `--pull` option ("always", "missing", "never") the call can trigger a `docker pull `. - `/containers/create` again after pulling the image. - `/containers/(id)/start` to start the container. -- `/containers/(id)/attach` to attach to the container when starting with the `-it` flags for interactive containers. +- `/containers/(id)/attach` to attach to the container when starting with the `-it` flags for interactive containers. \ No newline at end of file diff --git a/opts/envfile_test.go b/opts/envfile_test.go index be97373fcb..262eb7e793 100644 --- a/opts/envfile_test.go +++ b/opts/envfile_test.go @@ -87,6 +87,25 @@ func TestParseEnvFileNonExistentFile(t *testing.T) { } } +// Test TestParseEnvFile for a badly formatted header +func TestParseEnvFileFormattedWithSpace(t *testing.T) { + content := ` + [config 1] + foo=bar + f=quux +` + tmpFile := tmpFileWithContent(t, content) + + _, err := ParseEnvFile(tmpFile) + if _, ok := err.(ErrBadKey); !ok { + t.Fatalf("Expected an ErrBadKey, got [%v]", err) + } + expectedMessage := "poorly formatted environment: variable '[config 1]' contains whitespaces" + if err.Error() != expectedMessage { + t.Fatalf("Expected [%v], got [%v]", expectedMessage, err.Error()) + } +} + // Test ParseEnvFile for a badly formatted file func TestParseEnvFileBadlyFormattedFile(t *testing.T) { content := `foo=bar