test(examples): supply chain app end to end

Add end to end testing to the supply chain app that verifies not just the container but also the example being runnable on the CLI from bash. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
hyperledger-cacti · Jun 3, 2021 · c413388 · c413388
1 parent 645f47d
commit c413388
Show file tree

Hide file tree

Showing 9 changed files with 365 additions and 59 deletions.
diff --git a/...chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts b/...chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts
@@ -33,6 +33,7 @@ import {
 } from "@hyperledger/cactus-plugin-ledger-connector-fabric";
 import { DiscoveryOptions } from "fabric-network";
 import { SHIPMENT_CONTRACT_GO_SOURCE } from "../../go/shipment";
+import { IPluginKeychain } from "@hyperledger/cactus-core-api";
 
 export const org1Env = {
   CORE_PEER_LOCALMSPID: "Org1MSP",
@@ -47,6 +48,7 @@ export const org1Env = {
 
 export interface ISupplyChainAppDummyInfrastructureOptions {
   logLevel?: LogLevelDesc;
+  keychain?: IPluginKeychain;
 }
 
 /**
@@ -66,9 +68,10 @@ export class SupplyChainAppDummyInfrastructure {
   public readonly besu: BesuTestLedger;
   public readonly quorum: QuorumTestLedger;
   public readonly fabric: FabricTestLedgerV1;
+  public readonly keychain: IPluginKeychain;
   private readonly log: Logger;
-  private _quorumAccount: Account | undefined;
-  private _besuAccount: Account | undefined;
+  private _quorumAccount?: Account;
+  private _besuAccount?: Account;
 
   public get quorumAccount(): Account {
     if (!this._quorumAccount) {
@@ -107,6 +110,19 @@ export class SupplyChainAppDummyInfrastructure {
       imageName: "hyperledger/cactus-fabric-all-in-one",
       imageVersion: "2021-03-02-ssh-hotfix",
     });
+
+    if (this.options.keychain) {
+      this.keychain = this.options.keychain;
+      this.log.info("Reusing the provided keychain plugin...");
+    } else {
+      this.log.info("Instantiating new keychain plugin...");
+      this.keychain = new PluginKeychainMemory({
+        instanceId: uuidv4(),
+        keychainId: uuidv4(),
+        logLevel: this.options.logLevel || "INFO",
+      });
+    }
+    this.log.info("KeychainID=%o", this.keychain.getKeychainId());
   }
 
   public async stop(): Promise<void> {
@@ -147,16 +163,11 @@ export class SupplyChainAppDummyInfrastructure {
       let bookshelfRepository: IEthContractDeployment;
       let shipmentRepository: IFabricContractDeployment;
 
-      const keychainPlugin = new PluginKeychainMemory({
-        instanceId: uuidv4(),
-        keychainId: uuidv4(),
-        logLevel: this.options.logLevel || "INFO",
-      });
-      keychainPlugin.set(
+      await this.keychain.set(
         BookshelfRepositoryJSON.contractName,
         BookshelfRepositoryJSON,
       );
-      keychainPlugin.set(
+      await this.keychain.set(
         BambooHarvestRepositoryJSON.contractName,
         BambooHarvestRepositoryJSON,
       );
@@ -165,7 +176,7 @@ export class SupplyChainAppDummyInfrastructure {
         const rpcApiHttpHost = await this.quorum.getRpcApiHttpHost();
 
         const pluginRegistry = new PluginRegistry();
-        pluginRegistry.add(keychainPlugin);
+        pluginRegistry.add(this.keychain);
         const connector = new PluginLedgerConnectorQuorum({
           instanceId: "PluginLedgerConnectorQuorum_Contract_Deployment",
           rpcApiHttpHost,
@@ -182,7 +193,7 @@ export class SupplyChainAppDummyInfrastructure {
             secret: this.quorumAccount.privateKey,
             type: Web3SigningCredentialType.PrivateKeyHex,
           },
-          keychainId: keychainPlugin.getKeychainId(),
+          keychainId: this.keychain.getKeychainId(),
         });
         const {
           transactionReceipt: { contractAddress },
@@ -193,7 +204,7 @@ export class SupplyChainAppDummyInfrastructure {
           address: contractAddress as string,
           bytecode: BambooHarvestRepositoryJSON.bytecode,
           contractName: BambooHarvestRepositoryJSON.contractName,
-          keychainId: keychainPlugin.getKeychainId(),
+          keychainId: this.keychain.getKeychainId(),
         };
       }
 
@@ -203,7 +214,7 @@ export class SupplyChainAppDummyInfrastructure {
         const rpcApiWsHost = await this.besu.getRpcApiWsHost();
 
         const pluginRegistry = new PluginRegistry();
-        pluginRegistry.add(keychainPlugin);
+        pluginRegistry.add(this.keychain);
         const connector = new PluginLedgerConnectorBesu({
           instanceId: "PluginLedgerConnectorBesu_Contract_Deployment",
           rpcApiHttpHost,
@@ -223,7 +234,7 @@ export class SupplyChainAppDummyInfrastructure {
             secret: this.besuAccount.privateKey,
             type: Web3SigningCredentialType.PrivateKeyHex,
           },
-          keychainId: keychainPlugin.getKeychainId(),
+          keychainId: this.keychain.getKeychainId(),
         });
         const {
           transactionReceipt: { contractAddress },
@@ -234,7 +245,7 @@ export class SupplyChainAppDummyInfrastructure {
           address: contractAddress as string,
           bytecode: BookshelfRepositoryJSON.bytecode,
           contractName: BookshelfRepositoryJSON.contractName,
-          keychainId: keychainPlugin.getKeychainId(),
+          keychainId: this.keychain.getKeychainId(),
         };
       }
 
@@ -247,7 +258,7 @@ export class SupplyChainAppDummyInfrastructure {
         };
 
         const pluginRegistry = new PluginRegistry();
-        pluginRegistry.add(keychainPlugin);
+        pluginRegistry.add(this.keychain);
         const connector = new PluginLedgerConnectorFabric({
           instanceId: "PluginLedgerConnectorFabric_Contract_Deployment",
           dockerBinary: "/usr/local/bin/docker",

diff --git a/examples/cactus-example-supply-chain-backend/src/main/typescript/public-api.ts b/examples/cactus-example-supply-chain-backend/src/main/typescript/public-api.ts
@@ -1,2 +1,3 @@
 export { SupplyChainApp } from "./supply-chain-app";
+export { ISupplyChainAppOptions } from "./supply-chain-app";
 export { launchApp } from "./supply-chain-app-cli";
diff --git a/examples/cactus-example-supply-chain-backend/src/main/typescript/supply-chain-app-cli.ts b/examples/cactus-example-supply-chain-backend/src/main/typescript/supply-chain-app-cli.ts
@@ -4,9 +4,12 @@ import { ConfigService } from "@hyperledger/cactus-cmd-api-server";
 import { LoggerProvider } from "@hyperledger/cactus-common";
 import { ISupplyChainAppOptions, SupplyChainApp } from "./supply-chain-app";
 
-export async function launchApp(): Promise<void> {
+export async function launchApp(
+  env?: NodeJS.ProcessEnv,
+  args?: string[],
+): Promise<void> {
   const configService = new ConfigService();
-  const config = configService.getOrCreate();
+  const config = configService.getOrCreate({ args, env });
   const serverOptions = config.getProperties();
   LoggerProvider.setLogLevel(serverOptions.logLevel);
 
@@ -24,5 +27,5 @@ export async function launchApp(): Promise<void> {
 }
 
 if (require.main === module) {
-  launchApp();
+  launchApp(process.env, process.argv);
 }