Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use unenforced id feature #204

Merged
merged 3 commits into from
Aug 22, 2024
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
go.flow.arcalot.io/dockerdeployer v0.7.3
go.flow.arcalot.io/expressions v0.4.3
go.flow.arcalot.io/kubernetesdeployer v0.9.3
go.flow.arcalot.io/pluginsdk v0.12.5
go.flow.arcalot.io/pluginsdk v0.13.0
go.flow.arcalot.io/podmandeployer v0.11.3
go.flow.arcalot.io/pythondeployer v0.6.1
go.flow.arcalot.io/testdeployer v0.6.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ go.flow.arcalot.io/expressions v0.4.3 h1:0BRRghutHp0sctsITHe/A1le0yYiJtKNTxm27T+
go.flow.arcalot.io/expressions v0.4.3/go.mod h1:UORX78N4ep71wOzNXdIo/UY+6SdDD0id0mvuRNEQMeM=
go.flow.arcalot.io/kubernetesdeployer v0.9.3 h1:XKiqmCqXb6ZLwP5IQTAKS/gJHpq0Ub/yEjCfgAwQF2A=
go.flow.arcalot.io/kubernetesdeployer v0.9.3/go.mod h1:DtB6HR7HBt/HA1vME0faIpOQ/lhfBJjL6OAGgT3Bu/Q=
go.flow.arcalot.io/pluginsdk v0.12.5 h1:9b3pKeoHCRH4yF2xIdu8L7SqNUYJFxTsk8L5+inR1xw=
go.flow.arcalot.io/pluginsdk v0.12.5/go.mod h1:5kMCVigP89J/KU5T72EAczQXPWXZkRfUFcpnIkOECV8=
go.flow.arcalot.io/pluginsdk v0.13.0 h1:bZqohrDkyAHsWmFJbyvPkjqUALPNJqObefVQrmYqUTw=
go.flow.arcalot.io/pluginsdk v0.13.0/go.mod h1:YPVTOQ0BGn72RR4YkhsFXznaejfR5HN+or05t23Nqns=
go.flow.arcalot.io/podmandeployer v0.11.3 h1:I/p6PNWj1zOUEQltIgSzS/LSmyh+YXvR7nol7iYW1do=
go.flow.arcalot.io/podmandeployer v0.11.3/go.mod h1:3IdybYWxt9C+Woi2odsU04xiO7+fVODBij7xKCIg2Ms=
go.flow.arcalot.io/pythondeployer v0.6.1 h1:IyaA9BVfHJ2fhC+fNfT6VicrtRGFlZOlSaAVGGPwo1E=
Expand Down
2 changes: 1 addition & 1 deletion internal/builtinfunctions/functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ func HandleTypeSchemaCombine(inputType []schema.Type) (schema.Type, error) {
constantsTypeArg := inputType[1]
combinedObjectName := schemaName(itemType) + CombinedObjIDDelimiter + schemaName(constantsTypeArg)
return schema.NewListSchema(
schema.NewObjectSchema(
schema.NewUnenforcedIDObjectSchema(
combinedObjectName,
map[string]*schema.PropertySchema{
CombinedObjPropertyItemName: schema.NewPropertySchema(itemType, nil, false, nil, nil, nil, nil, nil),
Expand Down
1 change: 1 addition & 0 deletions internal/builtinfunctions/functions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,7 @@ func TestHandleTypeSchemaCombine(t *testing.T) {
listItemObj, isObj := schema.ConvertToObjectSchema(outputType.(*schema.ListSchema).ItemsValue)
assert.Equals(t, isObj, true)
assert.Equals(t, listItemObj.ID(), lclInput.expectedResult)
assert.Equals(t, listItemObj.IDUnenforced(), true)
})
}
}
Expand Down