Merge branch 'refs/heads/feat-cli-g2' into feat-organization-support

# Conflicts:
#	templates/cli/lib/questions.js.twig

Author: byawitz

src/SDK/Language/CLI.php

@@ -127,6 +127,11 @@ public function getFiles(): array
                 'destination'   => 'lib/questions.js',
                 'template'      => 'cli/lib/questions.js.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/validations.js',
+                'template'      => 'cli/lib/validations.js.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/parser.js',

templates/cli/lib/questions.js.twig

@@ -4,6 +4,7 @@ const { teamsList } = require('./commands/teams');
 const { functionsListRuntimes } = require('./commands/functions');
 const { accountListMfaFactors } = require("./commands/account");
 const { sdkForConsole } = require("./sdks");
+const { validateRequired } = require("./validations");
 const { paginate } = require('./paginate');
 
 const { databasesList } = require('./commands/databases');
@@ -109,6 +110,7 @@ const getInstallCommand = (runtime) => {
     return undefined;
 };
 
+
 const questionsInitProject = [
     {
         type: "confirm",
@@ -309,6 +311,7 @@ const questionsDeployFunctions = [
         type: "checkbox",
         name: "functions",
         message: "Which functions would you like to deploy?",
+        validate: (value) => validateRequired('function', value),
         choices: () => {
             let functions = localConfig.getFunctions();
             if (functions.length === 0) {
@@ -335,6 +338,7 @@ const questionsDeployCollections = [
         type: "checkbox",
         name: "collections",
         message: "Which collections would you like to deploy?",
+        validate: (value) => validateRequired('collection', value),
         choices: () => {
             let collections = localConfig.getCollections();
             if (collections.length === 0) {
@@ -360,6 +364,7 @@ const questionsDeployBuckets = [
         type: "checkbox",
         name: "buckets",
         message: "Which buckets would you like to deploy?",
+        validate: (value) => validateRequired('bucket', value),
         choices: () => {
             let buckets = localConfig.getBuckets();
             if (buckets.length === 0) {
@@ -400,6 +405,7 @@ const questionsDeployTeams = [
         type: "checkbox",
         name: "teams",
         message: "Which teams would you like to deploy?",
+        validate: (value) => validateRequired('team', value),
         choices: () => {
             let teams = localConfig.getTeams();
             if (teams.length === 0) {

templates/cli/lib/validations.js.twig

@@ -0,0 +1,17 @@
+const validateRequired = (resource, value) => {
+    if (Array.isArray(value)) {
+        if (value.length <= 0) {
+            return `Please select at least one ${resource}`;
+        }
+    } else {
+        if (value === undefined || value === null || value === 0 || (typeof value === "string" && value.trim() === '')) {
+            return `${resource} is required`;
+        }
+    }
+
+    return true;
+}
+
+module.exports = {
+    validateRequired
+}