Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions e2e/tests/up-docker-compose/host_requirements.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//go:build linux || darwin || unix

package up

import (
"context"
"encoding/json"
"os"
"path/filepath"
"strings"

"github.com/devsy-org/devsy/e2e/framework"
"github.com/devsy-org/devsy/pkg/devcontainer/config"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
)

var _ = ginkgo.Describe(
"testing up docker-compose command host requirements warnings",
ginkgo.Label("up-docker-compose-host-requirements"),
func() {
var btc *baseTestContext

ginkgo.BeforeEach(func(ctx context.Context) {
var err error
btc = &baseTestContext{}
btc.initialDir, err = os.Getwd()
framework.ExpectNoError(err)

btc.f, err = setupDockerProvider(
filepath.Join(btc.initialDir, "bin"), "docker",
)
framework.ExpectNoError(err)
})

ginkgo.It("surfaces hostRequirements warnings in JSON envelope", func(ctx context.Context) {
tempDir, err := setupWorkspace(
"tests/up-docker-compose/testdata/compose-host-requirements",
btc.initialDir,
btc.f,
)
framework.ExpectNoError(err)

stdout, _, err := btc.f.DevsyUpStreams(ctx, tempDir)
framework.ExpectNoError(err)

lines := strings.Split(strings.TrimSpace(stdout), "\n")
gomega.Expect(lines).NotTo(gomega.BeEmpty())

lastLine := lines[len(lines)-1]
var envelope config.ResultEnvelope
err = json.Unmarshal([]byte(lastLine), &envelope)
framework.ExpectNoError(err)

gomega.Expect(envelope.Outcome).To(gomega.Equal("success"))
gomega.Expect(envelope.Warnings).NotTo(gomega.BeEmpty())

found := false
for _, w := range envelope.Warnings {
if strings.Contains(w, "cpus:") {
found = true
break
}
}
gomega.Expect(found).To(gomega.BeTrue(),
"expected a cpus warning in %v", envelope.Warnings)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
},
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "ComposeHostRequirements",
"dockerComposeFile": "./docker-compose.yaml",
"service": "app",
"workspaceFolder": "/workspaces",
"hostRequirements": {
"cpus": 128
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: '3'

services:
app:
image: ghcr.io/devsy-org/test-images/go:1
command: sleep infinity
volumes:
- .:/workspaces:cached
9 changes: 8 additions & 1 deletion pkg/devcontainer/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,20 @@ func (r *runner) runDockerCompose(
composeAlias := project.Name
mergedConfig.RemoteEnv["COMPOSE_PROJECT_NAME"] = &composeAlias

// setup container
// validate host requirements (advisory only — warnings never block creation)
hostWarnings := config.ValidateHostRequirements(
parsedConfig.Config.HostRequirements,
config.SystemHostInfo{},
substitutionContext.LocalWorkspaceFolder,
)

return r.setupContainer(ctx, &setupContainerParams{
rawConfig: parsedConfig.Raw,
containerDetails: containerDetails,
mergedConfig: mergedConfig,
substitutionContext: substitutionContext,
timeout: timeout,
hostWarnings: hostWarnings,
})
}

Expand Down
Loading