migrate to buf

.devcontainer/devcontainer.json

@@ -1,29 +1,12 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/go
 {
-	"name": "Go",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			// Update the VARIANT arg to pick a version of Go: 1, 1.19, 1.18
-			// Append -bullseye or -buster to pin to an OS version.
-			// Use -bullseye variants on local arm64/Apple Silicon.
-			"VARIANT": "1-bullseye",
-			// Options
-			// "NODE_VERSION": "lts/*"
-		}
-	},
+	"name": "otaru",
+	"image": "mcr.microsoft.com/devcontainers/go",
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
-	// Configure tool-specific properties.
+	"postCreateCommand": "./.devcontainer/postCreate.sh",
+	"remoteUser": "vscode",
 	"customizations": {
-		// Configure properties specific to VS Code.
 		"vscode": {
-			// Set *default* container specific settings.json values on container create.
 			"settings": {
-				"go.toolsManagement.checkForUpdates": "local",
-				"go.useLanguageServer": true,
-				"go.gopath": "/go",
-
 				"terminal.integrated.defaultProfile.linux": "zsh",
 				"terminal.integrated.profiles.linux": {
 					"zsh": {
@@ -32,27 +15,12 @@
 				},
 			},
 
-			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
-				"golang.Go"
+				"golang.go"
 			]
 		}
 	},
-
-	"remoteEnv": {
-		"PATH": "${containerEnv:PATH}:/opt/protoc/bin"
-	},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	"postCreateCommand": "./.devcontainer/postCreate.sh",
-
 	"mounts": [
-		"source=${env:HOME}${env:USERPROFILE}/settings/otaru,target=/etc/otaru,type=bind",
-		"source=/var/otaru,target=/var/otaru,type=bind",
+		// "source=/var/otaru,target=/var/otaru,type=bind",
 	],
-
-	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode"
 }

.devcontainer/postCreate.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-go install google.golang.org/protobuf/cmd/[email protected]
-go install google.golang.org/grpc/cmd/[email protected]
+PREFIX="/usr/local" && \
+VERSION="1.41.0" && \
+curl -sSL \
+"https://github.com/bufbuild/buf/releases/download/v${VERSION}/buf-$(uname -s)-$(uname -m).tar.gz" | \
+sudo tar -xvzf - -C "${PREFIX}" --strip-components 1

buf.gen.yaml

@@ -0,0 +1,11 @@
+version: v1
+plugins:
+- remote: buf.build/grpc/go
+  out: .
+  opt: paths=source_relative
+- remote: buf.build/grpc-ecosystem/gateway
+  out: .
+  opt: paths=source_relative
+- remote: protocolbuffers/go
+  out: .
+  opt: paths=source_relative

buf.lock

@@ -0,0 +1,6 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/googleapis/googleapis
+    commit: e7f8d366f5264595bcc4cd4139af9973
+    digest: b5:0cd69a689ee320ed815663d57d1bc3a1d6823224a7a717d46fee3a68197c25a6f5f932c0b0e49f8370c70c247a6635969a6a54af5345cafd51e0667298768aca

buf.yaml

@@ -0,0 +1,9 @@
+version: v2
+breaking:
+  use:
+  - FILE
+lint:
+  use:
+  - STANDARD
+deps:
+- buf.build/googleapis/googleapis

facade/apiserver.go

@@ -4,7 +4,6 @@ import (
 	"github.com/nyaxt/otaru/apiserver"
 	"github.com/nyaxt/otaru/assets/webui"
 	"github.com/nyaxt/otaru/otaruapiserver"
-	"github.com/nyaxt/otaru/pb/json"
 	"go.uber.org/zap"
 )
 
@@ -20,7 +19,6 @@ func (o *Otaru) buildApiServerOptions(cfg *ApiServerConfig) ([]apiserver.Option,
 		apiserver.ClientCACert(cfg.ClientCACert),
 		apiserver.CORSAllowedOrigins(cfg.CORSAllowedOrigins),
 		apiserver.SetDefaultHandler(webui.WebUIHandler(override, "/index.otaru-server.html")),
-		apiserver.SetSwaggerJson(json.Assets, "/otaru.swagger.json"),
 		otaruapiserver.InstallBlobstoreService(o.S, o.DefaultBS, o.CBS),
 		otaruapiserver.InstallFileHandler(o.FS),
 		otaruapiserver.InstallFileSystemService(o.FS),

gen.go

@@ -0,0 +1,2 @@
+//go:generate buf generate
+package otaru