Skip to content

Commit ca6887d

Browse files
rohitagg2020praveenrewar
rohitagg2020
and
praveenrewar
authored
Reformating error output (#1024)
* Providing startTime and currentTime to facilitate timeout in case of ytt wait rules Signed-off-by: Rohit Aggarwal <[email protected]> * Update test/e2e/custom_wait_rules_test.go Co-authored-by: Praveen Rewar <[email protected]> * Reformating error output Signed-off-by: Rohit Aggarwal <[email protected]> --------- Signed-off-by: Rohit Aggarwal <[email protected]> Co-authored-by: Praveen Rewar <[email protected]>
1 parent 2e0c8d2 commit ca6887d

13 files changed

+26
-26
lines changed

‎pkg/kapp/clusterapply/waiting_changes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ func (c *WaitingChanges) WaitForAny() ([]WaitingChange, []string, error) {
116116
case state.Done && !state.Successful:
117117
msg := ""
118118
if len(state.Message) > 0 {
119-
msg += " (" + state.Message + ")"
119+
msg = ": " + state.Message
120120
}
121-
err := fmt.Errorf("%s: Finished unsuccessfully%s", desc, msg)
121+
err := fmt.Errorf("%s: Finished waiting unsuccessfully%s", desc, msg)
122122
if c.exitOnError {
123123
return nil, nil, err
124124
}

‎pkg/kapp/resourcesmisc/apps_v1_deployment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ func (s AppsV1Deployment) IsDoneApplying() DoneApplyState {
5151
case appsv1.DeploymentProgressing:
5252
if cond.Status == corev1.ConditionFalse {
5353
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
54-
"Deployment is not progressing: %s (message: %s)", cond.Reason, cond.Message)}
54+
"Deployment is not progressing: %s, message: %s", cond.Reason, cond.Message)}
5555
}
5656

5757
case appsv1.DeploymentReplicaFailure:
5858
if cond.Status == corev1.ConditionTrue {
5959
return DoneApplyState{Done: false, Successful: false, Message: fmt.Sprintf(
60-
"Deployment has encountered replica failure: %s (message: %s)", cond.Reason, cond.Message)}
60+
"Deployment has encountered replica failure: %s, message: %s", cond.Reason, cond.Message)}
6161
}
6262
}
6363
}

‎pkg/kapp/resourcesmisc/apps_v1_deployment_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ status:
8282
expectedState := ctlresm.DoneApplyState{
8383
Done: true,
8484
Successful: false,
85-
Message: "Deployment is not progressing: ProgressDeadlineExceeded (message: Progress deadline exceeded)",
85+
Message: "Deployment is not progressing: ProgressDeadlineExceeded, message: Progress deadline exceeded",
8686
}
8787

8888
require.Equal(t, expectedState, state, "Found incorrect state")
@@ -107,7 +107,7 @@ status:
107107
expectedState = ctlresm.DoneApplyState{
108108
Done: false,
109109
Successful: false,
110-
Message: "Deployment has encountered replica failure: FailedCreate (message: Failed to create pods)",
110+
Message: "Deployment has encountered replica failure: FailedCreate, message: Failed to create pods",
111111
}
112112

113113
require.Equal(t, expectedState, state, "Found incorrect state")

