From 076a0c87fd5622e3f45c011b5d4966cdd416a561 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 10:12:42 -0500 Subject: [PATCH 1/7] register listener Signed-off-by: Rafal Augustyniak --- mobile/envoy_build_config/BUILD | 1 + mobile/envoy_build_config/extension_registry.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mobile/envoy_build_config/BUILD b/mobile/envoy_build_config/BUILD index 3b10cbfec0113..8e9a6a66778b0 100644 --- a/mobile/envoy_build_config/BUILD +++ b/mobile/envoy_build_config/BUILD @@ -27,6 +27,7 @@ envoy_cc_library( "@envoy//source/extensions/filters/http/router:config", "@envoy//source/extensions/filters/network/http_connection_manager:config", "@envoy//source/extensions/http/header_formatters/preserve_case:config", + "@envoy//source/extensions/listener_managers/listener_manager:listener_manager_lib", "@envoy//source/extensions/network/dns_resolver/getaddrinfo:config", "@envoy//source/extensions/request_id/uuid:config", "@envoy//source/extensions/stat_sinks/metrics_service:config", diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc index 73edc3769c996..a1880e25bb0d7 100644 --- a/mobile/envoy_build_config/extension_registry.cc +++ b/mobile/envoy_build_config/extension_registry.cc @@ -24,6 +24,7 @@ #include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "source/extensions/transport_sockets/tls/config.h" #include "source/extensions/upstreams/http/generic/config.h" +#include "source/listener_manager/listener_manager_impl.h" #include "extension_registry_platform_additions.h" #include "library/common/extensions/cert_validator/platform_bridge/config.h" @@ -75,6 +76,7 @@ void ExtensionRegistry::registerFactories() { Router::forceRegisterUpstreamCodecFilterFactory(); Envoy::Network::forceRegisterGetAddrInfoDnsResolverFactory(); Envoy::Extensions::RequestId::forceRegisterUUIDRequestIDExtensionFactory(); + Envoy::Server::forceRegisterDefaultListenerManagerFactoryImpl(); // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code // in such a way that does not depend on the statically initialized variable. From fc342d8a950b2351c4815baba04aa39284a7963b Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 10:13:56 -0500 Subject: [PATCH 2/7] Revert "ci: disable running the Objective-C integration app (#24478)" This reverts commit 0a8043c9d184df94737ecc646744fcaf9914777a. Signed-off-by: Rafal Augustyniak --- .github/workflows/ios_build.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ios_build.yml b/.github/workflows/ios_build.yml index b9f386421fc2a..e947b602907d6 100644 --- a/.github/workflows/ios_build.yml +++ b/.github/workflows/ios_build.yml @@ -213,21 +213,20 @@ jobs: $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \ --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ //examples/objective-c/hello_world:app - # TODO(jpsim): Re-enable running the app # Run the app in the background and redirect logs. - # - name: 'Run app' - # if: steps.should_run.outputs.run_ci_job == 'true' - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # run: | - # cd mobile && ./bazelw run \ - # --config=ios \ - # $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \ - # --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ - # //examples/objective-c/hello_world:app &> /tmp/envoy.log & - # - run: sed '/received headers with status 200/q' <(touch /tmp/envoy.log && tail -F /tmp/envoy.log) - # if: steps.should_run.outputs.run_ci_job == 'true' - # name: 'Check connectivity' - # - run: cat /tmp/envoy.log - # if: ${{ failure() || cancelled() }} - # name: 'Log app run' + - name: 'Run app' + if: steps.should_run.outputs.run_ci_job == 'true' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + cd mobile && ./bazelw run \ + --config=ios \ + $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \ + --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ + //examples/objective-c/hello_world:app &> /tmp/envoy.log & + - run: sed '/received headers with status 200/q' <(touch /tmp/envoy.log && tail -F /tmp/envoy.log) + if: steps.should_run.outputs.run_ci_job == 'true' + name: 'Check connectivity' + - run: cat /tmp/envoy.log + if: ${{ failure() || cancelled() }} + name: 'Log app run' From 433fdb3676b237a9c24718395e2e0e880654f045 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 10:27:53 -0500 Subject: [PATCH 3/7] fixes Signed-off-by: Rafal Augustyniak --- mobile/envoy_build_config/extension_registry.cc | 2 +- .../listener_managers/listener_manager/listener_manager_impl.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc index a1880e25bb0d7..7e78fcbc99bad 100644 --- a/mobile/envoy_build_config/extension_registry.cc +++ b/mobile/envoy_build_config/extension_registry.cc @@ -24,7 +24,7 @@ #include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "source/extensions/transport_sockets/tls/config.h" #include "source/extensions/upstreams/http/generic/config.h" -#include "source/listener_manager/listener_manager_impl.h" +#include "source/extensions/listener_managers/listener_manager/listener_manager_impl.h" #include "extension_registry_platform_additions.h" #include "library/common/extensions/cert_validator/platform_bridge/config.h" diff --git a/source/extensions/listener_managers/listener_manager/listener_manager_impl.h b/source/extensions/listener_managers/listener_manager/listener_manager_impl.h index 72006c24478ec..4f87520911b0b 100644 --- a/source/extensions/listener_managers/listener_manager/listener_manager_impl.h +++ b/source/extensions/listener_managers/listener_manager/listener_manager_impl.h @@ -369,5 +369,7 @@ class DefaultListenerManagerFactoryImpl : public ListenerManagerFactory { } }; +DECLARE_FACTORY(DefaultListenerManagerFactoryImpl); + } // namespace Server } // namespace Envoy From 85aa658d6653f3e3d3e8d08443a9de2e73cd28fe Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 12:50:06 -0500 Subject: [PATCH 4/7] revert a part of a PR Signed-off-by: Rafal Augustyniak --- mobile/envoy_build_config/BUILD | 1 - mobile/envoy_build_config/extension_registry.cc | 2 -- 2 files changed, 3 deletions(-) diff --git a/mobile/envoy_build_config/BUILD b/mobile/envoy_build_config/BUILD index 8e9a6a66778b0..3b10cbfec0113 100644 --- a/mobile/envoy_build_config/BUILD +++ b/mobile/envoy_build_config/BUILD @@ -27,7 +27,6 @@ envoy_cc_library( "@envoy//source/extensions/filters/http/router:config", "@envoy//source/extensions/filters/network/http_connection_manager:config", "@envoy//source/extensions/http/header_formatters/preserve_case:config", - "@envoy//source/extensions/listener_managers/listener_manager:listener_manager_lib", "@envoy//source/extensions/network/dns_resolver/getaddrinfo:config", "@envoy//source/extensions/request_id/uuid:config", "@envoy//source/extensions/stat_sinks/metrics_service:config", diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc index 7e78fcbc99bad..73edc3769c996 100644 --- a/mobile/envoy_build_config/extension_registry.cc +++ b/mobile/envoy_build_config/extension_registry.cc @@ -24,7 +24,6 @@ #include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "source/extensions/transport_sockets/tls/config.h" #include "source/extensions/upstreams/http/generic/config.h" -#include "source/extensions/listener_managers/listener_manager/listener_manager_impl.h" #include "extension_registry_platform_additions.h" #include "library/common/extensions/cert_validator/platform_bridge/config.h" @@ -76,7 +75,6 @@ void ExtensionRegistry::registerFactories() { Router::forceRegisterUpstreamCodecFilterFactory(); Envoy::Network::forceRegisterGetAddrInfoDnsResolverFactory(); Envoy::Extensions::RequestId::forceRegisterUUIDRequestIDExtensionFactory(); - Envoy::Server::forceRegisterDefaultListenerManagerFactoryImpl(); // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code // in such a way that does not depend on the statically initialized variable. From 201132fae189e22d5fde6d54c51c74ab6274b0d5 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 12:51:32 -0500 Subject: [PATCH 5/7] Revert "Revert "ci: disable running the Objective-C integration app (#24478)"" This reverts commit 8a01a75ff6888fa120a97087fd0d5309dca170ae. Signed-off-by: Rafal Augustyniak --- .github/workflows/ios_build.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ios_build.yml b/.github/workflows/ios_build.yml index e947b602907d6..b9f386421fc2a 100644 --- a/.github/workflows/ios_build.yml +++ b/.github/workflows/ios_build.yml @@ -213,20 +213,21 @@ jobs: $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \ --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ //examples/objective-c/hello_world:app + # TODO(jpsim): Re-enable running the app # Run the app in the background and redirect logs. - - name: 'Run app' - if: steps.should_run.outputs.run_ci_job == 'true' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - cd mobile && ./bazelw run \ - --config=ios \ - $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \ - --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ - //examples/objective-c/hello_world:app &> /tmp/envoy.log & - - run: sed '/received headers with status 200/q' <(touch /tmp/envoy.log && tail -F /tmp/envoy.log) - if: steps.should_run.outputs.run_ci_job == 'true' - name: 'Check connectivity' - - run: cat /tmp/envoy.log - if: ${{ failure() || cancelled() }} - name: 'Log app run' + # - name: 'Run app' + # if: steps.should_run.outputs.run_ci_job == 'true' + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # run: | + # cd mobile && ./bazelw run \ + # --config=ios \ + # $([ -z $GITHUB_TOKEN ] || echo "--config=remote-ci-macos") \ + # --remote_header="Authorization=Bearer $GITHUB_TOKEN" \ + # //examples/objective-c/hello_world:app &> /tmp/envoy.log & + # - run: sed '/received headers with status 200/q' <(touch /tmp/envoy.log && tail -F /tmp/envoy.log) + # if: steps.should_run.outputs.run_ci_job == 'true' + # name: 'Check connectivity' + # - run: cat /tmp/envoy.log + # if: ${{ failure() || cancelled() }} + # name: 'Log app run' From 7321517471ffd0966098f0bb7d14ea81d6244574 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 12:53:31 -0500 Subject: [PATCH 6/7] Revert "revert a part of a PR" This reverts commit 6472ac439c4072480f0c03a5890bee3e7d1d84cd. Signed-off-by: Rafal Augustyniak --- mobile/envoy_build_config/BUILD | 1 + mobile/envoy_build_config/extension_registry.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mobile/envoy_build_config/BUILD b/mobile/envoy_build_config/BUILD index 3b10cbfec0113..8e9a6a66778b0 100644 --- a/mobile/envoy_build_config/BUILD +++ b/mobile/envoy_build_config/BUILD @@ -27,6 +27,7 @@ envoy_cc_library( "@envoy//source/extensions/filters/http/router:config", "@envoy//source/extensions/filters/network/http_connection_manager:config", "@envoy//source/extensions/http/header_formatters/preserve_case:config", + "@envoy//source/extensions/listener_managers/listener_manager:listener_manager_lib", "@envoy//source/extensions/network/dns_resolver/getaddrinfo:config", "@envoy//source/extensions/request_id/uuid:config", "@envoy//source/extensions/stat_sinks/metrics_service:config", diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc index 73edc3769c996..7e78fcbc99bad 100644 --- a/mobile/envoy_build_config/extension_registry.cc +++ b/mobile/envoy_build_config/extension_registry.cc @@ -24,6 +24,7 @@ #include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "source/extensions/transport_sockets/tls/config.h" #include "source/extensions/upstreams/http/generic/config.h" +#include "source/extensions/listener_managers/listener_manager/listener_manager_impl.h" #include "extension_registry_platform_additions.h" #include "library/common/extensions/cert_validator/platform_bridge/config.h" @@ -75,6 +76,7 @@ void ExtensionRegistry::registerFactories() { Router::forceRegisterUpstreamCodecFilterFactory(); Envoy::Network::forceRegisterGetAddrInfoDnsResolverFactory(); Envoy::Extensions::RequestId::forceRegisterUUIDRequestIDExtensionFactory(); + Envoy::Server::forceRegisterDefaultListenerManagerFactoryImpl(); // TODO: add a "force initialize" function to the upstream code, or clean up the upstream code // in such a way that does not depend on the statically initialized variable. From 9d4340c04fc3dacc3e304efddf52290673160ece Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Mon, 12 Dec 2022 12:54:06 -0500 Subject: [PATCH 7/7] lint fix Signed-off-by: Rafal Augustyniak --- mobile/envoy_build_config/extension_registry.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/envoy_build_config/extension_registry.cc b/mobile/envoy_build_config/extension_registry.cc index 7e78fcbc99bad..25b56240a7d59 100644 --- a/mobile/envoy_build_config/extension_registry.cc +++ b/mobile/envoy_build_config/extension_registry.cc @@ -16,6 +16,7 @@ #include "source/extensions/filters/network/http_connection_manager/config.h" #include "source/extensions/http/header_formatters/preserve_case/config.h" #include "source/extensions/http/original_ip_detection/xff/config.h" +#include "source/extensions/listener_managers/listener_manager/listener_manager_impl.h" #include "source/extensions/network/dns_resolver/getaddrinfo/getaddrinfo.h" #include "source/extensions/request_id/uuid/config.h" #include "source/extensions/stat_sinks/metrics_service/config.h" @@ -24,7 +25,6 @@ #include "source/extensions/transport_sockets/tls/cert_validator/default_validator.h" #include "source/extensions/transport_sockets/tls/config.h" #include "source/extensions/upstreams/http/generic/config.h" -#include "source/extensions/listener_managers/listener_manager/listener_manager_impl.h" #include "extension_registry_platform_additions.h" #include "library/common/extensions/cert_validator/platform_bridge/config.h"