Fix missing Elasticsearch indexing type in Docker ES7 configs

Docker ES7-backed configs enabled indexing and set Elasticsearch version/url, but did not set conductor.indexing.type=elasticsearch.

Because the ES7 IndexDAO condition requires that property, the MySQL docker-compose example could fail at startup with a missing IndexDAO bean.

This change:
- adds conductor.indexing.type=elasticsearch to ES7 docker configs
- updates the docs to show the required property
- adds a regression test for the ES7 condition

Author: bulgarian-beast

docker/server/config/config-mysql.properties

@@ -15,6 +15,7 @@ conductor.redis-lock.serverAddress=redis://rs:6379
 
 # Elastic search instance indexing is enabled.
 conductor.indexing.enabled=true
+conductor.indexing.type=elasticsearch
 conductor.elasticsearch.url=http://es:9200
 conductor.elasticsearch.indexName=conductor
 conductor.elasticsearch.version=7

docker/server/config/config-postgres-es7.properties

@@ -13,6 +13,7 @@ spring.datasource.password=conductor
 
 # Elastic search instance indexing is enabled.
 conductor.indexing.enabled=true
+conductor.indexing.type=elasticsearch
 conductor.elasticsearch.url=http://es:9200
 conductor.elasticsearch.indexName=conductor
 conductor.elasticsearch.version=7

docker/server/config/config-redis.properties

@@ -18,6 +18,7 @@ conductor.app.systemTaskMaxPollCount=20
 
 # Elastic search instance indexing is enabled.
 conductor.indexing.enabled=true
+conductor.indexing.type=elasticsearch
 conductor.elasticsearch.url=http://es:9200
 conductor.elasticsearch.indexName=conductor
 conductor.elasticsearch.version=7

docker/server/config/config.properties

@@ -36,6 +36,7 @@
 # When using Elasticsearch 7 for indexing, set the following
 
 # conductor.indexing.enabled=true
+# conductor.indexing.type=elasticsearch
 # conductor.elasticsearch.url=http://es:9200
 # conductor.elasticsearch.version=7
 # conductor.elasticsearch.indexName=conductor

docs/devguide/running/deploy.md

@@ -206,6 +206,7 @@ conductor.elasticsearch.version=0
 
 ```properties
 conductor.indexing.enabled=true
+conductor.indexing.type=elasticsearch
 conductor.elasticsearch.url=http://es-host:9200
 conductor.elasticsearch.version=7
 conductor.elasticsearch.indexName=conductor

es7-persistence/src/test/java/com/netflix/conductor/es7/config/ElasticSearchConditionsTest.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2026 Conductor Authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.netflix.conductor.es7.config;
+
+import org.junit.Test;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ElasticSearchConditionsTest {
+
+    private final ApplicationContextRunner contextRunner =
+            new ApplicationContextRunner()
+                    .withUserConfiguration(ConditionalTestConfiguration.class);
+
+    @Test
+    public void shouldActivateForElasticsearchV7Selector() {
+        contextRunner
+                .withPropertyValues(
+                        "conductor.indexing.enabled=true",
+                        "conductor.indexing.type=elasticsearch",
+                        "conductor.elasticsearch.version=7")
+                .run(context -> assertTrue(context.containsBean("es7Marker")));
+    }
+
+    @Test
+    public void shouldActivateWhenVersionIsImplicit() {
+        contextRunner
+                .withPropertyValues(
+                        "conductor.indexing.enabled=true", "conductor.indexing.type=elasticsearch")
+                .run(context -> assertTrue(context.containsBean("es7Marker")));
+    }
+
+    @Test
+    public void shouldNotActivateWhenIndexingIsDisabled() {
+        contextRunner
+                .withPropertyValues(
+                        "conductor.indexing.enabled=false",
+                        "conductor.indexing.type=elasticsearch",
+                        "conductor.elasticsearch.version=7")
+                .run(context -> assertFalse(context.containsBean("es7Marker")));
+    }
+
+    @Test
+    public void shouldNotActivateForLegacyVersionPropertyOnly() {
+        contextRunner
+                .withPropertyValues(
+                        "conductor.indexing.enabled=true", "conductor.elasticsearch.version=7")
+                .run(context -> assertFalse(context.containsBean("es7Marker")));
+    }
+
+    @Test
+    public void shouldNotActivateForElasticsearch8Selector() {
+        contextRunner
+                .withPropertyValues(
+                        "conductor.indexing.enabled=true", "conductor.indexing.type=elasticsearch8")
+                .run(context -> assertFalse(context.containsBean("es7Marker")));
+    }
+
+    @Configuration(proxyBeanMethods = false)
+    @Conditional(ElasticSearchConditions.ElasticSearchV7Enabled.class)
+    static class ConditionalTestConfiguration {
+
+        @Bean
+        Marker es7Marker() {
+            return new Marker();
+        }
+    }
+
+    static class Marker {}
+}