feat(geolcation): Change country scope to Country

Author: julienloizelet

.github/workflows/markdown.yml

@@ -1,5 +1,4 @@
 on:
-  push:
   workflow_dispatch:
 
 name: Markdown files test and update

.github/workflows/test-suite.yml

@@ -48,15 +48,17 @@ jobs:
           cp .ddev/additional_docker_compose/docker-compose.crowdsec.yaml .ddev/docker-compose.crowdsec.yaml
           cp .ddev/additional_docker_compose/docker-compose.playwright.yaml .ddev/docker-compose.playwright.yaml
           ddev start
-          ddev --version
-          ddev exec php -v
-          
 
       - name: Set BOUNCER_KEY and PROXY_IP env
         run: |
           echo "BOUNCER_KEY=$(ddev create-bouncer)" >> $GITHUB_ENV
           echo "PROXY_IP=$(ddev find-ip ddev-router)" >> $GITHUB_ENV
 
+      - name: Some DEBUG information
+        run: |
+          ddev --version
+          ddev exec php -v
+          ddev exec -s crowdsec crowdsec -version
 
       - name: Clone PHP lib Crowdsec files
         uses: actions/checkout@v2
@@ -81,9 +83,8 @@ jobs:
 
 
       - name: Run PHP UNIT tests
-        # ddev exec BOUNCER_KEY=${{ env.BOUNCER_KEY }} LAPI_URL=http://crowdsec:8080 MEMCACHED_DSN=memcached://memcached:11211 REDIS_DSN=redis://redis:6379 /usr/bin/php ./my-own-modules/crowdsec-php-lib/vendor/bin/phpunit --testdox --colors --exclude-group ignore ./my-own-modules/crowdsec-php-lib/tests/IpVerificationTest.php
         run: |
-          ddev exec -s crowdsec crowdsec -version
+          ddev exec BOUNCER_KEY=${{ env.BOUNCER_KEY }} LAPI_URL=http://crowdsec:8080 MEMCACHED_DSN=memcached://memcached:11211 REDIS_DSN=redis://redis:6379 /usr/bin/php ./my-own-modules/crowdsec-php-lib/vendor/bin/phpunit --testdox --colors --exclude-group ignore ./my-own-modules/crowdsec-php-lib/tests/IpVerificationTest.php
           ddev exec BOUNCER_KEY=${{ env.BOUNCER_KEY }} LAPI_URL=http://crowdsec:8080  /usr/bin/php ./my-own-modules/crowdsec-php-lib/vendor/bin/phpunit --testdox --colors --exclude-group ignore ./my-own-modules/crowdsec-php-lib/tests/GeolocationTest.php
 
       - name: Prepare END TO END tests

src/Constants.php

@@ -68,7 +68,7 @@ class Constants
     public const GEOLOCATION_TYPE_MAXMIND = 'maxmind';
 
     /** @var string The CrowdSec country scope for decisions */
-    public const SCOPE_COUNTRY = 'country';
+    public const SCOPE_COUNTRY = 'Country';
 
     /** @var string The CrowdSec Ip scope for decisions */
     public const SCOPE_IP = 'Ip';

tests/GeolocationTest.php

@@ -98,10 +98,5 @@ public function testCanVerifyIpAndCountryWithMaxmindInLiveMode(array $maxmindCon
             'Get decisions for a clean IP and bad country but with geolocation disabled'
         );
 
-
-
-
-
-
     }
 }

tests/WatcherClient.php

@@ -54,7 +54,7 @@ public function setInitialState(): void
         $now = new DateTime();
         $this->addDecision($now, '12h', '+12 hours', TestHelpers::BAD_IP, 'captcha');
         $this->addDecision($now, '24h', '+24 hours', TestHelpers::BAD_IP.'/'.TestHelpers::IP_RANGE, 'ban');
-        $this->addDecision($now, '24h', '+24 hours', TestHelpers::JAPAN, 'captcha', 'country');
+        $this->addDecision($now, '24h', '+24 hours', TestHelpers::JAPAN, 'captcha', Constants::SCOPE_COUNTRY);
     }
 
     /** Set the initial watcher state */