Merge/port recent changes from main into 5.x #1573
Merged
Conversation
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
Increase the default limits for finding activities
Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](go-chi/chi@v5.2.1...v5.2.2) --- updated-dependencies: - dependency-name: github.com/go-chi/chi/v5 dependency-version: 5.2.2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Remove "deploy" alias from env:deploy command
…ot allowed (#1553) * Changing instance count on services where autoscaling is enabled is not allowed * Move instance count autoscaling validation earlier --------- Co-authored-by: Ricardo Kirkner <[email protected]> Co-authored-by: Patrick Dawkins <[email protected]>
…g is not available (#1558) Co-authored-by: Ricardo Kirkner <[email protected]>
Avoid writing to stdout when opening a URL
Co-authored-by: Patrick Dawkins <[email protected]>
(This method is not yet used, but it will be used by a pending PR)
…t cannot be fetched
…-activate Fix "This environment is inactive" during activation if the deployment cannot be fetched
* Add support for organization types to the `orgs` command * Add support for organization types to the `org:create` command * Pass the type on creation * Allow org types to be disabled in the environment * Display the org type in the project:list (projects) command * Re-title project:list columns and display the org label by default, for neater layout * Preserve organization name as the default column * Fix current test expectations * Add unit tests covering org types * Add an --org-type filter to the project list command * Fix golangci-lint in Actions * Update help_test.go
Set --fail-with-body by default in curl commands
Co-authored-by: Ricardo Kirkner <[email protected]>
Port Verification Analysis (by Claude)I've systematically examined the differences between the main branch (since v4.22.0) and this port-4.x-5.x branch. Result: All 71 commits from v4.22.0..main are successfully reflected in this branch. Commit Distribution
Key Features Verified Present
Architecture AdaptationsThe porting commits show proper adaptation to 5.x architecture:
Conclusion: The port is complete and comprehensive. All functionality from main has been successfully ported and adapted to the 5.x architecture. |
pjcdawkins
force-pushed
the
port-4.x-5.x
branch
2 times, most recently
from
00068a7 to
31999a4
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR merges recent changes from the main branch into the 5.x branch, incorporating several new features and improvements including autoscaling configuration support, manual deployment capabilities, organization type filtering, guaranteed CPU resource management, and various code quality improvements.
Key changes:
- Added autoscaling configuration commands and API support for managing autoscaling settings
- Implemented manual deployment type functionality with staging and deployment commands
- Added organization type support with filtering capabilities across list and create operations
- Enhanced resource management with guaranteed CPU support and improved resource commands
Reviewed Changes
Copilot reviewed 59 out of 63 changed files in this pull request and generated 7 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Service/Api.php | Added autoscaling, guaranteed CPU, and project capabilities methods; refactored vendor filtering and subscription loading |
| src/Service/ActivityMonitor.php | Enhanced activity monitoring to handle staged deployments and improved result printing |
| src/Command/Autoscaling/* | New autoscaling get/set commands for configuring automatic scaling of apps and workers |
| src/Command/Environment/EnvironmentDeploy*.php | New commands for managing deployment types and deploying staged changes |
| src/Command/Resources/* | Enhanced resource commands with CPU type support and guaranteed resource handling |
| src/Command/Organization/* | Added organization type filtering and configuration |
| src/Service/ResourcesUtil.php | Enhanced formatChange method to support custom comparators and boolean values |
| config.yaml | Updated documentation URLs and added organization type configuration |
| go-tests/* | Updated test data and assertions for new organization type field |
Comments suppressed due to low confidence (1)
src/Command/Environment/EnvironmentDeployCommand.php:1
- Use strict comparison operator
===instead of loose comparison==for string equality checks to avoid type coercion issues.
<?php
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
pjcdawkins
force-pushed
the
port-4.x-5.x
branch
2 times, most recently
from
4b59c8b to
dcef40f
Compare
This ports changes made between v4.22.0 and v4.27.0, adapting code to the 5.x format: PHP 8, Guzzle 7, Symfony 7, etc.
pjcdawkins
force-pushed
the
port-4.x-5.x
branch
from
dcef40f to
1cbec9c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
No description provided.