From 1ef41aeb26f11a1b11345ca6da9828c87182a05e Mon Sep 17 00:00:00 2001
From: Declan Teevan
Date: Mon, 29 Sep 2025 03:58:39 +0100
Subject: [PATCH] chore: migrate buf configs fix versioning for Buf
dependencies
---
buf.gen.yaml | 17 +++++++++-------
buf.work.yaml | 3 ---
go.mod | 3 ++-
schema/protobufs/buf.lock | 20 +++++++------------
schema/protobufs/buf.yaml | 19 +++++++++++-------
schema/protobufs/stocklet/auth/v1/types.proto | 2 +-
6 files changed, 32 insertions(+), 32 deletions(-)
delete mode 100644 buf.work.yaml
diff --git a/buf.gen.yaml b/buf.gen.yaml
index 9e24499..e0d43b7 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -1,23 +1,26 @@
-version: v1
+version: v2
plugins:
- - plugin: buf.build/protocolbuffers/go:v1.31.0
+ - remote: buf.build/protocolbuffers/go:v1.31.0
out: internal/pkg/protogen
opt:
- paths=import
- module=github.com/hexolan/stocklet/internal/pkg/protogen
- - plugin: buf.build/grpc/go:v1.3.0
+ - remote: buf.build/grpc/go:v1.3.0
out: internal/pkg/protogen
opt:
- paths=import
- module=github.com/hexolan/stocklet/internal/pkg/protogen
- - plugin: buf.build/grpc-ecosystem/gateway:v2.18.0
+ - remote: buf.build/grpc-ecosystem/gateway:v2.18.0
out: internal/pkg/protogen
- opt:
+ opt:
- paths=import
- module=github.com/hexolan/stocklet/internal/pkg/protogen
- - plugin: buf.build/grpc-ecosystem/openapiv2:v2.18.0
+ - remote: buf.build/grpc-ecosystem/openapiv2:v2.18.0
out: schema/openapi
opt:
- output_format=yaml
- allow_merge=true
- - merge_file_name=services
\ No newline at end of file
+ - merge_file_name=services
+
+inputs:
+ - directory: schema/protobufs
\ No newline at end of file
diff --git a/buf.work.yaml b/buf.work.yaml
deleted file mode 100644
index 45dd086..0000000
--- a/buf.work.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-version: v1
-directories:
- - schema/protobufs
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 5ebf4b6..1d070b9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,7 @@
module github.com/hexolan/stocklet
-go 1.21.1
+go 1.23.0
+
toolchain go1.24.1
require (
diff --git a/schema/protobufs/buf.lock b/schema/protobufs/buf.lock
index 7961304..8bc5ee3 100644
--- a/schema/protobufs/buf.lock
+++ b/schema/protobufs/buf.lock
@@ -1,18 +1,12 @@
# Generated by buf. DO NOT EDIT.
-version: v1
+version: v2
deps:
- - remote: buf.build
- owner: bufbuild
- repository: protovalidate
+ - name: buf.build/bufbuild/protovalidate
commit: e097f827e65240ac9fd4b1158849a8fc
- digest: shake256:f19252436fd9ded945631e2ffaaed28247a92c9015ccf55ae99db9fb3d9600c4fdb00fd2d3bd7701026ec2fd4715c5129e6ae517c25a59ba690020cfe80bf8ad
- - remote: buf.build
- owner: googleapis
- repository: googleapis
+ digest: b5:beda657a164abf9d1bac222e352f14d9a4a8c913ccdb7e5c3dfeda097690f60e8edb27b518c2d8e73b70aecb6ac47fdc3654a1f62b9e09c3566cd4e620628cfd
+ - name: buf.build/googleapis/googleapis
commit: b30c5775bfb3485d9da2e87b26590ac9
- digest: shake256:9d0caaf056949a0e1c883b9849d8a2fa66e22f18a2a48f867d1a8c700aa22abee50ad3ef0d8171637457cadc43c584998bdf3adac55da0f9e4614c72686b057d
- - remote: buf.build
- owner: grpc-ecosystem
- repository: grpc-gateway
+ digest: b5:13f091a467b31c7f734307e6760d864e3319b9c47656f2ada6efa45c643864d9c9e7d5cd372c92cc8e0972deb63f41bc8fc88a5ca21ab2e9ea04d2144752857d
+ - name: buf.build/grpc-ecosystem/grpc-gateway
commit: 3f42134f4c564983838425bc43c7a65f
- digest: shake256:3d11d4c0fe5e05fda0131afefbce233940e27f0c31c5d4e385686aea58ccd30f72053f61af432fa83f1fc11cda57f5f18ca3da26a29064f73c5a0d076bba8d92
+ digest: b5:291b947d8ac09492517557e4e72e294788cb8201afc7d0df7bda80fa10931adb60d4d669208a7696bf24f1ecb2a33a16d4c1e766e6f31809248b00343119569b
diff --git a/schema/protobufs/buf.yaml b/schema/protobufs/buf.yaml
index e971b7e..4c0bceb 100644
--- a/schema/protobufs/buf.yaml
+++ b/schema/protobufs/buf.yaml
@@ -1,12 +1,17 @@
-version: v1
+version: v2
deps:
- - buf.build/googleapis/googleapis
- - buf.build/grpc-ecosystem/grpc-gateway
- - buf.build/bufbuild/protovalidate
+ - buf.build/bufbuild/protovalidate:e097f827e65240ac9fd4b1158849a8fc
+ - buf.build/googleapis/googleapis:b30c5775bfb3485d9da2e87b26590ac9
+ - buf.build/grpc-ecosystem/grpc-gateway:3f42134f4c564983838425bc43c7a65f
lint:
use:
- - DEFAULT
- allow_comment_ignores: true
+ - STANDARD
+ except:
+ - FIELD_NOT_REQUIRED
+ - PACKAGE_NO_IMPORT_CYCLE
breaking:
use:
- - FILE
\ No newline at end of file
+ - FILE
+ except:
+ - EXTENSION_NO_DELETE
+ - FIELD_SAME_DEFAULT
diff --git a/schema/protobufs/stocklet/auth/v1/types.proto b/schema/protobufs/stocklet/auth/v1/types.proto
index 54ac81b..07555b5 100644
--- a/schema/protobufs/stocklet/auth/v1/types.proto
+++ b/schema/protobufs/stocklet/auth/v1/types.proto
@@ -1,4 +1,4 @@
-// Copyright (C) 2024 Declan Teevan
+// Copyright (C) 2025 Declan Teevan
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by