Merge branch 'non-interactive-api-whitelist' into 'master'

Fix api whitelisting when using non-interactive mode See merge request transip/restapi-cli-client!183
transip · Nov 22, 2023 · 3b90681 · 3b90681
2 parents 332734f + debed8a
commit 3b90681
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+6.33.3
+-----
+* Correctly parse the useApiWhitelist flag when using non interactive mode
 
 6.33.2
 -----

diff --git a/src/Command/Setup/Setup.php b/src/Command/Setup/Setup.php
@@ -52,9 +52,11 @@ protected function interact(InputInterface $input, OutputInterface $output): voi
         $input->setOption(Field::API_LOGIN, $login);
 
         // Third question: use the IP whitelist?
-        $apiUseWhitelist   = $input->getOption(Field::API_USE_WHITELIST);
+        $apiUseWhitelistString = $input->getOption(Field::API_USE_WHITELIST);
+        $apiUseWhitelist = filter_var($apiUseWhitelistString, FILTER_VALIDATE_BOOLEAN);
+
         $whitelistQuestion = new ConfirmationQuestion(
-            "Use IP Whitelisting? [<comment>Yes</comment>]: ",
+            "Use IP Whitelisting? [<comment>{$apiUseWhitelistString}</comment>]: ",
             $apiUseWhitelist
         );
 
@@ -84,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $apiUrl     = strval($input->getOption(Field::API_URL));
         $login      = strval($input->getOption(Field::API_LOGIN));
-        $whitelist  = boolval($input->getOption(Field::API_USE_WHITELIST));
+        $whitelist  = filter_var($input->getOption(Field::API_USE_WHITELIST), FILTER_VALIDATE_BOOLEAN);
         $privateKey = $input->getOption(Field::API_PRIVATE_KEY);
 
         if (strlen($privateKey) < 2) {

diff --git a/src/Settings/Settings.php b/src/Settings/Settings.php
@@ -17,7 +17,7 @@ class Settings
 
     public const TRANSIP_API_ENDPOINT = 'https://api.transip.nl/v6';
 
-    public const TRANSIP_CLI_VERSION = '6.33.2';
+    public const TRANSIP_CLI_VERSION = '6.33.3';
 
     /**
      * @var string