Latest Everything

pentops · Jul 1, 2024 · 7c8bc3d · 7c8bc3d
1 parent 5fad182
commit 7c8bc3d
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 49 deletions.
diff --git a/gen/o5/dante/v1/dante_pb/dead_message.pb.go b/gen/o5/dante/v1/dante_pb/dead_message.pb.go
diff --git a/gen/o5/dante/v1/dante_pb/dead_message_psm.pb.go b/gen/o5/dante/v1/dante_pb/dead_message_psm.pb.go
diff --git a/gen/o5/dante/v1/dante_spb/dead_message_command.pb.go b/gen/o5/dante/v1/dante_spb/dead_message_command.pb.go
diff --git a/gen/o5/dante/v1/dante_spb/dead_message_command_grpc.pb.go b/gen/o5/dante/v1/dante_spb/dead_message_command_grpc.pb.go
diff --git a/gen/o5/dante/v1/dante_spb/dead_message_query.pb.go b/gen/o5/dante/v1/dante_spb/dead_message_query.pb.go
diff --git a/gen/o5/dante/v1/dante_spb/dead_message_query_grpc.pb.go b/gen/o5/dante/v1/dante_spb/dead_message_query_grpc.pb.go
diff --git a/go.mod b/go.mod
@@ -11,15 +11,15 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/lib/pq v1.10.9
 	github.com/pentops/envconf.go v0.0.0-20240607014745-65480a3da726
-	github.com/pentops/flowtest v0.0.0-20240607020132-7dda31076e79
+	github.com/pentops/flowtest v0.0.0-20240623020118-02bf89f30b87
 	github.com/pentops/go-grpc-helpers v0.0.0-20230815045451-2524ee695ebb
-	github.com/pentops/log.go v0.0.0-20240612184720-79634792a21e
+	github.com/pentops/log.go v0.0.0-20240618224413-ed85018bafd9
 	github.com/pentops/o5-auth v0.0.0-20240614180342-3765ffa80762
 	github.com/pentops/o5-messaging v0.0.0-20240614163039-d8f7b29ba565
-	github.com/pentops/o5-runtime-sidecar v0.0.0-20240614191238-bad146feb0c2
+	github.com/pentops/o5-runtime-sidecar v0.0.0-20240630234843-65c27c06599a
 	github.com/pentops/pgtest.go v0.0.0-20240604005819-2035f4562734
-	github.com/pentops/protostate v0.0.0-20240614171324-55fcf0652c6e
-	github.com/pentops/sqrlx.go v0.0.0-20240523172712-b615a994d8c0
+	github.com/pentops/protostate v0.0.0-20240618224345-07873fade6ae
+	github.com/pentops/sqrlx.go v0.0.0-20240618224315-b9b023d5f689
 	github.com/pressly/goose v2.7.0+incompatible
 	golang.org/x/sync v0.7.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240610135401-a8a62080eff3
