[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: modifying proto library generation and optimizing docker files. #52

Merged
merged 7 commits into from
Mar 20, 2024
Merged

feat: modifying proto library generation and optimizing docker files. #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34ba2a3
Migrating from a static proto file to one generated from envoy main.
jstraceski Mar 19, 2024
3a3fa5b
Optimizing and consolidating docker files to a common base image.
jstraceski Mar 20, 2024
531594b
Removing unused import
jstraceski Mar 20, 2024
25c97e7
Merge remote-tracking branch 'upstream/main' into dynamic-proto-gener…
jstraceski Mar 20, 2024
efee194
Fixing docker imports after recent changes
jstraceski Mar 20, 2024
912c572
Switching proto imports to the generated source
jstraceski Mar 20, 2024
cc7b02b
Reveting the base docker image to use marketplace.gcr.io
jstraceski Mar 20, 2024
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
Prev Previous commit
Next Next commit
Switching proto imports to the generated source
  • Loading branch information
@jstraceski
jstraceski committed Mar 20, 2024
commit 912c5721ef02a817468c581b2971ad8bb122989f
10 changes: 5 additions & 5 deletions callouts/python/extproc/service/callout_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

import grpc
from grpc import ServicerContext
from envoy.config.core.v3.base_pb2 import HeaderValueOption
from envoy.config.core.v3.base_pb2 import HeaderValue
from envoy.config.core.v3.base_pb2 import HeaderValueOption
from envoy.service.ext_proc.v3.external_processor_pb2_grpc import add_ExternalProcessorServicer_to_server
from envoy.service.ext_proc.v3 import external_processor_pb2 as service_pb2
from envoy.service.ext_proc.v3 import external_processor_pb2_grpc as service_pb2_grpc
Expand All @@ -53,8 +53,8 @@ def add_header_mutation(
header_mutation = service_pb2.HeadersResponse()
if add:
for k, v in add:
header_value_option = service_pb2.HeaderValueOption(
header=service_pb2.HeaderValue(key=k, raw_value=bytes(v, 'utf-8'))
header_value_option = HeaderValueOption(
header=HeaderValue(key=k, raw_value=bytes(v, 'utf-8'))
)
if append_action:
header_value_option.append_action = append_action
Expand Down Expand Up @@ -318,8 +318,8 @@ def generate_mock_response(self, mock_type):
"""Generate mock response based on type ('header' or 'body')."""
if mock_type == 'header':
mock_response = service_pb2.HeadersResponse()
mock_header = service_pb2.HeaderValueOption(
header=service_pb2.HeaderValue(key="Mock-Response", raw_value=bytes("Mocked-Value", 'utf-8')))
mock_header = HeaderValueOption(
header=HeaderValue(key="Mock-Response", raw_value=bytes("Mocked-Value", 'utf-8')))
mock_response.response.header_mutation.set_headers.append(mock_header)
return mock_response
elif mock_type == 'body':
Expand Down
14 changes: 8 additions & 6 deletions callouts/python/extproc/tests/add_custom_response_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
from grpc import ServicerContext
import pytest
from extproc.service import callout_server
from extproc.proto import service_pb2
from extproc.proto import service_pb2_grpc
from envoy.config.core.v3.base_pb2 import HeaderMap
from envoy.config.core.v3.base_pb2 import HeaderValue
from envoy.service.ext_proc.v3 import external_processor_pb2 as service_pb2
from envoy.service.ext_proc.v3 import external_processor_pb2_grpc as service_pb2_grpc

# Global server variable.
server: callout_server.CalloutServer | None = None
Expand Down Expand Up @@ -266,8 +268,8 @@ def test_mock_request_header_handling() -> None:
stub = service_pb2_grpc.ExternalProcessorStub(channel)

# Construct the HeaderMap
header_map = service_pb2.HeaderMap()
header_value = service_pb2.HeaderValue(key="mock", raw_value=b"true")
header_map = HeaderMap()
header_value = HeaderValue(key="mock", raw_value=b"true")
header_map.headers.extend([header_value])

# Construct HttpHeaders with the HeaderMap
Expand All @@ -290,8 +292,8 @@ def test_mock_response_header_handling() -> None:
stub = service_pb2_grpc.ExternalProcessorStub(channel)

# Construct the HeaderMap
header_map = service_pb2.HeaderMap()
header_value = service_pb2.HeaderValue(key="mock", raw_value=b"true")
header_map = HeaderMap()
header_value = HeaderValue(key="mock", raw_value=b"true")
header_map.headers.extend([header_value])

# Construct HttpHeaders with the HeaderMap
Expand Down
10 changes: 6 additions & 4 deletions callouts/python/extproc/tests/cloud_log_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
from grpc import ServicerContext
import pytest
from extproc.service import callout_server
from extproc.proto import service_pb2
from extproc.proto import service_pb2_grpc
from envoy.config.core.v3.base_pb2 import HeaderMap
from envoy.config.core.v3.base_pb2 import HeaderValue
from envoy.service.ext_proc.v3 import external_processor_pb2 as service_pb2
from envoy.service.ext_proc.v3 import external_processor_pb2_grpc as service_pb2_grpc

# Global server variable.
server: callout_server.CalloutServer | None = None
Expand Down Expand Up @@ -240,8 +242,8 @@ def test_header_validation_failure() -> None:
stub = service_pb2_grpc.ExternalProcessorStub(channel)

# Construct the HeaderMap
header_map = service_pb2.HeaderMap()
header_value = service_pb2.HeaderValue(key="header-check", raw_value=b"fail")
header_map = HeaderMap()
header_value = HeaderValue(key="header-check", raw_value=b"fail")
header_map.headers.extend([header_value])

# Construct HttpHeaders with the HeaderMap
Expand Down
Loading