Skip to content

Import Envoy Mobile Repo v2#24244

Merged
jpsim merged 1788 commits intomainfrom
envoy-mobile-repo-merge-v2
Nov 29, 2022
Merged

Import Envoy Mobile Repo v2#24244
jpsim merged 1788 commits intomainfrom
envoy-mobile-repo-merge-v2

Conversation

@jpsim
Copy link
Copy Markdown
Contributor

@jpsim jpsim commented Nov 29, 2022 •
edited
Loading

This re-imports the Envoy Mobile repo, this time preserving git history so that git log and git blame remain useful.

This is the second version of #24233, which did not preserve git history cleanly due to the PR being merged instead of rebased on main.

Part of #23758

jpsim and others added 30 commits November 29, 2022 10:33
@jpsim
bazel: retry repository downloads (#2338)
19bd222 
Sometimes these downloads fail due to transient errors
(example: https://github.com/envoyproxy/envoy-mobile/runs/6728606246?check_suite_focus=true)
and a retry will succeed.

Configure the downloader to retry twice before giving up.

Signed-off-by: JP Simard <jp@jpsim.com>
@abeyad @jpsim
tests: Adds an RTDS integration test for Envoy Mobile (#2328)
12a9714 
Adds an RTDS integration test for Envoy Mobile

This test does a simple verification that the RTDS protocol within the
xDS family is working correctly.  A subsequent PR will improve upon the
test coverage.

As part of this change, the common parts of running a Envoy Mobile
client integration test were refactored out into a new
BaseClientIntegrationTest class.  Both ClientIntegrationTest and
RtdsIntegrationTest inherit from BaseClientIntegrationTest.

NB: the parameterized test currently fails when using IPv6.  This will
be debugged and fixed in a subsequent PR.

Signed-off-by: Ali Beyad <abeyad@google.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@envoy-bot @jpsim
Bump Lyft Support Rotation (#2340)
7023a51 
Signed-off-by: GitHub Action <noreply@github.com>

Co-authored-by: jpsim <jpsim@users.noreply.github.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@envoy-bot @jpsim
Update Envoy (#2339)
93ce640 
Signed-off-by: GitHub Action <noreply@github.com>

Co-authored-by: jpsim <jpsim@users.noreply.github.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
android: attempting to respect Android's cleartext policies (#2318)
18ad777 
Rejecting requests which don't have an https scheme if Android disallows cleartext

Risk Level: High
Testing: TODO (envoyproxy/envoy-mobile#2341)
Docs Changes: n/a
Release Notes: inline
Fixes #1572

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
iOS: add SwiftPM example (#2333)
efdd879 
And validate that it builds successfully on CI.

Ideally we'd have a whole suite of example integrations that validate
all our supported installation methods, but this should be a good start.

I reached out to the owner of https://catfacts.ninja to make sure this
usage is within the terms of service and will update to use something
else if necessary.

https://user-images.githubusercontent.com/474794/171312056-2167333a-fb88-4cfe-aa30-353cceaa49a0.mp4

Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
builder: making compressor configurable (#2321)
8f7914f 
As a precursor to adding brotli, making the decompressor configurable.

Description:
Risk Level: low
Testing: new unit tests
Docs Changes: n/a
Release Notes: in the next PR

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
ios: add support for registering a platform KV store (#2334)
adde778 
Description: Adds EngineBuilder API and internal support for registering a platform key-value store on iOS. Internally this may be leveraged for HTTP caching, endpoint protocol support caching, and use in filters.
Risk: Moderate
Testing: Updated coverage.

Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
android: create persistent SharedPreferences-based KV store (#2319)
36cfe75 
Description: Updates the exposed KeyValueStore type to be a more traditional implementable interface, and provides a simple persisting implementation based on Android SharedPreferences.
Risk: Low
Testing: Application

Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
api: adding brotli knobs (#2342)
f115bbb 
Adding the option to configure brotli in the bulder

Risk Level: low off by default
Testing: cc unit tests, updated java tests
Docs Changes: n/a
Release Notes: inline

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
iOS: add a way to disable network monitoring (#2345)
5375446 
We may be interested in experimenting with network monitoring & interface switching completely disabled to assess the impact of this feature.

Disabling network switching is not something we recommend generally.

Risk Level: Low, adds the ability to disable network switching on an opt-in basis
Testing: Updated unit tests
Docs Changes: Added
Release Notes: Added

Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
bazel: update rules_apple (#2346)
af92f2d 
To pull in bazelbuild/rules_apple#1488, which should fix our CocoaPods integration and allow us to re-add it.

Risk Level: Medium for iOS users who use the xcframework, low for everyone else
Testing: There's a recent CI job that validates SwiftPM integration that acts as a good integration test for this
Docs Changes: None for now, this isn't really a user-facing change, as Xcode/SwiftPM handles both the old and new xcframework format/layout transparently
Release Notes: None for now, this isn't really a user-facing change

Signed-off-by: JP Simard <jp@jpsim.com>
@Augustyniak @jpsim
docs: update the list of clusters (#2344)
78ddde2 
Description: Update the list of clusters in docs.
Risk Level: None.
Testing: N/A
Docs Changes: N/A
Release Notes: N/A

Signed-off-by: Rafal Augustyniak <raugustyniak@lyft.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
ci: update Android setup (#2354)
73fa787 
To account for recent changes to defaults:
actions/runner-images#5595

Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
iOS: stop embedding bitcode in releases (#2347)
03eac4b 
Bitcode is all but dead at this point.

Here's a deprecation note from the Xcode 14 beta 1 release notes:

https://developer.apple.com/documentation/Xcode-Release-Notes/xcode-14-release-notes

> Starting with Xcode 14, bitcode is no longer required for watchOS and
> tvOS applications, and the App Store no longer accepts bitcode
> submissions from Xcode 14.

> Xcode no longer builds bitcode by default and generates a warning
> message if a project explicitly enables bitcode: “Building with
> bitcode is deprecated. Please update your project and/or target
> settings to disable bitcode.” The capability to build with bitcode
> will be removed in a future Xcode release. IPAs that contain bitcode
> will have the bitcode stripped before being submitted to the App
> Store. Debug symbols for past bitcode submissions remain available
> for download. (86118779)

* Don't recompress xcarchive

There are no longer any bad CRC errors, and bazel's compression is
slightly better than the system's `zip` (94MB vs 97MB).

Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
iOS: add configurable gzip and brotli decompression options (#2349)
bf16292 
Description: Previously, gzip decompression was always enabled in base configuration. This makes both gzip and brotli decompression configurable, with gzip defaulting to on (as it was previously) and brotli defaulting to off. No changes to usage of EngineBuilder need to be made to maintain existing behavior.
Risk Level: Moderate
Testing: Added config coverage.

Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
cleanup: remove unused function and resolve warning (#2350)
c4c6080 
Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
cleanup: consistently use nullptr in cc contexts (#2351)
3197e18 
Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
cleanup: convert some more uses of NULL to nullptr (#2359)
9ba1920 
Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
cleanup: fix warning in JNI layer (#2361)
84ca7aa 
Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@goaway @jpsim
ci: pin external GitHub Action (#2363)
eccd9fe 
Description: Improves security with respect to third-party actions. See:
https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions

I also read through the recent commits and updated to the latest release, since it contained a few bugfixes.

Risk: Low
Testing: CI

Signed-off-by: Mike Schore <mike.schore@gmail.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@envoy-bot @jpsim
Bump Lyft Support Rotation (#2365)
b7c0512 
Signed-off-by: GitHub Action <noreply@github.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@envoy-bot @jpsim
Update Envoy (#2364)
1584300 
Signed-off-by: GitHub Action <noreply@github.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
config: hopefully fixing C++ config default for apple (#2355)
b0c8ffd 
Replacing the default dns resolver in the config string to be correct for the OS in question.
Replaced overrides in the swift code now that the base config handles it.

Risk Level: low
Testing: existing tests should verify correctness
Docs Changes: n/a
Release Notes: did not add

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
iOS: fix xcframework upload in release workflow (#2366)
f501285 
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
test: got the client_integration_test moved over to the builder. (#2362)
fc29c36 
Risk Level: low
Testing: yep
Release Notes: inline
Fixes #2303

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim @alyssawilk
stats: disable global stats in config (#2367)
bc042c7 
These are already being filtered out of our stats inclusion list, so
this isn't a user-facing change, but this is needed to support the
singleton removal work in
envoyproxy/envoy-mobile#2129.

Splitting this out into its own PR to reduce the scope of the singleton
removal change.

Co-authored-by: alyssawilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
config: add additional comment to disallow_global_stats (#2371)
0c950f9 
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
test cleanup (#2372)
dd2a08e 
followup to #2362

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim @brentleyjones
bazel: use device_and_simulator rule (#2369)
e8366b9 
To simplify running sample iOS apps for physical devices.

Co-authored-by: Brentley Jones <github@brentleyjones.com>
Signed-off-by: JP Simard <jp@jpsim.com>
RyanTheOptimist and others added 18 commits November 29, 2022 10:33
@RyanTheOptimist @jpsim
Do not strip AndroidCertVerifyResult methods with proguard (#2682)
e5f124e 
Do not strip AndroidCertVerifyResult methods with proguard

Signed-off-by: Ryan Hamilton <rch@google.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
cleanup for repo merge (#2684)
59a8aa6 
This gets EM to pass Envoy format checks.

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@abeyad @jpsim
test: Remove obsolete comments (#2695)
78ef37f 
The initial_fetch_timeout is needed in the tests, as described in #2678 (comment).

Signed-off-by: Ali Beyad <abeyad@google.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@abeyad @jpsim
test: Wait for RTDS updates to be applied in the integration test (#2686
a56af6f 
)

This fixes a bug where sometimes the RtdsIntegrationTest would fail because we would check the updates after the DiscoveryResponse was sent but before ensuring the RTDS updates in the response have been applied by the Envoy engine.

Signed-off-by: Ali Beyad <abeyad@google.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@abeyad @jpsim
Honor the -l log level command line setting for C++ integration tes…
20e2d41 
…ts (#2677)

Instead of requiring adding the code addLogLevel() to an integration test to get finer-grained logging, now we can specify the log level on the command line via --test_arg="-l LOG_LEVEL", just like for the Envoy integration tests. For example:

bazel test --test_arg="-l trace" //test/common/integration:rtds_integration_test

Limitations:

This flag only applies to C++ integration tests (not unit tests or other language tests).

Signed-off-by: Ali Beyad <abeyad@google.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@RyanTheOptimist @jpsim
Move values in HeadersBuilder::set (#2694)
01f4bce 
Signed-off-by: Ryan Hamilton rch@google.com

Follow up from https://github.com/envoyproxy/envoy-mobile/pull/2667/files/2499cc1751d8de78d0e74ca7acc2da622dbc402e#diff-767c4a04d30b269fb25067e63d4b374c1e43dbc201bbea33121cac3af963abdc

Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
build: bump envoy dependency (#2690)
451d2fb 
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@phlax @jpsim
tooling: Fix format check (#2698)
4a41a17 
Fix #2697

Signed-off-by: Ryan Northey ryan@synca.io
Signed-off-by: JP Simard <jp@jpsim.com>
@RyanTheOptimist @jpsim
Fix a possible use-after-free with platform cert verification (#2692)
af25f00 
Fix a possible use-after-free with platform cert verification by using a unique_ptr in the flat_hash_set of pending validations. The flat_hash_set does not ensure pointer stability, but the validation thread holds a pointer to the PendingVerification, which is problematic. This PR makes PendingVerification non-moveable and non-copyable which avoids this problem.

There is also another potential use-after free in that the task posted to the dispatcher deletes the PendingValidation, but the PendingValidation touches member variables after the call to post. Reordered the call to post to avoid this.

Fixes #2691

Signed-off-by: Ryan Hamilton rch@google.com
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
bridge: fix up proto registration (#2702)
efc57f1 
This fixes up issues exposed in #24151 where the PlatformBridgeCertValidatorFactory was not associated with the PlatformBridgeCertValidator proto.

Risk Level: low
Testing: #24151
Docs Changes: n/a
Release Notes: n/a

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: JP Simard <jp@jpsim.com>
@RyanTheOptimist @jpsim
Rename release_validator to validation_cleanup (#2701)
a6dcdc0 
Rename release_validator to validation_cleanup.
The release_validator function does not actually release the validator.
On iOS is does nothing and on Android it merely detaches the JVM from the current thread.
So "cleanup validation" is a better description of it's function than "release validator" and
matches the existing description "to clean up after validation completion."

Signed-off-by: Ryan Hamilton rch@google.com
Signed-off-by: JP Simard <jp@jpsim.com>
@RyanTheOptimist @jpsim
Various small cleanups to PlatformBridgeCertValidator (#2700)
39b7260 
Remove unused next_iteration_callback_ member.
Remove unused config_ member.
Make some members const.
Use hostname instead of host_name.
Pass in the list of subject alt names instead of passing in the transport socket options.

Risk Level: Low
Testing: No behavior change
Docs Changes: N/A
Release Notes: N/A

Signed-off-by: Ryan Hamilton rch@google.com
Signed-off-by: JP Simard <jp@jpsim.com>
@envoy-bot @jpsim
Bump Lyft Support Rotation (#2706)
34a87ad 
Co-authored-by: jpsim <jpsim@users.noreply.github.com>
Signed-off-by: GitHub Action <noreply@github.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@alyssawilk @jpsim
build: removing admin (#2693)
f8c5cca 
Removing Admin from release builds by default

Risk Level: medium
Testing: n/a
Docs Changes: n/a
Release Notes: inline

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: alyssawilk <alyssar@google.com>
Co-authored-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@envoy-bot @jpsim
Update Envoy (#2705)
46b97d4 
Signed-off-by: GitHub Action <noreply@github.com>
Co-authored-by: jpsim <jpsim@users.noreply.github.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@RyanTheOptimist @jpsim
Fix typo in starting_envoy.rst. Backport of https://github.com/envoyp…
11c96cc 
…roxy/envoy/pull/24187/files (#2707)

Fix typo in starting_envoy.rst
Backport of https://github.com/envoyproxy/envoy/pull/24187/files

Signed-off-by: Ryan Hamilton <rch@google.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
docs: update sphinxcontrib-googleanalytics (#2708)
332b362 
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
Re-apply changes applied to previous import
eb9a6fd 
Signed-off-by: JP Simard <jp@jpsim.com>
@repokitteh-read-only repokitteh-read-only Bot added the deps Approval required for changes to Envoy's external dependencies label Nov 29, 2022
@repokitteh-read-only
Copy link
Copy Markdown

repokitteh-read-only Bot commented Nov 29, 2022

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @phlax

🐱

Caused by: #24244 was opened by jpsim.

see: more, trace.

@jpsim jpsim changed the title Envoy mobile repo merge v2 Import Envoy Mobile Repo v2 Nov 29, 2022
@phlax phlax enabled auto-merge (rebase) November 29, 2022 15:52
@jpsim jpsim merged commit eb9a6fd into main Nov 29, 2022
@mattklein123 mattklein123 deleted the envoy-mobile-repo-merge-v2 branch January 20, 2023 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Augustyniak Augustyniak Awaiting requested review from Augustyniak

@RyanTheOptimist RyanTheOptimist Awaiting requested review from RyanTheOptimist RyanTheOptimist is a code owner

@abeyad abeyad Awaiting requested review from abeyad abeyad is a code owner

1 more reviewer

@alyssawilk alyssawilk alyssawilk approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@phlax phlax

Labels

deps Approval required for changes to Envoy's external dependencies

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.