@microsoft/teamsfx-core 2.0.8-rc-hotfix.2 → 2.0.8-rc-hotfix.3
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/build/common/templates-config.json +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +1 -11
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ValidationResult.d.ts +12 -0
- package/build/component/driver/teamsApp/interfaces/ValidationResult.d.ts.map +1 -0
- package/build/component/driver/teamsApp/interfaces/ValidationResult.js +3 -0
- package/build/component/driver/teamsApp/interfaces/ValidationResult.js.map +1 -0
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +14 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +120 -0
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +5 -10
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts +14 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +77 -0
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +4 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +3 -0
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +4 -0
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +17 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +111 -28
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +4 -2
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": "0.0.0-rc",
|
|
3
|
-
"localVersion": "4.2.1-rc-hotfix.
|
|
3
|
+
"localVersion": "4.2.1-rc-hotfix.3",
|
|
4
4
|
"tagPrefix": "templates@",
|
|
5
5
|
"tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
|
|
6
6
|
"templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,OAAO,EAAE,MAAM,EAAiC,MAAM,wBAAwB,CAAC;AAahG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAQzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBAuP3B,aAAa;
|
|
1
|
+
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,OAAO,EAAE,MAAM,EAAiC,MAAM,wBAAwB,CAAC;AAahG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAQzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBAuP3B,aAAa;IASlC,OAAO,CAAC,YAAY;YAwBN,sBAAsB;IAsBpC;;;;;;;OAOG;YACW,SAAS;IAoCvB;;;;;;;OAOG;YACW,qBAAqB;YA4CrB,mBAAmB;IAuBjC,OAAO,CAAC,YAAY;CAGrB"}
|
|
@@ -18,7 +18,6 @@ const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry
|
|
|
18
18
|
const wrapUtil_1 = require("../util/wrapUtil");
|
|
19
19
|
const constants_1 = require("./constants");
|
|
20
20
|
const ManifestUtils_1 = require("./utils/ManifestUtils");
|
|
21
|
-
const common_2 = require("../../utils/common");
|
|
22
21
|
const telemetry_1 = require("./utils/telemetry");
|
|
23
22
|
const teamsApp_1 = require("../../../error/teamsApp");
|
|
24
23
|
const utils_1 = require("./utils/utils");
|
|
@@ -204,16 +203,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
|
|
|
204
203
|
}
|
|
205
204
|
static async expandEnvVars(filePath, ctx, telemetryKey) {
|
|
206
205
|
const content = await fs_extra_1.default.readFile(filePath, "utf8");
|
|
207
|
-
|
|
208
|
-
ctx.addTelemetryProperties({
|
|
209
|
-
[telemetryKey]: vars.join(";"),
|
|
210
|
-
});
|
|
211
|
-
const result = common_2.expandEnvironmentVariable(content);
|
|
212
|
-
const notExpandedVars = common_2.getEnvironmentVariables(result);
|
|
213
|
-
if (notExpandedVars.length > 0) {
|
|
214
|
-
return teamsfx_api_1.err(new common_1.MissingEnvironmentVariablesError("teamsApp", notExpandedVars.join(","), filePath));
|
|
215
|
-
}
|
|
216
|
-
return teamsfx_api_1.ok(result);
|
|
206
|
+
return utils_1.getResolvedManifest(content, filePath, telemetryKey, ctx);
|
|
217
207
|
}
|
|
218
208
|
validateArgs(args) {
|
|
219
209
|
const invalidParams = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export interface DeclarativeCopilotManifestValidationResult {
|
|
2
|
+
id: string;
|
|
3
|
+
filePath: string;
|
|
4
|
+
validationResult: string[];
|
|
5
|
+
actionValidationResult: PluginManifestValidationResult[];
|
|
6
|
+
}
|
|
7
|
+
export interface PluginManifestValidationResult {
|
|
8
|
+
id: string;
|
|
9
|
+
filePath: string;
|
|
10
|
+
validationResult: string[];
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=ValidationResult.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ValidationResult.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/ValidationResult.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,0CAA0C;IACzD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,sBAAsB,EAAE,8BAA8B,EAAE,CAAC;CAC1D;AAED,MAAM,WAAW,8BAA8B;IAC7C,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ValidationResult.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/ValidationResult.ts"],"names":[],"mappings":""}
|
|
@@ -1,8 +1,21 @@
|
|
|
1
|
-
import { FxError, Result, DeclarativeCopilotManifestSchema } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { FxError, Result, DeclarativeCopilotManifestSchema, IDeclarativeCopilot, Platform, Colors } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { WrapDriverContext } from "../../util/wrapUtil";
|
|
3
|
+
import { DeclarativeCopilotManifestValidationResult } from "../interfaces/ValidationResult";
|
|
2
4
|
export declare class CopilotGptManifestUtils {
|
|
3
5
|
readCopilotGptManifestFile(path: string): Promise<Result<DeclarativeCopilotManifestSchema, FxError>>;
|
|
6
|
+
/**
|
|
7
|
+
* Get Declarative Copilot Manifest with env value filled.
|
|
8
|
+
* @param path path of declaraitve Copilot
|
|
9
|
+
* @returns resolved manifest
|
|
10
|
+
*/
|
|
11
|
+
getManifest(path: string, context?: WrapDriverContext): Promise<Result<DeclarativeCopilotManifestSchema, FxError>>;
|
|
4
12
|
writeCopilotGptManifestFile(manifest: DeclarativeCopilotManifestSchema, path: string): Promise<Result<undefined, FxError>>;
|
|
13
|
+
validateAgainstSchema(declaraitveCopilot: IDeclarativeCopilot, manifestPath: string, context?: WrapDriverContext): Promise<Result<DeclarativeCopilotManifestValidationResult, FxError>>;
|
|
5
14
|
addAction(copilotGptPath: string, id: string, pluginFile: string): Promise<Result<DeclarativeCopilotManifestSchema, FxError>>;
|
|
15
|
+
logValidationErrors(validationRes: DeclarativeCopilotManifestValidationResult, platform: Platform, pluginPath: string): string | Array<{
|
|
16
|
+
content: string;
|
|
17
|
+
color: Colors;
|
|
18
|
+
}>;
|
|
6
19
|
}
|
|
7
20
|
export declare const copilotGptManifestUtils: CopilotGptManifestUtils;
|
|
8
21
|
//# sourceMappingURL=CopilotGptManifestUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CopilotGptManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"CopilotGptManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,MAAM,EAGN,gCAAgC,EAEhC,mBAAmB,EACnB,QAAQ,EACR,MAAM,EACP,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKxD,OAAO,EAAE,0CAA0C,EAAE,MAAM,gCAAgC,CAAC;AAM5F,qBAAa,uBAAuB;IACrB,0BAA0B,CACrC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAiB7D;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAoBhD,2BAA2B,CACtC,QAAQ,EAAE,gCAAgC,EAC1C,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAUzB,qBAAqB,CAChC,kBAAkB,EAAE,mBAAmB,EACvC,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,0CAA0C,EAAE,OAAO,CAAC,CAAC;IAkD1D,SAAS,CACpB,cAAc,EAAE,MAAM,EACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAyBtD,mBAAmB,CACxB,aAAa,EAAE,0CAA0C,EACzD,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CA8EtD;AAED,eAAO,MAAM,uBAAuB,yBAAgC,CAAC"}
|
|
@@ -8,6 +8,15 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
8
8
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
9
9
|
const common_1 = require("../../../../error/common");
|
|
10
10
|
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
11
|
+
const telemetry_1 = require("./telemetry");
|
|
12
|
+
const utils_1 = require("./utils");
|
|
13
|
+
const results_1 = require("../results");
|
|
14
|
+
const errors_1 = require("../errors");
|
|
15
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
16
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
17
|
+
const PluginManifestUtils_1 = require("./PluginManifestUtils");
|
|
18
|
+
const constant_1 = require("../../../configManager/constant");
|
|
19
|
+
const os_1 = require("os");
|
|
11
20
|
class CopilotGptManifestUtils {
|
|
12
21
|
async readCopilotGptManifestFile(path) {
|
|
13
22
|
if (!(await fs_extra_1.default.pathExists(path))) {
|
|
@@ -25,6 +34,24 @@ class CopilotGptManifestUtils {
|
|
|
25
34
|
return teamsfx_api_1.err(new common_1.JSONSyntaxError(path, e, "CopilotGptManifestUtils"));
|
|
26
35
|
}
|
|
27
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Get Declarative Copilot Manifest with env value filled.
|
|
39
|
+
* @param path path of declaraitve Copilot
|
|
40
|
+
* @returns resolved manifest
|
|
41
|
+
*/
|
|
42
|
+
async getManifest(path, context) {
|
|
43
|
+
const manifestRes = await this.readCopilotGptManifestFile(path);
|
|
44
|
+
if (manifestRes.isErr()) {
|
|
45
|
+
return teamsfx_api_1.err(manifestRes.error);
|
|
46
|
+
}
|
|
47
|
+
// Add environment variable keys to telemetry
|
|
48
|
+
const resolvedManifestRes = utils_1.getResolvedManifest(JSON.stringify(manifestRes.value), path, telemetry_1.TelemetryPropertyKey.customizedCopilotGptKeys, context);
|
|
49
|
+
if (resolvedManifestRes.isErr()) {
|
|
50
|
+
return teamsfx_api_1.err(resolvedManifestRes.error);
|
|
51
|
+
}
|
|
52
|
+
const resolvedManifestString = resolvedManifestRes.value;
|
|
53
|
+
return teamsfx_api_1.ok(JSON.parse(resolvedManifestString));
|
|
54
|
+
}
|
|
28
55
|
async writeCopilotGptManifestFile(manifest, path) {
|
|
29
56
|
const content = JSON.stringify(manifest, undefined, 4);
|
|
30
57
|
try {
|
|
@@ -35,6 +62,42 @@ class CopilotGptManifestUtils {
|
|
|
35
62
|
}
|
|
36
63
|
return teamsfx_api_1.ok(undefined);
|
|
37
64
|
}
|
|
65
|
+
async validateAgainstSchema(declaraitveCopilot, manifestPath, context) {
|
|
66
|
+
var _a;
|
|
67
|
+
const manifestRes = await this.getManifest(manifestPath, context);
|
|
68
|
+
if (manifestRes.isErr()) {
|
|
69
|
+
return teamsfx_api_1.err(manifestRes.error);
|
|
70
|
+
}
|
|
71
|
+
const manifest = manifestRes.value;
|
|
72
|
+
try {
|
|
73
|
+
const manifestValidationRes = await teamsfx_api_1.ManifestUtil.validateManifest(manifestRes.value);
|
|
74
|
+
const res = {
|
|
75
|
+
id: declaraitveCopilot.id,
|
|
76
|
+
filePath: manifestPath,
|
|
77
|
+
validationResult: manifestValidationRes,
|
|
78
|
+
actionValidationResult: [],
|
|
79
|
+
};
|
|
80
|
+
if ((_a = manifest.actions) === null || _a === void 0 ? void 0 : _a.length) {
|
|
81
|
+
// action
|
|
82
|
+
for (const action of manifest.actions) {
|
|
83
|
+
const actionPath = path_1.default.join(path_1.default.dirname(manifestPath), action.file);
|
|
84
|
+
const actionValidationRes = await PluginManifestUtils_1.pluginManifestUtils.validateAgainstSchema(action, actionPath, context);
|
|
85
|
+
if (actionValidationRes.isErr()) {
|
|
86
|
+
return teamsfx_api_1.err(actionValidationRes.error);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
res.actionValidationResult.push(actionValidationRes.value);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return teamsfx_api_1.ok(res);
|
|
94
|
+
}
|
|
95
|
+
catch (e) {
|
|
96
|
+
return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
|
|
97
|
+
localizeUtils_1.getLocalizedString("error.appstudio.validateFetchSchemaFailed", manifestRes.value.$schema, e.message),
|
|
98
|
+
])));
|
|
99
|
+
}
|
|
100
|
+
}
|
|
38
101
|
async addAction(copilotGptPath, id, pluginFile) {
|
|
39
102
|
var _a;
|
|
40
103
|
const gptManifestRes = await exports.copilotGptManifestUtils.readCopilotGptManifestFile(copilotGptPath);
|
|
@@ -59,6 +122,63 @@ class CopilotGptManifestUtils {
|
|
|
59
122
|
}
|
|
60
123
|
}
|
|
61
124
|
}
|
|
125
|
+
logValidationErrors(validationRes, platform, pluginPath) {
|
|
126
|
+
const validationErrors = validationRes.validationResult;
|
|
127
|
+
const filePath = validationRes.filePath;
|
|
128
|
+
let hasError = validationErrors.length > 0;
|
|
129
|
+
for (const actionValidationRes of validationRes.actionValidationResult) {
|
|
130
|
+
if (actionValidationRes.validationResult.length > 0) {
|
|
131
|
+
hasError = true;
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
if (!hasError) {
|
|
136
|
+
return "";
|
|
137
|
+
}
|
|
138
|
+
if (platform !== teamsfx_api_1.Platform.CLI) {
|
|
139
|
+
const errors = validationErrors
|
|
140
|
+
.map((error) => {
|
|
141
|
+
return `${constant_1.SummaryConstant.Failed} ${error}`;
|
|
142
|
+
})
|
|
143
|
+
.join(os_1.EOL);
|
|
144
|
+
let outputMessage = localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath", filePath) +
|
|
145
|
+
os_1.EOL +
|
|
146
|
+
errors;
|
|
147
|
+
for (const actionValidationRes of validationRes.actionValidationResult) {
|
|
148
|
+
if (pluginPath && actionValidationRes.filePath !== pluginPath) {
|
|
149
|
+
// do not output validation result of the Declarative Copilot if same file has been validated when validating plugin manifest.
|
|
150
|
+
const actionValidationMessage = PluginManifestUtils_1.pluginManifestUtils.logValidationErrors(actionValidationRes, platform);
|
|
151
|
+
if (actionValidationMessage) {
|
|
152
|
+
outputMessage += os_1.EOL + actionValidationMessage;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
return outputMessage;
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
const outputMessage = [];
|
|
160
|
+
outputMessage.push({
|
|
161
|
+
content: localizeUtils_1.getDefaultString("driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath", filePath) + "\n",
|
|
162
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
163
|
+
});
|
|
164
|
+
validationErrors.map((error) => {
|
|
165
|
+
outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
|
|
166
|
+
outputMessage.push({
|
|
167
|
+
content: `${error}\n`,
|
|
168
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
for (const actionValidationRes of validationRes.actionValidationResult) {
|
|
172
|
+
if (pluginPath && actionValidationRes.filePath !== pluginPath) {
|
|
173
|
+
const actionValidationMessage = PluginManifestUtils_1.pluginManifestUtils.logValidationErrors(actionValidationRes, platform);
|
|
174
|
+
if (actionValidationMessage) {
|
|
175
|
+
outputMessage.push(...actionValidationMessage);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
return outputMessage;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
62
182
|
}
|
|
63
183
|
exports.CopilotGptManifestUtils = CopilotGptManifestUtils;
|
|
64
184
|
exports.copilotGptManifestUtils = new CopilotGptManifestUtils();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CopilotGptManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"CopilotGptManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAKjB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,kBAAkB,CAAC;AAgC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAKjB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,kBAAkB,CAAC;AAgC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,qBAAa,aAAa;IAClB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAKhF,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAiB1F,iBAAiB,CACrB,WAAW,EAAE,gBAAgB,EAC7B,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAOtC,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAK9C,eAAe,CACnB,MAAM,EAAE,qBAAqB,EAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAyItC,sBAAsB,CACpB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,GAC9F,OAAO;IAkBH,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAI5D;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAU/C,iBAAiB,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAoB7B,aAAa,CACjB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,iBAAiB,EAC3B,uBAAuB,UAAO,GAC7B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAwC7C,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC;CAezF;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
|
|
@@ -25,6 +25,7 @@ const telemetry_1 = require("./telemetry");
|
|
|
25
25
|
const hooks_1 = require("@feathersjs/hooks");
|
|
26
26
|
const globalVars_1 = require("../../../../core/globalVars");
|
|
27
27
|
const projectTypeChecker_1 = require("../../../../common/projectTypeChecker");
|
|
28
|
+
const utils_1 = require("./utils");
|
|
28
29
|
class ManifestUtils {
|
|
29
30
|
async readAppManifest(projectPath) {
|
|
30
31
|
const filePath = this.getTeamsAppManifestPath(projectPath);
|
|
@@ -257,17 +258,11 @@ class ManifestUtils {
|
|
|
257
258
|
}
|
|
258
259
|
const manifestTemplateString = JSON.stringify(manifest);
|
|
259
260
|
// Add environment variable keys to telemetry
|
|
260
|
-
const
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
if (context) {
|
|
264
|
-
context.addTelemetryProperties(telemetryProps);
|
|
265
|
-
}
|
|
266
|
-
const resolvedManifestString = common_2.expandEnvironmentVariable(manifestTemplateString);
|
|
267
|
-
const tokens = common_2.getEnvironmentVariables(resolvedManifestString);
|
|
268
|
-
if (tokens.length > 0) {
|
|
269
|
-
return teamsfx_api_1.err(new common_1.MissingEnvironmentVariablesError("teamsApp", tokens.join(","), manifestTemplatePath));
|
|
261
|
+
const resolvedManifestRes = utils_1.getResolvedManifest(manifestTemplateString, manifestTemplatePath, telemetry_1.TelemetryPropertyKey.customizedKeys, context);
|
|
262
|
+
if (resolvedManifestRes.isErr()) {
|
|
263
|
+
return teamsfx_api_1.err(resolvedManifestRes.error);
|
|
270
264
|
}
|
|
265
|
+
const resolvedManifestString = resolvedManifestRes.value;
|
|
271
266
|
manifest = JSON.parse(resolvedManifestString);
|
|
272
267
|
if (generateIdIfNotResolved) {
|
|
273
268
|
if (!isUUID_1.default(teamsAppId)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAUgC;AAChC,8DAA6B;AAC7B,gEAA0B;AAC1B,mCAAmC;AACnC,mDAA6B;AAC7B,4BAA0B;AAC1B,kEAAiC;AACjC,+BAA0B;AAC1B,0EAA0C;AAC1C,qDAIkC;AAClC,wDAAgE;AAChE,kDAAiD;AACjD,8CAA4F;AAC5F,kDAA2F;AAC3F,4CAesB;AACtB,sCAA2C;AAC3C,wCAAoD;AACpD,2CAAmD;AAEnD,6CAA0C;AAC1C,4DAA6D;AAC7D,8EAAqG;
|
|
1
|
+
{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,20 @@
|
|
|
1
|
-
import { FxError, PluginManifestSchema, Result, TeamsAppManifest } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { Colors, FxError, IPlugin, Platform, PluginManifestSchema, Result, TeamsAppManifest } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { WrapDriverContext } from "../../util/wrapUtil";
|
|
3
|
+
import { PluginManifestValidationResult } from "../interfaces/ValidationResult";
|
|
2
4
|
export declare class PluginManifestUtils {
|
|
3
5
|
readPluginManifestFile(path: string): Promise<Result<PluginManifestSchema, FxError>>;
|
|
6
|
+
/**
|
|
7
|
+
* Get plugin manifest with env value filled.
|
|
8
|
+
* @param path path of declaraitve Copilot
|
|
9
|
+
* @returns resolved manifest
|
|
10
|
+
*/
|
|
11
|
+
getManifest(path: string, context?: WrapDriverContext): Promise<Result<PluginManifestSchema, FxError>>;
|
|
12
|
+
validateAgainstSchema(plugin: IPlugin, path: string, context?: WrapDriverContext): Promise<Result<PluginManifestValidationResult, FxError>>;
|
|
4
13
|
getApiSpecFilePathFromTeamsManifest(manifest: TeamsAppManifest, manifestPath: string): Promise<Result<string[], FxError>>;
|
|
14
|
+
logValidationErrors(validationRes: PluginManifestValidationResult, platform: Platform): string | Array<{
|
|
15
|
+
content: string;
|
|
16
|
+
color: Colors;
|
|
17
|
+
}>;
|
|
5
18
|
getApiSpecFilePathFromPlugin(plugin: PluginManifestSchema, pluginPath: string): Promise<string[]>;
|
|
6
19
|
}
|
|
7
20
|
export declare const pluginManifestUtils: PluginManifestUtils;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIhF,qBAAa,mBAAmB;IACjB,sBAAsB,CACjC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAiBjD;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAoBpC,qBAAqB,CAChC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IA6B9C,mCAAmC,CAC9C,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAiB9B,mBAAmB,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsC/C,4BAA4B,CAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
|
|
@@ -10,6 +10,13 @@ const common_1 = require("../../../../error/common");
|
|
|
10
10
|
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
11
11
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
12
12
|
const ManifestUtils_1 = require("./ManifestUtils");
|
|
13
|
+
const utils_1 = require("./utils");
|
|
14
|
+
const telemetry_1 = require("./telemetry");
|
|
15
|
+
const results_1 = require("../results");
|
|
16
|
+
const errors_1 = require("../errors");
|
|
17
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
18
|
+
const constant_1 = require("../../../configManager/constant");
|
|
19
|
+
const os_1 = require("os");
|
|
13
20
|
class PluginManifestUtils {
|
|
14
21
|
async readPluginManifestFile(path) {
|
|
15
22
|
if (!(await fs_extra_1.default.pathExists(path))) {
|
|
@@ -27,6 +34,43 @@ class PluginManifestUtils {
|
|
|
27
34
|
return teamsfx_api_1.err(new common_1.JSONSyntaxError(path, e, "PluginManifestUtils"));
|
|
28
35
|
}
|
|
29
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Get plugin manifest with env value filled.
|
|
39
|
+
* @param path path of declaraitve Copilot
|
|
40
|
+
* @returns resolved manifest
|
|
41
|
+
*/
|
|
42
|
+
async getManifest(path, context) {
|
|
43
|
+
const manifestRes = await this.readPluginManifestFile(path);
|
|
44
|
+
if (manifestRes.isErr()) {
|
|
45
|
+
return teamsfx_api_1.err(manifestRes.error);
|
|
46
|
+
}
|
|
47
|
+
// Add environment variable keys to telemetry
|
|
48
|
+
const resolvedManifestRes = utils_1.getResolvedManifest(JSON.stringify(manifestRes.value), path, telemetry_1.TelemetryPropertyKey.customizedAIPluginKeys, context);
|
|
49
|
+
if (resolvedManifestRes.isErr()) {
|
|
50
|
+
return teamsfx_api_1.err(resolvedManifestRes.error);
|
|
51
|
+
}
|
|
52
|
+
const resolvedManifestString = resolvedManifestRes.value;
|
|
53
|
+
return teamsfx_api_1.ok(JSON.parse(resolvedManifestString));
|
|
54
|
+
}
|
|
55
|
+
async validateAgainstSchema(plugin, path, context) {
|
|
56
|
+
const manifestRes = await this.getManifest(path, context);
|
|
57
|
+
if (manifestRes.isErr()) {
|
|
58
|
+
return teamsfx_api_1.err(manifestRes.error);
|
|
59
|
+
}
|
|
60
|
+
try {
|
|
61
|
+
const res = await teamsfx_api_1.ManifestUtil.validateManifest(manifestRes.value);
|
|
62
|
+
return teamsfx_api_1.ok({
|
|
63
|
+
id: plugin.id,
|
|
64
|
+
filePath: path,
|
|
65
|
+
validationResult: res,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
|
|
70
|
+
localizeUtils_1.getLocalizedString("error.appstudio.validateFetchSchemaFailed", manifestRes.value.$schema, e.message),
|
|
71
|
+
])));
|
|
72
|
+
}
|
|
73
|
+
}
|
|
30
74
|
async getApiSpecFilePathFromTeamsManifest(manifest, manifestPath) {
|
|
31
75
|
const pluginFilePathRes = await ManifestUtils_1.manifestUtils.getPluginFilePath(manifest, manifestPath);
|
|
32
76
|
if (pluginFilePathRes.isErr()) {
|
|
@@ -40,6 +84,39 @@ class PluginManifestUtils {
|
|
|
40
84
|
const apiSpecFiles = await this.getApiSpecFilePathFromPlugin(pluginContentRes.value, pluginFilePath);
|
|
41
85
|
return teamsfx_api_1.ok(apiSpecFiles);
|
|
42
86
|
}
|
|
87
|
+
logValidationErrors(validationRes, platform) {
|
|
88
|
+
const validationErrors = validationRes.validationResult;
|
|
89
|
+
const filePath = validationRes.filePath;
|
|
90
|
+
if (validationErrors.length === 0) {
|
|
91
|
+
return "";
|
|
92
|
+
}
|
|
93
|
+
if (platform !== teamsfx_api_1.Platform.CLI) {
|
|
94
|
+
const errors = validationErrors
|
|
95
|
+
.map((error) => {
|
|
96
|
+
return `${constant_1.SummaryConstant.Failed} ${error}`;
|
|
97
|
+
})
|
|
98
|
+
.join(os_1.EOL);
|
|
99
|
+
return (localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validatePluginManifest.checkPath", filePath) +
|
|
100
|
+
os_1.EOL +
|
|
101
|
+
errors);
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
const outputMessage = [];
|
|
105
|
+
outputMessage.push({
|
|
106
|
+
content: localizeUtils_1.getDefaultString("driver.teamsApp.summary.validatePluginManifest.checkPath", filePath) +
|
|
107
|
+
"\n",
|
|
108
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
109
|
+
});
|
|
110
|
+
validationErrors.map((error) => {
|
|
111
|
+
outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
|
|
112
|
+
outputMessage.push({
|
|
113
|
+
content: `${error}\n`,
|
|
114
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
return outputMessage;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
43
120
|
async getApiSpecFilePathFromPlugin(plugin, pluginPath) {
|
|
44
121
|
var _a;
|
|
45
122
|
const runtimes = plugin.runtimes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,10 @@ export declare enum TelemetryPropertyKey {
|
|
|
15
15
|
validationErrors = "validation-errors",
|
|
16
16
|
validationWarnings = "validation-warnings",
|
|
17
17
|
OverwriteIfAppAlreadyExists = "overwrite-if-app-already-exists",
|
|
18
|
-
region = "region"
|
|
18
|
+
region = "region",
|
|
19
|
+
pluginValidationErrors = "plugin-validation-errors",
|
|
20
|
+
gptValidationErrors = "gpt-validation-errors",
|
|
21
|
+
gptActionValidationErrors = "gpt-action-validation-errors"
|
|
19
22
|
}
|
|
20
23
|
export declare enum TelemetryPropertyValue {
|
|
21
24
|
success = "yes",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,qBAAqB,4BAA4B;IACjD,sBAAsB,8BAA8B;IACpD,wBAAwB,gCAAgC;IACxD,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,qBAAqB,4BAA4B;IACjD,sBAAsB,8BAA8B;IACpD,wBAAwB,gCAAgC;IACxD,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;IACjB,sBAAsB,6BAA6B;IACnD,mBAAmB,0BAA0B;IAC7C,yBAAyB,iCAAiC;CAC3D;AAED,oBAAY,sBAAsB;IAChC,OAAO,QAAQ;IACf,OAAO,OAAO;IACd,MAAM,WAAW;CAClB"}
|
|
@@ -22,6 +22,9 @@ var TelemetryPropertyKey;
|
|
|
22
22
|
TelemetryPropertyKey["validationWarnings"] = "validation-warnings";
|
|
23
23
|
TelemetryPropertyKey["OverwriteIfAppAlreadyExists"] = "overwrite-if-app-already-exists";
|
|
24
24
|
TelemetryPropertyKey["region"] = "region";
|
|
25
|
+
TelemetryPropertyKey["pluginValidationErrors"] = "plugin-validation-errors";
|
|
26
|
+
TelemetryPropertyKey["gptValidationErrors"] = "gpt-validation-errors";
|
|
27
|
+
TelemetryPropertyKey["gptActionValidationErrors"] = "gpt-action-validation-errors";
|
|
25
28
|
})(TelemetryPropertyKey = exports.TelemetryPropertyKey || (exports.TelemetryPropertyKey = {}));
|
|
26
29
|
var TelemetryPropertyValue;
|
|
27
30
|
(function (TelemetryPropertyValue) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,oBAqBX;AArBD,WAAY,oBAAoB;IAC9B,+CAAuB,CAAA;IACvB,gDAAwB,CAAA;IACxB,gDAAwB,CAAA;IACxB,sDAA8B,CAAA;IAC9B,oDAA4B,CAAA;IAC5B,2CAAmB,CAAA;IACnB,uCAAe,CAAA;IACf,8CAAsB,CAAA;IACtB,2DAAmC,CAAA;IACnC,mEAA2C,CAAA;IAC3C,yEAAiD,CAAA;IACjD,4EAAoD,CAAA;IACpD,gFAAwD,CAAA;IACxD,8DAAsC,CAAA;IACtC,kEAA0C,CAAA;IAC1C,uFAA+D,CAAA;IAC/D,yCAAiB,CAAA;IACjB,2EAAmD,CAAA;IACnD,qEAA6C,CAAA;IAC7C,kFAA0D,CAAA;AAC5D,CAAC,EArBW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAqB/B;AAED,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,wCAAc,CAAA;IACd,2CAAiB,CAAA;AACnB,CAAC,EAJW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAIjC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { AppDefinition } from "../interfaces/appdefinitions/appDefinition";
|
|
2
|
+
import { WrapDriverContext } from "../../util/wrapUtil";
|
|
3
|
+
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
4
|
+
import { TelemetryPropertyKey } from "./telemetry";
|
|
2
5
|
export declare function getCustomizedKeys(prefix: string, manifest: any): string[];
|
|
3
6
|
export declare function renderTemplate(manifestString: string, view: any): string;
|
|
4
7
|
export declare function isPersonalApp(appDefinition: AppDefinition): boolean;
|
|
@@ -30,4 +33,5 @@ export declare class RetryHandler {
|
|
|
30
33
|
static Retry<T>(fn: () => Promise<T>): Promise<T | undefined>;
|
|
31
34
|
}
|
|
32
35
|
export declare function normalizePath(path: string, useForwardSlash: boolean): string;
|
|
36
|
+
export declare function getResolvedManifest(content: string, path: string, telemetryKey: TelemetryPropertyKey, ctx?: WrapDriverContext): Result<string, FxError>;
|
|
33
37
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,qBAAa,YAAY;IACvB,OAAc,OAAO,SAAK;WACN,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAkB3E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAE5E"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAElE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,qBAAa,YAAY;IACvB,OAAc,OAAO,SAAK;WACN,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAkB3E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAE5E;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,oBAAoB,EAClC,GAAG,CAAC,EAAE,iBAAiB,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAWzB"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizePath = exports.RetryHandler = exports.MeetingsContext = exports.CommandScope = exports.hasMeetingExtension = exports.getFeaturesFromAppDefinition = exports.containsUnsupportedFeature = exports.needBotCode = exports.isBotAndBotBasedMessageExtension = exports.isBotBasedMessageExtension = exports.isBot = exports.needTabCode = exports.needTabAndBotCode = exports.isGroupApp = exports.isPersonalApp = exports.renderTemplate = exports.getCustomizedKeys = void 0;
|
|
3
|
+
exports.getResolvedManifest = exports.normalizePath = exports.RetryHandler = exports.MeetingsContext = exports.CommandScope = exports.hasMeetingExtension = exports.getFeaturesFromAppDefinition = exports.containsUnsupportedFeature = exports.needBotCode = exports.isBotAndBotBasedMessageExtension = exports.isBotBasedMessageExtension = exports.isBot = exports.needTabCode = exports.needTabAndBotCode = exports.isGroupApp = exports.isPersonalApp = exports.renderTemplate = exports.getCustomizedKeys = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
const mustache_1 = tslib_1.__importDefault(require("mustache"));
|
|
9
|
+
const common_1 = require("../../../utils/common");
|
|
10
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
11
|
+
const error_1 = require("../../../../error");
|
|
9
12
|
function getCustomizedKeys(prefix, manifest) {
|
|
10
13
|
let keys = [];
|
|
11
14
|
for (const key in manifest) {
|
|
@@ -191,4 +194,17 @@ function normalizePath(path, useForwardSlash) {
|
|
|
191
194
|
return useForwardSlash ? path.replace(/\\/g, "/") : path;
|
|
192
195
|
}
|
|
193
196
|
exports.normalizePath = normalizePath;
|
|
197
|
+
function getResolvedManifest(content, path, telemetryKey, ctx) {
|
|
198
|
+
const vars = common_1.getEnvironmentVariables(content);
|
|
199
|
+
ctx === null || ctx === void 0 ? void 0 : ctx.addTelemetryProperties({
|
|
200
|
+
[telemetryKey]: vars.join(";"),
|
|
201
|
+
});
|
|
202
|
+
const result = common_1.expandEnvironmentVariable(content);
|
|
203
|
+
const notExpandedVars = common_1.getEnvironmentVariables(result);
|
|
204
|
+
if (notExpandedVars.length > 0) {
|
|
205
|
+
return teamsfx_api_1.err(new error_1.MissingEnvironmentVariablesError("teamsApp", notExpandedVars.join(","), path));
|
|
206
|
+
}
|
|
207
|
+
return teamsfx_api_1.ok(result);
|
|
208
|
+
}
|
|
209
|
+
exports.getResolvedManifest = getResolvedManifest;
|
|
194
210
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mCAAkC;AAClC,gEAAgC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAiBzE,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAoE;IAC/E,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAUd,QAAQ,CACnB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoRhD,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -20,6 +20,9 @@ const constants_1 = require("../../../common/constants");
|
|
|
20
20
|
const common_1 = require("../../utils/common");
|
|
21
21
|
const constant_1 = require("../../configManager/constant");
|
|
22
22
|
const common_2 = require("../../../error/common");
|
|
23
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
24
|
+
const CopilotGptManifestUtils_1 = require("./utils/CopilotGptManifestUtils");
|
|
25
|
+
const PluginManifestUtils_1 = require("./utils/PluginManifestUtils");
|
|
23
26
|
const actionName = "teamsApp/validateManifest";
|
|
24
27
|
let ValidateManifestDriver = class ValidateManifestDriver {
|
|
25
28
|
constructor() {
|
|
@@ -35,20 +38,25 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
35
38
|
};
|
|
36
39
|
}
|
|
37
40
|
async validate(args, context) {
|
|
38
|
-
var _a, _b, _c, _d;
|
|
41
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
39
42
|
const result = this.validateArgs(args);
|
|
40
43
|
if (result.isErr()) {
|
|
41
44
|
return teamsfx_api_1.err(result.error);
|
|
42
45
|
}
|
|
43
|
-
const
|
|
46
|
+
const manifestPath = common_1.getAbsolutePath(args.manifestPath, context.projectPath);
|
|
47
|
+
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestPath, context);
|
|
44
48
|
if (manifestRes.isErr()) {
|
|
45
49
|
return teamsfx_api_1.err(manifestRes.error);
|
|
46
50
|
}
|
|
47
51
|
const manifest = manifestRes.value;
|
|
48
|
-
let
|
|
52
|
+
let manifestValidationResult;
|
|
53
|
+
const telemetryProperties = {};
|
|
49
54
|
if (manifest.$schema) {
|
|
50
55
|
try {
|
|
51
|
-
|
|
56
|
+
manifestValidationResult = await teamsfx_api_1.ManifestUtil.validateManifest(manifest);
|
|
57
|
+
telemetryProperties[telemetry_1.TelemetryPropertyKey.validationErrors] = manifestValidationResult
|
|
58
|
+
.map((r) => r.replace(/\//g, ""))
|
|
59
|
+
.join(";");
|
|
52
60
|
}
|
|
53
61
|
catch (e) {
|
|
54
62
|
return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
|
|
@@ -61,48 +69,123 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
61
69
|
localizeUtils_1.getLocalizedString("error.appstudio.validateSchemaNotDefined"),
|
|
62
70
|
]), constants_1.HelpLinks.WhyNeedProvision));
|
|
63
71
|
}
|
|
64
|
-
|
|
65
|
-
|
|
72
|
+
let declarativeCopilotValidationResult;
|
|
73
|
+
let pluginValidationResult;
|
|
74
|
+
let pluginPath = "";
|
|
75
|
+
if (manifest.copilotExtensions) {
|
|
76
|
+
// plugin
|
|
77
|
+
const plugins = manifest.copilotExtensions.plugins;
|
|
78
|
+
if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) && plugins[0].file) {
|
|
79
|
+
pluginPath = path_1.default.join(path_1.default.dirname(manifestPath), plugins[0].file);
|
|
80
|
+
const pluginValidationRes = await PluginManifestUtils_1.pluginManifestUtils.validateAgainstSchema(plugins[0], pluginPath, context);
|
|
81
|
+
if (pluginValidationRes.isErr()) {
|
|
82
|
+
return teamsfx_api_1.err(pluginValidationRes.error);
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
pluginValidationResult = pluginValidationRes.value;
|
|
86
|
+
telemetryProperties[telemetry_1.TelemetryPropertyKey.pluginValidationErrors] =
|
|
87
|
+
pluginValidationResult === null || pluginValidationResult === void 0 ? void 0 : pluginValidationResult.validationResult.map((r) => r.replace(/\//g, "")).join(";");
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
// Declarative Copilot
|
|
91
|
+
const declaraitveCopilots = manifest.copilotExtensions.declarativeCopilots;
|
|
92
|
+
if ((declaraitveCopilots === null || declaraitveCopilots === void 0 ? void 0 : declaraitveCopilots.length) && declaraitveCopilots[0].file) {
|
|
93
|
+
const declarativeCopilotPath = path_1.default.join(path_1.default.dirname(manifestPath), declaraitveCopilots[0].file);
|
|
94
|
+
const declarativeCopilotValidationRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.validateAgainstSchema(declaraitveCopilots[0], declarativeCopilotPath, context);
|
|
95
|
+
if (declarativeCopilotValidationRes.isErr()) {
|
|
96
|
+
return teamsfx_api_1.err(declarativeCopilotValidationRes.error);
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
declarativeCopilotValidationResult = declarativeCopilotValidationRes.value;
|
|
100
|
+
telemetryProperties[telemetry_1.TelemetryPropertyKey.gptValidationErrors] =
|
|
101
|
+
declarativeCopilotValidationResult === null || declarativeCopilotValidationResult === void 0 ? void 0 : declarativeCopilotValidationResult.validationResult.map((r) => r.replace(/\//g, "")).join(";");
|
|
102
|
+
if (declarativeCopilotValidationResult.actionValidationResult.length > 0) {
|
|
103
|
+
let errors = [];
|
|
104
|
+
for (let index = 0; index < declarativeCopilotValidationResult.actionValidationResult.length; index++) {
|
|
105
|
+
errors = errors.concat(declarativeCopilotValidationResult.actionValidationResult[index].validationResult.map((r) => index.toString() + ":" + r.replace(/\//g, "")));
|
|
106
|
+
}
|
|
107
|
+
telemetryProperties[`${telemetry_1.TelemetryPropertyKey.gptActionValidationErrors}`] =
|
|
108
|
+
errors.join(";");
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
const actionErrorCount = (_a = declarativeCopilotValidationResult === null || declarativeCopilotValidationResult === void 0 ? void 0 : declarativeCopilotValidationResult.actionValidationResult.filter((o) => o.filePath !== pluginPath).reduce((acc, { validationResult }) => acc + validationResult.length, 0)) !== null && _a !== void 0 ? _a : 0;
|
|
114
|
+
const allErrorCount = manifestValidationResult.length +
|
|
115
|
+
((_b = declarativeCopilotValidationResult === null || declarativeCopilotValidationResult === void 0 ? void 0 : declarativeCopilotValidationResult.validationResult.length) !== null && _b !== void 0 ? _b : 0) +
|
|
116
|
+
((_c = pluginValidationResult === null || pluginValidationResult === void 0 ? void 0 : pluginValidationResult.validationResult.length) !== null && _c !== void 0 ? _c : 0) +
|
|
117
|
+
actionErrorCount;
|
|
118
|
+
if (allErrorCount > 0) {
|
|
119
|
+
const summaryStr = localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.failed", allErrorCount);
|
|
66
120
|
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
67
121
|
const outputMessage = [
|
|
68
122
|
{
|
|
69
|
-
content: "Teams Toolkit has checked manifest with
|
|
123
|
+
content: "Teams Toolkit has checked manifest(s) with corresponding schema:\n\nSummary: \n",
|
|
70
124
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
71
125
|
},
|
|
72
126
|
{
|
|
73
|
-
content: `${
|
|
127
|
+
content: `${allErrorCount} failed.\n`,
|
|
74
128
|
color: teamsfx_api_1.Colors.BRIGHT_RED,
|
|
75
129
|
},
|
|
76
|
-
{
|
|
77
|
-
content: localizeUtils_1.getDefaultString("driver.teamsApp.summary.validateManifest.checkPath", args.manifestPath),
|
|
78
|
-
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
79
|
-
},
|
|
80
130
|
];
|
|
81
|
-
|
|
82
|
-
outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
|
|
131
|
+
if (manifestValidationResult.length > 0) {
|
|
83
132
|
outputMessage.push({
|
|
84
|
-
content:
|
|
133
|
+
content: localizeUtils_1.getDefaultString("driver.teamsApp.summary.validateTeamsManifest.checkPath", args.manifestPath) + "\n",
|
|
85
134
|
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
86
135
|
});
|
|
87
|
-
|
|
88
|
-
|
|
136
|
+
manifestValidationResult.map((error) => {
|
|
137
|
+
outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
|
|
138
|
+
outputMessage.push({
|
|
139
|
+
content: `${error}\n`,
|
|
140
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
if (declarativeCopilotValidationResult) {
|
|
145
|
+
const validationMessage = CopilotGptManifestUtils_1.copilotGptManifestUtils.logValidationErrors(declarativeCopilotValidationResult, context.platform, pluginPath);
|
|
146
|
+
if (validationMessage) {
|
|
147
|
+
outputMessage.push(...validationMessage);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
if (pluginValidationResult) {
|
|
151
|
+
const validationMessage = PluginManifestUtils_1.pluginManifestUtils.logValidationErrors(pluginValidationResult, context.platform);
|
|
152
|
+
if (validationMessage) {
|
|
153
|
+
outputMessage.push(...validationMessage);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
(_d = context.ui) === null || _d === void 0 ? void 0 : _d.showMessage("info", outputMessage, false);
|
|
89
157
|
}
|
|
90
158
|
else {
|
|
91
159
|
// logs in output window
|
|
92
|
-
const
|
|
160
|
+
const teamsManifestErrors = manifestValidationResult
|
|
93
161
|
.map((error) => {
|
|
94
162
|
return `${constant_1.SummaryConstant.Failed} ${error}`;
|
|
95
163
|
})
|
|
96
164
|
.join(os_1.EOL);
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
165
|
+
let outputMessage = os_1.EOL + localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateManifest", summaryStr);
|
|
166
|
+
if (teamsManifestErrors.length > 0) {
|
|
167
|
+
outputMessage +=
|
|
168
|
+
os_1.EOL +
|
|
169
|
+
localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateTeamsManifest.checkPath", args.manifestPath) +
|
|
170
|
+
os_1.EOL +
|
|
171
|
+
teamsManifestErrors;
|
|
172
|
+
}
|
|
173
|
+
if (declarativeCopilotValidationResult) {
|
|
174
|
+
const validationMessage = CopilotGptManifestUtils_1.copilotGptManifestUtils.logValidationErrors(declarativeCopilotValidationResult, context.platform, pluginPath);
|
|
175
|
+
if (validationMessage) {
|
|
176
|
+
outputMessage += os_1.EOL + validationMessage;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
if (pluginValidationResult) {
|
|
180
|
+
const validationMessage = PluginManifestUtils_1.pluginManifestUtils.logValidationErrors(pluginValidationResult, context.platform);
|
|
181
|
+
if (validationMessage) {
|
|
182
|
+
outputMessage += os_1.EOL + validationMessage;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
outputMessage += os_1.EOL;
|
|
186
|
+
(_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.info(outputMessage);
|
|
100
187
|
}
|
|
101
|
-
lodash_1.merge(context.telemetryProperties,
|
|
102
|
-
[telemetry_1.TelemetryPropertyKey.validationErrors]: validationResult
|
|
103
|
-
.map((r) => r.replace(/\//g, ""))
|
|
104
|
-
.join(";"),
|
|
105
|
-
});
|
|
188
|
+
lodash_1.merge(context.telemetryProperties, telemetryProperties);
|
|
106
189
|
return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, [
|
|
107
190
|
localizeUtils_1.getDefaultString("driver.teamsApp.validate.result", summaryStr),
|
|
108
191
|
localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result.display", summaryStr),
|
|
@@ -112,7 +195,7 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
112
195
|
// logs in output window
|
|
113
196
|
const summaryStr = localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.succeed", localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.all"));
|
|
114
197
|
const outputMessage = os_1.EOL + localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateManifest", summaryStr, "", "");
|
|
115
|
-
(
|
|
198
|
+
(_f = context.logProvider) === null || _f === void 0 ? void 0 : _f.info(outputMessage);
|
|
116
199
|
const validationSuccess = localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result.display", summaryStr);
|
|
117
200
|
if (context.platform === teamsfx_api_1.Platform.VS) {
|
|
118
201
|
context.logProvider.info(validationSuccess);
|
|
@@ -130,7 +213,7 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
130
213
|
context.logProvider.info(outputMessage);
|
|
131
214
|
}
|
|
132
215
|
else {
|
|
133
|
-
(
|
|
216
|
+
(_g = context.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", validationSuccess, false);
|
|
134
217
|
}
|
|
135
218
|
}
|
|
136
219
|
return teamsfx_api_1.ok(new Map());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAkG;AAClG,+CAA8C;AAC9C,mCAAiC;AACjC,2BAAyB;AACzB,mCAA+B;AAG/B,+CAAqD;AAErD,mFAAgF;AAChF,iDAAyD;AACzD,uCAAmD;AACnD,qCAA0C;AAC1C,yDAAsD;AACtD,iEAAqF;AACrF,yDAAsD;AACtD,+CAAqD;AACrD,2DAA+D;AAC/D,kDAAgE;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "2.0.8-rc-hotfix.
|
|
3
|
+
"version": "2.0.8-rc-hotfix.3",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -94,8 +94,8 @@
|
|
|
94
94
|
"@feathersjs/hooks": "^0.6.5",
|
|
95
95
|
"@microsoft/dev-tunnels-contracts": "1.1.9",
|
|
96
96
|
"@microsoft/dev-tunnels-management": "1.1.9",
|
|
97
|
-
"@microsoft/m365-spec-parser": "^0.2.0-rc-hotfix.
|
|
98
|
-
"@microsoft/teamsfx-api": "0.23.0-rc-hotfix.
|
|
97
|
+
"@microsoft/m365-spec-parser": "^0.2.0-rc-hotfix.3",
|
|
98
|
+
"@microsoft/teamsfx-api": "0.23.0-rc-hotfix.2",
|
|
99
99
|
"adm-zip": "^0.5.10",
|
|
100
100
|
"ajv": "^8.5.0",
|
|
101
101
|
"axios": "^1.6.8",
|
|
@@ -210,7 +210,7 @@
|
|
|
210
210
|
"resource/**/*",
|
|
211
211
|
"templates/**/*"
|
|
212
212
|
],
|
|
213
|
-
"gitHead": "
|
|
213
|
+
"gitHead": "0647b71164b5b313a1349fb91e44d76a6de271b9",
|
|
214
214
|
"publishConfig": {
|
|
215
215
|
"access": "public"
|
|
216
216
|
},
|
|
@@ -759,8 +759,10 @@
|
|
|
759
759
|
"driver.teamsApp.summary.copyIconSuccess": "%s icon(s) were successfully updated under %s.",
|
|
760
760
|
"driver.teamsApp.summary.validate": "Teams Toolkit has checked against all validation rules:\n\nSummary:\n%s.\n%s%s\n%s\n\nA complete log of validations can be found in %s",
|
|
761
761
|
"driver.teamsApp.summary.validate.checkPath": "You can check and update your Teams app package at %s.\n",
|
|
762
|
-
"driver.teamsApp.summary.validateManifest": "Teams Toolkit has checked manifest with
|
|
763
|
-
"driver.teamsApp.summary.
|
|
762
|
+
"driver.teamsApp.summary.validateManifest": "Teams Toolkit has checked manifest(s) with the corresponding schema:\n\nSummary:\n%s.",
|
|
763
|
+
"driver.teamsApp.summary.validateTeamsManifest.checkPath": "You can check and update your Teams manifest at %s.",
|
|
764
|
+
"driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath": "You can check and update your Declarative Copilot manifest at %s.",
|
|
765
|
+
"driver.teamsApp.summary.validatePluginManifest.checkPath": "You can check and update your Copilot Plugin manifest at %s.",
|
|
764
766
|
"driver.teamsApp.summary.validate.succeed": "%s passed",
|
|
765
767
|
"driver.teamsApp.summary.validate.failed": "%s failed",
|
|
766
768
|
"driver.teamsApp.summary.validate.warning": "%s warning",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|