-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Correctly parse labels if they are passed as a single string instead of a list #34183
Conversation
@@ -447,6 +447,8 @@ def __init__(self, options, proto_pipeline): | |||
if self.google_cloud_options.labels: | |||
self.proto.labels = dataflow.Job.LabelsValue() | |||
labels = self.google_cloud_options.labels | |||
if isinstance(labels, str): | |||
labels = [labels] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you mean options.view_as(GoogleCloudOptions).labels = {'env': 'bluecore-qa-extensibility', 'team': 'cdp-vertical'}
is interpreted as a string although it is a Python dict?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, meant to make this a draft until I full tested it. But you're right, this won't fully work yet. I think I'll also want something like:
if not isinstance(labels, Iterable):
labels = [str(labels)]
But I'll fix/test this with the string and dict cases
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should now handle both cases, and I added some representative test cases, PTAL
R: @liferoad |
Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment |
…mccorm/parseLabels
Right now, if you submit a job like:
The job does not correctly recognize the labels. We could validate and fail because labels is expected to be a list, but that might break existing (mostly working) pipelines. This is an in between where we can still do a best effort to correctly identify/use the user's labels.
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
addresses #123
), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, commentfixes #<ISSUE NUMBER>
instead.CHANGES.md
with noteworthy changes.See the Contributor Guide for more tips on how to make review process smoother.
To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md
GitHub Actions Tests Status (on master branch)
See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.