From 3cd3c98e08869d63909d91ee5d42b56d7ffb3172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Titsworth-Morin?= Date: Mon, 20 Jul 2026 07:34:24 +0000 Subject: [PATCH 1/2] fix(mastra): use portable model aliases --- samples/mastra-extended/compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/mastra-extended/compose.yaml b/samples/mastra-extended/compose.yaml index d5f248d55..757d41321 100644 --- a/samples/mastra-extended/compose.yaml +++ b/samples/mastra-extended/compose.yaml @@ -107,6 +107,6 @@ services: models: chat: - model: ai/chat-default + model: chat-default embedding: - model: ai/embedding-default + model: embedding-default From 1c63954d8155051b369e773676a8aa5bc7573ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lio=E6=9D=8E=E6=AD=90?= Date: Mon, 20 Jul 2026 13:29:44 +0000 Subject: [PATCH 2/2] fix(testing): bump compose-go to v2.7.1 for service-level models binding The Deploy Changed Samples CI tool (tools/testing) loads each sample's compose.yaml via compose-go purely to enumerate empty-valued env vars (config names) before deploying. It pinned compose-go v2.6.5, whose schema does not recognize the modern service-level `models:` binding (endpoint_var/model_var). This caused mastra-extended to fail at pre-flight config load with: validating .../mastra-extended/compose.yaml: services.app additional properties 'models' not allowed before `defang compose up` ever ran. v2.7.1 is the minimal version that accepts the long-form service `models:` binding (v2.7.0 accepts the short form only). No `go` directive change and no transitive dependency changes (v2.7.1 has an identical go.mod to v2.6.5). Precedent: 64e746eb bumped compose-go for the `provider` field. Co-Authored-By: Claude Opus 4.8 --- tools/testing/go.mod | 2 +- tools/testing/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/go.mod b/tools/testing/go.mod index 52e3b758d..50224bd51 100644 --- a/tools/testing/go.mod +++ b/tools/testing/go.mod @@ -8,7 +8,7 @@ replace github.com/DefangLabs/defang-mvp/fabric v0.0.0 => ../../fabric require ( github.com/DefangLabs/defang/src v0.0.0-20241029000357-13e464478c8d - github.com/compose-spec/compose-go/v2 v2.6.5 + github.com/compose-spec/compose-go/v2 v2.7.1 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/spf13/pflag v1.0.5 ) diff --git a/tools/testing/go.sum b/tools/testing/go.sum index 46daec9f4..7e964c60c 100644 --- a/tools/testing/go.sum +++ b/tools/testing/go.sum @@ -4,8 +4,8 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/bufbuild/connect-go v1.10.0 h1:QAJ3G9A1OYQW2Jbk3DeoJbkCxuKArrvZgDt47mjdTbg= github.com/bufbuild/connect-go v1.10.0/go.mod h1:CAIePUgkDR5pAFaylSMtNK45ANQjp9JvpluG20rhpV8= -github.com/compose-spec/compose-go/v2 v2.6.5 h1:H7xP5OMKdkN2p0brx01slxIU6dE/q6ybbG+jozPtIqk= -github.com/compose-spec/compose-go/v2 v2.6.5/go.mod h1:TmjkIB9W73fwVxkYY+u2uhMbMUakjiif79DlYgXsyvU= +github.com/compose-spec/compose-go/v2 v2.7.1 h1:EUIbuaD0R/J1KA+FbJMNbcS9+jt/CVudbp5iHqUllSs= +github.com/compose-spec/compose-go/v2 v2.7.1/go.mod h1:TmjkIB9W73fwVxkYY+u2uhMbMUakjiif79DlYgXsyvU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=