@@ -31,6 +31,12 @@ export function getRunUrl(): string {
3131}
3232
3333export async function callCommand ( command : string , ...args : string [ ] ) {
34+ // // set LW_ACCOUNT for backwards compatibility
35+ // let env = { ...process.env }
36+ // const lwAccountName = getOptionalEnvVariable('LW_ACCOUNT_NAME', '')
37+ // if (lwAccountName !== '') {
38+ // env.LW_ACCOUNT = lwAccountName
39+ // }
3440 info ( 'Invoking ' + command + ' ' + args . join ( ' ' ) )
3541 const child = spawn ( command , args , { stdio : 'inherit' } )
3642 const exitCode = await new Promise ( ( resolve , _ ) => {
@@ -51,6 +57,10 @@ export function getRequiredEnvVariable(name: string) {
5157 return value
5258}
5359
60+ export function setEnvironmentVariable ( name : string , value : string ) {
61+ process . env [ name ] = value
62+ }
63+
5464export function getOptionalEnvVariable ( name : string , defaultValue : string ) {
5565 const value = process . env [ name ]
5666 if ( ! value ) {
@@ -60,22 +70,7 @@ export function getOptionalEnvVariable(name: string, defaultValue: string) {
6070}
6171
6272export async function callLaceworkCli ( ...args : string [ ] ) {
63- const accountName = getRequiredEnvVariable ( 'LW_ACCOUNT_NAME' )
64- const apiKey = getRequiredEnvVariable ( 'LW_API_KEY' )
65- const apiSecret = getRequiredEnvVariable ( 'LW_API_SECRET' )
66- const expandedArgs = [
67- '--noninteractive' ,
68- '--account' ,
69- accountName ,
70- '--api_key' ,
71- apiKey ,
72- '--api_secret' ,
73- apiSecret ,
74- 'sca' ,
75- ...args ,
76- ]
77- info ( 'Calling lacework ' + expandedArgs . join ( ' ' ) )
78- await callCommand ( 'lacework' , ...expandedArgs )
73+ await callCommand ( 'lacework' , '--noninteractive' , 'sca' , ...args )
7974}
8075
8176export function getOrDefault ( name : string , defaultValue : string ) {
@@ -93,7 +88,7 @@ export function generateUILink() {
9388
9489 if ( targetBranch !== defaultBranch ) return ''
9590
96- let lwAccountName = process . env . LW_ACCOUNT_NAME
91+ let lwAccountName = process . env . LW_ACCOUNT
9792 lwAccountName = lwAccountName ?. replace ( / \. l a c e w o r k \. n e t $ / , '' )
9893
9994 let url =
@@ -102,8 +97,8 @@ export function generateUILink() {
10297 `github.com%2F${ context . repo . owner } %2F${ context . repo . repo } ` +
10398 `/${ defaultBranch } `
10499
105- if ( process . env . LW_SUBACCOUNT_NAME ) {
106- url += '?accountName=' + process . env . LW_SUBACCOUNT_NAME
100+ if ( process . env . LW_SUBACCOUNT ) {
101+ url += '?accountName=' + process . env . LW_SUBACCOUNT
107102 }
108103
109104 return url
0 commit comments