Skip to content

Commit d1858f8

Browse files
authored
Extract private/usage to separate repository (#4059)
1 parent 0b926a9 commit d1858f8

File tree

163 files changed

+198
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+198
-274
lines changed

data/bandeps/bandeps.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,17 @@ bans:
44
- ./private/bufpkg/...
55
- ./private/pkg/...
66
- ./private/gen/...
7-
- ./private/usage/...
87
deps:
98
use:
109
- ./private/buf/...
11-
except:
12-
- ./private/usage/...
1310
note: Packages in private/buf cannot be depended on by other packages.
1411
- packages:
1512
use:
1613
- ./private/pkg/...
1714
- ./private/gen/...
18-
- ./private/usage/...
1915
deps:
2016
use:
2117
- ./private/bufpkg/...
22-
except:
23-
- ./private/usage/...
2418
note: Packages in private/bufpkg cannot be depended on by other packages except private/buf packages.
2519
- packages:
2620
use:
@@ -33,7 +27,7 @@ bans:
3327
note: Packages in cmd should be self-contained.
3428
- packages:
3529
use:
36-
- ./private/...
30+
- ./...
3731
except:
3832
- ./private/buf/bufcli/...
3933
- ./cmd/...
@@ -49,5 +43,4 @@ bans:
4943
- ./...
5044
except:
5145
- ./private/pkg/...
52-
- ./private/usage/...
5346
note: Packages in private/pkg cannot depend on packages outside of private/pkg.

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require (
99
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.10-20250924144421-cb55f06efbd2.1
1010
buf.build/go/app v0.1.0
1111
buf.build/go/bufplugin v0.9.0
12+
buf.build/go/bufprivateusage v0.1.0
1213
buf.build/go/protovalidate v1.0.0
1314
buf.build/go/protoyaml v0.6.0
1415
buf.build/go/spdx v0.2.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ buf.build/go/app v0.1.0 h1:nlqD/h0rhIN73ZoiDElprrPiO2N6JV+RmNK34K29Ihg=
1212
buf.build/go/app v0.1.0/go.mod h1:0XVOYemubVbxNXVY0DnsVgWeGkcbbAvjDa1fmhBC+Wo=
1313
buf.build/go/bufplugin v0.9.0 h1:ktZJNP3If7ldcWVqh46XKeiYJVPxHQxCfjzVQDzZ/lo=
1414
buf.build/go/bufplugin v0.9.0/go.mod h1:Z0CxA3sKQ6EPz/Os4kJJneeRO6CjPeidtP1ABh5jPPY=
15+
buf.build/go/bufprivateusage v0.1.0 h1:SzCoCcmzS3zyXHEXHeSQhGI7OTkgtljoknLzsUz9Gg4=
16+
buf.build/go/bufprivateusage v0.1.0/go.mod h1:GlCCJ3VVF7EqqU0CoRmo1FzAwwaKymEWSr+ty69xU5w=
1517
buf.build/go/interrupt v1.1.0 h1:olBuhgv9Sav4/9pkSLoxgiOsZDgM5VhRhvRpn3DL0lE=
1618
buf.build/go/interrupt v1.1.0/go.mod h1:ql56nXPG1oHlvZa6efNC7SKAQ/tUjS6z0mhJl0gyeRM=
1719
buf.build/go/protovalidate v1.0.0 h1:IAG1etULddAy93fiBsFVhpj7es5zL53AfB/79CVGtyY=

make/buf/all.mk

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ LICENSE_HEADER_COPYRIGHT_HOLDER := Buf Technologies, Inc.
4545
LICENSE_HEADER_YEAR_RANGE := 2020-2025
4646
LICENSE_HEADER_IGNORES := \/testdata enterprise
4747
BANDEPS_CONFIG := data/bandeps/bandeps.yaml
48+
BUFPRIVATEUSAGE_PKGS := ./private/...
4849
PROTOVALIDATE_VERSION := v1.0.0
4950
# Comment out to use released buf
5051
#BUF_GO_INSTALL_PATH := ./cmd/buf
@@ -68,6 +69,7 @@ include make/go/go.mk
6869
include make/go/docker.mk
6970
include make/go/license_header.mk
7071
include make/go/bandeps.mk
72+
include make/go/bufprivateusage.mk
7173
include make/go/buf.mk
7274

7375
installtest:: $(PROTOC) $(PROTOC_GEN_GO)
@@ -98,12 +100,6 @@ bufworkspacebuflocks: installbuf-digest installbuf-new-commit-id
98100

99101
prepostgenerate:: bufworkspacebuflocks
100102

101-
.PHONY: privateusage
102-
privateusage:
103-
bash make/buf/scripts/privateusage.bash
104-
105-
postprepostgenerate:: privateusage
106-
107103
bufgeneratedeps:: $(PROTOC_GEN_GO) $(PROTOC_GEN_CONNECT_GO)
108104

109105
.PHONY: bufgeneratecleango

make/buf/scripts/privateusage.bash

Lines changed: 0 additions & 22 deletions
This file was deleted.

make/go/bufprivateusage.mk

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Managed by makego. DO NOT EDIT.
2+
3+
# Must be set
4+
$(call _assert_var,MAKEGO)
5+
$(call _conditional_include,$(MAKEGO)/base.mk)
6+
$(call _conditional_include,make/go/dep_bufprivateusage.mk)
7+
8+
BUFPRIVATEUSAGE_PKGS ?=
9+
10+
ifneq ($(BUFPRIVATEUSAGE_PKGS),)
11+
.PHONY: bufprivateusage
12+
bufprivateusage: $(BUFPRIVATEUSAGE)
13+
bufprivateusage $(BUFPRIVATEUSAGE_PKGS)
14+
15+
postprepostgenerate:: bufprivateusage
16+
endif

make/go/dep_bufprivateusage.mk

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Managed by makego. DO NOT EDIT.
2+
3+
# Must be set
4+
$(call _assert_var,MAKEGO)
5+
$(call _conditional_include,$(MAKEGO)/base.mk)
6+
$(call _conditional_include,$(MAKEGO)/dep_buf.mk)
7+
$(call _assert_var,CACHE_VERSIONS)
8+
$(call _assert_var,CACHE_BIN)
9+
$(call _assert_var,BUF_VERSION)
10+
11+
# Settable
12+
# https://github.com/bufbuild/bufprivateusage-go/releases
13+
BUFPRIVATEUSAGE_VERSION ?= v0.1.0
14+
15+
BUFPRIVATEUSAGE := $(CACHE_VERSIONS)/bufprivateusage/$(BUFPRIVATEUSAGE_VERSION)
16+
$(BUFPRIVATEUSAGE):
17+
@rm -f $(CACHE_BIN)/bufprivateusage
18+
GOBIN=$(CACHE_BIN) go install buf.build/go/bufprivateusage/cmd/bufprivateusage@$(BUFPRIVATEUSAGE_VERSION)
19+
@rm -rf $(dir $(BUFPRIVATEUSAGE))
20+
@mkdir -p $(dir $(BUFPRIVATEUSAGE))
21+
@touch $(BUFPRIVATEUSAGE)
22+
23+
dockerdeps:: $(BUFPRIVATEUSAGE)

private/buf/bufapp/usage.gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

private/buf/bufcli/usage.gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

private/buf/bufconvert/usage.gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)