Skip to content

Commit 253b21f

Browse files
petermetzelenaizaguirre
authored andcommitted
fix(cmd-api-server): plugins interfere with API server deps hyperledger-cacti#1192
Migrates to the live-plugin-manager package to install plugins instead of doing it via vanilla npm which was causing problems with conflicting dependency versions where the API server would want semver 7.x and one of the plugins (through some transient dependency of the plugin itself) would install semver 5.x which would then cause the API server to break down at runtime due to the breaking changes between semver 7 and 5. The hope with the new live-plugin-manager package is that using this will provide sufficient isolation so that these kind of issues are non-existent and also that it does not introduce other different types of issues stemming from exactly said isolation. With that said if isolation problems do occur we'll have to fix that anyway because the plugins should not depend on the API server and vica versa. Fixes hyperledger-cacti#1192 Depends on hyperledger-cacti#1203 Signed-off-by: Peter Somogyvari <[email protected]>
1 parent 63e639e commit 253b21f

File tree

289 files changed

+1021
-844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+1021
-844
lines changed

.cspell.json

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"DockerOde",
2727
"ealen",
2828
"ecparams",
29+
"elenaizaguirre",
2930
"Errorf",
3031
"escc",
3132
"execa",

examples/cactus-example-carbon-accounting-backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"repository": {
3939
"type": "git",
40-
"url": "git+https://github.com/hyperledger/cactus.git"
40+
"url": "git+https://github.com/elenaizaguirre/cactus.git"
4141
},
4242
"keywords": [
4343
"Hyperledger",

examples/cactus-example-carbon-accounting-backend/src/main/typescript/carbon-accounting-app-cli.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

3-
import { ConfigService } from "@hyperledger/cactus-cmd-api-server";
4-
import { LoggerProvider } from "@hyperledger/cactus-common";
3+
import { ConfigService } from "@elenaizaguirre/cactus-cmd-api-server";
4+
import { LoggerProvider } from "@elenaizaguirre/cactus-common";
55
import {
66
ICarbonAccountingAppOptions,
77
CarbonAccountingApp,

examples/cactus-example-carbon-accounting-backend/src/main/typescript/carbon-accounting-app.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@ import { Server as SecureServer } from "https";
55
import { v4 as uuidv4 } from "uuid";
66
import exitHook, { IAsyncExitHookDoneCallback } from "async-exit-hook";
77

8-
import { PluginRegistry } from "@hyperledger/cactus-core";
8+
import { PluginRegistry } from "@elenaizaguirre/cactus-core";
99

1010
import {
1111
LogLevelDesc,
1212
Logger,
1313
LoggerProvider,
1414
Servers,
15-
} from "@hyperledger/cactus-common";
15+
} from "@elenaizaguirre/cactus-common";
1616

1717
import {
1818
ApiServer,
1919
ConfigService,
2020
Configuration,
2121
ICactusApiServerOptions,
22-
} from "@hyperledger/cactus-cmd-api-server";
22+
} from "@elenaizaguirre/cactus-cmd-api-server";
2323

24-
import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
24+
import { PluginKeychainMemory } from "@elenaizaguirre/cactus-plugin-keychain-memory";
2525

2626
import {
2727
PluginLedgerConnectorFabric,
2828
DefaultApi as FabricApi,
2929
DefaultEventHandlerStrategy,
30-
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
30+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-fabric";
3131

32-
import { CarbonAccountingPlugin } from "@hyperledger/cactus-example-carbon-accounting-business-logic-plugin";
32+
import { CarbonAccountingPlugin } from "@elenaizaguirre/cactus-example-carbon-accounting-business-logic-plugin";
3333

3434
import {
3535
PluginLedgerConnectorXdai,
3636
DefaultApi as XdaiApi,
3737
Web3SigningCredentialType,
38-
} from "@hyperledger/cactus-plugin-ledger-connector-xdai";
38+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-xdai";
3939

4040
import { CarbonAccountingAppDummyInfrastructure } from "./infrastructure/carbon-accounting-app-dummy-infrastructure";
4141

examples/cactus-example-carbon-accounting-backend/src/main/typescript/infrastructure/carbon-accounting-app-dummy-infrastructure.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import {
77
Checks,
88
LogLevelDesc,
99
LoggerProvider,
10-
} from "@hyperledger/cactus-common";
10+
} from "@elenaizaguirre/cactus-common";
1111
import {
1212
PluginLedgerConnectorXdai,
1313
Web3SigningCredentialType,
14-
} from "@hyperledger/cactus-plugin-ledger-connector-xdai";
14+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-xdai";
1515
import {
1616
FabricTestLedgerV1,
1717
OpenEthereumTestLedger,
18-
} from "@hyperledger/cactus-test-tooling";
19-
import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
18+
} from "@elenaizaguirre/cactus-test-tooling";
19+
import { PluginKeychainMemory } from "@elenaizaguirre/cactus-plugin-keychain-memory";
2020

