improve nil handling, add tests (#36835)

elastic · Oct 12, 2023 · 68bcbb0 · 68bcbb0
1 parent 549aec1
commit 68bcbb0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/libbeat/idxmgmt/lifecycle/es_client_handler.go b/libbeat/idxmgmt/lifecycle/es_client_handler.go
@@ -64,9 +64,11 @@ func NewESClientHandler(c ESClient, info beat.Info, cfg RawConfig) (*ESClientHan
 
 		// unpack name value separately
 		dsName := DefaultDSLName()
-		err := cfg.DSL.Unpack(&dsName)
-		if err != nil {
-			return nil, fmt.Errorf("error unpacking DSL data stream name: %w", err)
+		if cfg.DSL != nil {
+			err := cfg.DSL.Unpack(&dsName)
+			if err != nil {
+				return nil, fmt.Errorf("error unpacking DSL data stream name: %w", err)
+			}
 		}
 		lifecycleCfg.PolicyName = dsName.DataStreamPattern
 

diff --git a/libbeat/idxmgmt/lifecycle/es_client_test.go b/libbeat/idxmgmt/lifecycle/es_client_test.go
@@ -81,6 +81,14 @@ func TestESSetup(t *testing.T) {
 		ILM: config.MustNewConfigFrom(mapstr.M{"enabled": true, "policy_name": "test", "check_exists": true}),
 		DSL: config.MustNewConfigFrom(mapstr.M{"enabled": true, "data_stream_pattern": "%{[beat.name]}-%{[beat.version]}", "check_exists": true}),
 	}
+	withDSLBlank := RawConfig{
+		ILM: config.MustNewConfigFrom(mapstr.M{"enabled": false, "policy_name": "test", "check_exists": true}),
+		DSL: nil,
+	}
+	withILMBlank := RawConfig{
+		ILM: nil,
+		DSL: config.MustNewConfigFrom(mapstr.M{"enabled": false, "data_stream_pattern": "%{[beat.name]}-%{[beat.version]}", "check_exists": true}),
+	}
 
 	cases := map[string]struct {
 		serverless      bool
@@ -174,6 +182,16 @@ func TestESSetup(t *testing.T) {
 			cfg:        bothDisabledConfig,
 			err:        false,
 		},
+		"serverless-with-bare-config": {
+			serverless: true,
+			cfg:        withDSLBlank,
+			err:        false,
+		},
+		"stateful-with-bare-config": {
+			serverless: false,
+			cfg:        withILMBlank,
+			err:        false,
+		},
 	}
 
 	for name, test := range cases {