fix(auth tokens) Added support for auth tokens (#49)

Pive01 · web-flow · commit 8aab9f8c2339 · 2023-12-06T09:26:57.000+01:00
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE?=localstack/localstack-docker-desktop
-TAG?=0.5.1
+TAG?=0.5.2
 
 BUILDER=buildx-multi-arch
 
diff --git a/ui/src/components/Header/Controller.tsx b/ui/src/components/Header/Controller.tsx
@@ -11,15 +11,15 @@ import {
 } from '../../services';
 import {
   DEFAULT_CONFIGURATION_ID,
-  START_ARGS,
   FLAGS,
-  IMAGE,
   PRO_IMAGE,
+  COMMUNITY_IMAGE,
 } from '../../constants';
 import { LongMenu } from './Menu';
 import { DockerContainer, DockerImage } from '../../types';
 import { DownloadProgressDialog } from '../Feedback/DownloadProgressDialog';
 import { ProgressButton } from '../Feedback';
+import { generateCLIArgs } from '../../services/util/cli';
 
 const EXCLUDED_ERROR_TOAST = ['INFO', 'WARN', 'DEBUG'];
 
@@ -28,7 +28,7 @@ export const Controller = (): ReactElement => {
   const { data, mutate } = useLocalStack();
   const { user, os, hasSkippedConfiguration } = useMountPoint();
   const [runningConfig, setRunningConfig] = useState<string>(configData.runningConfig ?? DEFAULT_CONFIGURATION_ID);
-  const [downloadProps, setDownloadProps] = useState({ open: false, image: IMAGE });
+  const [downloadProps, setDownloadProps] = useState({ open: false, image: COMMUNITY_IMAGE });
   const [isStarting, setIsStarting] = useState<boolean>(false);
   const [isStopping, setIsStopping] = useState<boolean>(false);
   const ddClient = useDDClient();
@@ -48,38 +48,49 @@ export const Controller = (): ReactElement => {
     }
   }, [isLoading]);
 
