Skip to content

Fix postcommit python validates container dataflow #37490

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
Amar3tto merged 3 commits into from
Feb 4, 2026
+18 −10
Merged

Fix postcommit python validates container dataflow #37490

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91418fd
Fix ValidatesContainer Cloud Build test
aIbrahiim Feb 3, 2026
425d827
Update sdk_container_builder for google-cloud-build 3.35 API
aIbrahiim Feb 3, 2026
98cdbc7
Added fall back to additionalProperties for older clients
aIbrahiim Feb 3, 2026
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
28 changes: 18 additions & 10 deletions sdks/python/apache_beam/runners/portability/sdk_container_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,11 @@ def _invoke_docker_build_and_push(self, container_image_name):
build.steps.append(step)

source = cloud_build_types.Source()
source.storageSource = cloud_build_types.StorageSource()
storage_source = cloud_build_types.StorageSource()
gcs_bucket, gcs_object = self._get_gcs_bucket_and_name(gcs_location)
source.storageSource.bucket = os.path.join(gcs_bucket)
source.storageSource.object = gcs_object
storage_source.bucket = os.path.join(gcs_bucket)
storage_source.object_ = gcs_object
source.storage_source = storage_source
build.source = source
# TODO(zyichi): make timeout configurable
build.timeout = '7200s'
Expand Down Expand Up @@ -325,15 +326,22 @@ def _upload_to_gcs(self, local_file_path, gcs_location):
_LOGGER.info('Completed GCS upload to %s.', gcs_location)

def _get_cloud_build_id_and_log_url(self, metadata):
# google-cloud-build 3.35+
if getattr(metadata, 'build', None):
build = metadata.build
return (build.id, build.log_url)
# Fallback for older clients that use additionalProperties.
id = None
log_url = None
for item in metadata.additionalProperties:
if item.key == 'build':
for field in item.value.object_value.properties:
if field.key == 'logUrl':
log_url = field.value.string_value
if field.key == 'id':
id = field.value.string_value
additional_props = getattr(metadata, 'additionalProperties', None)
if additional_props:
for item in additional_props:
if item.key == 'build':
for field in item.value.object_value.properties:
if field.key == 'logUrl':
log_url = field.value.string_value
if field.key == 'id':
id = field.value.string_value
return id, log_url

@staticmethod
Expand Down
Loading