Pass Sandbox credentials to the CLI's env.

This commit is contained in:
ms 2021-10-14 20:26:02 +02:00
parent 84ca0b1cb9
commit c25b26983c
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F

View File

@ -218,17 +218,6 @@ export class LibeufinSandboxService implements LibeufinSandboxServiceInterface {
LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri, LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri,
}, },
); );
await runCommand(
this.globalTestState,
"libeufin-sandbox-superuser",
"libeufin-sandbox",
["superuser", "admin", "--password", "test"],
{
...process.env,
LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri,
},
);
this.sandboxProc = this.globalTestState.spawnService( this.sandboxProc = this.globalTestState.spawnService(
"libeufin-sandbox", "libeufin-sandbox",
["serve", "--port", `${this.sandboxConfig.httpPort}`], ["serve", "--port", `${this.sandboxConfig.httpPort}`],
@ -236,6 +225,7 @@ export class LibeufinSandboxService implements LibeufinSandboxServiceInterface {
{ {
...process.env, ...process.env,
LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri, LIBEUFIN_SANDBOX_DB_CONNECTION: this.sandboxConfig.databaseJdbcUri,
LIBEUFIN_SANDBOX_ADMIN_PASSWORD: "secret",
}, },
); );
} }
@ -271,7 +261,7 @@ export class LibeufinSandboxService implements LibeufinSandboxServiceInterface {
} }
async pingUntilAvailable(): Promise<void> { async pingUntilAvailable(): Promise<void> {
const url = `${this.baseUrl}config`; const url = this.baseUrl;
await pingProc(this.sandboxProc, url, "libeufin-sandbox"); await pingProc(this.sandboxProc, url, "libeufin-sandbox");
} }
} }
@ -485,14 +475,22 @@ export class LibeufinCli {
this.cliDetails = cd; this.cliDetails = cd;
} }
env(): any {
return {
...process.env,
LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl,
LIBEUFIN_SANDBOX_USERNAME: "admin",
LIBEUFIN_SANDBOX_PASSWORD: "secret",
}
}
async checkSandbox(): Promise<void> { async checkSandbox(): Promise<void> {
const stdout = await sh( const stdout = await sh(
this.globalTestState, this.globalTestState,
"libeufin-cli-checksandbox", "libeufin-cli-checksandbox",
"libeufin-cli sandbox check", "libeufin-cli sandbox check",
{ ...process.env, LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }, this.env()
); );
console.log(stdout);
} }
async createEbicsHost(hostId: string): Promise<void> { async createEbicsHost(hostId: string): Promise<void> {
@ -500,7 +498,7 @@ export class LibeufinCli {
this.globalTestState, this.globalTestState,
"libeufin-cli-createebicshost", "libeufin-cli-createebicshost",
`libeufin-cli sandbox ebicshost create --host-id=${hostId}`, `libeufin-cli sandbox ebicshost create --host-id=${hostId}`,
{ ...process.env, LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }, this.env()
); );
console.log(stdout); console.log(stdout);
} }
@ -515,7 +513,7 @@ export class LibeufinCli {
` --host-id=${details.hostId}` + ` --host-id=${details.hostId}` +
` --partner-id=${details.partnerId}` + ` --partner-id=${details.partnerId}` +
` --user-id=${details.userId}`, ` --user-id=${details.userId}`,
{ ...process.env, LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }, this.env()
); );
console.log(stdout); console.log(stdout);
} }
@ -536,7 +534,7 @@ export class LibeufinCli {
` --ebics-host-id=${sd.hostId}` + ` --ebics-host-id=${sd.hostId}` +
` --ebics-partner-id=${sd.partnerId}` + ` --ebics-partner-id=${sd.partnerId}` +
` --ebics-user-id=${sd.userId}`, ` --ebics-user-id=${sd.userId}`,
{ ...process.env, LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }, this.env()
); );
console.log(stdout); console.log(stdout);
} }
@ -546,7 +544,7 @@ export class LibeufinCli {
this.globalTestState, this.globalTestState,
"libeufin-cli-generatetransactions", "libeufin-cli-generatetransactions",
`libeufin-cli sandbox bankaccount generate-transactions ${accountName}`, `libeufin-cli sandbox bankaccount generate-transactions ${accountName}`,
{ ...process.env, LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }, this.env()
); );
console.log(stdout); console.log(stdout);
} }
@ -556,7 +554,7 @@ export class LibeufinCli {
this.globalTestState, this.globalTestState,
"libeufin-cli-showsandboxtransactions", "libeufin-cli-showsandboxtransactions",
`libeufin-cli sandbox bankaccount transactions ${accountName}`, `libeufin-cli sandbox bankaccount transactions ${accountName}`,
{ ...process.env, LIBEUFIN_SANDBOX_URL: this.cliDetails.sandboxUrl }, this.env()
); );
console.log(stdout); console.log(stdout);
} }