@equinor/fusion-framework-cli 10.0.0-next-499bdf0f6597dbdcfdabd563b94ed08de36bbfe4 → 10.0.0-next-eafbd16f5fe29e2541a1a35881b265cd027de89e
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/dist/bin/upload-application.js +2 -1
- package/dist/bin/upload-application.js.map +1 -1
- package/dist/bin/utils/isAppRegistered.js +4 -2
- package/dist/bin/utils/isAppRegistered.js.map +1 -1
- package/dist/types/bin/utils/isAppRegistered.d.ts +1 -1
- package/package.json +10 -10
package/CHANGELOG.md
CHANGED
|
@@ -32,7 +32,7 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
32
32
|
const pkg = yield resolveAppPackage();
|
|
33
33
|
const appKey = resolveAppKey(pkg.packageJson);
|
|
34
34
|
try {
|
|
35
|
-
spinner.info(
|
|
35
|
+
spinner.info(`Verifying that ${appKey} is registered`);
|
|
36
36
|
const state = { endpoint: '' };
|
|
37
37
|
try {
|
|
38
38
|
state.endpoint = yield getEndpointUrl(`apps/${appKey}`, env, service);
|
|
@@ -41,6 +41,7 @@ export const uploadApplication = (options) => __awaiter(void 0, void 0, void 0,
|
|
|
41
41
|
const err = e;
|
|
42
42
|
throw new Error(`Could not get endpoint from service discovery while verifying app. service-discovery status: ${err.message}`);
|
|
43
43
|
}
|
|
44
|
+
spinner.info('Using endpoint:', state.endpoint);
|
|
44
45
|
yield isAppRegistered(state.endpoint, appKey);
|
|
45
46
|
spinner.succeed(`${appKey} is registered`);
|
|
46
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-application.js","sourceRoot":"","sources":["../../src/bin/upload-application.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGlG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAO,OAIvC,EAAE,EAAE;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEzC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEpE,IAAI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAExC,wBAAwB;QACxB,YAAY,EAAE,CAAC;QAEf,gEAAgE;QAChE,MAAM,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAEtC,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,GAAG,GAAG,CAAU,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,sBAAsB;IACtB,MAAM,GAAG,GAAG,MAAM,iBAAiB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE9C,IAAI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"upload-application.js","sourceRoot":"","sources":["../../src/bin/upload-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
+
import fetch from 'node-fetch';
|
|
10
11
|
/**
|
|
11
12
|
* Make sure the app is registerred in the app-service
|
|
12
13
|
* @param endpoint <string> The endpoint to make a call to
|
|
@@ -19,14 +20,15 @@ export const isAppRegistered = (endpoint, appKey) => __awaiter(void 0, void 0, v
|
|
|
19
20
|
Authorization: `Bearer ${process.env.FUSION_TOKEN}`,
|
|
20
21
|
},
|
|
21
22
|
});
|
|
23
|
+
const response = yield requestApp.json();
|
|
22
24
|
if (requestApp.status === 404) {
|
|
25
|
+
console.log(response);
|
|
23
26
|
throw new Error(`The appkey '${appKey}' is not registered, visit the app-admin app and register the application there.`);
|
|
24
27
|
}
|
|
25
28
|
if (!requestApp.ok) {
|
|
26
|
-
const response = yield requestApp.json();
|
|
27
29
|
console.log(response);
|
|
28
30
|
throw new Error(`Could not connect to apps-service. HTTP status ${requestApp.status}, ${requestApp.statusText}`);
|
|
29
31
|
}
|
|
30
|
-
return
|
|
32
|
+
return response;
|
|
31
33
|
});
|
|
32
34
|
//# sourceMappingURL=isAppRegistered.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isAppRegistered.js","sourceRoot":"","sources":["../../../src/bin/utils/isAppRegistered.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,QAAgB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACrC,OAAO,EAAE;YACL,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;SACtD;KACJ,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACX,eAAe,MAAM,kFAAkF,CAC1G,CAAC;IACN,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;QACjB,
|
|
1
|
+
{"version":3,"file":"isAppRegistered.js","sourceRoot":"","sources":["../../../src/bin/utils/isAppRegistered.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAO,QAAgB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;QACrC,OAAO,EAAE;YACL,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;SACtD;KACJ,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAEzC,IAAI,UAAU,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,MAAM,IAAI,KAAK,CACX,eAAe,MAAM,kFAAkF,CAC1G,CAAC;IACN,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,MAAM,IAAI,KAAK,CACX,kDAAkD,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC,UAAU,EAAE,CAClG,CAAC;IACN,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAA,CAAC"}
|
|
@@ -4,4 +4,4 @@
|
|
|
4
4
|
* @param appKey <string> The appkey to check for
|
|
5
5
|
* @returns response object as json
|
|
6
6
|
*/
|
|
7
|
-
export declare const isAppRegistered: (endpoint: string, appKey: string) => Promise<
|
|
7
|
+
export declare const isAppRegistered: (endpoint: string, appKey: string) => Promise<unknown>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@equinor/fusion-framework-cli",
|
|
3
|
-
"version": "10.0.0-next-
|
|
3
|
+
"version": "10.0.0-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"Fusion",
|
|
6
6
|
"Fusion Framework",
|
|
@@ -83,21 +83,21 @@
|
|
|
83
83
|
"rxjs": "^7.8.1",
|
|
84
84
|
"styled-components": "^6.0.7",
|
|
85
85
|
"typescript": "^5.5.4",
|
|
86
|
-
"@equinor/fusion-framework
|
|
86
|
+
"@equinor/fusion-framework": "^7.2.8",
|
|
87
|
+
"@equinor/fusion-framework-app": "^9.1.10-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
88
|
+
"@equinor/fusion-framework-module-app": "^6.0.0-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
87
89
|
"@equinor/fusion-framework-module-bookmark": "^1.2.12",
|
|
88
90
|
"@equinor/fusion-framework-module-context": "^5.0.12",
|
|
91
|
+
"@equinor/fusion-framework-module-navigation": "^4.0.7",
|
|
89
92
|
"@equinor/fusion-framework-module-msal": "^3.1.5",
|
|
90
93
|
"@equinor/fusion-framework-module-feature-flag": "^1.1.9",
|
|
94
|
+
"@equinor/fusion-framework-react": "^7.3.0-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
95
|
+
"@equinor/fusion-framework-react-components-bookmark": "^0.5.2-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
91
96
|
"@equinor/fusion-framework-module-services": "^4.1.5",
|
|
92
|
-
"@equinor/fusion-framework-
|
|
93
|
-
"@equinor/fusion-framework-react-
|
|
94
|
-
"@equinor/fusion-framework": "^7.2.8",
|
|
95
|
-
"@equinor/fusion-framework-react-module-bookmark": "^2.1.18-next-499bdf0f6597dbdcfdabd563b94ed08de36bbfe4",
|
|
96
|
-
"@equinor/fusion-framework-app": "^9.1.10-next-499bdf0f6597dbdcfdabd563b94ed08de36bbfe4",
|
|
97
|
+
"@equinor/fusion-framework-react-components-people-provider": "^1.4.9-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
98
|
+
"@equinor/fusion-framework-react-module-bookmark": "^2.1.18-next-eafbd16f5fe29e2541a1a35881b265cd027de89e",
|
|
97
99
|
"@equinor/fusion-query": "^5.1.3",
|
|
98
|
-
"@equinor/fusion-observable": "^8.4.1"
|
|
99
|
-
"@equinor/fusion-framework-react": "^7.3.0-next-499bdf0f6597dbdcfdabd563b94ed08de36bbfe4",
|
|
100
|
-
"@equinor/fusion-framework-react-components-people-provider": "^1.4.9-next-499bdf0f6597dbdcfdabd563b94ed08de36bbfe4"
|
|
100
|
+
"@equinor/fusion-observable": "^8.4.1"
|
|
101
101
|
},
|
|
102
102
|
"scripts": {
|
|
103
103
|
"prebuild": "pnpm build:source",
|