From 038d84f45262ce43c24d951eb2b2b4b245fbca84 Mon Sep 17 00:00:00 2001
From: Ruben Vargas <ruben.vp8510@gmail.com>
Date: Sat, 11 Sep 2021 15:52:54 -0500
Subject: [PATCH] Increase coverage of rollover action

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
---
 cmd/es-rollover/app/rollover/action.go      |  6 +-
 cmd/es-rollover/app/rollover/action_test.go | 82 +++++++++++++++------
 2 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/cmd/es-rollover/app/rollover/action.go b/cmd/es-rollover/app/rollover/action.go
index e75e0c87dfd8..53d8ae5d1f33 100644
--- a/cmd/es-rollover/app/rollover/action.go
+++ b/cmd/es-rollover/app/rollover/action.go
@@ -67,8 +67,8 @@ func (a *Action) rollover(indexSet app.IndexOption) error {
 			Name:  readAlias,
 		})
 	}
-	if len(aliases) > 0 {
-		return a.IndicesClient.CreateAlias(aliases)
+	if len(aliases) == 0 {
+		return nil
 	}
-	return nil
+	return a.IndicesClient.CreateAlias(aliases)
 }
diff --git a/cmd/es-rollover/app/rollover/action_test.go b/cmd/es-rollover/app/rollover/action_test.go
index 0376270b95a9..07bc25df9492 100644
--- a/cmd/es-rollover/app/rollover/action_test.go
+++ b/cmd/es-rollover/app/rollover/action_test.go
@@ -36,43 +36,87 @@ func TestRolloverAction(t *testing.T) {
 	}
 
 	aliasToCreate := []client.Alias{{Index: "jaeger-read-span", Name: "jaeger-span-archive-read", IsWriteIndex: false}}
-	tests := []struct {
-		name                 string
-		conditions           string
-		unmarshalErrExpected bool
-		getJaegerIndicesErr  error
-		rolloverErr          error
-		createAliasErr       error
-		expectedError        bool
-	}{
+	type testCase struct {
+		name                  string
+		conditions            string
+		unmarshalErrExpected  bool
+		getJaegerIndicesErr   error
+		rolloverErr           error
+		createAliasErr        error
+		expectedError         bool
+		indices               []client.Index
+		setupCallExpectations func(indexClient *mocks.MockIndexAPI, t *testCase)
+	}
+
+	tests := []testCase{
 		{
 			name:          "success",
 			conditions:    "{\"max_age\": \"2d\"}",
 			expectedError: false,
+			indices:       readIndices,
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {
+				indexClient.On("GetJaegerIndices", "").Return(test.indices, test.getJaegerIndicesErr)
+				indexClient.On("CreateAlias", aliasToCreate).Return(test.createAliasErr)
+				indexClient.On("Rollover", "jaeger-span-archive-write", map[string]interface{}{"max_age": "2d"}).Return(test.rolloverErr)
+			},
+		},
+		{
+			name:          "no alias write alias",
+			conditions:    "{\"max_age\": \"2d\"}",
+			expectedError: false,
+			indices: []client.Index{
+				{
+					Index: "jaeger-read-span",
+					Aliases: map[string]bool{
+						"jaeger-span-archive-read": true,
+					},
+				},
+			},
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {
+				indexClient.On("GetJaegerIndices", "").Return(test.indices, test.getJaegerIndicesErr)
+				indexClient.On("Rollover", "jaeger-span-archive-write", map[string]interface{}{"max_age": "2d"}).Return(test.rolloverErr)
+			},
 		},
 		{
 			name:                "get jaeger indices error",
 			conditions:          "{\"max_age\": \"2d\"}",
 			expectedError:       true,
 			getJaegerIndicesErr: errors.New("unable to get indices"),
+			indices:             readIndices,
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {
+				indexClient.On("Rollover", "jaeger-span-archive-write", map[string]interface{}{"max_age": "2d"}).Return(test.rolloverErr)
+				indexClient.On("GetJaegerIndices", "").Return(test.indices, test.getJaegerIndicesErr)
+			},
 		},
 		{
 			name:          "rollover error",
 			conditions:    "{\"max_age\": \"2d\"}",
 			expectedError: true,
 			rolloverErr:   errors.New("unable to rollover"),
+			indices:       readIndices,
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {
+				indexClient.On("Rollover", "jaeger-span-archive-write", map[string]interface{}{"max_age": "2d"}).Return(test.rolloverErr)
+			},
 		},
 		{
 			name:           "create alias error",
 			conditions:     "{\"max_age\": \"2d\"}",
 			expectedError:  true,
 			createAliasErr: errors.New("unable to create alias"),
+			indices:        readIndices,
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {
+				indexClient.On("GetJaegerIndices", "").Return(test.indices, test.getJaegerIndicesErr)
+				indexClient.On("CreateAlias", aliasToCreate).Return(test.createAliasErr)
+				indexClient.On("Rollover", "jaeger-span-archive-write", map[string]interface{}{"max_age": "2d"}).Return(test.rolloverErr)
+			},
 		},
 		{
-			name:                 "unmarshal conditions error",
-			conditions:           "{\"max_age\" \"2d\"},",
-			unmarshalErrExpected: true,
-			createAliasErr:       errors.New("unable to create alias"),
+			name:                  "unmarshal conditions error",
+			conditions:            "{\"max_age\" \"2d\"},",
+			unmarshalErrExpected:  true,
+			createAliasErr:        errors.New("unable to create alias"),
+			indices:               readIndices,
+			setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {},
 		},
 	}
 
@@ -89,17 +133,7 @@ func TestRolloverAction(t *testing.T) {
 				},
 				IndicesClient: indexClient,
 			}
-
-			if !test.unmarshalErrExpected {
-				if test.rolloverErr == nil {
-					indexClient.On("GetJaegerIndices", "").Return(readIndices, test.getJaegerIndicesErr)
-					if test.getJaegerIndicesErr == nil {
-						indexClient.On("CreateAlias", aliasToCreate).Return(test.createAliasErr)
-					}
-				}
-				indexClient.On("Rollover", "jaeger-span-archive-write", map[string]interface{}{"max_age": "2d"}).Return(test.rolloverErr)
-			}
-
+			test.setupCallExpectations(indexClient, &test)
 			err := rolloverAction.Do()
 			if test.expectedError || test.unmarshalErrExpected {
 				assert.Error(t, err)