From 869c675c9326a53ba1724452dde3726dcd643912 Mon Sep 17 00:00:00 2001
From: mannukalra <mkmandeepkalra@gmail.com>
Date: Sun, 11 Dec 2022 15:37:03 +0530
Subject: [PATCH] feat(outputs.opensearch): test case compilation failure fixes
 and minor fix

---
 plugins/outputs/opensearch/opensearch.go      |  2 +-
 plugins/outputs/opensearch/opensearch_test.go | 32 +++++--------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/plugins/outputs/opensearch/opensearch.go b/plugins/outputs/opensearch/opensearch.go
index 91e5171f7bac2..97bcf546018cf 100644
--- a/plugins/outputs/opensearch/opensearch.go
+++ b/plugins/outputs/opensearch/opensearch.go
@@ -113,7 +113,7 @@ func (a *Opensearch) Connect() error {
 		clientOptions = append(clientOptions,
 			elastic.SetHealthcheck(false),
 		)
-		a.Log.Debugf("Disabling health check")
+		a.Log.Debug("Disabling health check")
 	}
 
 	a.client, err = elastic.NewClient(clientOptions...)
diff --git a/plugins/outputs/opensearch/opensearch_test.go b/plugins/outputs/opensearch/opensearch_test.go
index 4013d88d2f8d5..eeef13b004741 100644
--- a/plugins/outputs/opensearch/opensearch_test.go
+++ b/plugins/outputs/opensearch/opensearch_test.go
@@ -45,9 +45,7 @@ func TestConnectAndWriteIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -81,9 +79,7 @@ func TestConnectAndWriteMetricWithNaNValueEmptyIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -126,9 +122,7 @@ func TestConnectAndWriteMetricWithNaNValueNoneIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -170,9 +164,7 @@ func TestConnectAndWriteMetricWithNaNValueDropIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -236,9 +228,7 @@ func TestConnectAndWriteMetricWithNaNValueReplacementIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -286,9 +276,7 @@ func TestTemplateManagementEmptyTemplateIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -317,9 +305,7 @@ func TestTemplateManagementIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),
@@ -352,9 +338,7 @@ func TestTemplateInvalidIndexPatternIntegration(t *testing.T) {
 	}
 
 	container := launchTestContainer(t)
-	defer func() {
-		require.NoError(t, container.Terminate(), "terminating container failed")
-	}()
+	defer container.Terminate()
 
 	urls := []string{
 		fmt.Sprintf("http://%s:%s", container.Address, container.Ports[servicePort]),