Skip to content

Commit

Permalink
delete forward sni, cluster rewrite, and sni verifier filters (#4958)
Browse files Browse the repository at this point in the history
* delete cluster rewrite filter

Signed-off-by: Kuat Yessenov <kuat@google.com>

* fix

Signed-off-by: Kuat Yessenov <kuat@google.com>

---------

Signed-off-by: Kuat Yessenov <kuat@google.com>
  • Loading branch information
kyessenov authored Sep 18, 2023
1 parent b5daff1 commit e2ced9c
Show file tree
Hide file tree
Showing 28 changed files with 2 additions and 1,679 deletions.
3 changes: 0 additions & 3 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,8 @@ envoy_cc_binary(
"//source/extensions/filters/http/istio_stats",
"//source/extensions/filters/http/peer_metadata:filter_lib",
"//source/extensions/filters/listener/set_internal_dst_address:filter_lib", # Experimental: ambient
"//source/extensions/filters/network/forward_downstream_sni:config_lib",
"//source/extensions/filters/network/istio_authn:config_lib",
"//source/extensions/filters/network/metadata_exchange:config_lib",
"//source/extensions/filters/network/sni_verifier:config_lib",
"//source/extensions/filters/network/tcp_cluster_rewrite:config_lib",
"@envoy//source/exe:envoy_main_entry_lib",
],
)
Expand Down
59 changes: 0 additions & 59 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ workspace(name = "io_istio_proxy")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load(
"//bazel:repositories.bzl",
"docker_dependencies",
"istioapi_dependencies",
)

Expand Down Expand Up @@ -85,61 +84,3 @@ install_deps()
load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")

envoy_dependency_imports()

# Bazel @rules_pkg

http_archive(
name = "rules_pkg",
sha256 = "aeca78988341a2ee1ba097641056d168320ecc51372ef7ff8e64b139516a4937",
urls = [
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.6-1/rules_pkg-0.2.6.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.6/rules_pkg-0.2.6.tar.gz",
],
)

load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")

rules_pkg_dependencies()

# Docker dependencies

docker_dependencies()

load(
"@io_bazel_rules_docker//repositories:repositories.bzl",
container_repositories = "repositories",
)

container_repositories()

load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")

container_deps()

load(
"@io_bazel_rules_docker//container:container.bzl",
"container_pull",
)

container_pull(
name = "distroless_cc",
# Latest as of 10/21/2019. To update, remove this line, re-build, and copy the suggested digest.
digest = "sha256:86f16733f25964c40dcd34edf14339ddbb2287af2f7c9dfad88f0366723c00d7",
registry = "gcr.io",
repository = "distroless/cc",
)

container_pull(
name = "bionic",
# Latest as of 10/21/2019. To update, remove this line, re-build, and copy the suggested digest.
digest = "sha256:3e83eca7870ee14a03b8026660e71ba761e6919b6982fb920d10254688a363d4",
registry = "index.docker.io",
repository = "library/ubuntu",
tag = "bionic",
)

# End of docker dependencies

load("//bazel:wasm.bzl", "wasm_dependencies")

wasm_dependencies()
28 changes: 0 additions & 28 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,6 @@ cc_proto_library(
":alpn_filter_config_proto_lib",
],
)
proto_library(
name = "tcp_cluster_rewrite_config_proto_lib",
srcs = glob(
["envoy/config/filter/network/tcp_cluster_rewrite/v2alpha1/*.proto", ],
),
visibility = ["//visibility:public"],
)
cc_proto_library(
name = "tcp_cluster_rewrite_config_cc_proto",
visibility = ["//visibility:public"],
deps = [
":tcp_cluster_rewrite_config_proto_lib",
],
)
"""
http_archive(
name = "istioapi_git",
Expand All @@ -114,17 +97,6 @@ cc_proto_library(
name = "alpn_filter_config_cc_proto",
actual = "@istioapi_git//:alpn_filter_config_cc_proto",
)
native.bind(
name = "tcp_cluster_rewrite_config_cc_proto",
actual = "@istioapi_git//:tcp_cluster_rewrite_config_cc_proto",
)

def istioapi_dependencies():
istioapi_repositories()

def docker_dependencies():
http_archive(
name = "io_bazel_rules_docker",
sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz"],
)
36 changes: 0 additions & 36 deletions bazel/wasm.bzl

This file was deleted.

2 changes: 1 addition & 1 deletion extensions/common/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ envoy_cc_library(
],
hdrs = [
"//extensions/common/wasm:json_util.h",
"//extensions/common/wasm:nlohmann_json_hpp",
],
repository = "@envoy",
visibility = ["//visibility:public"],
deps = [
"@com_github_nlohmann_json//:json",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:optional",
],
Expand Down
23 changes: 0 additions & 23 deletions extensions/common/wasm/BUILD
Original file line number Diff line number Diff line change
@@ -1,28 +1,5 @@
licenses(["notice"])

genrule(
name = "nlohmann_json_hpp",
srcs = ["@com_github_nlohmann_json_single_header//file"],
outs = ["nlohmann_json.hpp"],
cmd = "cp $< $@",
visibility = ["//visibility:public"],
)

cc_library(
name = "json_util",
srcs = ["json_util.cc"],
hdrs = [
"json_util.h",
":nlohmann_json_hpp",
],
copts = ["-UNULL_PLUGIN"],
visibility = ["//visibility:public"],
deps = [
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:optional",
],
)

exports_files([
"base64.h",
"json_util.cc",
Expand Down
2 changes: 1 addition & 1 deletion extensions/common/wasm/json_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <optional>

#include "extensions/common/wasm/nlohmann_json.hpp"
#include "include/nlohmann/json.hpp"

/**
* Utilities for working with JSON without exceptions.
Expand Down
68 changes: 0 additions & 68 deletions source/extensions/filters/network/forward_downstream_sni/BUILD

This file was deleted.

48 changes: 0 additions & 48 deletions source/extensions/filters/network/forward_downstream_sni/config.cc

This file was deleted.

41 changes: 0 additions & 41 deletions source/extensions/filters/network/forward_downstream_sni/config.h

This file was deleted.

This file was deleted.

Loading

0 comments on commit e2ced9c

Please sign in to comment.