Skip to content
This repository was archived by the owner on Jan 16, 2022. It is now read-only.

Update istio/api #29

Merged
kyessenov merged 3 commits into from
Mar 16, 2018
Merged

Update istio/api #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec00fe0
Update istio/api
kyessenov Mar 16, 2018
6b30a5a
Update istio/api
kyessenov Mar 16, 2018
0f95b09
update api
kyessenov Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Gopkg.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ required = [
# TODO replace with master as api/master should be tracked in istio/master
[[constraint]]
name = "istio.io/api"
revision = "cc0e5e493a556ed726ec528fcce2e03ff0eed66e"
branch = "master"

[[constraint]]
name = "github.com/envoyproxy/go-control-plane"
Expand Down
19 changes: 0 additions & 19 deletions istio.io/api/CODEOWNERS
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions istio.io/api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ protoc_gen_go_plugin := $(protoc_gen_go_prefix):$(out_path)
########################

gogo_plugin_prefix := --gogo_out=plugins=grpc,
gogofast_plugin_prefix := --gogofast_out=plugins=grpc,
gogoslick_plugin_prefix := --gogoslick_out=plugins=grpc,

comma := ,
Expand All @@ -45,6 +46,7 @@ importmaps := \
google/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor \
google/protobuf/duration.proto=github.com/gogo/protobuf/types \
google/protobuf/timestamp.proto=github.com/gogo/protobuf/types \
google/protobuf/wrappers.proto=github.com/gogo/protobuf/types \
google/rpc/status.proto=github.com/gogo/googleapis/google/rpc \
google/rpc/code.proto=github.com/gogo/googleapis/google/rpc \
google/rpc/error_details.proto=github.com/gogo/googleapis/google/rpc \
Expand All @@ -54,6 +56,7 @@ mapping_with_spaces := $(foreach map,$(importmaps),M$(map),)
gogo_mapping := $(subst $(space),$(empty),$(mapping_with_spaces))

gogo_plugin := $(gogo_plugin_prefix)$(gogo_mapping):$(out_path)
gogofast_plugin := $(gogofast_plugin_prefix)$(gogo_mapping):$(out_path)
gogoslick_plugin := $(gogoslick_plugin_prefix)$(gogo_mapping):$(out_path)

########################
Expand Down Expand Up @@ -216,7 +219,7 @@ $(routing_v1alpha1_pb_gos) $(routing_v1alpha1_pb_doc): $(routing_v1alpha1_protos

$(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_doc): $(routing_v1alpha3_protos)
## Generate networking/v1alpha3/*.pb.go
@$(docker_gen) $(protoc_gen_go_plugin) $(protoc_gen_docs_plugin)$(routing_v1alpha3_path) $^
@$(docker_gen) $(gogofast_plugin) $(protoc_gen_docs_plugin)$(routing_v1alpha3_path) $^

clean-routing:
rm -f $(routing_v1alpha1_pb_gos) $(routing_v1alpha3_pb_gos)
Expand Down Expand Up @@ -255,7 +258,7 @@ generate-authn-go: $(authn_v1alpha1_pb_gos) $(authn_v1alpha1_pb_doc)

$(authn_v1alpha1_pb_gos) $(authn_v1alpha1_pb_doc): $(authn_v1alpha1_protos)
## Generate authentication/v1alpha1/*.pb.go
@$(docker_gen) $(protoc_gen_go_plugin) $(protoc_gen_docs_plugin)$(authn_v1alpha1_path) $^
@$(docker_gen) $(gogofast_plugin) $(protoc_gen_docs_plugin)$(authn_v1alpha1_path) $^

clean-authn:
rm -f $(authn_v1alpha1_pb_gos)
Expand Down
Loading