Skip to content

Commit

Permalink
almost
Browse files Browse the repository at this point in the history
  • Loading branch information
francoposa committed Dec 28, 2024
1 parent f5180c9 commit b55986f
Show file tree
Hide file tree
Showing 38 changed files with 1,177 additions and 1,166 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ images: ## Print all image names.
@echo > /dev/null

# Generating proto code is automated.
PROTO_DEFS := $(shell find . $(DONT_FIND) -type f -name '*.proto' -print)
PROTO_DEFS := $(shell find . $(DONT_FIND) -type f -name '*_custom_types.proto' -prune -o -name '*.proto' -print)
PROTO_GOS := $(patsubst %.proto,%.pb.go,$(PROTO_DEFS))

# Generating OTLP translation code is automated.
Expand Down Expand Up @@ -325,7 +325,10 @@ GENERATE_FILES ?= true
%.pb.go: %.proto
ifeq ($(GENERATE_FILES),true)
if case "$@" in *_custom_types.pb.go) false ;; *) true ;; esac; then \
protoc -I $(GOPATH)/src:./vendor/github.com/gogo/protobuf:./vendor:./$(@D):./pkg/storegateway/storepb:./pkg/mimirpb --gogoslick_out=plugins=grpc,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,:./$(@D) ./$(patsubst %.pb.go,%.proto,$@); \
protoc \
-I ./vendor -I ./ -I ./vendor/github.com/gogo/protobuf \
--gogoslick_out=plugins=grpc,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types:. \
./$(patsubst %.pb.go,%.proto,$@); \
else \
echo "Skipping $@"; \
fi
Expand Down
84 changes: 43 additions & 41 deletions pkg/alertmanager/alertmanagerpb/alertmanager.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/alertmanager/alertmanagerpb/alertmanager.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ syntax = "proto3";

package alertmanagerpb;
import "gogoproto/gogo.proto";

option go_package = "alertmanagerpb";

import "github.com/grafana/dskit/httpgrpc/httpgrpc.proto";
Expand Down
82 changes: 42 additions & 40 deletions pkg/alertmanager/alertspb/alerts.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b55986f

Please sign in to comment.