2121
import DaoTokenContract from "../../json/generated/src/main/solidity/net-emissions-token-network/Governance/DAOToken.sol/DAOToken.json";
2222
import GovernorContract from "../../json/generated/src/main/solidity/net-emissions-token-network/Governance/Governor.sol/Governor.json";
@@ -27,7 +27,7 @@ import {
2727
DeploymentTargetOrgFabric2x,
2828
FileBase64,
2929
PluginLedgerConnectorFabric,
30-
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
30+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-fabric";
3131
import {
3232
ICarbonAccountingFabricContractDeploymentInfo,
3333
ICarbonAccountingXdaiContractDeploymentInfo,

examples/cactus-example-carbon-accounting-backend/src/test/typescript/integration/admin-enroll-v1-endpoint.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ import {
1111
ConfigService,
1212
Configuration,
1313
IAuthorizationConfig,
14-
} from "@hyperledger/cactus-cmd-api-server";
14+
} from "@elenaizaguirre/cactus-cmd-api-server";
1515

1616
import {
1717
LoggerProvider,
1818
LogLevelDesc,
1919
Servers,
20-
} from "@hyperledger/cactus-common";
20+
} from "@elenaizaguirre/cactus-common";
2121

22-
import { pruneDockerAllIfGithubAction } from "@hyperledger/cactus-test-tooling";
22+
import { pruneDockerAllIfGithubAction } from "@elenaizaguirre/cactus-test-tooling";
2323

2424
import {
2525
AuthzScope,
2626
DefaultApi as CarbonAccountingApi,
27-
} from "@hyperledger/cactus-example-carbon-accounting-business-logic-plugin";
27+
} from "@elenaizaguirre/cactus-example-carbon-accounting-business-logic-plugin";
2828

2929
import {
3030
CarbonAccountingApp,

examples/cactus-example-carbon-accounting-business-logic-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"repository": {
4242
"type": "git",
43-
"url": "git+https://github.com/hyperledger/cactus.git"
43+
"url": "git+https://github.com/elenaizaguirre/cactus.git"
4444
},
4545
"keywords": [
4646
"Hyperledger",

examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/business-logic-plugin/carbon-accounting-plugin.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ import {
1212
Checks,
1313
LogLevelDesc,
1414
LoggerProvider,
15-
} from "@hyperledger/cactus-common";
15+
} from "@elenaizaguirre/cactus-common";
1616

1717
import {
1818
ICactusPlugin,
1919
IPluginWebService,
2020
IWebServiceEndpoint,
21-
} from "@hyperledger/cactus-core-api";
21+
} from "@elenaizaguirre/cactus-core-api";
2222

23-
import { PluginRegistry } from "@hyperledger/cactus-core";
23+
import { PluginRegistry } from "@elenaizaguirre/cactus-core";
2424

2525
import {
2626
DefaultApi as XdaiApi,
2727
Web3SigningCredential,
28-
} from "@hyperledger/cactus-plugin-ledger-connector-xdai";
28+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-xdai";
2929