‎pkg/kapp/resourcesmisc/core_v1_pod.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (s CoreV1Pod) pendingDetailsReason(pod corev1.Pod) string {
8484
if st.State.Waiting != nil {
8585
msg := st.State.Waiting.Reason
8686
if len(st.State.Waiting.Message) > 0 {
87-
msg += fmt.Sprintf(" (message: %s)", st.State.Waiting.Message)
87+
msg += fmt.Sprintf(", message: %s", st.State.Waiting.Message)
8888
}
8989
return msg
9090
}
@@ -96,7 +96,7 @@ func (s CoreV1Pod) pendingDetailsReason(pod corev1.Pod) string {
9696
if cond.Reason == corev1.PodReasonUnschedulable {
9797
msg := cond.Reason
9898
if len(cond.Message) > 0 {
99-
msg += fmt.Sprintf(" (message: %s)", cond.Message)
99+
msg += fmt.Sprintf(", message: %s", cond.Message)
100100
}
101101
return msg
102102
}

‎pkg/kapp/resourcesmisc/custom_waiting_resource.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ func (s CustomWaitingResource) IsDoneApplying() DoneApplyState {
106106
isTimeOutConditionPresent = true
107107
if s.hasTimeoutOccurred(condMatcher.Timeout, s.resource.Description()) {
108108
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
109-
"Encountered failure condition %s == %s: %s (message: %s) continuously for %s duration",
110-
cond.Type, condMatcher.Status, cond.Reason, cond.Message, condMatcher.Timeout)}
109+
"Continuously failed for %s with %s: %s, message: %s",
110+
condMatcher.Timeout, cond.Type, cond.Reason, cond.Message)}
111111
}
112112
return DoneApplyState{Done: false, Message: fmt.Sprintf(
113113
"%s: %s (message: %s)",
@@ -116,7 +116,7 @@ func (s CustomWaitingResource) IsDoneApplying() DoneApplyState {
116116

117117
if condMatcher.Failure {
118118
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
119-
"Encountered failure condition %s == %s: %s (message: %s)",
119+
"Encountered failure condition %s == %s: %s, message: %s",
120120
cond.Type, condMatcher.Status, cond.Reason, cond.Message)}
121121
}
122122
}

‎pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ func (s KappctrlK14sIoV1alpha1App) IsDoneApplying() DoneApplyState {
5656

5757
case cond.Type == kcv1alpha1.ReconcileFailed && cond.Status == corev1.ConditionTrue:
5858
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
59-
"Reconcile failed: %s (message: %s)", cond.Reason, errorMsg)}
59+
"Reconcile failed: message: %s", errorMsg)}
6060

6161
case cond.Type == kcv1alpha1.DeleteFailed && cond.Status == corev1.ConditionTrue:
6262
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
63-
"Delete failed: %s (message: %s)", cond.Reason, errorMsg)}
63+
"Delete failed: message: %s", errorMsg)}
6464
}
6565
}
6666

‎pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ status:
3636
expectedState := ctlresm.DoneApplyState{
3737
Done: true,
3838
Successful: false,
39-
Message: fmt.Sprintf("Reconcile failed: (message: %s)", usefulErrorMessage),
39+
Message: fmt.Sprintf("Reconcile failed: message: %s", usefulErrorMessage),
4040
}
4141
require.Equal(t, expectedState, state)
4242

@@ -46,7 +46,7 @@ status:
4646
expectedState = ctlresm.DoneApplyState{
4747
Done: true,
4848
Successful: false,
49-
Message: fmt.Sprintf("Reconcile failed: (message: %s)", conditionMessage),
49+
Message: fmt.Sprintf("Reconcile failed: message: %s", conditionMessage),
5050
}
5151
require.Equal(t, state, expectedState)
5252

‎pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ func (s PackagingCarvelDevV1alpha1PackageInstall) IsDoneApplying() DoneApplyStat
5757

5858
case cond.Type == appv1alpha1.ReconcileFailed && cond.Status == corev1.ConditionTrue:
5959
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
60-
"Reconcile failed: %s (message: %s)", cond.Reason, errorMsg)}
60+
"Reconcile failed: message: %s", errorMsg)}
6161

6262
case cond.Type == appv1alpha1.DeleteFailed && cond.Status == corev1.ConditionTrue:
6363
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
64-
"Delete failed: %s (message: %s)", cond.Reason, errorMsg)}
64+
"Delete failed: message: %s", errorMsg)}
6565
}
6666
}
6767

‎pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ status:
3636
expectedState := ctlresm.DoneApplyState{
3737
Done: true,
3838
Successful: false,
39-
Message: fmt.Sprintf("Reconcile failed: (message: %s)", usefulErrorMessage),
39+
Message: fmt.Sprintf("Reconcile failed: message: %s", usefulErrorMessage),
4040
}
4141
require.Equal(t, expectedState, state)
4242

