From c9affabaebc40e6a4bec053c85e73d455abc59b3 Mon Sep 17 00:00:00 2001
From: Andrew Z Allen <me@andrewzallen.com>
Date: Mon, 16 Dec 2019 15:13:50 -0700
Subject: [PATCH] Explicitly load rules_proto rules

Fixes: #1101
---
 examples/pbwrappers/helloworld/BUILD.bazel | 1 +
 examples/proto/examplepb/BUILD.bazel       | 1 +
 examples/proto/pathenum/BUILD.bazel        | 1 +
 examples/proto/sub/BUILD.bazel             | 1 +
 examples/proto/sub2/BUILD.bazel            | 1 +
 internal/BUILD.bazel                       | 1 +
 protoc-gen-swagger/defs.bzl                | 2 ++
 protoc-gen-swagger/options/BUILD.bazel     | 1 +
 8 files changed, 9 insertions(+)

diff --git a/examples/pbwrappers/helloworld/BUILD.bazel b/examples/pbwrappers/helloworld/BUILD.bazel
index 0b6c67f8074..d193503bb29 100644
--- a/examples/pbwrappers/helloworld/BUILD.bazel
+++ b/examples/pbwrappers/helloworld/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
diff --git a/examples/proto/examplepb/BUILD.bazel b/examples/proto/examplepb/BUILD.bazel
index b483934a865..aaf33e679da 100644
--- a/examples/proto/examplepb/BUILD.bazel
+++ b/examples/proto/examplepb/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@grpc_ecosystem_grpc_gateway//protoc-gen-swagger:defs.bzl", "protoc_gen_swagger")
diff --git a/examples/proto/pathenum/BUILD.bazel b/examples/proto/pathenum/BUILD.bazel
index 26b3efc1921..28b27b629eb 100644
--- a/examples/proto/pathenum/BUILD.bazel
+++ b/examples/proto/pathenum/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
diff --git a/examples/proto/sub/BUILD.bazel b/examples/proto/sub/BUILD.bazel
index bc5874bba55..6ff26698b24 100644
--- a/examples/proto/sub/BUILD.bazel
+++ b/examples/proto/sub/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
diff --git a/examples/proto/sub2/BUILD.bazel b/examples/proto/sub2/BUILD.bazel
index 539f5b6e450..1e97c9ae2dd 100644
--- a/examples/proto/sub2/BUILD.bazel
+++ b/examples/proto/sub2/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
diff --git a/internal/BUILD.bazel b/internal/BUILD.bazel
index 76cafe6ec7f..d3c5d2dd5c1 100644
--- a/internal/BUILD.bazel
+++ b/internal/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
diff --git a/protoc-gen-swagger/defs.bzl b/protoc-gen-swagger/defs.bzl
index fac06f3b9b7..1d5809f96d5 100644
--- a/protoc-gen-swagger/defs.bzl
+++ b/protoc-gen-swagger/defs.bzl
@@ -4,6 +4,8 @@ Reads the the api spec in protobuf format and generate an open-api spec.
 Optionally applies settings from the grpc-service configuration.
 """
 
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "ProtoInfo")
+
 # TODO(yannic): Replace with |proto_common.direct_source_infos| when
 # https://github.com/bazelbuild/rules_proto/pull/22 lands.
 def _direct_source_infos(proto_info, provided_sources = []):
diff --git a/protoc-gen-swagger/options/BUILD.bazel b/protoc-gen-swagger/options/BUILD.bazel
index 8dea43d297d..2bd65ed58dc 100644
--- a/protoc-gen-swagger/options/BUILD.bazel
+++ b/protoc-gen-swagger/options/BUILD.bazel
@@ -1,3 +1,4 @@
+load("//third_party/bazel_rules/rules_proto/proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")