Merge pull request #224 from laurazard/fix_cast_interpolation_units

Author: ndeloof

.gitignore

@@ -1,2 +1,3 @@
 ### IDEs ###
 .idea/*
+.vscode/*

loader/interpolate.go

@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	interp "github.com/compose-spec/compose-go/interpolation"
-	"github.com/compose-spec/compose-go/types"
 	"github.com/pkg/errors"
 )
 
@@ -94,19 +93,11 @@ func toInt64(value string) (interface{}, error) {
 }
 
 func toUnitBytes(value string) (interface{}, error) {
-	i, err := strconv.ParseInt(value, 10, 64)
-	if err != nil {
-		return nil, err
-	}
-	return types.UnitBytes(i), nil
+	return transformSize(value)
 }
 
 func toDuration(value string) (interface{}, error) {
-	i, err := strconv.ParseInt(value, 10, 64)
-	if err != nil {
-		return nil, err
-	}
-	return types.Duration(i), nil
+	return transformStringToDuration(value)
 }
 
 func toFloat(value string) (interface{}, error) {

loader/loader.go

@@ -1045,6 +1045,8 @@ var transformStringToDuration TransformerFunc = func(value interface{}) (interfa
 			return value, err
 		}
 		return types.Duration(d), nil
+	case types.Duration:
+		return value, nil
 	default:
 		return value, errors.Errorf("invalid type %T for duration", value)
 	}

loader/loader_test.go

@@ -601,7 +601,8 @@ services:
         soft: $theint
     privileged: $thebool
     read_only: $thebool
-    shm_size: 2gb
+    shm_size: ${thesize}
+    stop_grace_period: ${theduration}
     stdin_open: ${thebool}
     tty: $thebool
     volumes:
@@ -628,9 +629,11 @@ networks:
   back:
 `
 	env := map[string]string{
-		"theint":   "555",
-		"thefloat": "3.14",
-		"thebool":  "true",
+		"theint":      "555",
+		"thefloat":    "3.14",
+		"thebool":     "true",
+		"theduration": "60s",
+		"thesize":     "2gb",
 	}
 
 	config, err := Load(buildConfigDetails(dict, env), func(options *Options) {
@@ -641,9 +644,12 @@ networks:
 
 	workingDir, err := os.Getwd()
 	assert.NilError(t, err)
+	duration, err := time.ParseDuration("60s")
+	assert.NilError(t, err)
+	typesDuration := types.Duration(duration)
 	expected := &types.Project{
 		Name:        "",
-		Environment: map[string]string{"thebool": "true", "thefloat": "3.14", "theint": "555"},
+		Environment: env,
 		WorkingDir:  workingDir,
 		Services: []types.ServiceConfig{
 			{
@@ -690,12 +696,13 @@ networks:
 					"nproc":  {Single: 555},
 					"nofile": {Hard: 555, Soft: 555},
 				},
-				Privileged: true,
-				ReadOnly:   true,
-				Scale:      1,
-				ShmSize:    types.UnitBytes(2 * 1024 * 1024 * 1024),
-				StdinOpen:  true,
-				Tty:        true,
+				Privileged:      true,
+				ReadOnly:        true,
+				Scale:           1,
+				ShmSize:         types.UnitBytes(2 * 1024 * 1024 * 1024),
+				StopGracePeriod: &typesDuration,
+				StdinOpen:       true,
+				Tty:             true,
 				Volumes: []types.ServiceVolumeConfig{
 					{
 						Source:   "data",