@@ -46,7 +46,7 @@ status:
4646
expectedState = ctlresm.DoneApplyState{
4747
Done: true,
4848
Successful: false,
49-
Message: fmt.Sprintf("Reconcile failed: (message: %s)", conditionMessage),
49+
Message: fmt.Sprintf("Reconcile failed: message: %s", conditionMessage),
5050
}
5151
require.Equal(t, state, expectedState)
5252

‎pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ func (s PackagingCarvelDevV1alpha1PackageRepo) IsDoneApplying() DoneApplyState {
5757

5858
case cond.Type == appv1alpha1.ReconcileFailed && cond.Status == corev1.ConditionTrue:
5959
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
60-
"Reconcile failed: %s (message: %s)", cond.Reason, errorMsg)}
60+
"Reconcile failed: message: %s", errorMsg)}
6161

6262
case cond.Type == appv1alpha1.DeleteFailed && cond.Status == corev1.ConditionTrue:
6363
return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
64-
"Delete failed: %s (message: %s)", cond.Reason, errorMsg)}
64+
"Delete failed: message: %s", errorMsg)}
6565
}
6666
}
6767

‎pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ status:
3636
expectedState := ctlresm.DoneApplyState{
3737
Done: true,
3838
Successful: false,
39-
Message: fmt.Sprintf("Reconcile failed: (message: %s)", usefulErrorMessage),
39+
Message: fmt.Sprintf("Reconcile failed: message: %s", usefulErrorMessage),
4040
}
4141
require.Equal(t, expectedState, state)
4242

@@ -46,7 +46,7 @@ status:
4646
expectedState = ctlresm.DoneApplyState{
4747
Done: true,
4848
Successful: false,
49-
Message: fmt.Sprintf("Reconcile failed: (message: %s)", conditionMessage),
49+
Message: fmt.Sprintf("Reconcile failed: message: %s", conditionMessage),
5050
}
5151
require.Equal(t, state, expectedState)
5252

‎test/e2e/apply_wait_error_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ spec:
128128

129129
expectedErrs := []string{
130130
`kapp: Error:`,
131-
fmt.Sprintf(`- waiting on reconcile job/my-job-fail-2 (batch/v1) namespace: %s: Finished unsuccessfully (Failed with reason BackoffLimitExceeded: Job has reached the specified backoff limit)`, env.Namespace),
132-
fmt.Sprintf(`- waiting on reconcile job/my-job-fail (batch/v1) namespace: %s: Finished unsuccessfully (Failed with reason BackoffLimitExceeded: Job has reached the specified backoff limit)`, env.Namespace),
131+
fmt.Sprintf(`- waiting on reconcile job/my-job-fail-2 (batch/v1) namespace: %s: Finished waiting unsuccessfully: Failed with reason BackoffLimitExceeded: Job has reached the specified backoff limit`, env.Namespace),
132+
fmt.Sprintf(`- waiting on reconcile job/my-job-fail (batch/v1) namespace: %s: Finished waiting unsuccessfully: Failed with reason BackoffLimitExceeded: Job has reached the specified backoff limit`, env.Namespace),
133133
fmt.Sprintf(`- create service/service-fail (v1) namespace: %s: Creating resource service/service-fail (v1) namespace: kapp-test: API server says: Service "service-fail" is invalid: spec.ports: Required value (reason: Invalid)`, env.Namespace),
134134
}
135135

‎test/e2e/wait_timeout_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ waitRules:
103103
RunOpts{IntoNs: true, AllowError: true, StdinReader: strings.NewReader(fmt.Sprintf(yaml2, "nginx:200"))})
104104

105105
require.Error(t, err)
106-
require.Contains(t, err.Error(), "message: containers with unready status: [nginx]) continuously for 50s duration")
106+
require.Contains(t, err.Error(), "Continuously failed for 50s with")
107107
})
108108

109109
cleanUp()

0 commit comments

Comments
 (0)