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.

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

macos, deps: Add more SHAs to configs and kafka requirements.txt #14887

Merged
merged 1 commit into from
Feb 1, 2021
Merged

macos, deps: Add more SHAs to configs and kafka requirements.txt #14887

merged 1 commit into from
Feb 1, 2021

Conversation

dio
Copy link
Member

@dio dio commented Feb 1, 2021

Commit Message: This fixes: THESE PACKAGES DO NOT MATCH THE HASHES FROM THE REQUIREMENTS FILE. If you have updated the package versions, please update the hashes. (A sample logs of a failure on CI (macos test): https://dev.azure.com/cncf/4684fb3d-0389-4e0b-8251-221942316e06/_apis/build/builds/65283/logs/70) for config/requirements.txt and kafka/requirements.txt.

Risk Level: Low
Testing: Local test on macOS
Docs Changes: N/A
Release Notes: N/A
Platform-Specific Features: N/A

Signed-off-by: Dhi Aurrahman dio@rockybars.com

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Feb 1, 2021
@repokitteh-read-only
Copy link

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).

🐱

Caused by: #14887 was opened by dio.

see: more, trace.

@dio
Copy link
Member Author

dio commented Feb 1, 2021

Seems like it fixes the macos test.

/assign @moderation

@moderation
Copy link
Contributor

moderation commented Feb 1, 2021

When I rerun hashin for the requirements.txt that contain MarkupSafe I get quite a few additional values:

Jinja2==2.11.2 \
    --hash=sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0 \
    --hash=sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035
MarkupSafe==1.1.1 \
    --hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \
    --hash=sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161 \
    --hash=sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235 \
    --hash=sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5 \
    --hash=sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42 \
    --hash=sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f \
    --hash=sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39 \
    --hash=sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff \
    --hash=sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b \
    --hash=sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014 \
    --hash=sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f \
    --hash=sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1 \
    --hash=sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e \
    --hash=sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183 \
    --hash=sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66 \
    --hash=sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b \
    --hash=sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1 \
    --hash=sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15 \
    --hash=sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1 \
    --hash=sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85 \
    --hash=sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1 \
    --hash=sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e \
    --hash=sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b \
    --hash=sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905 \
    --hash=sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850 \
    --hash=sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0 \
    --hash=sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735 \
    --hash=sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d \
    --hash=sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb \
    --hash=sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e \
    --hash=sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d \
    --hash=sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c \
    --hash=sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1 \
    --hash=sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2 \
    --hash=sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21 \
    --hash=sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2 \
    --hash=sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5 \
    --hash=sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7 \
    --hash=sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b \
    --hash=sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8 \
    --hash=sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6 \
    --hash=sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193 \
    --hash=sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f \
    --hash=sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b \
    --hash=sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f \
    --hash=sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2 \
    --hash=sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5 \
    --hash=sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c \
    --hash=sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032 \
    --hash=sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7 \
    --hash=sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be \
    --hash=sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621

I have some pip updates I need to do later this week so if this unblocks for now

@moderation
Copy link
Contributor

/lgtm deps

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Feb 1, 2021
@dio
Copy link
Member Author

dio commented Feb 1, 2021

@moderation thanks! Yeah, I just want to be safe for now. :). But if you think I need to update it. I'll be happy to do so.

@dio
Copy link
Member Author

dio commented Feb 1, 2021

@lizan when you have time, could you help to review this? Thanks!

@yanavlasov yanavlasov merged commit 0d5b470 into envoyproxy:main Feb 1, 2021
junr03 pushed a commit to envoyproxy/envoy-mobile that referenced this pull request Feb 2, 2021
Description: pull envoy 8e2286b for envoyproxy/envoy#14887 to fix ci
Risk Level: low
Testing: ci

Signed-off-by: Jingwei Hao <jingweih@lyft.com>
Shikugawa pushed a commit to Shikugawa/envoy that referenced this pull request Feb 3, 2021
…#14887)

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: Shikugawa <rei@tetrate.io>
Shikugawa added a commit that referenced this pull request Feb 5, 2021
* docs: kickoff 1.17.1

