Skip to content

Commit

Permalink
removed echos and console logs from code
Browse files Browse the repository at this point in the history
  • Loading branch information
eyalk007 committed Aug 22, 2024
1 parent 4e4d49a commit 2e461f9
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 24 deletions.
5 changes: 1 addition & 4 deletions client/src/api/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { execOnHost, isWindows, throwErrorAsString, ddClient, ddToast } from './utils';
import { execOnHost, isWindows, throwErrorAsString, ddClient } from './utils';
import { ExtensionConfig } from '../types';
/**
* There are two kinds of configurations that are managed and used in the extension:
Expand Down Expand Up @@ -108,7 +108,6 @@ export async function getJfrogExtensionConfig(): Promise<JfrogExtensionConfig> {

let jfrogExtensionConfig: JfrogExtensionConfig;
try {
console.log(cmdResult.stdout);
jfrogExtensionConfig = JSON.parse(cmdResult.stdout);
} catch (e: any) {
console.log('Failed while parsing configuration file', e);
Expand Down Expand Up @@ -149,8 +148,6 @@ async function getJfrogCliConfigServerId(): Promise<string | undefined> {
async function getJfrogCliFullConfig(): Promise<any> {
let cliConfigRes;
const cliConfResult = await execOnHost('runcli.sh', 'runcli.bat', ['config', 'export']);
console.log(cliConfResult);

cliConfigRes = JSON.parse(window.atob(cliConfResult.stdout));
return cliConfigRes;
}
Expand Down
2 changes: 0 additions & 2 deletions host/windows/readconf.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
@ECHO OFF

:: Prints the extension configuration to stdout (in JSON format).

set "HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension"
set "CONF_FILE=%HOME_DIR%\jfrog-docker-desktop-extension.conf"

:: Debug: Echo the paths to ensure they are correct.
:: Use quotes around the CONF_FILE variable to handle paths with spaces.
type "%CONF_FILE%"
6 changes: 1 addition & 5 deletions host/windows/runcli.bat
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
@ECHO OFF

:: Runs JFrog CLI with the given arguments. The JFrog CLI's home directory is the extension's home directory.

set "HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension"
set "LOGS_DIR=%HOME_DIR%\logs"

set "JFROG_CLI_HOME_DIR=%HOME_DIR%"
set JFROG_CLI_USER_AGENT=jfrog-docker-extension
set JFROG_CLI_LOG_LEVEL=DEBUG
set CI=true

:: Debug: Echo the paths and enviro

:: Create logs directory if it doesn't exist, handling paths with spaces.
if not exist "%LOGS_DIR%" mkdir "%LOGS_DIR%"

:: Get the current datetime in a specific format for the log file name.
for /f "tokens=2 delims==" %%I in ('wmic os get localdatetime /format:list') do set datetime=%%I
set LOG_FILE_PATH=%LOGS_DIR%\jfrog-docker-desktop-extension.%datetime:~0,4%-%datetime:~4,2%-%datetime:~6,2%.%datetime:~8,2%-%datetime:~10,2%.log
:: Debug: Echo the log file path

:: Run the JFrog CLI with the given arguments, redirecting stderr to the log file.
"%~dp0/jf" %* 2>> "%LOG_FILE_PATH%"
3 changes: 0 additions & 3 deletions host/windows/scanpermissions.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

:: Checks whether the user has permissions to run scans in Xray.
:: The return value (in stdout) is the HTTP code returned from Xray.

set "JFROG_CLI_HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension"

:: Debug: Echo the JFROG_CLI_HOME_DIR path

:: Run the JFrog CLI with the specified command.
:: Handle paths with spaces by wrapping the command in quotes.
"%~dp0jf" xr curl --server-id validation -X POST -H "Content-Type:application/json" -d "{\"component_details\":[{\"component_id\":\"testComponent\"}]}" api/v1/summary/component -s --output nul -w %%{exitcode},%%{http_code}
11 changes: 1 addition & 10 deletions host/windows/writeconf.bat
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
@ECHO OFF

:: Gets the extension configuration (in JSON format) as an argument and writes it to the configuration file.

set "HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension"
set "CONF_FILE=%HOME_DIR%\jfrog-docker-desktop-extension.conf"

:: Debug: Echo the HOME_DIR and CONF_FILE paths
echo HOME_DIR is set to: "%HOME_DIR%"
echo CONF_FILE is set to: "%CONF_FILE%"

:: Create the HOME_DIR if it doesn't exist, handling paths with spaces
if not exist "%HOME_DIR%" mkdir "%HOME_DIR%"

:: Write the provided configuration to the CONF_FILE, handling paths with spaces
echo %* > "%CONF_FILE%"

:: Debug: Echo the content written to the configuration file
echo Configuration written to %CONF_FILE%:
type "%CONF_FILE%"
echo %* > "%CONF_FILE%"

0 comments on commit 2e461f9

Please sign in to comment.