import godotenv as a subpackage

Signed-off-by: Nicolas De Loof <[email protected]>

cli/options.go

@@ -24,10 +24,10 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/compose-spec/compose-go/dotenv"
 	"github.com/compose-spec/compose-go/errdefs"
 	"github.com/compose-spec/compose-go/loader"
 	"github.com/compose-spec/compose-go/types"
-	"github.com/compose-spec/godotenv"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -220,7 +220,7 @@ func WithDotEnv(o *ProjectOptions) error {
 	defer file.Close()
 
 	notInEnvSet := make(map[string]interface{})
-	env, err := godotenv.ParseWithLookup(file, func(k string) (string, bool) {
+	env, err := dotenv.ParseWithLookup(file, func(k string) (string, bool) {
 		v, ok := os.LookupEnv(k)
 		if !ok {
 			notInEnvSet[k] = nil

dotenv/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2013 John Barton
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

dotenv/fixtures/equals.env

@@ -0,0 +1,2 @@
+export OPTION_A='postgres://localhost:5432/database?sslmode=disable'
+

dotenv/fixtures/exported.env

@@ -0,0 +1,2 @@
+export OPTION_A=2
+export OPTION_B='\n'

dotenv/fixtures/inherited-multi-var.env

@@ -0,0 +1,3 @@
+foo=bar
+VAR_TO_BE_LOADED_FROM_OS_ENV
+bar=baz

dotenv/fixtures/inherited-not-found.env

@@ -0,0 +1 @@
+VARIABLE_NOT_FOUND

dotenv/fixtures/inherited-single-var.env

@@ -0,0 +1 @@
+VAR_TO_BE_LOADED_FROM_OS_ENV

dotenv/fixtures/invalid1.env

@@ -0,0 +1,2 @@
+INVALID LINE
+foo=bar

dotenv/fixtures/plain.env

@@ -0,0 +1,7 @@
+OPTION_A=1
+OPTION_B=2
+OPTION_C= 3
+OPTION_D =4
+OPTION_E = 5
+OPTION_F = 
+OPTION_G=

dotenv/fixtures/quoted.env

@@ -0,0 +1,14 @@
+OPTION_A='1'
+OPTION_B='2'
+OPTION_C=''
+OPTION_D='\n'
+OPTION_E="1"
+OPTION_F="2"
+OPTION_G=""
+OPTION_H="\n"
+OPTION_I = "echo 'asd'"
+OPTION_J = 'first line
+second line
+third line
+and so on'
+OPTION_Z = "last value"

dotenv/fixtures/substitutions.env

@@ -0,0 +1,5 @@
+OPTION_A=1
+OPTION_B=${OPTION_A}
+OPTION_C=$OPTION_B
+OPTION_D=${OPTION_A}${OPTION_B}
+OPTION_E=${OPTION_NOT_DEFINED}

dotenv/fixtures/unquoted.env

@@ -0,0 +1,5 @@
+OPTION_A = "some quoted phrase"
+OPTION_B=first one with an unquoted phrase
+OPTION_C = then another one with an unquoted phrase
+OPTION_D = then another one with an unquoted phrase special è char
+OPTION_E = "then another one quoted phrase"