Skip to content

Don't try to parse non-flags as retained pipeline options. #22276

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.

Sign up for GitHub

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

Merged
robertwb merged 1 commit into from
Jul 15, 2022
Merged

Don't try to parse non-flags as retained pipeline options. #22276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sdks/python/apache_beam/options/pipeline_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ def get_all_options(
while i < len(unknown_args):
# Treat all unary flags as booleans, and all binary argument values as
# strings.
if not unknown_args[i].startswith('-'):
i += 1
continue
Comment on lines +323 to +325
Copy link
Contributor

@ahmedabu98 ahmedabu98 Jul 15, 2022

Choose a reason for hiding this comment

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

should we start looking at i+1?

Copy link
Contributor Author

@robertwb robertwb Jul 15, 2022

Choose a reason for hiding this comment

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

We will look at i+1, which will be a fresh argument, in the next iteration of the loop.

if i + 1 >= len(unknown_args) or unknown_args[i + 1].startswith('-'):
split = unknown_args[i].split('=', 1)
if len(split) == 1:
Expand All @@ -330,7 +333,7 @@ def get_all_options(
else:
parser.add_argument(unknown_args[i], type=str)
i += 2
parsed_args = parser.parse_args(self._flags)
parsed_args, _ = parser.parse_known_args(self._flags)
else:
if unknown_args:
_LOGGER.warning("Discarding unparseable args: %s", unknown_args)
Expand Down
5 changes: 0 additions & 5 deletions sdks/python/apache_beam/options/pipeline_options_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,6 @@ def test_retain_unknown_options_unary_single_dash_store_true(self):
result = options.get_all_options(retain_unknown_options=True)
self.assertEqual(result['i'], True)

def test_retain_unknown_options_unary_missing_prefix(self):
options = PipelineOptions(['bad_option'])
with self.assertRaises(SystemExit):
options.get_all_options(retain_unknown_options=True)

def test_override_options(self):
base_flags = ['--num_workers', '5']
options = PipelineOptions(base_flags)
Expand Down