Skip to content

Conversation

@mmorel-35
Copy link
Contributor

Description

This PR apply necessary changes for envoy_api MODULE without MODULE.bazel file.

cf. envoyproxy/data-plane-api#632

Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]

@repokitteh-read-only
Copy link

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #41835 was opened by mmorel-35.

see: more, trace.

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Nov 4, 2025
@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).
envoyproxy/dependency-shepherds assignee is @moderation

🐱

Caused by: #41835 was opened by mmorel-35.

see: more, trace.

@mmorel-35
Copy link
Contributor Author

mmorel-35 commented Nov 4, 2025

/cc @phlax , @agrawroh

/cc @mering, @veblush as you published previous versions of envoy_api in the BCR

@mmorel-35 mmorel-35 force-pushed the module/envoy_api branch 3 times, most recently from c76664a to bc2076e Compare November 4, 2025 06:58
@mmorel-35 mmorel-35 marked this pull request as ready for review November 4, 2025 07:13
if mapped == None:
prefix = "@" + Label(dep).workspace_name if not dep.startswith("//") else ""
prefix = "@@" if _IS_BZLMOD else "@"
prefix = prefix + Label(dep).repo_name if not dep.startswith("//") else ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about relative labels?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean ?
I took exactly what was provided here

Is something missing there ?

@mmorel-35
Copy link
Contributor Author

@phlax ,

Can you retry the failing job ?

@phlax
Copy link
Member

phlax commented Nov 4, 2025

sure - you can too

/retest

@mmorel-35
Copy link
Contributor Author

sure - you can too

I'm not so sure or I was sending the message too fast in the process but lately I wasn't seeing the rockets on my comment asking for retest

@phlax
Copy link
Member

phlax commented Nov 4, 2025

it triggers this workflow https://github.com/envoyproxy/envoy/actions/workflows/command.yml

so you can check there if its not doing the expected

@mmorel-35
Copy link
Contributor Author

I'm not sure I'm in the right group for that.

license = "Apache-2.0",
license_url = "https://github.com/google/cel-spec/blob/v{version}/LICENSE",
),
envoy_toolshed = dict(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering if we should remove this from the main repository_locations.bzl - dependency relations between api <> envoy have always been a bit vague

Copy link
Contributor Author

@mmorel-35 mmorel-35 Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we keep in both places until it is clearly decided ?
Once envoy_toolshed is published in BCR, it will directly be used in MODULE.bazel and not in repository_locations.
I can also do that in the same time

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the downside of keeping two are that they need to be kept in sync and its confusing as to what is authoritative

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh - i see re modules - yeah was wondering how shared deps work in that context

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it stay this way as first step toward bzlmod for envoy_api or shall I publish envoy_toolshed to be, then validate its working in data-plane-api PR then remove it here or do you have another strategy in mind ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i hadnt thought that far ahead - im happy to go with whatever strategy you think is best - if that means duplicating this dep for now - fine

@meteorcloudy
Copy link
Contributor

meteorcloudy commented Nov 5, 2025

@mmorel-35 I also made some fixes for Bazel 9 in envoyproxy/data-plane-api#633, can you please integrate those changes as well?

@mmorel-35
Copy link
Contributor Author

I believe that this can be merged if it passes tests. That will allow to validate a first version of MODULE.bazel in data-plane-api.

I want to publish a new version of xds in BCR but I want to first integrate #41746

Then validate cncf/xds#127 within envoy and publish XDS and envoy_toolshed to BCR to have them as dependencies in MODULE.bazel directly

@phlax phlax self-assigned this Nov 5, 2025
@meteorcloudy
Copy link
Contributor

@mmorel-35 Thanks, looks good. I removed envoy_toolshed because it was not introduced in data-plane-api, but maybe you have that fixed? It'll be great if you can test this with Bazel 9 rc (set USE_BAZEL_VERSION=9.*).

Copy link
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @mmorel-35

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Nov 6, 2025
@phlax phlax merged commit 78cff07 into envoyproxy:main Nov 6, 2025
25 checks passed
@mmorel-35 mmorel-35 deleted the module/envoy_api branch November 6, 2025 11:31
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.

5 participants