3030
import {
3131
DefaultApi as FabricApi,
3232
PluginLedgerConnectorFabric,
33-
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
33+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-fabric";
3434

35-
import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
35+
import { PluginKeychainMemory } from "@elenaizaguirre/cactus-plugin-keychain-memory";
3636

3737
import {
3838
ICarbonAccountingFabricContractDeploymentInfo,
@@ -145,7 +145,7 @@ export class CarbonAccountingPlugin
145145
}
146146

147147
public getPackageName(): string {
148-
return "@hyperledger/cactus-example-carbon-accounting-backend";
148+
return "@elenaizaguirre/cactus-example-carbon-accounting-backend";
149149
}
150150

151151
public async onPluginInit(): Promise<unknown> {

examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/business-logic-plugin/web-services/dao-token/get-allowance-endpoint.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import {
66
LogLevelDesc,
77
LoggerProvider,
88
IAsyncProvider,
9-
} from "@hyperledger/cactus-common";
9+
} from "@elenaizaguirre/cactus-common";
1010
import {
1111
IEndpointAuthzOptions,
1212
IExpressRequestHandler,
1313
IWebServiceEndpoint,
14-
} from "@hyperledger/cactus-core-api";
15-
import { registerWebServiceEndpoint } from "@hyperledger/cactus-core";
14+
} from "@elenaizaguirre/cactus-core-api";
15+
import { registerWebServiceEndpoint } from "@elenaizaguirre/cactus-core";
1616

1717
import { DaoTokenGetAllowanceRequest } from "../../../generated/openapi/typescript-axios";
1818
import { CarbonAccountingPlugin } from "../../carbon-accounting-plugin";

examples/cactus-example-carbon-accounting-business-logic-plugin/src/main/typescript/business-logic-plugin/web-services/utility-emissions-channel/enroll-admin-v1-endpoint.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import {
66
LogLevelDesc,
77
LoggerProvider,
88
IAsyncProvider,
9-
} from "@hyperledger/cactus-common";
9+
} from "@elenaizaguirre/cactus-common";
1010
import {
1111
IEndpointAuthzOptions,
1212
IExpressRequestHandler,
1313
IWebServiceEndpoint,
14-
} from "@hyperledger/cactus-core-api";
15-
import { registerWebServiceEndpoint } from "@hyperledger/cactus-core";
14+
} from "@elenaizaguirre/cactus-core-api";
15+
import { registerWebServiceEndpoint } from "@elenaizaguirre/cactus-core";
1616

1717
import { EnrollAdminV1Request } from "../../../generated/openapi/typescript-axios";
1818
import { CarbonAccountingPlugin } from "../../carbon-accounting-plugin";

examples/cactus-example-carbon-accounting-frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
"repository": {
7373
"type": "git",
74-
"url": "git+https://github.com/hyperledger/cactus.git"
74+
"url": "git+https://github.com/elenaizaguirre/cactus.git"
7575
},
7676
"keywords": [
7777
"Hyperledger",

examples/cactus-example-carbon-accounting-frontend/src/app/app.module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import { StatusBar } from "@ionic-native/status-bar/ngx";
88

99
import { AppComponent } from "./app.component";
1010
import { AppRoutingModule } from "./app-routing.module";
11-
import { Logger, LoggerProvider } from "@hyperledger/cactus-common";
12-
import { Configuration } from "@hyperledger/cactus-core-api";
11+
import { Logger, LoggerProvider } from "@elenaizaguirre/cactus-common";
12+
import { Configuration } from "@elenaizaguirre/cactus-core-api";
1313
import {
1414
BESU_DEMO_LEDGER_ID,
1515
CACTUS_API_URL,
1616
FABRIC_DEMO_LEDGER_ID,
1717
} from "src/constants";
18-
import { ApiClient } from "@hyperledger/cactus-api-client";
18+
import { ApiClient } from "@elenaizaguirre/cactus-api-client";
1919

2020
LoggerProvider.setLogLevel("TRACE");
2121

examples/cactus-example-supply-chain-backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"repository": {
3333
"type": "git",
34-
"url": "git+https://github.com/hyperledger/cactus.git"
34+
"url": "git+https://github.com/elenaizaguirre/cactus.git"
3535
},
3636
"keywords": [
3737
"Hyperledger",

examples/cactus-example-supply-chain-backend/src/main/typescript/infrastructure/supply-chain-app-dummy-infrastructure.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import {
55
Checks,
66
LogLevelDesc,
77
LoggerProvider,
8-
} from "@hyperledger/cactus-common";
9-
import { PluginRegistry } from "@hyperledger/cactus-core";
10-
import { PluginLedgerConnectorBesu } from "@hyperledger/cactus-plugin-ledger-connector-besu";
11-
import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
8+
} from "@elenaizaguirre/cactus-common";
9+
import { PluginRegistry } from "@elenaizaguirre/cactus-core";
10+
import { PluginLedgerConnectorBesu } from "@elenaizaguirre/cactus-plugin-ledger-connector-besu";
11+
import { PluginKeychainMemory } from "@elenaizaguirre/cactus-plugin-keychain-memory";
1212
import {
1313
PluginLedgerConnectorQuorum,
1414
Web3SigningCredentialType,
15-
} from "@hyperledger/cactus-plugin-ledger-connector-quorum";
15+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-quorum";
1616
import {
1717
BesuTestLedger,
1818
FabricTestLedgerV1,
1919
QuorumTestLedger,
20-
} from "@hyperledger/cactus-test-tooling";
20+
} from "@elenaizaguirre/cactus-test-tooling";
2121

