@spinnaker/core 0.16.0 → 0.16.1

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/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@spinnaker/core",
3
3
  "license": "Apache-2.0",
4
- "version": "0.16.0",
4
+ "version": "0.16.1",
5
5
  "module": "dist/index.js",
6
6
  "typings": "dist/index.d.ts",
7
7
  "scripts": {
@@ -120,5 +120,5 @@
120
120
  "shx": "0.3.3",
121
121
  "typescript": "4.3.5"
122
122
  },
123
- "gitHead": "59026ea6af7b81ffb8e8c59e18f43396906ddafb"
123
+ "gitHead": "17b98201c6de43729a39f6d205656d0c4be1db16"
124
124
  }
@@ -71,18 +71,33 @@ export class StageFailureMessage extends React.Component<IStageFailureMessagePro
71
71
  }
72
72
 
73
73
  public render() {
74
- const { message, messages } = this.props;
74
+ const { message, messages, stage } = this.props;
75
75
  const { isFailed, failedTask, failedExecutionId, failedStageName, failedStageId } = this.state;
76
- if (isFailed || failedTask || message || messages.length) {
76
+
77
+ let stageMessages = message || !messages.length ? [message] : messages;
78
+ if (stageMessages.length > 0) {
77
79
  const exceptionTitle = isFailed ? (messages.length ? 'Exceptions' : 'Exception') : 'Warning';
78
- const displayMessages =
79
- message || !messages.length ? (
80
- <Markdown message={message || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
81
- ) : (
82
- messages.map((m, i) => (
83
- <Markdown key={i} message={m || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
84
- ))
85
- );
80
+
81
+ // expression evaluation warnings can get really long and hide actual failure messages, source
82
+ // filter out expression evaluation failure messages if either:
83
+ // - there was a stage failure (and failed expressions don't fail the stage)
84
+ // - expression evaluation was explicitly disabled for the stage(as Orca still processes expressions and populates
85
+ // warnings when evaluation is disabled disabled)
86
+ const shouldFilterExpressionFailures =
87
+ (isFailed && !stage.context?.failOnFailedExpressions) || stage.context?.skipExpressionEvaluation;
88
+
89
+ if (shouldFilterExpressionFailures) {
90
+ stageMessages = stageMessages.filter((m) => !m.startsWith('Failed to evaluate'));
91
+
92
+ if (stageMessages.length === 0) {
93
+ // no messages to be displayed after filtering
94
+ return null;
95
+ }
96
+ }
97
+
98
+ const displayMessages = stageMessages.map((m, i) => (
99
+ <Markdown key={i} message={m || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
100
+ ));
86
101
 
87
102
  if (displayMessages) {
88
103
  return (