Signed-off-by: Shikugawa <rei@tetrate.io>

* add version history

Signed-off-by: Shikugawa <rei@tetrate.io>

* add versionversion

Signed-off-by: Shikugawa <rei@tetrate.io>

* master -> main

Signed-off-by: Shikugawa <rei@tetrate.io>

* fix

Signed-off-by: Shikugawa <rei@tetrate.io>

* fix

Signed-off-by: Shikugawa <rei@tetrate.io>

* fix kafka server source

Signed-off-by: Shikugawa <rei@tetrate.io>

* deps: Add more SHAs to configs and kafka requirements.txt (#14887)

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: Shikugawa <rei@tetrate.io>

* conflict

Signed-off-by: yanavlasov <yavlasov@google.com>

* examples: test/fix websocket ci flake (#14941)

switch to 127.0.0.1 from localhost in ws example tests as this seeems to make ci <> websocat flakey

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Shikugawa <rei@tetrate.io>

Co-authored-by: Dhi Aurrahman <dio@rockybars.com>
Co-authored-by: yanavlasov <yavlasov@google.com>
Co-authored-by: phlax <phlax@users.noreply.github.com>
Shikugawa pushed a commit to Shikugawa/envoy that referenced this pull request Feb 6, 2021
…#14887)

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: Shikugawa <rei@tetrate.io>
Shikugawa added a commit that referenced this pull request Feb 8, 2021
* ci: fix docs tag build

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

* review

Signed-off-by: Shikugawa <rei@tetrate.io>

* add versionversion

Signed-off-by: Shikugawa <rei@tetrate.io>

* add versionversion

Signed-off-by: Shikugawa <rei@tetrate.io>

* add versionversion

Signed-off-by: Shikugawa <rei@tetrate.io>

* add versionversion

Signed-off-by: Shikugawa <rei@tetrate.io>

* master -> main

Signed-off-by: Shikugawa <rei@tetrate.io>

* fix

Signed-off-by: Shikugawa <rei@tetrate.io>

* ci: fix CodeQL-build by removing deprecated set-env command (#14046)

Signed-off-by: Taylor Barrella <tabarr@google.com>
Signed-off-by: Shikugawa <rei@tetrate.io>

* deps: Add more SHAs to configs and kafka requirements.txt (#14887)

Signed-off-by: Dhi Aurrahman <dio@rockybars.com>
Signed-off-by: Shikugawa <rei@tetrate.io>

Co-authored-by: Lizan Zhou <lizan@tetrate.io>
Co-authored-by: Taylor Barrella <tabarr@google.com>
Co-authored-by: Dhi Aurrahman <dio@rockybars.com>
junr03 pushed a commit that referenced this pull request Feb 8, 2021
Commit Message: Updating deps to include all hashin shas for MarkupSafe. Adds additional shas on top of #14887
Risk Level: low
Testing: CI

Signed-off-by: Alan Chiu <achiu@lyft.com>
ipuustin pushed a commit to ipuustin/envoy that referenced this pull request Mar 18, 2021
ipuustin pushed a commit to ipuustin/envoy that referenced this pull request Mar 18, 2021
Commit Message: Updating deps to include all hashin shas for MarkupSafe. Adds additional shas on top of envoyproxy#14887
Risk Level: low
Testing: CI

Signed-off-by: Alan Chiu <achiu@lyft.com>
jpsim pushed a commit that referenced this pull request Nov 28, 2022
Description: pull envoy 8e2286b for #14887 to fix ci
Risk Level: low
Testing: ci

Signed-off-by: Jingwei Hao <jingweih@lyft.com>
Signed-off-by: JP Simard <jp@jpsim.com>
jpsim pushed a commit that referenced this pull request Nov 29, 2022
Description: pull envoy 8e2286b for #14887 to fix ci
Risk Level: low
Testing: ci

Signed-off-by: Jingwei Hao <jingweih@lyft.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants