Skip to content

Commit bbeebf7

Browse files
committed
fix: update formae version and fix version pattern matching
- Update PklProject files to use formae@0.77.15-internal - Fix sed pattern in run-conformance-tests.sh to handle versions with suffixes like -internal (was [0-9.]*, now [0-9a-zA-Z.\-]*) - Update plugin-conformance-tests to v0.1.2 (adds discoverable check)
1 parent a627e76 commit bbeebf7

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ require (
1010
github.com/aws/aws-sdk-go-v2/service/iam v1.47.3
1111
github.com/aws/aws-sdk-go-v2/service/route53 v1.49.1
1212
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.36.1
13-
github.com/aws/aws-sdk-go-v2/service/ssm v1.67.8
1413
github.com/aws/smithy-go v1.24.0
1514
github.com/google/uuid v1.6.0
1615
github.com/platform-engineering-labs/formae/pkg/model v0.0.0-20260120041653-c26026025caf
17-
github.com/platform-engineering-labs/formae/pkg/plugin v0.1.0
18-
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.0
16+
github.com/platform-engineering-labs/formae/pkg/plugin v0.1.1
17+
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.2
1918
github.com/stretchr/testify v1.11.1
2019
)
2120

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.49.1 h1:krDhGq5RpSgpfPB9riTYLLSo
3434
github.com/aws/aws-sdk-go-v2/service/route53 v1.49.1/go.mod h1:kGYOjvTa0Vw0qxrqrOLut1vMnui6qLxqv/SX3vYeM8Y=
3535
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.36.1 h1:fnOIjzwTVrtVnkRef3Qs+uTr3qYKwXuFom5pqdZERNQ=
3636
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.36.1/go.mod h1:/19D53IxSX9W8uu5bo0t89oCLncvNP68V1KiRthhLd4=
37-
github.com/aws/aws-sdk-go-v2/service/ssm v1.67.8 h1:31Llf5VfrZ78YvYs7sWcS7L2m3waikzRc6q1nYenVS4=
38-
github.com/aws/aws-sdk-go-v2/service/ssm v1.67.8/go.mod h1:/jgaDlU1UImoxTxhRNxXHvBAPqPZQ8oCjcPbbkR6kac=
3937
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8=
4038
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
4139
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako=
@@ -78,10 +76,12 @@ github.com/platform-engineering-labs/formae/pkg/api/model v0.0.0-20260120041653-
7876
github.com/platform-engineering-labs/formae/pkg/api/model v0.0.0-20260120041653-c26026025caf/go.mod h1:0ncHFCsGA6b0w1kBm6m+QwJ823qAY2vL47GvoR0BTyU=
7977
github.com/platform-engineering-labs/formae/pkg/model v0.0.0-20260120041653-c26026025caf h1:JPJvm6WFnIUtWf/1P9JAahmX494vmicLYgKG0VuIul0=
8078
github.com/platform-engineering-labs/formae/pkg/model v0.0.0-20260120041653-c26026025caf/go.mod h1:XmGJA7jNPX9cEGc8TxTiEDitBuEVJOddNakdTZ/bH4U=
81-
github.com/platform-engineering-labs/formae/pkg/plugin v0.1.0 h1:hTaSy84Pwru8J2stKMDW2ibCBaesuC2C32FAGrJVua8=
82-
github.com/platform-engineering-labs/formae/pkg/plugin v0.1.0/go.mod h1:8natf83aLhyYS6gPH3ExpIo+F72TjLZTXNDpxDfUpz8=
83-
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.0 h1:T1mLTegcMtXRn5Ac5jMQjoADOH8pvmBX6nfU8uLkCSw=
84-
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.0/go.mod h1:j68ZmEj4u8gMKPPjfUItQO7MqfkD49lVaz2BfnPFa14=
79+
github.com/platform-engineering-labs/formae/pkg/plugin v0.1.1 h1:c4w0nStzh1l7Bw30zBRZZAbXe3MKunb6rLqlC4P9AAE=
80+
github.com/platform-engineering-labs/formae/pkg/plugin v0.1.1/go.mod h1:8natf83aLhyYS6gPH3ExpIo+F72TjLZTXNDpxDfUpz8=
81+
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.1 h1:oe4eo8C+XzX81giCIR35BIyFcJAHSNVTbtu1l22CQAQ=
82+
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.1/go.mod h1:j68ZmEj4u8gMKPPjfUItQO7MqfkD49lVaz2BfnPFa14=
83+
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.2 h1:1doUJBVhLiamXjaLy8b6DACmEs/M+nDOq4kXU5glbbM=
84+
github.com/platform-engineering-labs/formae/pkg/plugin-conformance-tests v0.1.2/go.mod h1:j68ZmEj4u8gMKPPjfUItQO7MqfkD49lVaz2BfnPFa14=
8585
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8686
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
8787
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

schema/pkl/PklProject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ amends "pkl:Project"
22

33
dependencies {
44
["formae"] {
5-
uri = "package://hub.platform.engineering/plugins/pkl/schema/pkl/formae/formae@0.76.5"
5+
uri = "package://hub.platform.engineering/plugins/pkl/schema/pkl/formae/formae@0.77.15-internal"
66
}
77
}
88

scripts/run-conformance-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ if [[ "${VERSION}" != "latest" ]]; then
122122
# Update schema/pkl/PklProject (plugin schema depends on formae)
123123
if [[ -f "${PROJECT_ROOT}/schema/pkl/PklProject" ]]; then
124124
echo "Updating schema/pkl/PklProject to use formae@${VERSION}..."
125-
sed_inplace "s|formae/formae@[0-9.]*\"|formae/formae@${VERSION}\"|g" "${PROJECT_ROOT}/schema/pkl/PklProject"
125+
sed_inplace "s|formae/formae@[0-9a-zA-Z.\-]*\"|formae/formae@${VERSION}\"|g" "${PROJECT_ROOT}/schema/pkl/PklProject"
126126
fi
127127

128128
# Update testdata/PklProject (test files depend on formae)
129129
if [[ -f "${PROJECT_ROOT}/testdata/PklProject" ]]; then
130130
echo "Updating testdata/PklProject to use formae@${VERSION}..."
131-
sed_inplace "s|formae/formae@[0-9.]*\"|formae/formae@${VERSION}\"|g" "${PROJECT_ROOT}/testdata/PklProject"
131+
sed_inplace "s|formae/formae@[0-9a-zA-Z.\-]*\"|formae/formae@${VERSION}\"|g" "${PROJECT_ROOT}/testdata/PklProject"
132132
fi
133133
fi
134134

testdata/PklProject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ dependencies {
66

77
// Formae schema - fetched from public registry
88
["formae"] {
9-
uri = "package://hub.platform.engineering/plugins/pkl/schema/pkl/formae/formae@0.76.5"
9+
uri = "package://hub.platform.engineering/plugins/pkl/schema/pkl/formae/formae@0.77.15-internal"
1010
}
1111
}

0 commit comments

Comments
 (0)