@@ -52,7 +52,7 @@ require (
 	github.com/jhump/protoreflect v1.16.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/pentops/j5 v0.0.0-20240614161723-64c6aebaabe0 // indirect
+	github.com/pentops/j5 v0.0.0-20240630233950-623dde7a966a // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect

diff --git a/go.sum b/go.sum
@@ -99,26 +99,26 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pentops/envconf.go v0.0.0-20240607014745-65480a3da726 h1:91kehOTa299SDQbPjVmSr5/H11fEkfb8qjb9QCGU0sQ=
 github.com/pentops/envconf.go v0.0.0-20240607014745-65480a3da726/go.mod h1:NYtaIY8a+Y8LYV9Y/nJb24zxx8mQyRK4h9k2oZDJveI=
-github.com/pentops/flowtest v0.0.0-20240607020132-7dda31076e79 h1:KDFU89YeGtsFewe5hP45bCGvt779YEUre6a6X3RmniY=
-github.com/pentops/flowtest v0.0.0-20240607020132-7dda31076e79/go.mod h1:5vX1QXxvMqOZb/KiJd4V2STThM6Q9OnHZIxAbv1Pprw=
+github.com/pentops/flowtest v0.0.0-20240623020118-02bf89f30b87 h1:O7ZZJfgIRPOke+nVH5yrENHARN+DquSIeP5yXc3yMZc=
+github.com/pentops/flowtest v0.0.0-20240623020118-02bf89f30b87/go.mod h1:5vX1QXxvMqOZb/KiJd4V2STThM6Q9OnHZIxAbv1Pprw=
 github.com/pentops/go-grpc-helpers v0.0.0-20230815045451-2524ee695ebb h1:wuswjiI9CzLUGmLXCjwyXDNCFim4iz1IU0GmTmEerMQ=
 github.com/pentops/go-grpc-helpers v0.0.0-20230815045451-2524ee695ebb/go.mod h1:F3N1VgUmEky7it5iOBkyBbyuXu9Mqb9mfhFGR8FhZVQ=
-github.com/pentops/j5 v0.0.0-20240614161723-64c6aebaabe0 h1:k2o/YQe0VNwDQnowWcho+NXsqg4sOF+WiICwye17RIg=
-github.com/pentops/j5 v0.0.0-20240614161723-64c6aebaabe0/go.mod h1:5rdIYcDiJJ6WpfbPVqVGdRCXANMtR5H3unGsM9Gb5Y8=
-github.com/pentops/log.go v0.0.0-20240612184720-79634792a21e h1:YqtP83u5EzkIEm2Lg/6RiM2EsAI38Mh/Ph4lcfN1rKs=
-github.com/pentops/log.go v0.0.0-20240612184720-79634792a21e/go.mod h1:UXhrs+VZ6cWZ7b/v8AtuvBZc5nwS5WFHP94JoFrZQA8=
+github.com/pentops/j5 v0.0.0-20240630233950-623dde7a966a h1:Y14L50fr1Oqhav4gd7bwgHGKavSolbkpiEOOPmy86eA=
+github.com/pentops/j5 v0.0.0-20240630233950-623dde7a966a/go.mod h1:5gam/pNybAmaAx3qCiqEuxb1FuFgeibPdQkWy1dsbRM=
+github.com/pentops/log.go v0.0.0-20240618224413-ed85018bafd9 h1:dDFQNUjn3j32t9YMBjfThw888JQCpmj+ucKiURTg71E=
+github.com/pentops/log.go v0.0.0-20240618224413-ed85018bafd9/go.mod h1:UXhrs+VZ6cWZ7b/v8AtuvBZc5nwS5WFHP94JoFrZQA8=
 github.com/pentops/o5-auth v0.0.0-20240614180342-3765ffa80762 h1:O8QSwCoTVEWjrhXLLKp/6diYBaaUvHwt5EfYpR0Wh9A=
 github.com/pentops/o5-auth v0.0.0-20240614180342-3765ffa80762/go.mod h1:UWcrIlF04hicGhn5WJOH6HpdgFemmGEX7DYaMCHeV28=
 github.com/pentops/o5-messaging v0.0.0-20240614163039-d8f7b29ba565 h1:meUCVkYLgHKlj3Nj/84XUA6yrg2kSJKLHvOCfXuQzgA=
 github.com/pentops/o5-messaging v0.0.0-20240614163039-d8f7b29ba565/go.mod h1:aXyY7kDScVPxRzxkxpC0jmYPWiInLkTQDwzmE9NcFOM=
-github.com/pentops/o5-runtime-sidecar v0.0.0-20240614191238-bad146feb0c2 h1:TLxlDqs/U+JF2MeGs4M3gKOD4gLdd78kFidthq4mtHw=
-github.com/pentops/o5-runtime-sidecar v0.0.0-20240614191238-bad146feb0c2/go.mod h1:BbACB/LUDAIXSt5WrEEFTg3ZOUGZuS08wGIcbxlsr+U=
+github.com/pentops/o5-runtime-sidecar v0.0.0-20240630234843-65c27c06599a h1:L1e9UECXdGrvoknuDDg+Rsm70yMai6+9xVtNvlqOuW4=
+github.com/pentops/o5-runtime-sidecar v0.0.0-20240630234843-65c27c06599a/go.mod h1:pnBP9Mro5rB3nEZiY79pNJn2KcXi8FwRUHHdA5UgUzM=
 github.com/pentops/pgtest.go v0.0.0-20240604005819-2035f4562734 h1:NnTjggH2Y3gCiS5r/k5UvHN3vVHMOMDZ/vFsLsNAn8o=
 github.com/pentops/pgtest.go v0.0.0-20240604005819-2035f4562734/go.mod h1:BgX0+UvohWaq7Vr3McsBWt8FpzerKaNRsmG2uH7L1FE=
-github.com/pentops/protostate v0.0.0-20240614171324-55fcf0652c6e h1:4jgQiNqlOJ9XDAk8ovuLnQw3s4uOH2hnzlgKFMbu9Uk=
-github.com/pentops/protostate v0.0.0-20240614171324-55fcf0652c6e/go.mod h1:griFQMGgOLpxNe2drVn5Lifrklot4ruojhDysXhmR4c=
-github.com/pentops/sqrlx.go v0.0.0-20240523172712-b615a994d8c0 h1:0OTQyz+jyxOdDxlFBM24zq5Q3VSI8fYHxcHUSXkuS3I=
-github.com/pentops/sqrlx.go v0.0.0-20240523172712-b615a994d8c0/go.mod h1:Zfb/6O+9jxKfO8ujfNbArrCAO9MbFKYiczAewnMozbs=
+github.com/pentops/protostate v0.0.0-20240618224345-07873fade6ae h1:eP26KoJrVJAm36EXWP7t3g1QY/7GHfV8O+1gx4GXLtA=
+github.com/pentops/protostate v0.0.0-20240618224345-07873fade6ae/go.mod h1:VC6koK374rZHzjqyS1/2O0fKfAX09QByTdjrw/FRGMU=
+github.com/pentops/sqrlx.go v0.0.0-20240618224315-b9b023d5f689 h1:pFMffipzY0LPnrbTcnr0NRQLph2HRv1mpipc0upRHRY=
+github.com/pentops/sqrlx.go v0.0.0-20240618224315-b9b023d5f689/go.mod h1:Zfb/6O+9jxKfO8ujfNbArrCAO9MbFKYiczAewnMozbs=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/j5.yaml b/j5.yaml
@@ -1,37 +1,47 @@
 ---
-
 bundles:
-  - dir: proto
+  - name: proto
+    dir: proto
 
 generate:
   - name: go
-    src: [proto]
-    out: .
+    inputs:
+      - local: proto
+    output: .
     opts:
       paths: import
       module: github.com/pentops/dante
     plugins:
-      - name: go
-      - name: go-grpc
-      - name: go-sugar
-      - name: go-o5-messaging
-      - name: go-psm
+      - base: go
+      - base: go-grpc
+      - base: go-sugar
+      - base: go-psm
+      - base: go-o5-messaging
 
 plugins:
   - name: go
+    type: PLUGIN_PROTO
     docker:
       image: ghcr.io/pentops/protoc-gen-go:v1.32.0
+
   - name: go-grpc
+    base: go
     docker:
       image: ghcr.io/pentops/protoc-gen-go-grpc:v1.3.0
+
   - name: go-sugar
+    base: go
     docker:
       image: ghcr.io/pentops/protoc-gen-go-sugar:19495b5f5ac3fd3964a03031396d83f1bc1341ca
+
+  - name: go-psm
+    base: go
+    docker:
+      image: ghcr.io/pentops/protoc-gen-go-protostate:07873fade6ae6e078124d38250498fcec068b6cd
+
   - name: go-o5-messaging
+    base: go
     docker:
-      image: ghcr.io/pentops/o5-messaging/protoc-gen-go-o5-messaging:9f9694311c7c2ad1d88dd6d0d3d5ece61f3c3e2c
+      image: ghcr.io/pentops/protoc-gen-go-o5-messaging:d8f7b29ba56513be908c4d5d2c6adee57f1ee174
       env:
         - PROTOC_GEN_GO_MESSAGING_EXTRA_HEADERS=api-version:$GIT_HASH
-  - name: go-psm
-    docker:
-      image: ghcr.io/pentops/protoc-gen-go-protostate:8daef5060f930ca57a47920ced86ed319710b62a