Repository navigation
Fix ComposerEnvironment storageConfig.bucketRef mapping - #11001
Merged
ldanielmadariaga merged 2 commits intoJul 15, 2026
Merged
ldanielmadariaga merged 2 commits into
ldanielmadariaga merged 2 commits into
Conversation
anhdle-sso
reviewed
Jun 30, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 7, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 7, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 8, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 8, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 8, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 8, 2026
ldanielmadariaga
previously approved these changes
Jul 9, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 9, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 9, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 10, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 10, 2026
ldanielmadariaga
enabled auto-merge
July 10, 2026 11:06
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 10, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 10, 2026
ldanielmadariaga
enabled auto-merge
July 11, 2026 00:37
anhdle-sso
disabled auto-merge
July 13, 2026 18:44
anhdle-sso
enabled auto-merge
July 13, 2026 18:44
In ComposerEnvironment direct reconciler, override autogenerated
StorageConfig_ToProto and StorageConfig_FromProto mappers so that
storageConfig.bucketRef maps to just the GCS bucket name without full
resource path ('projects/../buckets/..'). This resolves API error 400
during ComposerEnvironment creation/update (b/528060386).
auto-merge was automatically disabled
July 15, 2026 04:41
Head branch was pushed to by a user without write access
himanigulati01
dismissed stale reviews from ldanielmadariaga and anhdle-sso
via
July 15, 2026 04:41
abbae7a
himanigulati01
force-pushed
the
fix-composer-bucketref
branch
from
July 15, 2026 04:41
773736c to
abbae7a
Compare
ldanielmadariaga
enabled auto-merge
July 15, 2026 06:19
ldanielmadariaga
approved these changes
Jul 15, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: anhdle-sso, ldanielmadariaga The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Merged
via the queue into
GoogleCloudPlatform:master
with commit Jul 15, 2026
d041595
209 of 398 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes b/528060386
In ComposerEnvironment direct reconciler, override autogenerated
StorageConfig_ToProtoandStorageConfig_FromProtomappers so thatstorageConfig.bucketRefmaps to just the GCS bucket name without full resource path (projects/../buckets/..). This resolves API error 400 duringComposerEnvironmentcreation and updates.Changes
StorageConfigmappers inpkg/controller/direct/composer/environment_mappings.goto useStorageBucketIdentity.FromExternal(...).mockgcp/mockcomposer/environment.goto validate and reject storage bucket strings containing slashes (/), matching real Google Cloud Composer frontend validation.composerenvironmentwithrefs. Verified all 4 composer basic test fixtures pass cleanly viahack/compare-mock.