Skip to content

Conversation

@denik
Copy link
Contributor

@denik denik commented Jul 30, 2025

Changes

No-op refactor to extract a set of mutators that are needed for "bundle plan".

Why

Going to use deployPrepare() in "bundle plan": #3329

It needs the same bundle config as bundle deploy in order to properly calculate plan.

},
{
"key": "skip_artifact_cleanup",
"key": "python_wheel_wrapper_is_set",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wonder why don't we use map[string]bool here, it would be more compact and not sensitive to order (since it's sorted on serialization). cc @shreyas-goenka

@eng-dev-ecosystem-bot
Copy link
Collaborator

eng-dev-ecosystem-bot commented Jul 30, 2025

Run: 16647500234

Env ✅‌pass 🙈‌skip
✅‌ aws linux 308 452
✅‌ aws windows 309 451
✅‌ aws-ucws linux 414 352
✅‌ aws-ucws windows 415 351
✅‌ azure linux 308 451
✅‌ azure windows 309 450
✅‌ azure-ucws linux 416 349
✅‌ azure-ucws windows 417 348
✅‌ gcp linux 307 453
✅‌ gcp windows 308 452

@denik denik force-pushed the denik/split-deploy-prepare branch from 2d71652 to d9150a9 Compare July 30, 2025 13:01
@denik denik temporarily deployed to test-trigger-is July 30, 2025 13:01 — with GitHub Actions Inactive
@denik denik force-pushed the denik/split-deploy-prepare branch from d9150a9 to 1c70ed9 Compare July 30, 2025 13:58
@denik denik temporarily deployed to test-trigger-is July 30, 2025 13:58 — with GitHub Actions Inactive
@denik denik force-pushed the denik/split-deploy-prepare branch from 1c70ed9 to 9a6696f Compare July 30, 2025 14:03
@denik denik temporarily deployed to test-trigger-is July 30, 2025 14:03 — with GitHub Actions Inactive
// SwitchToPatchedWheels must be run after ExpandGlobReferences and after build phase because it Artifact.Source and Artifact.Patched populated
libraries.SwitchToPatchedWheels(),
libraries.Upload(),
trampoline.TransformWheelTask(),
Copy link
Contributor

Choose a reason for hiding this comment

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

I think trampoline.TransformWheelTask() needs to be run after libraries.Upload because Upload mutates the config to have libraries point to uploaded location and transform needs to use this location

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, good catch. I have moved libraries.Upload() (and artifacts.CleanUp(), seems like it might be relevant as well) to their original place. This affects UX of "bundle plan" but that's ok at the moment, it's only internal command.

@denik denik temporarily deployed to test-trigger-is July 31, 2025 11:03 — with GitHub Actions Inactive
@denik denik force-pushed the denik/split-deploy-prepare branch from 543f7a1 to eabe999 Compare July 31, 2025 11:13
@denik denik temporarily deployed to test-trigger-is July 31, 2025 11:13 — with GitHub Actions Inactive
@denik denik requested a review from andrewnester July 31, 2025 11:13
@denik denik temporarily deployed to test-trigger-is July 31, 2025 11:16 — with GitHub Actions Inactive
@denik denik changed the title Extract deployPrepare(); change mutator order in deploy Extract deployPrepare() Jul 31, 2025
@denik denik enabled auto-merge July 31, 2025 12:06
@denik denik added this pull request to the merge queue Jul 31, 2025
Merged via the queue into main with commit 2973b59 Jul 31, 2025
13 checks passed
@denik denik deleted the denik/split-deploy-prepare branch July 31, 2025 12:26
denik added a commit that referenced this pull request Jul 31, 2025
## Changes
- Add "bundle plan" command that shows resource-level plan. It works for
both TF and direct backend.
- Make plan in direct deployment sort groups and resources so that
output of "bundle plan" is consistent.

Depends on #3328

## Why
Going to use this in acceptance tests to verify direct deployment.

It'll be extended with an option to show field-level changes as well
(most likely for direct deployment only).

## Tests
Modified different acceptance tests to show different actions.
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.

4 participants