Merge pull request #789 from dereknola/main

Define a `go_package` for protobuf, rename to a more unique `ipns-record.proto`
ipfs · Jan 16, 2025 · b7d0d20 · b7d0d20
2 parents 11b5100 + 34a082c
commit b7d0d20
Show file tree

Hide file tree

Showing 5 changed files with 273 additions and 272 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ The following emojis are used to highlight certain changes:
 ### Fixed
 
 - `gateway` Fix redirect URLs for subdirectories with characters that need escaping. [#779](https://github.com/ipfs/boxo/pull/779)
+- `ipns` Defined a `go_package` name in `ipns-record.proto` to avoid protobuf conflicts [#789](https://github.com/ipfs/boxo/pull/789)
 
 ### Security
 

diff --git a/ipns/pb/ipns-record.pb.go b/ipns/pb/ipns-record.pb.go
diff --git a/ipns/pb/record.proto → ipns/pb/ipns-record.proto b/ipns/pb/record.proto → ipns/pb/ipns-record.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package github.com.boxo.ipns.pb;
 
-option go_package = ".;pb";
+option go_package = "github.com/ipfs/boxo/ipns/pb";
 
 // https://specs.ipfs.tech/ipns/ipns-record/#record-serialization-format
 message IpnsRecord {