tiltfile: compose projects should default to COMPOSE_PROFILES env var (…

…#6264) fixes #6250 Signed-off-by: Nick Santos <[email protected]>
tilt-dev · Nov 23, 2023 · 764a80b · 764a80b
1 parent 11c084c
commit 764a80b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/internal/tiltfile/docker_compose.go b/internal/tiltfile/docker_compose.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/compose-spec/compose-go/consts"
 	"github.com/compose-spec/compose-go/loader"
 	"github.com/compose-spec/compose-go/types"
 	"github.com/distribution/reference"
@@ -26,6 +27,7 @@ import (
 	"github.com/tilt-dev/tilt/internal/tiltfile/starkit"
 	"github.com/tilt-dev/tilt/internal/tiltfile/value"
 	"github.com/tilt-dev/tilt/pkg/apis/core/v1alpha1"
+	"github.com/tilt-dev/tilt/pkg/logger"
 	"github.com/tilt-dev/tilt/pkg/model"
 )
 
@@ -147,6 +149,12 @@ func (s *tiltfileState) dockerCompose(thread *starlark.Thread, fn *starlark.Buil
 		project.ProjectPath = filepath.Dir(currentTiltfilePath)
 	}
 
+	if !profiles.IsSet && os.Getenv(consts.ComposeProfiles) != "" {
+		logger.Get(s.ctx).Infof("Compose project %q loading profiles from environment: %s",
+			project.Name, os.Getenv(consts.ComposeProfiles))
+		project.Profiles = strings.Split(os.Getenv(consts.ComposeProfiles), ",")
+	}
+
 	dc := s.dc[project.Name]
 	if dc == nil {
 		dc = &dcResourceSet{

diff --git a/internal/tiltfile/tiltfile_docker_compose_test.go b/internal/tiltfile/tiltfile_docker_compose_test.go
@@ -707,6 +707,23 @@ dc_resource('bar')
 		f.assertNoMoreManifests()
 	})
 
+	t.Run("include specified profile from env var", func(t *testing.T) {
+		f := newFixture(t)
+		t.Setenv("COMPOSE_PROFILES", "barprofile")
+
+		f.setupFoo()
+		f.file("docker-compose.yml", twoServiceConfigWithProfiles)
+		f.file("Tiltfile", `docker_compose('docker-compose.yml')
+dc_resource('foo')
+dc_resource('bar')
+`)
+		f.load()
+
+		_ = f.assertNextManifest("foo")
+		_ = f.assertNextManifest("bar")
+		f.assertNoMoreManifests()
+	})
+
 	t.Run("must include profile to have resource", func(t *testing.T) {
 		f := newFixture(t)
 

diff --git a/internal/tiltfile/value/string.go b/internal/tiltfile/value/string.go
@@ -72,6 +72,7 @@ func (s *StringList) Unpack(v starlark.Value) error {
 
 type StringOrStringList struct {
 	Values []string
+	IsSet  bool
 }
 
 var _ starlark.Unpacker = &StringOrStringList{}
@@ -87,6 +88,7 @@ func (s *StringOrStringList) Unpack(v starlark.Value) error {
 	vs, ok := AsString(v)
 	if ok {
 		s.Values = []string{vs}
+		s.IsSet = true
 		return nil
 	}
 
@@ -112,5 +114,6 @@ func (s *StringOrStringList) Unpack(v starlark.Value) error {
 		s.Values = append(s.Values, sv)
 	}
 
+	s.IsSet = true
 	return nil
 }