[CORD-2871]
Fix protobuf integration in prep for CORD-2276
Change-Id: I67ffa17d97d97e9a226269e99de76c236a431dd1
diff --git a/protoc_plugins/gw_gen.py b/protoc_plugins/gw_gen.py
index a6f9414..c63d776 100755
--- a/protoc_plugins/gw_gen.py
+++ b/protoc_plugins/gw_gen.py
@@ -23,9 +23,7 @@
from jinja2 import Template
from simplejson import dumps
-from chameleon.protos.third_party.google.api import annotations_pb2, http_pb2
-_ = annotations_pb2, http_pb2 # to keep import line from being optimized out
-
+from chameleon.protos import annotations_pb2, http_pb2
template = Template("""
# Generated file; please do not edit
@@ -111,7 +109,7 @@
options = method.options
assert isinstance(options, MethodOptions)
for fd, http in options.ListFields():
- if fd.full_name == 'google.api.http':
+ if fd.full_name == 'googleapi.http':
assert fd.name == 'http'
assert isinstance(http, http_pb2.HttpRule)
diff --git a/protoc_plugins/schema2dict.py b/protoc_plugins/schema2dict.py
index e644ba8..3a7a63b 100644
--- a/protoc_plugins/schema2dict.py
+++ b/protoc_plugins/schema2dict.py
@@ -21,9 +21,7 @@
"""
import json
import sys
-from chameleon.protos.third_party.google.api import annotations_pb2
-_ = annotations_pb2
-from chameleon.protos import schema_pb2
+from chameleon.protos import schema_pb2, annotations_pb2
from protobuf_to_dict import protobuf_to_dict
diff --git a/protoc_plugins/swagger_gen.py b/protoc_plugins/swagger_gen.py
index 67d6a9a..3b558d6 100755
--- a/protoc_plugins/swagger_gen.py
+++ b/protoc_plugins/swagger_gen.py
@@ -20,7 +20,7 @@
from simplejson import dumps
# without this import, http method annotations would not be recognized:
-from google.api import annotations_pb2, http_pb2
+from chameleon.protos import annotations_pb2, http_pb2
from chameleon.protoc_plugins.descriptor_parser import DescriptorParser
from swagger_template import native_descriptors_to_swagger