-
-  const buildMountArg = () => {
+  const buildHostArgs = () => {
     let location = 'LOCALSTACK_VOLUME_DIR=/tmp/localstack/volume';
+    let homeDir = `HOME=/home/${user}`;
 
     if (!hasSkippedConfiguration) {
       switch (ddClient.host.platform) {
         case 'win32':
           location = `LOCALSTACK_VOLUME_DIR=\\\\wsl$\\${os}\\home\\${user}\\.cache\\localstack\\volume`;
+          homeDir = `HOME=\\\\wsl$\\${os}\\home\\${user}`;
           break;
         case 'darwin':
           location = `LOCALSTACK_VOLUME_DIR=/Users/${user}/Library/Caches/localstack/volume`;
+          homeDir = `HOME=/Users/${user}`;
           break;
         default:
           location = `LOCALSTACK_VOLUME_DIR=/home/${user}/.cache/localstack/volume`;
+          homeDir = `HOME=/home/${user}`;
       }
     }
-    return ['-e', location];
+    return ['-e', location, '-e', homeDir];
   };
 
   const normalizeArguments = async () => {
     const extendedFlag = FLAGS.map(x => x); // clone
-
+    let isPro = false;
     const addedArgs = configData.configs.find(config => config.id === runningConfig)
       .vars.map(item => {
         if (item.variable === 'DOCKER_FLAGS') {
           extendedFlag[1] = FLAGS.at(1).slice(0, -1).concat(` ${item.value}'`);
         }
+        if (item.variable === 'LOCALSTACK_AUTH_TOKEN') {
+          isPro = true;
+        }
 
         return ['-e', `${item.variable}=${item.value}`];
       }).flat();
 
-    return [...extendedFlag, ...buildMountArg(), ...addedArgs, ...START_ARGS];
+    return [
+      ...extendedFlag,
+      ...buildHostArgs(),
+      ...addedArgs,
+      ...generateCLIArgs({ call: 'start', pro: isPro }),
+    ];
   };
 
   const start = async () => {
@@ -89,26 +100,25 @@ export const Controller = (): ReactElement => {
       .vars.some(item => (item.variable === 'LOCALSTACK_API_KEY' ||
         item.variable === 'LOCALSTACK_AUTH_TOKEN') && item.value);
 
-    const haveCommunity = images.some(image => image.RepoTags?.at(0) === IMAGE);
-    if (!haveCommunity) {
-      setDownloadProps({ open: true, image: IMAGE });
+    const havePro = images.some(image => removeTagFromImage(image) === PRO_IMAGE);
+    if (!havePro && isPro) {
+      setDownloadProps({ open: true, image: PRO_IMAGE });
       return;
     }
 
-    if (isPro) {
-      const havePro = images.some(image => removeTagFromImage(image) === PRO_IMAGE);
-      if (!havePro) {
-        setDownloadProps({ open: true, image: PRO_IMAGE });
-        return;
-      }
+    const haveCommunity = images.some(image => removeTagFromImage(image) === COMMUNITY_IMAGE);
+    if (!haveCommunity) {
+      setDownloadProps({ open: true, image: COMMUNITY_IMAGE });
+      return;
     }
 
     const args = await normalizeArguments();
+
     setIsStarting(true);
     ddClient.docker.cli.exec('run', args, {
       stream: {
         onOutput(data): void {
-          const shouldDisplayError = !EXCLUDED_ERROR_TOAST.some(item => data.stderr.includes(item));
+          const shouldDisplayError = !EXCLUDED_ERROR_TOAST.some(item => data.stderr?.includes(item)) && data.stderr;
           if (shouldDisplayError) {
             ddClient.desktopUI.toast.error(data.stderr);
             setIsStarting(false);
diff --git a/ui/src/components/Views/Update/UpdateDialog.tsx b/ui/src/components/Views/Update/UpdateDialog.tsx
@@ -6,8 +6,8 @@ import {
   Typography,
 } from '@mui/material';
 import React, { ReactElement, useEffect, useState } from 'react';
-import { UPDATE_ARGS } from '../../../constants';
 import { useDDClient } from '../../../services';
+import { generateCLIArgs } from '../../../services/util/cli';
 
 type Props = {
   open: boolean,
@@ -20,14 +20,18 @@ export const UpdateDialog = ({ open, onClose }: Props): ReactElement => {
   const [isUpdating, setIsUpdating] = useState<boolean>(true);
 
   useEffect(() => {
-    const listener = ddClient.docker.cli.exec('run', UPDATE_ARGS, {
+    const listener = ddClient.docker.cli.exec('run', generateCLIArgs({ call: 'update' }), {
       stream: {
         onOutput(data): void {
           let resultStr = data.stdout
             .replaceAll('â', '')
             .replaceAll('â', '✅')
             .replaceAll('â', '❌');
 
+          if (data.stdout.includes('Updating docker images')) {
+            resultStr = 'Updating Docker images';
+          }
+
           if (resultStr.endsWith('updated.')) {
             resultStr = resultStr.concat(' 🔼');
           }
diff --git a/ui/src/constants/common.ts b/ui/src/constants/common.ts
@@ -1,4 +1,4 @@
-export const DEFAULT_CONFIGURATION_ID='00000000-0000-0000-0000-000000000000';
-export const CORS_ALLOW_DEFAULT='http://localhost:3000';
-export const IMAGE = 'localstack/localstack:2.1.0';
+export const DEFAULT_CONFIGURATION_ID = '00000000-0000-0000-0000-000000000000';
+export const CORS_ALLOW_DEFAULT = 'http://localhost:3000';
+export const COMMUNITY_IMAGE = 'localstack/localstack';
 export const PRO_IMAGE = 'localstack/localstack-pro';
diff --git a/ui/src/constants/docker.ts b/ui/src/constants/docker.ts
@@ -1,36 +1,36 @@
-import { IMAGE } from './common';
+import { PRO_IMAGE, COMMUNITY_IMAGE } from './common';
 
-const COMMON_ARGS = [
+export const COMMON_ARGS = [
   '--label',
   'cloud.localstack.spawner=true',
   '--rm',
   '-i',
   '--entrypoint=',
   '-v',
   '/var/run/docker.sock:/var/run/docker.sock',
-  IMAGE,
-  'bin/localstack',
 ];
 
+export const PRO_CLI = [
+  PRO_IMAGE,
+  './.venv/bin/python3',
+  '-m',
+  'localstack.cli.main',
+];
+
+export const COMMUNITY_CLI = [COMMUNITY_IMAGE, 'bin/localstack'];
+
 export const START_ARGS = [
-  ...COMMON_ARGS,
   'start',
   '-d',
 ];
 
-export const STATUS_ARGS = [
-  ...COMMON_ARGS,
-  'status',
-];
-
 export const UPDATE_ARGS = [
-  ...COMMON_ARGS,
   'update',
   'docker-images',
 ];
 
 export const FLAGS = [
   '-e',
   // eslint-disable-next-line max-len
-  'DOCKER_FLAGS=\'--label com.docker.compose.project=localstack_localstack-docker-desktop-desktop-extension --label com.docker.desktop.extension=true --label com.docker.compose.project.config_files\'',
+  'DOCKER_FLAGS=--label com.docker.compose.project=localstack_localstack-docker-desktop-desktop-extension --label com.docker.desktop.extension=true --label com.docker.compose.project.config_files',
 ];
diff --git a/ui/src/services/util/cli.ts b/ui/src/services/util/cli.ts
@@ -0,0 +1,24 @@
+import { COMMON_ARGS, COMMUNITY_CLI, PRO_CLI, START_ARGS, UPDATE_ARGS } from '../../constants';
+
+export interface generateCLIArgsProps {
+  call: 'start' | 'update',
+  pro?: boolean,
+}
+
+export const generateCLIArgs = ({ call, pro = false }: generateCLIArgsProps): string[] => {
+  const callArgs = [...COMMON_ARGS];
+  if (pro) {
+    callArgs.push(...PRO_CLI);
+  } else {
+    callArgs.push(...COMMUNITY_CLI);
+  }
+
+  switch (call) {
+    case 'start': callArgs.push(...START_ARGS);
+      break;
+    default: callArgs.push(...UPDATE_ARGS);
+      break;
+  }
+  return callArgs;
+
+};
diff --git a/ui/src/services/util/format.ts b/ui/src/services/util/format.ts
@@ -21,7 +21,7 @@ const EXCLUDED_USER_WSL = ['[.]', '[..]', '\r'];
 
 export function getUsersFromBinaryWindows(res: string): string[] {
   return res.split('\n').filter(string => string.startsWith('[')) // get only directory rows (they are in form "[user1] [user2]" )
-    .map(elem =>elem.split(' ').filter(item => item.length > 0 && !EXCLUDED_USER_WSL.includes(item)))// get only dir names
+    .map(elem => elem.split(' ').filter(item => item.length > 0 && !EXCLUDED_USER_WSL.includes(item)))// get only dir names
     .reduce((accumulator, currentValue) => accumulator.concat(currentValue), []) // combine multiple lines into one
     .map(user => user.slice(1, -1)); // remove "[" and "]" from names
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ const EXCLUDED_USER_WSL = ['[.]', '[..]', '\r'];`
`21`	`21`
`22`	`22`	`export function getUsersFromBinaryWindows(res: string): string[] {`
`23`	`23`	`return res.split('\n').filter(string => string.startsWith('[')) // get only directory rows (they are in form "[user1] [user2]" )`
`24`		`- .map(elem =>elem.split(' ').filter(item => item.length > 0 && !EXCLUDED_USER_WSL.includes(item)))// get only dir names`
	`24`	`+ .map(elem => elem.split(' ').filter(item => item.length > 0 && !EXCLUDED_USER_WSL.includes(item)))// get only dir names`
`25`	`25`	`.reduce((accumulator, currentValue) => accumulator.concat(currentValue), []) // combine multiple lines into one`
`26`	`26`	`.map(user => user.slice(1, -1)); // remove "[" and "]" from names`
`27`	`27`	`}`