(fix): update deps, fix compatibility issues (#62)

.github/workflows/build.yml

@@ -16,9 +16,9 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4
 
       - name: go build
         run: |

.github/workflows/check-code.yml

@@ -16,10 +16,10 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4
 
-      - uses: dominikh/[email protected].0
+      - uses: dominikh/[email protected].1
         with:
           install-go: false

.github/workflows/check-test.yml

@@ -16,9 +16,9 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4
 
       - name: go build
         run: |

broker/eventbridge/awscdk.go

@@ -38,23 +38,23 @@ type SinkProps struct {
 	Source     []string
 	Categories []string
 	Pattern    map[string]interface{}
-	Lambda     *scud.FunctionGoProps
+	Function   scud.FunctionProps
 }
 
 func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 	sink := &Sink{Construct: constructs.NewConstruct(scope, id)}
 
 	//
 	pattern := &awsevents.EventPattern{}
-	if props.Categories != nil && len(props.Categories) > 0 {
+	if len(props.Categories) > 0 {
 		seq := make([]*string, len(props.Categories))
 		for i, category := range props.Categories {
 			seq[i] = jsii.String(category)
 		}
 		pattern.DetailType = &seq
 	}
 
-	if props.Source != nil && len(props.Source) > 0 {
+	if len(props.Source) > 0 {
 		seq := make([]*string, len(props.Source))
 		for i, agent := range props.Source {
 			seq[i] = jsii.String(agent)
@@ -78,8 +78,8 @@ func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 		},
 	)
 
-	if props.Lambda != nil {
-		sink.Handler = scud.NewFunctionGo(sink.Construct, jsii.String("Func"), props.Lambda)
+	if props.Function != nil {
+		sink.Handler = scud.NewFunction(sink.Construct, jsii.String("Func"), props.Function)
 
 		sink.Rule.AddTarget(awseventstargets.NewLambdaFunction(
 			sink.Handler,

broker/eventbridge/awscdk_test.go

@@ -28,9 +28,9 @@ func TestEventBridgeCDK(t *testing.T) {
 	broker.NewSink(
 		&eventbridge.SinkProps{
 			Source: []string{"swarm-example-eventbridge"},
-			Lambda: &scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "examples/eventbridge/dequeue",
+			Function: &scud.FunctionGoProps{
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "examples/eventbridge/dequeue",
 			},
 		},
 	)

broker/eventddb/awscdk.go

@@ -33,14 +33,14 @@ type Sink struct {
 
 type SinkProps struct {
 	Table       awsdynamodb.ITable
-	Lambda      *scud.FunctionGoProps
+	Function    scud.FunctionProps
 	EventSource *awslambdaeventsources.DynamoEventSourceProps
 }
 
 func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 	sink := &Sink{Construct: constructs.NewConstruct(scope, id)}
 
-	sink.Handler = scud.NewFunctionGo(sink.Construct, jsii.String("Func"), props.Lambda)
+	sink.Handler = scud.NewFunction(sink.Construct, jsii.String("Func"), props.Function)
 
 	eventsource := &awslambdaeventsources.DynamoEventSourceProps{
 		StartingPosition: awslambda.StartingPosition_LATEST,
@@ -142,7 +142,9 @@ func (broker *Broker) NewTable(props *awsdynamodb.TablePropsV2) awsdynamodb.ITab
 	}
 
 	if props.Billing == nil {
-		props.Billing = awsdynamodb.Billing_OnDemand()
+		props.Billing = awsdynamodb.Billing_OnDemand(
+			&awsdynamodb.MaxThroughputProps{},
+		)
 	}
 
 	if props.DynamoStream == "" {

broker/eventddb/awscdk_test.go

@@ -27,9 +27,9 @@ func TestEventDdbCDK(t *testing.T) {
 
 	broker.NewSink(
 		&eventddb.SinkProps{
-			Lambda: &scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "examples/eventddb/dequeue",
+			Function: &scud.FunctionGoProps{
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "examples/eventddb/dequeue",
 			},
 		},
 	)

broker/events3/awscdk.go

@@ -35,13 +35,13 @@ type Sink struct {
 type SinkProps struct {
 	Bucket      awss3.Bucket
 	EventSource *awslambdaeventsources.S3EventSourceProps
-	Lambda      *scud.FunctionGoProps
+	Function    scud.FunctionProps
 }
 
 func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 	sink := &Sink{Construct: constructs.NewConstruct(scope, id)}
 
-	sink.Handler = scud.NewFunctionGo(sink.Construct, jsii.String("Func"), props.Lambda)
+	sink.Handler = scud.NewFunction(sink.Construct, jsii.String("Func"), props.Function)
 
 	eventsource := &awslambdaeventsources.S3EventSourceProps{
 		Events: &[]awss3.EventType{

broker/events3/awscdk_test.go

@@ -27,9 +27,9 @@ func TestEventS3CDK(t *testing.T) {
 
 	broker.NewSink(
 		&events3.SinkProps{
-			Lambda: &scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "examples/events3/dequeue",
+			Function: &scud.FunctionGoProps{
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "examples/events3/dequeue",
 			},
 		},
 	)

broker/eventsqs/awscdk.go

@@ -33,14 +33,14 @@ type Sink struct {
 }
 
 type SinkProps struct {
-	Queue  awssqs.IQueue
-	Lambda *scud.FunctionGoProps
+	Queue    awssqs.IQueue
+	Function scud.FunctionProps
 }
 
 func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 	sink := &Sink{Construct: constructs.NewConstruct(scope, id)}
 
-	sink.Handler = scud.NewFunctionGo(sink.Construct, jsii.String("Func"), props.Lambda)
+	sink.Handler = scud.NewFunction(sink.Construct, jsii.String("Func"), props.Function)
 
 	source := awslambdaeventsources.NewSqsEventSource(props.Queue,
 		&awslambdaeventsources.SqsEventSourceProps{})

broker/eventsqs/awscdk_test.go

@@ -27,9 +27,9 @@ func TestEventBridgeCDK(t *testing.T) {
 
 	broker.NewSink(
 		&eventsqs.SinkProps{
-			Lambda: &scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "examples/eventsqs/dequeue",
+			Function: &scud.FunctionGoProps{
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "examples/eventsqs/dequeue",
 			},
 		},
 	)

broker/websocket/awscdk.go

@@ -23,6 +23,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/constructs-go/constructs/v10"
 	"github.com/aws/jsii-runtime-go"
+	"github.com/fogfish/golem/optics"
 	"github.com/fogfish/scud"
 )
 
@@ -40,32 +41,16 @@ type Sink struct {
 }
 
 type SinkProps struct {
-	Route   string
-	Lambda  *scud.FunctionGoProps
-	Gateway awsapigatewayv2.WebSocketApi
+	Route    string
+	Function scud.FunctionProps
+	Gateway  awsapigatewayv2.WebSocketApi
 }
 
 func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 	sink := &Sink{Construct: constructs.NewConstruct(scope, id)}
 
-	if props.Lambda.FunctionProps == nil {
-		props.Lambda.FunctionProps = &awslambda.FunctionProps{}
-	}
-
-	if props.Lambda.FunctionProps.Environment == nil {
-		props.Lambda.FunctionProps.Environment = &map[string]*string{}
-	}
-
-	if _, has := (*props.Lambda.FunctionProps.Environment)["CONFIG_SWARM_WS_EVENT_TYPE"]; !has {
-		(*props.Lambda.FunctionProps.Environment)["CONFIG_SWARM_WS_EVENT_TYPE"] = jsii.String(props.Route)
-	}
-
-	if _, has := (*props.Lambda.FunctionProps.Environment)["CONFIG_SWARM_WS_URL"]; !has {
-		url := aws.ToString(props.Gateway.ApiEndpoint()) + "/" + stage
-		(*props.Lambda.FunctionProps.Environment)["CONFIG_SWARM_WS_URL"] = aws.String(url)
-	}
-
-	sink.Handler = scud.NewFunctionGo(sink.Construct, jsii.String("Func"), props.Lambda)
+	defaultEnvironment(props)
+	sink.Handler = scud.NewFunction(sink.Construct, jsii.String("Func"), props.Function)
 
 	it := integrations.NewWebSocketLambdaIntegration(jsii.String(props.Route), sink.Handler,
 		&integrations.WebSocketLambdaIntegrationProps{},
@@ -82,6 +67,46 @@ func NewSink(scope constructs.Construct, id *string, props *SinkProps) *Sink {
 	return sink
 }
 
+var (
+	lensFunction  = optics.ForProduct1[scud.FunctionGoProps, *map[string]*string]("Environment")
+	lensContainer = optics.ForProduct1[scud.ContainerGoProps, *map[string]*string]("Environment")
+)
+
+func defineLambdaEnvironment[T any](lens optics.Lens[T, *map[string]*string], props *SinkProps, fprops *T) {
+	env := lens.Get(fprops)
+
+	if env == nil {
+		env = &map[string]*string{}
+	}
+
+	if _, has := (*env)["CONFIG_SWARM_WS_EVENT_TYPE"]; !has {
+		(*env)["CONFIG_SWARM_WS_EVENT_TYPE"] = jsii.String(props.Route)
+	}
+
+	if _, has := (*env)["CONFIG_SWARM_WS_URL"]; !has {
+		url := aws.ToString(props.Gateway.ApiEndpoint()) + "/" + stage
+		(*env)["CONFIG_SWARM_WS_URL"] = aws.String(url)
+	}
+
+	lens.Put(fprops, env)
+}
+
+func defaultEnvironment(props *SinkProps) {
+	switch fprops := props.Function.(type) {
+	case *scud.FunctionGoProps:
+		if fprops.FunctionProps == nil {
+			fprops.FunctionProps = &awslambda.FunctionProps{}
+		}
+
+		defineLambdaEnvironment(lensFunction, props, fprops)
+	case *scud.ContainerGoProps:
+		if fprops.DockerImageFunctionProps == nil {
+			fprops.DockerImageFunctionProps = &awslambda.DockerImageFunctionProps{}
+		}
+		defineLambdaEnvironment(lensContainer, props, fprops)
+	}
+}
+
 //------------------------------------------------------------------------------
 //
 // AWS CDK Stack Construct
@@ -123,8 +148,8 @@ func (broker *Broker) NewAuthorizerApiKey(props *AuthorizerApiKeyProps) awsapiga
 
 	handler := scud.NewFunctionGo(broker.Construct, jsii.String("Authorizer"),
 		&scud.FunctionGoProps{
-			SourceCodePackage: "github.com/fogfish/swarm",
-			SourceCodeLambda:  "broker/websocket/lambda/auth",
+			SourceCodeModule: "github.com/fogfish/swarm",
+			SourceCodeLambda: "broker/websocket/lambda/auth",
 			FunctionProps: &awslambda.FunctionProps{
 				Environment: &map[string]*string{
 					"CONFIG_SWARM_WS_AUTHORIZER_ACCESS": jsii.String(props.Access),
@@ -165,8 +190,8 @@ func (broker *Broker) NewAuthorizerJwt(props *AuthorizerJwtProps) awsapigatewayv
 
 	handler := scud.NewFunctionGo(broker.Construct, jsii.String("Authorizer"),
 		&scud.FunctionGoProps{
-			SourceCodePackage: "github.com/fogfish/swarm",
-			SourceCodeLambda:  "broker/websocket/lambda/auth",
+			SourceCodeModule: "github.com/fogfish/swarm",
+			SourceCodeLambda: "broker/websocket/lambda/auth",
 			FunctionProps: &awslambda.FunctionProps{
 				Environment: &map[string]*string{
 					"CONFIG_SWARM_WS_AUTHORIZER_ISS": jsii.String(props.Issuer),
@@ -215,8 +240,8 @@ func (broker *Broker) NewAuthorizerUniversal(props *AuthorizerUniversalProps) aw
 
 	handler := scud.NewFunctionGo(broker.Construct, jsii.String("Authorizer"),
 		&scud.FunctionGoProps{
-			SourceCodePackage: "github.com/fogfish/swarm",
-			SourceCodeLambda:  "broker/websocket/lambda/auth",
+			SourceCodeModule: "github.com/fogfish/swarm",
+			SourceCodeLambda: "broker/websocket/lambda/auth",
 			FunctionProps: &awslambda.FunctionProps{
 				Environment: &map[string]*string{
 					"CONFIG_SWARM_WS_AUTHORIZER_ACCESS": jsii.String(props.AuthorizerApiKey.Access),
@@ -258,8 +283,8 @@ func (broker *Broker) NewGateway(props *WebSocketApiProps) awsapigatewayv2.WebSo
 	if props.WebSocketApiProps.ConnectRouteOptions == nil && broker.Authorizer != nil {
 		connector := scud.NewFunctionGo(broker.Construct, jsii.String("Connector"),
 			&scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "broker/websocket/lambda/connector",
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "broker/websocket/lambda/connector",
 			},
 		)
 

event.go

@@ -32,20 +32,28 @@ type EventKind[A any] pure.HKT[EventType, A]
 // changed together with  using unique identifier.
 type Event[T any] struct {
 	//
-	// Unique identity for event
-	// It is automatically defined by the library upon the transmission
+	// Unique identity for event.
+	// It is automatically defined by the library upon the transmission unless
+	// defined by sender. Preserving ID across sequence of messages allows
+	// building request/response semantic.
 	ID string `json:"id,omitempty"`
 
 	//
 	// Canonical IRI that defines a type of action.
-	// It is automatically defined by the library upon the transmission
+	// It is automatically defined by the library upon the transmission unless
+	// defined by sender.
 	Type curie.IRI `json:"type,omitempty"`
 
 	//
-	// Direct performer of the event, a software service that emits action to the stream.
-	// It is automatically defined by the library upon the transmission
+	// Direct performer of the event, a software service that emits action to
+	// the stream. It is automatically defined by the library upon the transmission
+	// unless defined by sender.
 	Agent curie.IRI `json:"agent,omitempty"`
 
+	//
+	// Indicates target performer of the event, a software service that is able to
+	Target curie.IRI `json:"target,omitempty"`
+
 	//
 	// Indirect participants, a user who initiated an event.
 	Participant curie.IRI `json:"participant,omitempty"`
@@ -58,6 +66,11 @@ type Event[T any] struct {
 	//
 	// The object upon which the event is carried out.
 	Object T `json:"object,omitempty"`
+
+	// Status (Pending | Success | Failure)
+	// Deadline before after | nbf NotBefore
+	// Target
+
 }
 
 func (Event[T]) HKT1(EventType) {}

examples/eventbridge/serverless/main.go

@@ -34,9 +34,9 @@ func main() {
 	broker.NewSink(
 		&eventbridge.SinkProps{
 			Source: []string{"swarm-example-eventbridge"},
-			Lambda: &scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "examples/eventbridge/dequeue",
+			Function: &scud.FunctionGoProps{
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "examples/eventbridge/dequeue",
 			},
 		},
 	)

examples/eventddb/serverless/main.go

@@ -33,9 +33,9 @@ func main() {
 
 	broker.NewSink(
 		&eventddb.SinkProps{
-			Lambda: &scud.FunctionGoProps{
-				SourceCodePackage: "github.com/fogfish/swarm",
-				SourceCodeLambda:  "examples/eventddb/dequeue",
+			Function: &scud.FunctionGoProps{
+				SourceCodeModule: "github.com/fogfish/swarm",
+				SourceCodeLambda: "examples/eventddb/dequeue",
 			},
 		},
 	)