From e45456860012ee7aa3cf6f853f8dec59f351e5c1 Mon Sep 17 00:00:00 2001 From: aksm-ms <58936966+aksm-ms@users.noreply.github.com> Date: Tue, 14 Jul 2020 00:19:41 +0530 Subject: [PATCH 1/5] change in validation factory --- lib/ActionInputValidator/ValidatorFactory.js | 2 +- src/ActionInputValidator/ValidatorFactory.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ActionInputValidator/ValidatorFactory.js b/lib/ActionInputValidator/ValidatorFactory.js index 8ed135e8b..ac065c31a 100644 --- a/lib/ActionInputValidator/ValidatorFactory.js +++ b/lib/ActionInputValidator/ValidatorFactory.js @@ -29,8 +29,8 @@ class ValidatorFactory { return __awaiter(this, void 0, void 0, function* () { let actionParams = actionparameters_1.ActionParameters.getActionParams(); if (type === BaseWebAppDeploymentProvider_1.DEPLOYMENT_PROVIDER_TYPES.PUBLISHPROFILE) { - yield this.setResourceDetails(actionParams); if (!!actionParams.images) { + yield this.setResourceDetails(actionParams); return new PublishProfileContainerWebAppValidator_1.PublishProfileContainerWebAppValidator(); } else { diff --git a/src/ActionInputValidator/ValidatorFactory.ts b/src/ActionInputValidator/ValidatorFactory.ts index eeb8403d7..36535a47f 100644 --- a/src/ActionInputValidator/ValidatorFactory.ts +++ b/src/ActionInputValidator/ValidatorFactory.ts @@ -17,8 +17,8 @@ export class ValidatorFactory { public static async getValidator(type: DEPLOYMENT_PROVIDER_TYPES) : Promise { let actionParams: ActionParameters = ActionParameters.getActionParams(); if(type === DEPLOYMENT_PROVIDER_TYPES.PUBLISHPROFILE) { - await this.setResourceDetails(actionParams); if (!!actionParams.images) { + await this.setResourceDetails(actionParams); return new PublishProfileContainerWebAppValidator(); } else { From dac2bcc23c3eb7a762f1deaa847c9ae281ebf42c Mon Sep 17 00:00:00 2001 From: aksm-ms <58936966+aksm-ms@users.noreply.github.com> Date: Tue, 14 Jul 2020 00:37:52 +0530 Subject: [PATCH 2/5] Update ValidatorFactory.js --- lib/ActionInputValidator/ValidatorFactory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ActionInputValidator/ValidatorFactory.js b/lib/ActionInputValidator/ValidatorFactory.js index ac065c31a..8ed135e8b 100644 --- a/lib/ActionInputValidator/ValidatorFactory.js +++ b/lib/ActionInputValidator/ValidatorFactory.js @@ -29,8 +29,8 @@ class ValidatorFactory { return __awaiter(this, void 0, void 0, function* () { let actionParams = actionparameters_1.ActionParameters.getActionParams(); if (type === BaseWebAppDeploymentProvider_1.DEPLOYMENT_PROVIDER_TYPES.PUBLISHPROFILE) { + yield this.setResourceDetails(actionParams); if (!!actionParams.images) { - yield this.setResourceDetails(actionParams); return new PublishProfileContainerWebAppValidator_1.PublishProfileContainerWebAppValidator(); } else { From 98e7946f791f63ee6022a7f9142b87d16f3fdbae Mon Sep 17 00:00:00 2001 From: aksm-ms <58936966+aksm-ms@users.noreply.github.com> Date: Tue, 14 Jul 2020 00:46:27 +0530 Subject: [PATCH 3/5] fix for runtime os --- lib/ActionInputValidator/ValidatorFactory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ActionInputValidator/ValidatorFactory.js b/lib/ActionInputValidator/ValidatorFactory.js index 8ed135e8b..ac065c31a 100644 --- a/lib/ActionInputValidator/ValidatorFactory.js +++ b/lib/ActionInputValidator/ValidatorFactory.js @@ -29,8 +29,8 @@ class ValidatorFactory { return __awaiter(this, void 0, void 0, function* () { let actionParams = actionparameters_1.ActionParameters.getActionParams(); if (type === BaseWebAppDeploymentProvider_1.DEPLOYMENT_PROVIDER_TYPES.PUBLISHPROFILE) { - yield this.setResourceDetails(actionParams); if (!!actionParams.images) { + yield this.setResourceDetails(actionParams); return new PublishProfileContainerWebAppValidator_1.PublishProfileContainerWebAppValidator(); } else { From a33fb3c157ac5bf733573bb990dc108bf2716caa Mon Sep 17 00:00:00 2001 From: aksm-ms <58936966+aksm-ms@users.noreply.github.com> Date: Tue, 14 Jul 2020 01:03:30 +0530 Subject: [PATCH 4/5] update error log --- lib/Utilities/PublishProfile.js | 2 +- src/Utilities/PublishProfile.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Utilities/PublishProfile.js b/lib/Utilities/PublishProfile.js index 4354e2b9a..6134fa0b7 100644 --- a/lib/Utilities/PublishProfile.js +++ b/lib/Utilities/PublishProfile.js @@ -62,7 +62,7 @@ class PublishProfile { } } catch (error) { - throw Error("Internal Server Error. Please try again\n" + error); + throw Error("Failed to get app runtime OS\n" + error); } return this._appOS; }); diff --git a/src/Utilities/PublishProfile.ts b/src/Utilities/PublishProfile.ts index 301b66b68..e72d71cb7 100644 --- a/src/Utilities/PublishProfile.ts +++ b/src/Utilities/PublishProfile.ts @@ -65,7 +65,7 @@ export class PublishProfile { core.debug(`App Runtime OS: ${this._appOS}`); } } catch(error) { - throw Error("Internal Server Error. Please try again\n" + error); + throw Error("Failed to get app runtime OS\n" + error); } return this._appOS; } From 14e00596d897e81bb75404e392ef84704e2f81f2 Mon Sep 17 00:00:00 2001 From: aksm-ms <58936966+aksm-ms@users.noreply.github.com> Date: Tue, 14 Jul 2020 01:17:38 +0530 Subject: [PATCH 5/5] updated error log --- lib/Utilities/PublishProfile.js | 2 +- src/Utilities/PublishProfile.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Utilities/PublishProfile.js b/lib/Utilities/PublishProfile.js index 6134fa0b7..db023ac4d 100644 --- a/lib/Utilities/PublishProfile.js +++ b/lib/Utilities/PublishProfile.js @@ -62,7 +62,7 @@ class PublishProfile { } } catch (error) { - throw Error("Failed to get app runtime OS\n" + error); + throw Error("Failed to get app runtime OS\n" + JSON.stringify(error)); } return this._appOS; }); diff --git a/src/Utilities/PublishProfile.ts b/src/Utilities/PublishProfile.ts index e72d71cb7..fc8dc7f98 100644 --- a/src/Utilities/PublishProfile.ts +++ b/src/Utilities/PublishProfile.ts @@ -65,7 +65,7 @@ export class PublishProfile { core.debug(`App Runtime OS: ${this._appOS}`); } } catch(error) { - throw Error("Failed to get app runtime OS\n" + error); + throw Error("Failed to get app runtime OS\n" + JSON.stringify(error)); } return this._appOS; }