2222
import BambooHarvestRepositoryJSON from "../../json/generated/BambooHarvestRepository.json";
2323
import BookshelfRepositoryJSON from "../../json/generated/BookshelfRepository.json";
@@ -26,14 +26,14 @@ import {
2626
ISupplyChainContractDeploymentInfo,
2727
IFabricContractDeployment,
2828
// OrgEnv,
29-
} from "@hyperledger/cactus-example-supply-chain-business-logic-plugin";
29+
} from "@elenaizaguirre/cactus-example-supply-chain-business-logic-plugin";
3030
import {
3131
PluginLedgerConnectorFabric,
3232
DefaultEventHandlerStrategy,
33-
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
33+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-fabric";
3434
import { DiscoveryOptions } from "fabric-network";
3535
import { SHIPMENT_CONTRACT_GO_SOURCE } from "../../go/shipment";
36-
import { IPluginKeychain } from "@hyperledger/cactus-core-api";
36+
import { IPluginKeychain } from "@elenaizaguirre/cactus-core-api";
3737

3838
export const org1Env = {
3939
CORE_PEER_LOCALMSPID: "Org1MSP",

examples/cactus-example-supply-chain-backend/src/main/typescript/supply-chain-app-cli.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

3-
import { ConfigService } from "@hyperledger/cactus-cmd-api-server";
4-
import { LoggerProvider } from "@hyperledger/cactus-common";
3+
import { ConfigService } from "@elenaizaguirre/cactus-cmd-api-server";
4+
import { LoggerProvider } from "@elenaizaguirre/cactus-common";
55
import { ISupplyChainAppOptions, SupplyChainApp } from "./supply-chain-app";
66

77
export async function launchApp(

examples/cactus-example-supply-chain-backend/src/main/typescript/supply-chain-app.ts

+13-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
IPluginKeychain,
1414
Ledger,
1515
LedgerType,
16-
} from "@hyperledger/cactus-core-api";
16+
} from "@elenaizaguirre/cactus-core-api";
1717

1818
import { PluginRegistry } from "@hyperledger/cactus-core";
1919

@@ -22,29 +22,32 @@ import {
2222
Logger,
2323
LoggerProvider,
2424
Servers,
25-
} from "@hyperledger/cactus-common";
25+
} from "@elenaizaguirre/cactus-common";
2626

27-
import { ApiServer, ConfigService } from "@hyperledger/cactus-cmd-api-server";
27+
import {
28+
ApiServer,
29+
ConfigService,
30+
} from "@elenaizaguirre/cactus-cmd-api-server";
2831

