Update Everything (#71)

* Update Everything * Include notification...
pentops · Jun 15, 2024 · 5fad182 · 5fad182
1 parent 53fd5a2
commit 5fad182
Show file tree

Hide file tree

Showing 20 changed files with 213 additions and 205 deletions.
diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -1,21 +1,24 @@
-version: v1
+version: v2
 plugins:
-  - plugin: buf.build/protocolbuffers/go:v1.31.0
+  - remote: buf.build/protocolbuffers/go:v1.31.0
     out: .
     opt: paths=import,module=github.com/pentops/dante
 
-  - name: go-messaging # github.com/pentops/protoc-gen-go-messaging
+  - local: protoc-gen-go-o5-messaging # github.com/pentops/o5-messaging/protoc-gen-go-o5-messaging
     out: .
     opt: paths=import,module=github.com/pentops/dante
 
-  - name: go-sugar # github.com/pentops/protoc-gen-go-sugar
+  - local: protoc-gen-go-sugar # github.com/pentops/protoc-gen-go-sugar
     out: .
     opt: paths=import,module=github.com/pentops/dante
 
-  - name: go-psm # github.com/pentops/protostate
+  - local: protoc-gen-go-psm # github.com/pentops/protostate
     out: .
     opt: paths=import,module=github.com/pentops/dante
 
-  - name: go-grpc # 'Official' version
+  - local: protoc-gen-go-grpc # 'Official' version
     out: .
     opt: paths=import,module=github.com/pentops/dante
+
+inputs:
+  - directory: ./proto
diff --git a/buf.lock b/buf.lock
@@ -0,0 +1,24 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/bufbuild/protovalidate
+    commit: 46a4cf4ba1094a34bcd89a6c67163b4b
+    digest: b5:2076a950fdf4a8047064d55fd1d20ef21e6d745bf56e3edf557071abd4488ed48c9466d60831d8a03489dc1fcc8ceaa073d197411b59ecd873e28b1328034e0b
+  - name: buf.build/googleapis/googleapis
+    commit: f0e53af8f2fc4556b94f482688b57223
+    digest: b5:24e758f963ee1bb3b5218eb452e0bdfb7a5449d9a77d174b8284b6368ccc1884213689381cdcd79e4231796c281c128ac1ae50825237b1774deb542bdc704b32
+  - name: buf.build/pentops/auth
+    commit: 70d5766eb24b4ff79eb48d5a4dd82569
+    digest: b5:ab11632bc17fa146e7f2d784468ab8eb66af674bd8ed85817a5e21256bbf32c8a95c1958fd9ee1f78c89a1484c2ef915fe8c6dd3610c1effd9e55f0d1b739b87
+  - name: buf.build/pentops/j5
+    commit: 69a0e8239f434b37a715872d6d7a6edb
+    digest: b5:77689587ff655f87d2caaa148758ba84783ac8569e3ec15747e3fc4989ddf608485b8d2bd4350901fd564dbeeb6432a068d2f0f41fed1edf87e1771af65040df
+  - name: buf.build/pentops/listify
+    commit: e55386703ee44dfbb774e997db21da03
+    digest: b5:b27766c492a771761e3209ba0f607164bfb1c0f3b785e122d4b55477051273cb6c6dd75ba0990a9c3433385add99aac84dba483d87becc688c016216dcd0c4ee
+  - name: buf.build/pentops/messaging
+    commit: 675bd3c4763842e0bdef1047f7ab7225
+    digest: b5:629df4339e90ae70da7741d49f58064c3764cfce3bc397c0d9105541b7777a1614e6aca32b109e833347bebe286925aefb6279e59d846eeaa66017312aa4054a
+  - name: buf.build/pentops/protostate
+    commit: f5aff9c2f198442a96802cb84ac697c9
+    digest: b5:29b5a977e5c842d7e82dfc3ca4aa610873e837b5164e7c0ce8ac07c4a2c6dc99b4f79305fedfbb48dd96604015b8dfbf9536800da3deef2e6a1a5da922a5d514
diff --git a/proto/buf.yaml → buf.yaml b/proto/buf.yaml → buf.yaml
@@ -1,13 +1,16 @@
-version: v1
-name: buf.build/pentops/o5-deployer
+version: v2
+modules:
+  - path: ./proto
+    name: buf.build/pentops/o5-deployer
 
 deps:
   - buf.build/googleapis/googleapis
   - buf.build/bufbuild/protovalidate
   - buf.build/pentops/listify
   - buf.build/pentops/protostate
   - buf.build/pentops/j5
-  - buf.build/pentops/o5
+  - buf.build/pentops/auth
+  - buf.build/pentops/messaging
 
 lint:
   use:

diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -14,7 +14,7 @@ import (
 	"github.com/pentops/dante/gen/o5/dante/v1/dante_spb"
 	"github.com/pentops/dante/service"
 	"github.com/pentops/log.go/log"
-	"github.com/pentops/o5-go/messaging/v1/messaging_tpb"
+	"github.com/pentops/o5-messaging/gen/o5/messaging/v1/messaging_tpb"
 	"github.com/pressly/goose"
 
 	"github.com/pentops/envconf.go/envconf"

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_messaging.pb.go b/gen/o5/dante/v1/dante_spb/dead_message_command_messaging.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_messaging.pb.go b/gen/o5/dante/v1/dante_spb/dead_message_query_messaging.pb.go