@@ -20,41 +20,42 @@ export class CxWrapper {
2020 constructor ( cxScanConfig : CxConfig , logFilePath ?: string ) {
2121 getLoggerWithFilePath ( logFilePath )
2222 this . downloadIfNotInstalledCLI ( process . platform ) . then ( ( ) => {
23- const cxInstaller = new CxInstaller ( process . platform ) ;
24- if ( cxScanConfig . apiKey ) {
25- this . config . apiKey = cxScanConfig . apiKey ;
26- } else if ( cxScanConfig . clientId && cxScanConfig . clientSecret ) {
27- logger . info ( "Received clientId and clientSecret" ) ;
28- this . config . clientId = cxScanConfig . clientId ;
29- this . config . clientSecret = cxScanConfig . clientSecret ;
30- } else {
31- logger . info ( "Did not receive ClientId/Secret or ApiKey from cli arguments" ) ;
32- }
33- const executablePath = cxInstaller . getExecutablePath ( ) ;
34- if ( cxScanConfig . pathToExecutable ) {
35- this . config . pathToExecutable = cxScanConfig . pathToExecutable ;
36- } else if ( process . platform === 'win32' ) {
37- this . config . pathToExecutable = executablePath ;
38- } else if ( process . platform === 'darwin' ) {
39- this . config . pathToExecutable = executablePath ;
40- fs . chmodSync ( this . config . pathToExecutable , 0o777 ) ;
41- } else {
42- this . config . pathToExecutable = executablePath ;
43- fs . chmodSync ( this . config . pathToExecutable , 0o777 ) ;
44- }
45- if ( cxScanConfig . baseUri ) {
46- this . config . baseUri = cxScanConfig . baseUri ;
47- }
48- if ( cxScanConfig . baseAuthUri ) {
49- this . config . baseAuthUri = cxScanConfig . baseAuthUri ;
50- }
51- if ( cxScanConfig . tenant ) {
52- this . config . tenant = cxScanConfig . tenant ;
53- }
54- if ( cxScanConfig . additionalParameters ) {
55- this . config . additionalParameters = cxScanConfig . additionalParameters ;
56- }
23+ logger . info ( "CLI downloaded successfully" )
5724 } ) ;
25+ const cxInstaller = new CxInstaller ( process . platform ) ;
26+ if ( cxScanConfig . apiKey ) {
27+ this . config . apiKey = cxScanConfig . apiKey ;
28+ } else if ( cxScanConfig . clientId && cxScanConfig . clientSecret ) {
29+ logger . info ( "Received clientId and clientSecret" ) ;
30+ this . config . clientId = cxScanConfig . clientId ;
31+ this . config . clientSecret = cxScanConfig . clientSecret ;
32+ } else {
33+ logger . info ( "Did not receive ClientId/Secret or ApiKey from cli arguments" ) ;
34+ }
35+ const executablePath = cxInstaller . getExecutablePath ( ) ;
36+ if ( cxScanConfig . pathToExecutable ) {
37+ this . config . pathToExecutable = cxScanConfig . pathToExecutable ;
38+ } else if ( process . platform === 'win32' ) {
39+ this . config . pathToExecutable = executablePath ;
40+ } else if ( process . platform === 'darwin' ) {
41+ this . config . pathToExecutable = executablePath ;
42+ fs . chmodSync ( this . config . pathToExecutable , 0o777 ) ;
43+ } else {
44+ this . config . pathToExecutable = executablePath ;
45+ fs . chmodSync ( this . config . pathToExecutable , 0o777 ) ;
46+ }
47+ if ( cxScanConfig . baseUri ) {
48+ this . config . baseUri = cxScanConfig . baseUri ;
49+ }
50+ if ( cxScanConfig . baseAuthUri ) {
51+ this . config . baseAuthUri = cxScanConfig . baseAuthUri ;
52+ }
53+ if ( cxScanConfig . tenant ) {
54+ this . config . tenant = cxScanConfig . tenant ;
55+ }
56+ if ( cxScanConfig . additionalParameters ) {
57+ this . config . additionalParameters = cxScanConfig . additionalParameters ;
58+ }
5859 }
5960
6061 async downloadIfNotInstalledCLI ( os : string ) {
0 commit comments