Fixes #2945 by removing cloud hook exception for ACSF. #2946
Conversation
mikemadison13
force-pushed
the
2945
branch
2 times, most recently
from
ce0b010
to
a77831d
Compare
| @@ -60,29 +59,17 @@ public function postCodeDeploy($site, $target_env, $source_branch, $deployed_tag | |||
| * @throws \Exception | |||
| */ | |||
| public function postCodeUpdate($site, $target_env, $source_branch, $deployed_tag, $repo_url, $repo_type) { | |||
| $this->dieIfAcsfEnv($target_env); | |||
There was a problem hiding this comment.
This is here to intentionally prevent a post-deploy hook from being executed an ACSF, given that it is a dangerous practice that is discouraged.
@lcatlett right?
There was a problem hiding this comment.
@grasmash the issue is that with the exception it kills the deployment. the intent with this PR is to still "not" do the cloud hook, but not throw an exception in the process (so fail gracefully)
There was a problem hiding this comment.
Failing gracefully on post-code-update looks fine, however I recommend adding the exception to kill the deployment to postCodeDeploy since that is the most problematic of the Cloud Hooks - it may be up for debate whether to throw the exception and terminate the deployment if $env is 01live / production as well as 01update, as using post-code-deploy on an ACSF code update in production is dangerous in all usages since it often will bypass the ACSF update environment during deployments.
There was a problem hiding this comment.
Just to be clear, I doubt we want to throw an exception on post-code-deploy. That would make it impossible to maintain a codebase on ACE and ACSF simultaneously. Rather, we want to bail gracefully on post-code-deploy on ACSF. It looks like this is what Mike implemented in the latest commit below.
There was a problem hiding this comment.
Looks good to me! I agree that we don't want to run update scripts via Cloud Hooks on ACSF, but we also don't want those scripts to fail in a way that would block deployments. We want them to simply bail silently.
The reason is that some projects deploy code simultaneously to ACE and ACSF, so they need to have both Cloud Hooks and Factory Hooks in the same codebase. They need to play nicely together and not block deployments on ACSF by throwing an exception.
|
this seemed to work on my last deployments to both ACE and ACSF. |
|
Project Cloud Hook files are not automatically synced with the BLT templates which has historically been a pain point with pushing updates to files such as |
|
@lcatlett please have another look, i added the same check to the db scrub and post code deploy hooks as well as post code update. thoughts? |
|
Latest changes look good to me. |
|
@ba66e77 how do you feel about getting this merged? |
|
did we need to remove the scrub command commit? i rebased but it looks like that got struck out in the description? |
|
I think my last comment was deleted because the diff was updated, so posting again below: This approach is fine for now to unblock deploys, however be aware that post-code-deploy hooks will be disabled on ACSF in the coming weeks/months, even if they are in the deployed codebase. Customers using them will hear from Acquia product and their account managers well in advance, but adding a todo or creating an issue in BLT to come back to this later might make sense. |
|
Since this is a bug, we'll need to forward-port it to 9.2.x as well. |
|
@mikemadison13, it's not clear to my why/how that scrub line in the description was struck out. I've un-struck it. |
* Test against Drupal 8.6.x-dev. (#2937) * Updating versions of Drupal core and Lightning. (#3061) * Updating CHANGELOG.md and setting version for 9.2.0-alpha1. * Fixes #3055: Update memcache settings to match changes in Drupal memcache module. (#3058) (#3067) * Require drupa/memcache equal or greater than 2.0-alpha7. * Updating memcache settings based on change in drupal/memcache module. * Allow PHPUnit to bootstrap from core. (#3071) * Clarified Git hook documentation. (#3073) * Finished updating memcache config for alpha7. (#3076) * Finished updating memcache config for alpha7. * Locking drupal/memcache to 2.0-alpha7 until memcache stabilizes. * Updating CHANGELOG.md and setting version for 9.2.0-alpha2. * Travis CI Memcache Service and Settings (#3082) * Start memcached service and add php extension. * Check status of memcached service. * Use blt memcache config on CI. * Run simplesaml config command on all composer calls. (#3051) * Update local-development.md (#3087) Correcting links to PHPStorm documentation on Acquia's documentation service. * Remove memcache.yml and references to it. (#3093) (#3094) * Cherry-pick in lost/abandoned commits from 9.x (#3072) * VM setup tips (#3036) * Update local-development.md to reference committing DrupalVM files. * New guidelines for contribution. (#3045) * Adding replication and verification step sections and clean up formatting. * Adding new guidelines for PRs to the CONTRIBUTING docs. * Fixes #2964: When manually deploying using a tag also push that tag to source repo. (#2992) * Adding a cutSourceTag method and invoking when deploying tag. * Set default deploy.tag_source config setting and check it when deploying. * Refactoring to use a single cutTag method. * Remove line about expectation you already have a tag on your source before you tag a release. * Warn if user is creating a tag but tag_source option is false. * Updating deploy documentation. * Fixes #3053: Update requirement to drush/drush:^9.4.0. (#3078) * Fixes #3065: Use webflo/drupal-core-require-dev instead of tracking core dev dependencies. (#3068) * Use core's PHPUnit bootstrap file. (#3092) * amotic -> atomic (#3098) Fixed minor typo in code review docs. * Support memcache on ACSF via flags. (#3096) * Remove support for PHPUnit 5. (#3102) * Run validation without interaction on CI. (#3070) (#3097) * Fixes #3046: Cleaned up Pipelines docs. (#3104) * Exclude the 'sites/settings' dir for the default list of sites. (#2994) (#3105) Force-approving this based on the same code's approval on the 9.x branch. * Updating CHANGELOG.md and setting version for 9.2.0-alpha3. * Update config_split.config_split.ci.yml (#3129) * Update README.md (#3113) * Minor variable / comment refactor. (#3111) * Fix the link of Memcache documentation page. (#3135) * Remove PHP 5.6 from the list of tested versions. (#3137) * Fixes #2945 by removing cloud hook exception for ACSF. (#2946) * Fixes #2945: removing exception for cloud hooks on ACSF. * Cleaning up variable use in db scrub hook. * Adding ACSF check to post deploy and makes db scrub consistent with others. * updating blt docs to cover ACSF memcache use. (#3136) * Fix INSTALL.md installation directions for Drush Launcher. (#3127) * Fixes #3118: Update theme path to more standardized D8 defaults. (#3119) * Resolves #3106: Add 'skip_permissions_hardening' setting to local settings file template (#3107) * Update support policies (#3147) * Update support policies * Update README.md * Fix PHP syntax error in acquia simplesamlphp config. (#3141) * 3149: Minor grammar fix (#3150) * Fixed travis output. (#3151) * Travis shouldn't duplicate Drupal 8.6 tests (#3152) * Travis should test Drupal 8.7. * Disable 8.7 tests. * Updating CHANGELOG.md and setting version for 9.2.0. * Prevent cache collisions in multisite db-update tasks (#3166) * Add drush cache dir utility script. * Enhanced Factory Hook to isolate db-update tasks to tempoary drush cache. * Update Factory Hooks from BLT template. * Remove redundant cache clear and rebuild to preserve drush context of current request. * Style tweaks and setting update version number to 9.2. * Prevent cache collisions in multisite install tasks (#3171) * Refactor post-install hook to use temp cache dir per site, use requests instead of ENV. * Refresh Factory Hooks from template for 9002001. * Update version number for hook. * Remove redundant factory hook update. * Removed unused use statements. * Style and phpcs updates. * Update BLT settings for site and http/proxy detection (#3172) * Fix auto detection of sites dir due to core changes. * Update proxy and host detection for core updates and Acquia VCL changes. * PHPCS fixes. * Update deploy.md with correct Cloud Hooks links. (#3188) The Acquia docs link pointed to a stale page and the BLT one pointed to the 8.x branch, both throwing 404's. I've updated both to point to the latest iterations of each page. * Update to Drupal Coder 8.3.x. (#3132) Fixes #2289 -------- Changes proposed: --------- (What are you proposing we change?) - Update composer contraint on Drupal Coder newest release (8.3.1 as of this date) - Update composer constraint on squizlabs/php_codesniffer to 3.0.1 (matching Coder) - Remove the use of a bootstrap file with PHPCS. File paths that are not allowed by filesets won't be sniffed by default. - Add a tests:phpcs:sniff:modified command to sniff unstaged modified or added files in repo for convenience. * Updating CHANGELOG.md and setting version for 9.2.1. * Merge tag '9.1.7' of github.com:acquia/blt * PHP CS fixes. * Restrict lightning version constraint to 8.5x. * Revert coder to older version. * Revert required and suggested composer merge plugin config. * Update RoboFile.php * Fix default drush local multisite alias bug causing test failures. * Fix multisite test alias bug. * Revert "Update to Drupal Coder 8.3.x. (#3132)" fccd0d0 * Update hooks and phpcs config. * BLT Backport of 9.2 to 9x (#3280) * Fix comment formatting in PhpUnitCommand. (#3211) * Fixes #3063 by updating faq and install docs to improve install profile instructions. (#3064) * [9.2.x] Fix undefined trusted_reverse_proxy_ips #3214 (#3215) Fixes #3214 -------- Changes proposed: --------- (What are you proposing we change?) - check if trusted_reverse_proxy_ips is defined as an array - if not, set an empty array Steps to replicate the issue: ---------- (If this PR is not fixing a defect/bug, you can remove this section.) 1. blt setup 2. bootstrap drupal Steps to verify the solution: ----------- (How does someone verify that this does what you think does?) 1. apply the patch 2. blt setup / bootstrap Drupal 3. check to ensure following warning does not appear: ``` Warning: in_array() expects parameter 2 to be array, null given in require() (line 27 of /app/vendor/acquia/blt/settings/blt.settings.php). require('/app/vendor/acquia/blt/settings/blt.settings.php') (Line: 806) require('/app/docroot/sites/naswa_main/settings.php') (Line: 125) Drupal\Core\Site\Settings::initialize('/app/docroot', 'sites/naswa_main', Object) (Line: 1056) Drupal\Core\DrupalKernel->initializeSettings(Object) (Line: 655) Drupal\Core\DrupalKernel->handle(Object) (Line: 19) ``` * Fixes #3185 to bring install and local docs inline. (#3186) * Fixing updates 9002000 message. (#3205) * Fixing missing semi-colon at end of line. (#3208) * Fixes #3243 to clean up dry-run in deploy command. (#3263) * Multisite bugfixes (#3231) * Fix multisite test alias bug. * Fix default drush local multisite alias bug causing test failures. * Fix global varible scope and phpcs syntax. * Update variable names and fix phpcs validation errors.. * Add missing phpunit-bridge package. * Add BLT update hook for 9.1.9 release. * Update version for 9.1.9 release. * Revert "Lock core in 9.x branch to 8.5.6. (#3062)" b2e0bcf * Use assertions to resolve build failures due to phpunit 'risky tests' notice. * Revert travis backports to debug build. * Ensure minimum of dmore/chrome-mink-driver 2.5.0. * Remove duplicate update hook. * Removing changes from composer files.
Fixes #2945.
Changes proposed: