Skip to content

Commit

Permalink
Revert copy envoy.type.Percent and its usage
Browse files Browse the repository at this point in the history
Signed-off-by: Venil Noronha <veniln@vmware.com>
  • Loading branch information
venilnoronha committed Aug 17, 2018
1 parent aee3bd2 commit 81320ce
Show file tree
Hide file tree
Showing 8 changed files with 208 additions and 727 deletions.
35 changes: 11 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -310,39 +310,26 @@ clean-authn:
#####################

envoy_path := envoy
envoy_types_protos := $(shell find $(envoy_path) -type f -path '*/types/*' -name '*.proto' | sort)
envoy_types_pb_gos := $(envoy_types_protos:.proto=.pb.go)
envoy_types_pb_pythons := $(envoy_types_protos:.proto=_pb2.py)
envoy_v2alpha1_protos := $(shell find $(envoy_path) -type f -path '*/v2alpha1/*' -name '*.proto' | sort)
envoy_v2alpha1_pb_gos := $(envoy_v2alpha1_protos:.proto=.pb.go)
envoy_v2alpha1_pb_pythons := $(envoy_v2alpha1_protos:.proto=_pb2.py)

generate-envoy-go: $(envoy_types_pb_gos) $(envoy_v2alpha1_pb_gos) $(envoy_pb_doc)

# Envoy types are internal types, documents is not required.
$(envoy_types_pb_gos): $(envoy_types_protos)
## Generate envoy/*/types/*.pb.go
@$(docker_gen) $(gogofast_plugin) $^
envoy_protos := $(shell find $(envoy_path) -type f -name '*.proto' | sort)
envoy_pb_gos := $(envoy_protos:.proto=.pb.go)
envoy_pb_pythons := $(envoy_protos:.proto=_pb2.py)

generate-envoy-go: $(envoy_pb_gos) $(envoy_pb_doc)

# Envoy APIs is internal APIs, documents is not required.
$(envoy_v2alpha1_pb_gos): $(envoy_v2alpha1_protos)
## Generate envoy/*/v2alpha1/*.pb.go
$(envoy_pb_gos): $(envoy_protos)
## Generate envoy/*/*.pb.go
@$(docker_gen) $(gogofast_plugin) $^

generate-envoy-python: $(envoy_types_pb_pythons) $(envoy_v2alpha1_pb_pythons)

# Envoy types are internal types, documents is not required.
$(envoy_types_pb_pythons): $(envoy_types_protos)
## Generate envoy/*/types/*_pb2.py
@$(docker_gen) $(protoc_gen_python_plugin) $^
generate-envoy-python: $(envoy_pb_pythons)

# Envoy APIs is internal APIs, documents is not required.
$(envoy_v2alpha1_pb_pythons): $(envoy_v2alpha1_protos)
## Generate envoy/*/v2alpha1/*_pb2.py
$(envoy_pb_pythons): $(envoy_protos)
## Generate envoy/*/*_pb2.py
@$(docker_gen) $(protoc_gen_python_plugin) $^

clean-envoy:
rm -f $(envoy_types_pb_gos) $(envoy_v2alpha1_pb_gos)
rm -f $(envoy_pb_gos)

#####################
# common/...
Expand Down
314 changes: 0 additions & 314 deletions envoy/types/percent.pb.go

This file was deleted.

31 changes: 0 additions & 31 deletions envoy/types/percent.proto

This file was deleted.

0 comments on commit 81320ce

Please sign in to comment.