29-
import { PluginConsortiumManual } from "@hyperledger/cactus-plugin-consortium-manual";
30-
import { PluginKeychainMemory } from "@hyperledger/cactus-plugin-keychain-memory";
32+
import { PluginConsortiumManual } from "@elenaizaguirre/cactus-plugin-consortium-manual";
33+
import { PluginKeychainMemory } from "@elenaizaguirre/cactus-plugin-keychain-memory";
3134

3235
import {
3336
PluginLedgerConnectorQuorum,
3437
Web3SigningCredentialType,
3538
DefaultApi as QuorumApi,
36-
} from "@hyperledger/cactus-plugin-ledger-connector-quorum";
39+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-quorum";
3740

3841
import {
3942
PluginLedgerConnectorBesu,
4043
DefaultApi as BesuApi,
41-
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
44+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-besu";
4245

4346
import {
4447
PluginLedgerConnectorFabric,
4548
DefaultApi as FabricApi,
4649
DefaultEventHandlerStrategy,
47-
} from "@hyperledger/cactus-plugin-ledger-connector-fabric";
50+
} from "@elenaizaguirre/cactus-plugin-ledger-connector-fabric";
4851

4952
import {
5053
SupplyChainAppDummyInfrastructure,
@@ -53,8 +56,8 @@ import {
5356
import {
5457
Configuration,
5558
DefaultApi as SupplyChainApi,
56-
} from "@hyperledger/cactus-example-supply-chain-business-logic-plugin";
57-
import { SupplyChainCactusPlugin } from "@hyperledger/cactus-example-supply-chain-business-logic-plugin";
59+
} from "@elenaizaguirre/cactus-example-supply-chain-business-logic-plugin";
60+
import { SupplyChainCactusPlugin } from "@elenaizaguirre/cactus-example-supply-chain-business-logic-plugin";
5861
import { DiscoveryOptions } from "fabric-network";
5962

6063
export interface ISupplyChainAppOptions {

examples/cactus-example-supply-chain-backend/src/test/typescript/integration/supply-chain-backend-api-calls.test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import test, { Test } from "tape-promise/tape";
2-
import { LogLevelDesc } from "@hyperledger/cactus-common";
3-
import { pruneDockerAllIfGithubAction } from "@hyperledger/cactus-test-tooling";
4-
import { AuthorizationProtocol } from "@hyperledger/cactus-cmd-api-server";
5-
import { IAuthorizationConfig } from "@hyperledger/cactus-cmd-api-server";
6-
import { ConfigService } from "@hyperledger/cactus-cmd-api-server";
2+
import { LogLevelDesc } from "@elenaizaguirre/cactus-common";
3+
import { pruneDockerAllIfGithubAction } from "@elenaizaguirre/cactus-test-tooling";
4+
import { AuthorizationProtocol } from "@elenaizaguirre/cactus-cmd-api-server";
5+
import { IAuthorizationConfig } from "@elenaizaguirre/cactus-cmd-api-server";
6+
import { ConfigService } from "@elenaizaguirre/cactus-cmd-api-server";
77

88
import * as publicApi from "../../../main/typescript/public-api";
99
import { ISupplyChainAppOptions } from "../../../main/typescript/public-api";

examples/cactus-example-supply-chain-backend/src/test/typescript/integration/supply-chain-cli-via-npm-script.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import path from "path";
22
import { spawn } from "child_process";
33
import test, { Test } from "tape-promise/tape";
4-
import { LogLevelDesc } from "@hyperledger/cactus-common";
5-
import { pruneDockerAllIfGithubAction } from "@hyperledger/cactus-test-tooling";
4+
import { LogLevelDesc } from "@elenaizaguirre/cactus-common";
5+
import { pruneDockerAllIfGithubAction } from "@elenaizaguirre/cactus-test-tooling";
66
import * as publicApi from "../../../main/typescript/public-api";
77

88
const testCase =

examples/cactus-example-supply-chain-business-logic-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
},
4141
"repository": {
4242
"type": "git",
43-
"url": "git+https://github.com/hyperledger/cactus.git"
43+
"url": "git+https://github.com/elenaizaguirre/cactus.git"
4444
},
4545
"keywords": [
4646
"Hyperledger",

0 commit comments

Comments
 (0)