Merge branch 'refs/heads/master' into chore-run-function

Author: byawitz

templates/cli/lib/commands/push.js.twig

@@ -5,7 +5,7 @@ const { Command } = require("commander");
 const { localConfig, globalConfig, KeysAttributes, KeysFunction, whitelistKeys, KeysTopics, KeysStorage, KeysTeams, } = require("../config");
 const { Spinner, SPINNER_ARC, SPINNER_DOTS } = require('../spinner');
 const { paginate } = require('../paginate');
-const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionPushChanges, questionsPushMessagingTopics, questionsPushResources } = require("../questions");
+const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionPushChanges, questionPushChangesConfirmation, questionsPushMessagingTopics, questionsPushResources } = require("../questions");
 const { cliConfig, actionRunner, success, warn, log, hint, error, commandDescriptions, drawTable } = require("../parser");
 const { proxyListRules } = require('./proxy');
 const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsGetDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
@@ -340,6 +340,33 @@ const awaitPools = {
     },
 }
 
+const getConfirmation = async () => {
+    if (!cliConfig.force) {
+        async function fixConfirmation() {
+            const answers = await inquirer.prompt(questionPushChangesConfirmation);
+            if(answers.changes !== 'YES' && answers.changes !== 'NO') {
+                return await fixConfirmation();
+            }
+
+            return answers.changes;
+        }
+
+        let answers = await inquirer.prompt(questionPushChanges);
+        if(answers.changes !== 'YES' && answers.changes !== 'NO') {
+            answers.changes = await fixConfirmation();
+        }
+
+        if (answers.changes === 'YES') {
+            return true;
+        }
+
+        warn('Skipping push action. Changes were not applied.');
+        return false;
+    }
+
+    return true;
+};
+
 const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural, skipKeys = []) => {
     log('Checking for changes');
     const changes = [];
@@ -385,11 +412,8 @@ const approveChanges = async (resource, resourceGetFunction, keys, resourceName,
     }
 
     drawTable(changes);
-    if (!cliConfig.force) {
-        const answers = await inquirer.prompt(questionPushChanges);
-        if (answers.changes.toLowerCase() === 'yes') {
-            return true;
-        }
+    if((await getConfirmation()) === true) {
+        return true;
     }
 
     success(`Successfully pushed 0 ${resourcePlural}.`);
@@ -769,9 +793,7 @@ const attributesToCreate = async (remoteAttributes, localAttributes, collection,
             log(`Attribute recreation will cause ${chalk.red('loss of data')}`);
         }
 
-        const answers = await inquirer.prompt(questionPushChanges);
-
-        if (answers.changes.toLowerCase() !== 'yes') {
+        if((await getConfirmation()) !== true) {
             return changedAttributes;
         }
     }
@@ -893,12 +915,9 @@ const pushSettings = async () => {
 
         if (changes.length > 0) {
             drawTable(changes);
-            if (!cliConfig.force) {
-                const answers = await inquirer.prompt(questionPushChanges);
-                if (answers.changes.toLowerCase() !== 'yes') {
-                    success(`Successfully pushed 0 project settings.`);
-                    return;
-                }
+            if((await getConfirmation()) !== true) {
+                success(`Successfully pushed 0 project settings.`);
+                return;
             }
         }
     } catch (e) {
@@ -1391,10 +1410,10 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
             throw e;
         }
         numberOfCollections++;
-        success(`Pushed ${collection.name} ( ${collection['$id']} )`);
+        success(`Successfully pushed ${collection.name} ( ${collection['$id']} )`);
     }
 
-    success(`Pushed ${numberOfCollections} collections`);
+    success(`Successfully pushed ${numberOfCollections} collections`);
 }
 
 const pushBucket = async ({ returnOnZero } = { returnOnZero: false }) => {
@@ -1557,7 +1576,6 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
 
     let topicsIds = [];
     const configTopics = localConfig.getMessagingTopics();
-    let overrideExisting = cliConfig.force;
 
     if (cliConfig.all) {
         checkDeployConditions(localConfig);
@@ -1584,13 +1602,6 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
         topics.push(...idTopic);
     }
 
-    if (!cliConfig.force) {
-        const answers = await inquirer.prompt(questionsPushMessagingTopics[1])
-        if (answers.override.toLowerCase() === "yes") {
-            overrideExisting = true;
-        }
-    }
-
     if (!(await approveChanges(topics, messagingGetTopic, KeysTopics, 'topicId', 'topics'))) {
         return;
     }
@@ -1607,11 +1618,6 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
             })
             log(`Topic ${topic.name} ( ${topic['$id']} ) already exists.`);
 
-            if (!overrideExisting) {
-                log(`Skipping ${topic.name} ( ${topic['$id']} )`);
-                continue;
-            }
-
             await messagingUpdateTopic({
                 topicId: topic['$id'],
                 name: topic.name,

templates/cli/lib/questions.js.twig

@@ -631,11 +631,6 @@ const questionsPushFunctions = [
             return choices;
         }
     },
-    {
-        type: "input",
-        name: "override",
-        message: 'Are you sure you want to override this function\'s variables? This can lead to loss of secrets! Type "YES" to confirm.'
-    },
 ]
 
 const questionsPushCollections = [
@@ -663,7 +658,15 @@ const questionPushChanges = [
     {
         type: "input",
         name: "changes",
-        message: `Would you like to apply these changes? Type "YES" to confirm.`
+        message: `Are you sure you want to apply these changes? (YES/NO)`
+    }
+];
+
+const questionPushChangesFix = [
+    {
+        type: "input",
+        name: "changes",
+        message: `Please type 'YES' or 'NO':`
     }
 ];
 
@@ -693,6 +696,7 @@ const questionsPushMessagingTopics = [
         type: "checkbox",
         name: "topics",
         message: "Which messaging topic would you like to push?",
+        validate: (value) => validateRequired('topics', value),
         when: () => localConfig.getMessagingTopics().length > 0,
         choices: () => {
             let topics = localConfig.getMessagingTopics();
@@ -704,11 +708,6 @@ const questionsPushMessagingTopics = [
                 }
             });
         }
-    },
-    {
-        type: "input",
-        name: "override",
-        message: 'Would you like to override existing topics? This can lead to loss of data! Type "YES" to confirm.'
     }
 ]
 
@@ -847,5 +846,6 @@ module.exports = {
     questionGetEndpoint,
     questionsInitResources,
     questionsCreateTeam,
-    questionPushChanges
+    questionPushChanges,
+    questionPushChangesFix
 };

templates/flutter/pubspec.yaml.twig

@@ -20,16 +20,16 @@ dependencies:
     sdk: flutter
   cookie_jar: ^4.0.8
   device_info_plus: ^10.1.0
-  flutter_web_auth_2: ^3.1.1
+  flutter_web_auth_2: ^3.1.2
   http: '>=0.13.6 <2.0.0'
   package_info_plus: ^8.0.0
   path_provider: ^2.1.3
-  web_socket_channel: ^2.4.5
+  web_socket_channel: ^3.0.0
   web: ^0.5.1
 
 dev_dependencies:
   path_provider_platform_interface: ^2.1.2
-  flutter_lints: ^3.0.2
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
   mockito: ^5.4.4

tests/Base.php

@@ -143,7 +143,7 @@ public function setUp(): void
 
             \exec('
                 cd ./mock-server && \
-                docker-compose build && \
+                docker compose build && \
                 docker compose up -d --force-recreate
             ');
         }