From 90f0c0baf1889836b36ac20a766fe27504de0849 Mon Sep 17 00:00:00 2001
From: michel-laterman <michel.laterman@elastic.co>
Date: Wed, 24 Jan 2024 14:14:22 -0600
Subject: [PATCH] Change response codes for elasticsearch failures to 503

---
 ...des-for-elasticsearch-failures-to-503.yaml | 32 +++++++++++++++++++
 internal/pkg/api/error.go                     | 10 ++++++
 internal/pkg/api/error_test.go                | 29 +++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 changelog/fragments/1706127160-Change-response-codes-for-elasticsearch-failures-to-503.yaml

diff --git a/changelog/fragments/1706127160-Change-response-codes-for-elasticsearch-failures-to-503.yaml b/changelog/fragments/1706127160-Change-response-codes-for-elasticsearch-failures-to-503.yaml
new file mode 100644
index 000000000..04ea8228a
--- /dev/null
+++ b/changelog/fragments/1706127160-Change-response-codes-for-elasticsearch-failures-to-503.yaml
@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Change response codes for elasticsearch failures to 503
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; a word indicating the component this changeset affects.
+component:
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+#pr: https://github.com/owner/repo/1234
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+issue: 2852
diff --git a/internal/pkg/api/error.go b/internal/pkg/api/error.go
index fd8016a15..1e23e661b 100644
--- a/internal/pkg/api/error.go
+++ b/internal/pkg/api/error.go
@@ -484,6 +484,16 @@ func NewHTTPErrResp(err error) HTTPErrResp {
 		}
 	}
 
+	var esErr *es.ErrElastic
+	if errors.As(err, &esErr) {
+		return HTTPErrResp{
+			http.StatusServiceUnavailable,
+			esErr.Error(),
+			"elasticsearch error",
+			zerolog.ErrorLevel,
+		}
+	}
+
 	// Check if we have encountered a connectivity error
 	// Predicate taken from https://github.com/golang/go/blob/go1.17.5/src/net/dial_test.go#L798
 	if strings.Contains(err.Error(), "connection refused") {
diff --git a/internal/pkg/api/error_test.go b/internal/pkg/api/error_test.go
index 3be9feed6..ba788e997 100644
--- a/internal/pkg/api/error_test.go
+++ b/internal/pkg/api/error_test.go
@@ -92,3 +92,32 @@ func Test_ErrorResp_NoTransaction(t *testing.T) {
 	require.Len(t, payloads.Transactions, 0)
 	require.Len(t, payloads.Errors, 0)
 }
+
+func Test_ErrResp_Status(t *testing.T) {
+	tests := []struct {
+		name   string
+		err    error
+		status int
+	}{{
+		name:   "context canceled",
+		err:    context.Canceled,
+		status: 499,
+	}, {
+		name:   "generic error",
+		err:    fmt.Errorf("some error"),
+		status: 500,
+	}, {
+		name: "es error",
+		err: &es.ErrElastic{
+			Status: 500,
+		},
+		status: 503,
+	}}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			r := NewHTTPErrResp(tc.err)
+			require.Equal(t, tc.status, r.StatusCode)
+		})
+	}
+}