feat: update local refresh script (#258)

* feat: update local refresh script * feat: more local improvements * fix(api): remove `driverOptions` from `export` DB connection
dvsa · Aug 21, 2024 · f8c169e · f8c169e
1 parent 56a5db3
commit f8c169e
Show file tree

Hide file tree

Showing 28 changed files with 649 additions and 490 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 # IntelliJ project files
-.idea
+.idea/**
+!.idea/php.xml
+!.idea/.name
 
 # Logs
 logs

diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs
@@ -1,6 +1,6 @@
 import chalk from "chalk";
-import path from "path";
-import { execSync } from "child_process";
+import path from "node:path";
+import { execSync } from "node:child_process";
 
 const generateTerraformDocs = (filenames) => {
   try {

diff --git a/app/api/config/autoload/config.global.php b/app/api/config/autoload/config.global.php
@@ -54,13 +54,8 @@
             ],
             'export' => [
                 'driverClass' => \Doctrine\DBAL\Driver\PDO\MySQL\Driver::class,
-                'params' => $doctrine_connection_params +
-                    [
-                        'driverOptions' => [
-                            PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => false,
-                            PDO::CURSOR_FWDONLY => true,
-                        ],
-                    ],
+                // Database connection details
+                'params' => $doctrine_connection_params,
             ],
         ],
         'driver' => [

diff --git a/app/api/config/autoload/local.php.dist b/app/api/config/autoload/local.php.dist
@@ -346,12 +346,14 @@ return [
         'client' => [ // Guzzle client options; see https://docs.guzzlephp.org/en/stable/quickstart.html
             'base_uri' => '', //param
             'headers' => [], // additional or override default client headers
+            'proxy' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),
         ],
         'oauth2' => [ // if client['headers']['Authorization'] is not set, then this will be used to get token
             'client_id' => '', //param
             'client_secret' => '', // secret
             'token_url' => '', //param
             'scope' => '', //param
+            'proxy' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),
         ],
     ],
 ];
diff --git a/app/internal/config/application.config.php b/app/internal/config/application.config.php
@@ -86,12 +86,4 @@
     // 'service_manager' => array(),
 ];
 
-if (file_exists(__DIR__ . '/../vendor/laminas/laminas-developer-tools/src/Module.php')) {
-    $config['modules'][] = 'Laminas\DeveloperTools';
-
-    if (file_exists(__DIR__ . '/../vendor/san/san-session-toolbar/src/Module.php')) {
-        $config['modules'][] = 'SanSessionToolbar';
-    }
-}
-
 return $config;
diff --git a/app/internal/config/autoload/local.php.dist b/app/internal/config/autoload/local.php.dist
@@ -18,7 +18,7 @@ return [
                     'backend' => [
                         'options' => [
                             // Backend service URI *Environment specific*
-                            'route' => 'backend-nginx',
+                            'route' => 'api.local.olcs.dev-dvsacloud.uk',
                         ]
                     ]
                 ]
@@ -31,11 +31,11 @@ return [
         'endpoints' => [
             // Backend service URI *Environment specific*
             'backend' => [
-                'url' => 'backend-nginx',
+                'url' => 'api.local.olcs.dev-dvsacloud.uk',
             ],
             // Postcode/Address service URI *Environment specific*
             'postcode' => [
-                'url' => 'backend-nginx',
+                'url' => 'https://int.nonprod.address.dvsa.api.gov.uk/',
             ],
         ]
     ],
@@ -65,7 +65,7 @@ return [
     ],
 
     // Asset path, URI to olcs-static (CSS, JS, etc] *Environment specific*
-    'asset_path' => 'http://localhost:7001',
+    'asset_path' => 'http://cdn.local.olcs.dev-dvsacloud.uk/',
 
     'openam' => [
         'url' => 'http://olcs-auth.olcs.gov.uk:8081/secure/',

diff --git a/app/internal/config/development.config.php.dist b/app/internal/config/development.config.php.dist
@@ -3,6 +3,8 @@
 return [
   // Additional modules to include when in development mode
   'modules' => [
+    'Laminas\DeveloperTools',
+    'SanSessionToolbar',
   ],
   // Configuration overrides during development mode
   'module_listener_options' => [

diff --git a/app/selfserve/config/application.config.php b/app/selfserve/config/application.config.php
@@ -69,12 +69,4 @@
     ],
 ];
 
-if (file_exists(__DIR__ . '/../vendor/laminas/laminas-developer-tools/src/Module.php')) {
-    $config['modules'][] = 'Laminas\DeveloperTools';
-
-    if (file_exists(__DIR__ . '/../vendor/san/san-session-toolbar/src/Module.php')) {
-        $config['modules'][] = 'SanSessionToolbar';
-    }
-}
-
 return $config;
diff --git a/app/selfserve/config/autoload/local.php.dist b/app/selfserve/config/autoload/local.php.dist
@@ -18,7 +18,7 @@ return [
                     'backend' => [
                         'options' => [
                             // Backend service URI *Environment specific*
-                            'route' => 'backend-nginx',
+                            'route' => 'api.local.olcs.dev-dvsacloud.uk',
                         ]
                     ]
                 ]
@@ -31,17 +31,17 @@ return [
         'endpoints' => [
             // Backend service URI *Environment specific*
             'backend' => [
-                'url' => 'backend-nginx',
+                'url' => 'api.local.olcs.dev-dvsacloud.uk',
             ],
             // Postcode/Address service URI *Environment specific*
             'postcode' => [
-                'url' => 'http://address.reg.olcs.dev-dvsacloud.uk/',
+              'url' => 'https://int.nonprod.address.dvsa.api.gov.uk/',
             ],
         ]
     ],
 
     // Asset path, URI to olcs-static (CSS, JS, etc) *Environment specific for local use http://127.0.0.1:7001*
-    'asset_path' => 'http://localhost:7001',
+    'asset_path' => 'http://cdn.local.olcs.dev-dvsacloud.uk/',
 
     'openam' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),
 

diff --git a/app/selfserve/config/development.config.php.dist b/app/selfserve/config/development.config.php.dist
@@ -3,6 +3,8 @@
 return [
   // Additional modules to include when in development mode
   'modules' => [
+    'Laminas\DeveloperTools',
+    'SanSessionToolbar',
   ],
   // Configuration overrides during development mode
   'module_listener_options' => [

diff --git a/infra/docker/cli/Dockerfile b/infra/docker/cli/Dockerfile
@@ -47,6 +47,11 @@ RUN apk add --no-cache linux-headers $PHPIZE_DEPS \
   && docker-php-ext-enable xdebug \
   && apk del linux-headers $PHPIZE_DEPS
 
+RUN apk update && \
+  apk add --no-cache openldap-dev \
+  && docker-php-ext-install ldap \
+  && docker-php-ext-enable ldap
+
 RUN \
   # Disable OPCache in development.
   echo "opcache.enable=0" >> ${PHP_INI_DIR}/conf.d/1000-php.ini \