Simplify config split settings (#1455)

blt/blt.yml

@@ -21,44 +21,29 @@ drush:
   default_alias: '${drush.aliases.local}'
 modules:
   local:
-    enable: {  }
+    enable: { }
     uninstall:
-      - google_analytics
       - acquia_connector
       - purge
-      - shield
-      - config_readonly
   ci:
-    enable:
-      - hs_config_readonly
+    enable: { }
     uninstall:
-      - google_analytics
       - purge
       - acquia_connector
-      - shield
   dev:
     enable:
       - acquia_connector
-      - shield
       - stage_file_proxy
-    uninstall:
-      - google_analytics
-      - config_readonly
+    uninstall: { }
   test:
     enable:
       - acquia_connector
-      - shield
       - stage_file_proxy
-    uninstall:
-      - google_analytics
-      - config_readonly
+    uninstall: { }
   prod:
     enable:
-      - google_analytics
       - acquia_connector
-      - hs_config_readonly
     uninstall:
-      - shield
       - stage_file_proxy
 multisites:
   - aaai

blt/src/Blt/Plugin/Commands/ToggleModulesCommand.php

@@ -59,6 +59,8 @@ protected function doToggleModules($command, $config_key) {
       $modules_list = implode(' ', $modules);
       $result = $this->taskDrush()
         ->drush("$command $modules_list")
+        ->drush('eval')
+        ->arg('\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();')
         ->run();
       // Unable to uninstall all modules at the same time, try one at a time.
       if (!$result->wasSuccessful()) {
@@ -68,6 +70,8 @@ protected function doToggleModules($command, $config_key) {
           // command will throw an error. Ignore that.
           $this->taskDrush()
             ->drush("$command $module")
+            ->drush('eval')
+            ->arg('\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();')
             ->printOutput(FALSE)
             ->run();
         }

composer.json

@@ -243,6 +243,9 @@
             "drupal/focal_point": {
                 "https://www.drupal.org/project/focal_point/issues/3328807": "https://www.drupal.org/files/issues/2023-01-06/3328807-focal_point-image_width_when_no_image_to_crop.patch"
             },
+            "drupal/google_analytics": {
+                "https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
+            },
             "drupal/hook_event_dispatcher": {
                 "https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2023-04-17/hook_event_dispatcher-4.x-3354751.patch"
             },

config/default/config_split.config_split.ci.yml

@@ -7,9 +7,7 @@ label: Ci
 description: 'CircleCi Environment'
 weight: 0
 folder: ../config/envs/ci
-module:
-  hs_config_readonly: 0
-  config_readonly: 0
+module: {  }
 theme: {  }
 blacklist: {  }
 graylist: {  }

config/default/config_split.config_split.dev.yml

@@ -11,23 +11,19 @@ module:
   acquia_connector: 0
   acquia_purge: 0
   dblog: 0
-  nobots: 0
   purge: 0
   purge_drush: 0
   purge_processor_cron: 0
   purge_processor_lateruntime: 0
   purge_queuer_coretags: 0
   purge_ui: 0
-  shield: 0
   stage_file_proxy: 0
 theme: {  }
 blacklist:
   - acquia_connector.settings
   - purge.logger_channels
   - purge.plugins
   - purge_queuer_coretags.settings
-  - key.key.hs_shield_key
-  - shield.settings
 graylist:
   - field_ui.settings
   - system.performance

config/default/config_split.config_split.prod.yml

@@ -10,9 +10,6 @@ folder: ../config/envs/prod
 module:
   acquia_connector: 0
   acquia_purge: 0
-  config_readonly: 0
-  google_analytics: 0
-  hs_config_readonly: 0
   purge: 0
   purge_drush: 0
   purge_processor_cron: 0

config/default/config_split.config_split.stage.yml

@@ -11,23 +11,19 @@ module:
   acquia_connector: 0
   acquia_purge: 0
   dblog: 0
-  nobots: 0
   purge: 0
   purge_drush: 0
   purge_processor_cron: 0
   purge_processor_lateruntime: 0
   purge_queuer_coretags: 0
   purge_ui: 0
-  shield: 0
   stage_file_proxy: 0
 theme: {  }
 blacklist:
   - acquia_connector.settings
   - purge.logger_channels
   - purge.plugins
   - purge_queuer_coretags.settings
-  - key.key.hs_shield_key
-  - shield.settings
 graylist:
   - field_ui.settings
   - system.performance

config/default/core.extension.yml

@@ -38,6 +38,7 @@ module:
   config_update: 0
   config_update_ui: 0
   confirm_leave: 0
+  config_readonly: 0
   content_access: 0
   contextual: 0
   core_event_dispatcher: 0
@@ -82,6 +83,7 @@ module:
   focal_point: 0
   fontawesome: 0
   gin_toolbar: 0
+  google_analytics: 0
   hal: 0
   help: 0
   honeypot: 0
@@ -92,6 +94,7 @@ module:
   hs_blocks: 0
   hs_capx: 0
   hs_config_prefix: 0
+  hs_config_readonly: 0
   hs_courses: 0
   hs_courses_importer: 0
   hs_entities: 0
@@ -209,6 +212,7 @@ module:
   search_api: 0
   search_api_db: 0
   serialization: 0
+  shield: 0
   shortcut: 0
   shortcut_menu: 0
   slick: 0

config/default/shield.settings.yml

@@ -0,0 +1,11 @@
+allow_cli: false
+print: ''
+credential_provider: multikey
+credentials:
+  multikey:
+    user_pass_key: hs_shield_key
+shield_enable: false
+whitelist: ''
+paths: "/.well-known\r\n/.well-known/*"
+domains: ''
+method: 0

config/envs/stage/field_ui.settings.yml

@@ -1,3 +1,3 @@
-field_prefix: field_
+field_prefix: custm_
 _core:
   default_config_hash: Q1nMi90W6YQxKzZAgJQw7Ag9U4JrsEUwkomF0lhvbIM

docroot/sites/settings/acquia.settings.php

@@ -9,8 +9,8 @@
 $settings['file_temp_path'] = '/mnt/gfs/' . EnvironmentDetector::getAhGroup() . '.' . EnvironmentDetector::getAhEnv() . '/tmp';
 $settings['letsencrypt_challenge_directory'] = $settings['file_temp_path'];
 
-if (!EnvironmentDetector::isProdEnv()) {
-  // Disables domain redirect on all environments except production.
-  $config['domain_301_redirect.settings']['enabled'] = FALSE;
-}
+// Disables domain redirect on all environments except production.
+$config['domain_301_redirect.settings']['enabled'] = EnvironmentDetector::isProdEnv();
 
+// Enable shield on non prod.
+$config['shield.settings']['shield_enable'] = !EnvironmentDetector::isProdEnv();

docroot/sites/settings/global.settings.php

@@ -54,13 +54,14 @@
 }
 
 // Don't lock config when using drush.
-if (PHP_SAPI !== 'cli') {
+if (PHP_SAPI !== 'cli' && EnvironmentDetector::isProdEnv()) {
   $settings['config_readonly'] = TRUE;
 }
 
 // Enable nobots on any non-prod site.
 if (!EnvironmentDetector::isProdEnv()) {
   $settings['nobots'] = TRUE;
+  $config['google_analytics.settings']['account'] = '';
 }
 
 if (EnvironmentDetector::isAhEnv()) {