Skip to content

Commit 069f53b

Browse files
committed
feat: add PostgREST as a service type (PLAT-499/500/501/502/503)
1 parent 6ee7a84 commit 069f53b

22 files changed

Lines changed: 1014 additions & 133 deletions

api/apiv1/design/database.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const (
99
cpuPattern = `^[0-9]+(\.[0-9]{1,3}|m)?$`
1010
postgresVersionPattern = `^\d{2}\.\d{1,2}$`
1111
spockVersionPattern = `^\d{1}$`
12-
serviceVersionPattern = `^(\d+\.\d+\.\d+|latest)$`
12+
serviceVersionPattern = `^(\d+\.\d+(\.\d+)?|latest)$`
1313
)
1414

1515
var HostIDs = g.ArrayOf(Identifier, func() {
@@ -166,10 +166,10 @@ var ServiceSpec = g.Type("ServiceSpec", func() {
166166
g.Meta("struct:tag:json", "service_type")
167167
})
168168
g.Attribute("version", g.String, func() {
169-
g.Description("The version of the service in semver format (e.g., '1.0.0') or the literal 'latest'.")
169+
g.Description("The version of the service (e.g., '1.0.0', '14.5') or the literal 'latest'.")
170170
g.Pattern(serviceVersionPattern)
171171
g.Example("1.0.0")
172-
g.Example("1.2.3")
172+
g.Example("14.5")
173173
g.Example("latest")
174174
g.Meta("struct:tag:json", "version")
175175
})

api/apiv1/gen/control_plane/service.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/apiv1/gen/http/control_plane/client/types.go

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/apiv1/gen/http/control_plane/server/types.go

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/apiv1/gen/http/openapi.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/apiv1/gen/http/openapi.yaml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/apiv1/gen/http/openapi3.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/apiv1/gen/http/openapi3.yaml

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/internal/api/apiv1/validate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ func validateS3RepoProperties(props repoProperties, path []string) []error {
613613
}
614614

615615
var pgBackRestOptionPattern = regexp.MustCompile(`^[a-z0-9-]+$`)
616-
var semverPattern = regexp.MustCompile(`^\d+\.\d+\.\d+$`)
616+
var semverPattern = regexp.MustCompile(`^\d+\.\d+(\.\d+)?$`)
617617

618618
// reservedLabelPrefix is the label key prefix reserved for system use.
619619
const reservedLabelPrefix = "pgedge."

server/internal/api/apiv1/validate_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,16 @@ func TestValidateServiceSpec(t *testing.T) {
813813
},
814814
},
815815
},
816+
{
817+
name: "valid PostgREST service with two-part version",
818+
svc: &api.ServiceSpec{
819+
ServiceID: "postgrest",
820+
ServiceType: "postgrest",
821+
Version: "14.5",
822+
HostIds: []api.Identifier{"host-1"},
823+
Config: map[string]any{},
824+
},
825+
},
816826
{
817827
name: "valid MCP service with 'latest' version",
818828
svc: &api.ServiceSpec{

0 commit comments

Comments
 (0)