From 0ba900402b5c7fdfcb7591adef97d67e0bbb9fa4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:02:56 +0000
Subject: [PATCH 1/2] Bump github.com/dogmatiq/enginekit from 0.12.0 to 0.15.1

Bumps [github.com/dogmatiq/enginekit](https://github.com/dogmatiq/enginekit) from 0.12.0 to 0.15.1.
- [Release notes](https://github.com/dogmatiq/enginekit/releases)
- [Changelog](https://github.com/dogmatiq/enginekit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dogmatiq/enginekit/compare/v0.12.0...v0.15.1)

---
updated-dependencies:
- dependency-name: github.com/dogmatiq/enginekit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index f44f0045..ce0f6ddc 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/dogmatiq/discoverkit v0.1.2
 	github.com/dogmatiq/dodeca v1.4.2
 	github.com/dogmatiq/dogma v0.14.3
-	github.com/dogmatiq/enginekit v0.12.0
+	github.com/dogmatiq/enginekit v0.15.1
 	github.com/dogmatiq/iago v0.4.0
 	github.com/dogmatiq/interopspec v0.5.4
 	github.com/dogmatiq/kyu v0.2.0
diff --git a/go.sum b/go.sum
index b2fbff29..335c9faa 100644
--- a/go.sum
+++ b/go.sum
@@ -19,8 +19,8 @@ github.com/dogmatiq/dodeca v1.4.2 h1:qVQpMfFju99fvAcV3h1lA0yVaD5X38EpO1my0iKpTqs
 github.com/dogmatiq/dodeca v1.4.2/go.mod h1:kYImsyZhGxSOLiqzTK4Z1CB9ycSLpnJPBQa2yR//N5Q=
 github.com/dogmatiq/dogma v0.14.3 h1:qwZqU1yqp80toUJcJBdFxLlh6xvlFd7jb7rycmriRUo=
 github.com/dogmatiq/dogma v0.14.3/go.mod h1:9lyVA+6V2+E/exV0IrBOrkUiyFwIATEhv+b0vnB2umQ=
-github.com/dogmatiq/enginekit v0.12.0 h1:w16TGKVrvvfTejd6HJ2rhVQGZBW3TSK+o3heo7gTEog=
-github.com/dogmatiq/enginekit v0.12.0/go.mod h1:o0xikkm3INnWBjIXvJ9LffjdYRhIG3jwFNDyhTk1hcI=
+github.com/dogmatiq/enginekit v0.15.1 h1:i5FhnfTNyIZwgqHlH9MNU/9kDoOXvnDLi40FtIkUhbo=
+github.com/dogmatiq/enginekit v0.15.1/go.mod h1:VYNGtuEGGYOnJqvSzi40QnkptFSfuSGeVk0jV83lzUA=
 github.com/dogmatiq/iago v0.4.0 h1:57nZqVT34IZxtCZEW/RFif7DNUEjMXgevfr/Mmd0N8I=
 github.com/dogmatiq/iago v0.4.0/go.mod h1:fishMWBtzYcjgis6d873VTv9kFm/wHYLOzOyO9ECBDc=
 github.com/dogmatiq/interopspec v0.5.4 h1:klyGPy16zUKJartJIJOBZ4JrQ4LxFiY3wgzFTTiNlDk=

From 9ed36f72fa9dcd5a1d5440db7b16aa8ef6877cc2 Mon Sep 17 00:00:00 2001
From: James Harris <contact@jamesharris.id.au>
Date: Thu, 3 Oct 2024 08:00:49 +1000
Subject: [PATCH 2/2] Remove use of `Packet.PortableName()`, which has been
 removed.

---
 fixtures/parcel.go | 8 +++++++-
 parcel/packer.go   | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fixtures/parcel.go b/fixtures/parcel.go
index a06b19ce..d149a2b3 100644
--- a/fixtures/parcel.go
+++ b/fixtures/parcel.go
@@ -1,6 +1,7 @@
 package fixtures
 
 import (
+	"reflect"
 	"strconv"
 	"sync"
 	"time"
@@ -72,6 +73,11 @@ func NewParcel(
 		panic(err)
 	}
 
+	portableName, err := stubs.Marshaler.MarshalType(reflect.TypeOf(m))
+	if err != nil {
+		panic(err)
+	}
+
 	env := &envelopespec.Envelope{
 		MessageId:     id,
 		CausationId:   "<cause>",
@@ -87,7 +93,7 @@ func NewParcel(
 		SourceInstanceId: "<instance>",
 		CreatedAt:        createdAt.Format(time.RFC3339Nano),
 		Description:      m.MessageDescription(),
-		PortableName:     packet.PortableName(),
+		PortableName:     portableName,
 		MediaType:        packet.MediaType,
 		Data:             packet.Data,
 	}
diff --git a/parcel/packer.go b/parcel/packer.go
index 91bdcc7d..e1e563d4 100644
--- a/parcel/packer.go
+++ b/parcel/packer.go
@@ -2,11 +2,13 @@ package parcel
 
 import (
 	"fmt"
+	"reflect"
 	"strings"
 	"time"
 
 	"github.com/dogmatiq/configkit/message"
 	"github.com/dogmatiq/dogma"
+	"github.com/dogmatiq/enginekit/enginetest/stubs"
 	"github.com/dogmatiq/enginekit/marshaler"
 	"github.com/dogmatiq/interopspec/envelopespec"
 	"github.com/google/uuid"
@@ -126,6 +128,11 @@ func (p *Packer) new(m dogma.Message, r message.Role) Parcel {
 		panic(err)
 	}
 
+	portableName, err := stubs.Marshaler.MarshalType(reflect.TypeOf(m))
+	if err != nil {
+		panic(err)
+	}
+
 	pcl := Parcel{
 		Envelope: &envelopespec.Envelope{
 			MessageId:         id,
@@ -134,7 +141,7 @@ func (p *Packer) new(m dogma.Message, r message.Role) Parcel {
 			SourceApplication: p.Application,
 			CreatedAt:         now.Format(time.RFC3339Nano),
 			Description:       m.MessageDescription(),
-			PortableName:      packet.PortableName(),
+			PortableName:      portableName,
 			MediaType:         packet.MediaType,
 			Data:              packet.Data,
 		},