grim/convey

Do not set -e VAR if VAR has no value (explicitly or on host) in run command.
empty-vars
2017-10-12, Eric Fritz
e815cddca2c1
Parents eba0fb6f4af8
Children 14f4be8f0ecfe25d7598fc98
Do not set -e VAR if VAR has no value (explicitly or on host) in run command.
3 files changed, 71 insertions(+), 1 deletions(-)
  • +1 -1
    docker/run.go
  • +38 -0
    environment/prune.go
  • +32 -0
    environment/prune_test.go
    • --- a/docker/run.go Wed Oct 11 09:22:28 2017 -0500
    +++ b/docker/run.go Thu Oct 12 13:21:31 2017 -0500
    @@ -231,7 +231,7 @@
    "CPUShares": st.CPUShares,
    "Detach": r.Detach,
    "Hostname": hostname,
    - "Environment": fullEnv,
    + "Environment": environment.Prune(fullEnv),
    "EntryPoint": entryPoint,
    "GID": user.Gid,
    "HealthCheck": r.HealthCheck,
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/environment/prune.go Thu Oct 12 13:21:31 2017 -0500
    @@ -0,0 +1,38 @@
    +/*
    + * Convey
    + * Copyright 2016-2017 Gary Kramlich <grim@reaperworld.com>
    + *
    + * This program is free software: you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License as published by
    + * the Free Software Foundation, either version 3 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    + */
    +package environment
    +
    +import (
    + "os"
    +)
    +
    +// Prune removes all empty-value variables from the environment.
    +func Prune(env []string) []string {
    + pruned := []string{}
    +
    + for _, val := range env {
    + k, v := splitEqual(val)
    + if v == "" && os.Getenv(k) == "" {
    + continue
    + }
    +
    + pruned = append(pruned, val)
    + }
    +
    + return pruned
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/environment/prune_test.go Thu Oct 12 13:21:31 2017 -0500
    @@ -0,0 +1,32 @@
    +/*
    + * Convey
    + * Copyright 2016-2017 Gary Kramlich <grim@reaperworld.com>
    + *
    + * This program is free software: you can redistribute it and/or modify
    + * it under the terms of the GNU General Public License as published by
    + * the Free Software Foundation, either version 3 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program. If not, see <http://www.gnu.org/licenses/>.
    + */
    +package environment
    +
    +import (
    + "os"
    +
    + "github.com/aphistic/sweet"
    + . "github.com/onsi/gomega"
    +)
    +
    +func (e *environmentSuite) TestPrune(t sweet.T) {
    + os.Clearenv()
    + os.Setenv("BONK", "not-empty")
    +
    + Expect(Prune([]string{"FOO=bar", "BAZ", "BONK", "QUUX="})).To(Equal([]string{"FOO=bar", "BONK"}))
    +}