From 1a99f2e85ecbce798449d90f20052cded0cda4f5 Mon Sep 17 00:00:00 2001
From: Pere Miquel Brull <peremiquelbrull@gmail.com>
Date: Thu, 3 Apr 2025 09:04:11 +0200
Subject: [PATCH] Revert "Rename ingestion agent to ingestion runner entity
 reference (#20588)" (#20599)

This reverts commit d1f8b30a0688a18c0ab8b59efa1b1940ab83346b.
---
 .../jdbi3/IngestionPipelineRepository.java    |  6 +++---
 .../jdbi3/ServiceEntityRepository.java        | 20 +++++++++----------
 .../apiservices/APIServiceMapper.java         |  2 +-
 .../dashboard/DashboardServiceMapper.java     |  2 +-
 .../database/DatabaseServiceMapper.java       |  2 +-
 .../messaging/MessagingServiceMapper.java     |  2 +-
 .../metadata/MetadataServiceMapper.java       |  2 +-
 .../mlmodel/MlModelServiceMapper.java         |  2 +-
 .../pipeline/PipelineServiceMapper.java       |  2 +-
 .../searchIndexes/SearchServiceMapper.java    |  2 +-
 .../storage/StorageServiceMapper.java         |  2 +-
 .../schema/ServiceEntityInterface.java        |  2 +-
 .../schema/api/services/createApiService.json |  2 +-
 .../api/services/createDashboardService.json  |  2 +-
 .../api/services/createDatabaseService.json   |  2 +-
 .../api/services/createMessagingService.json  |  2 +-
 .../api/services/createMetadataService.json   |  2 +-
 .../api/services/createMlModelService.json    |  2 +-
 .../api/services/createPipelineService.json   |  2 +-
 .../api/services/createSearchService.json     |  2 +-
 .../api/services/createStorageService.json    |  2 +-
 .../schema/entity/services/apiService.json    |  2 +-
 .../entity/services/dashboardService.json     |  2 +-
 .../entity/services/databaseService.json      |  2 +-
 .../ingestionPipelines/ingestionPipeline.json |  2 +-
 .../entity/services/messagingService.json     |  2 +-
 .../entity/services/metadataService.json      |  2 +-
 .../entity/services/mlmodelService.json       |  2 +-
 .../entity/services/pipelineService.json      |  2 +-
 .../schema/entity/services/searchService.json |  2 +-
 .../entity/services/storageService.json       |  2 +-
 .../api/services/createApiService.ts          |  2 +-
 .../api/services/createDashboardService.ts    | 12 +----------
 .../api/services/createDatabaseService.ts     |  6 +-----
 .../api/services/createMessagingService.ts    |  2 +-
 .../api/services/createMetadataService.ts     |  2 +-
 .../api/services/createMlModelService.ts      |  2 +-
 .../api/services/createPipelineService.ts     |  2 +-
 .../api/services/createSearchService.ts       |  2 +-
 .../api/services/createStorageService.ts      |  2 +-
 .../generated/entity/services/apiService.ts   |  2 +-
 .../entity/services/dashboardService.ts       | 12 +----------
 .../entity/services/databaseService.ts        |  6 +-----
 .../ingestionPipelines/ingestionPipeline.ts   | 16 +--------------
 .../entity/services/messagingService.ts       |  2 +-
 .../entity/services/metadataService.ts        |  2 +-
 .../entity/services/mlmodelService.ts         |  2 +-
 .../entity/services/pipelineService.ts        |  2 +-
 .../entity/services/searchService.ts          |  2 +-
 .../entity/services/storageService.ts         |  2 +-
 50 files changed, 61 insertions(+), 103 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java
index ea75f2a75ea..3c823b517d1 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/IngestionPipelineRepository.java
@@ -154,12 +154,12 @@ public class IngestionPipelineRepository extends EntityRepository<IngestionPipel
   @Override
   public void storeRelationships(IngestionPipeline ingestionPipeline) {
     addServiceRelationship(ingestionPipeline, ingestionPipeline.getService());
-    if (ingestionPipeline.getIngestionRunner() != null) {
+    if (ingestionPipeline.getIngestionAgent() != null) {
       addRelationship(
           ingestionPipeline.getId(),
-          ingestionPipeline.getIngestionRunner().getId(),
+          ingestionPipeline.getIngestionAgent().getId(),
           entityType,
-          ingestionPipeline.getIngestionRunner().getType(),
+          ingestionPipeline.getIngestionAgent().getType(),
           Relationship.USES);
     }
   }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
index 34a45295586..ca7f5cc75ce 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ServiceEntityRepository.java
@@ -84,16 +84,16 @@ public abstract class ServiceEntityRepository<
 
   @Override
   public void storeRelationships(T service) {
-    addIngestionRunnerRelationship(service);
+    addIngestionAgentRelationship(service);
   }
 
-  private void addIngestionRunnerRelationship(T service) {
-    if (service.getIngestionRunner() != null) {
+  private void addIngestionAgentRelationship(T service) {
+    if (service.getIngestionAgent() != null) {
       addRelationship(
           service.getId(),
-          service.getIngestionRunner().getId(),
+          service.getIngestionAgent().getId(),
           entityType,
-          service.getIngestionRunner().getType(),
+          service.getIngestionAgent().getType(),
           Relationship.USES);
     }
   }
@@ -134,7 +134,7 @@ public abstract class ServiceEntityRepository<
     @Override
     public void entitySpecificUpdate(boolean consolidatingChanges) {
       updateConnection();
-      updateIngestionRunner();
+      updateIngestionAgent();
     }
 
     private void updateConnection() {
@@ -170,13 +170,13 @@ public abstract class ServiceEntityRepository<
       }
     }
 
-    private void updateIngestionRunner() {
+    private void updateIngestionAgent() {
       UUID originalAgentId =
-          original.getIngestionRunner() != null ? original.getIngestionRunner().getId() : null;
+          original.getIngestionAgent() != null ? original.getIngestionAgent().getId() : null;
       UUID updatedAgentId =
-          updated.getIngestionRunner() != null ? updated.getIngestionRunner().getId() : null;
+          updated.getIngestionAgent() != null ? updated.getIngestionAgent().getId() : null;
       if (!Objects.equals(originalAgentId, updatedAgentId)) {
-        addIngestionRunnerRelationship(updated);
+        addIngestionAgentRelationship(updated);
         recordChange("ingestionAgent", originalAgentId, updatedAgentId, true);
       }
     }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceMapper.java
index 4e94d4c7123..89c77deffcc 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/apiservices/APIServiceMapper.java
@@ -10,6 +10,6 @@ public class APIServiceMapper implements EntityMapper<ApiService, CreateApiServi
     return copy(new ApiService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceMapper.java
index 045e8b6a2c3..3b152c6267d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/dashboard/DashboardServiceMapper.java
@@ -11,6 +11,6 @@ public class DashboardServiceMapper
     return copy(new DashboardService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceMapper.java
index ba5a3c66167..0ae40bef4d9 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/database/DatabaseServiceMapper.java
@@ -10,6 +10,6 @@ public class DatabaseServiceMapper implements EntityMapper<DatabaseService, Crea
     return copy(new DatabaseService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceMapper.java
index 2f748f13a87..b18d4a7f66b 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/messaging/MessagingServiceMapper.java
@@ -11,6 +11,6 @@ public class MessagingServiceMapper
     return copy(new MessagingService(), create, user)
         .withConnection(create.getConnection())
         .withServiceType(create.getServiceType())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceMapper.java
index 317fc8c7693..ba293e96124 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/metadata/MetadataServiceMapper.java
@@ -10,6 +10,6 @@ public class MetadataServiceMapper implements EntityMapper<MetadataService, Crea
     return copy(new MetadataService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceMapper.java
index bb50b319993..1d455fa680f 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/mlmodel/MlModelServiceMapper.java
@@ -10,6 +10,6 @@ public class MlModelServiceMapper implements EntityMapper<MlModelService, Create
     return copy(new MlModelService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceMapper.java
index 35e3f4dcc09..9b40b975d29 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/pipeline/PipelineServiceMapper.java
@@ -10,6 +10,6 @@ public class PipelineServiceMapper implements EntityMapper<PipelineService, Crea
     return copy(new PipelineService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceMapper.java
index d0219f71e2e..081dd3e55a1 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/searchIndexes/SearchServiceMapper.java
@@ -10,6 +10,6 @@ public class SearchServiceMapper implements EntityMapper<SearchService, CreateSe
     return copy(new SearchService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceMapper.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceMapper.java
index 8821cd40083..a8e913f8de5 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceMapper.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/services/storage/StorageServiceMapper.java
@@ -10,6 +10,6 @@ public class StorageServiceMapper implements EntityMapper<StorageService, Create
     return copy(new StorageService(), create, user)
         .withServiceType(create.getServiceType())
         .withConnection(create.getConnection())
-        .withIngestionRunner(create.getIngestionRunner());
+        .withIngestionAgent(create.getIngestionAgent());
   }
 }
diff --git a/openmetadata-spec/src/main/java/org/openmetadata/schema/ServiceEntityInterface.java b/openmetadata-spec/src/main/java/org/openmetadata/schema/ServiceEntityInterface.java
index d846a9175a6..1e8718c107c 100644
--- a/openmetadata-spec/src/main/java/org/openmetadata/schema/ServiceEntityInterface.java
+++ b/openmetadata-spec/src/main/java/org/openmetadata/schema/ServiceEntityInterface.java
@@ -33,7 +33,7 @@ public interface ServiceEntityInterface extends EntityInterface {
 
   EnumInterface getServiceType();
 
-  default EntityReference getIngestionRunner() {
+  default EntityReference getIngestionAgent() {
     return null;
   }
 }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createApiService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createApiService.json
index 7b25c2a72c3..47853bf9743 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createApiService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createApiService.json
@@ -50,7 +50,7 @@
       "description": "Fully qualified name of the domain the API Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createDashboardService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createDashboardService.json
index 5551c771a15..f881a5a2500 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createDashboardService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createDashboardService.json
@@ -49,7 +49,7 @@
       "description": "Fully qualified name of the domain the Dashboard Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createDatabaseService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createDatabaseService.json
index 85c26403ac5..64a9879e087 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createDatabaseService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createDatabaseService.json
@@ -50,7 +50,7 @@
       "description": "Fully qualified name of the domain the Database Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline. It will be defined at runtime based on the Ingestion Agent of the service.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createMessagingService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createMessagingService.json
index e0633f2bb3e..a02c007829d 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createMessagingService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createMessagingService.json
@@ -50,7 +50,7 @@
       "description": "Fully qualified name of the domain the Messaging Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createMetadataService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createMetadataService.json
index 2dc5f120fa6..496afd0d9cf 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createMetadataService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createMetadataService.json
@@ -42,7 +42,7 @@
       "description": "Fully qualified name of the domain the Table belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createMlModelService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createMlModelService.json
index eee44c8d7cd..5d6748276db 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createMlModelService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createMlModelService.json
@@ -50,7 +50,7 @@
       "description": "Fully qualified name of the domain the MLModel Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createPipelineService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createPipelineService.json
index 4dddcf9650c..d989a929cab 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createPipelineService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createPipelineService.json
@@ -59,7 +59,7 @@
       "description": "Life Cycle of the entity",
       "$ref": "../../type/lifeCycle.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createSearchService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createSearchService.json
index 616dbb37cc0..b11b3a2f04a 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createSearchService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createSearchService.json
@@ -50,7 +50,7 @@
       "description": "Fully qualified name of the domain the Search Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/services/createStorageService.json b/openmetadata-spec/src/main/resources/json/schema/api/services/createStorageService.json
index 6b89b25a96d..11e7557320c 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/services/createStorageService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/services/createStorageService.json
@@ -50,7 +50,7 @@
       "description": "Fully qualified name of the domain the Storage Service belongs to.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/apiService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/apiService.json
index 8f0e796268b..fc650ba29b3 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/apiService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/apiService.json
@@ -134,7 +134,7 @@
       "description": "Domain the API service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/dashboardService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/dashboardService.json
index 708d683f663..3edc37fa71a 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/dashboardService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/dashboardService.json
@@ -233,7 +233,7 @@
       "description": "Domain the Dashboard service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/databaseService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/databaseService.json
index ee0b3bd2e9d..eec766981e9 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/databaseService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/databaseService.json
@@ -436,7 +436,7 @@
       "description": "Domain the Database service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/ingestionPipelines/ingestionPipeline.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/ingestionPipelines/ingestionPipeline.json
index 73d77984b2a..7a978890884 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/ingestionPipelines/ingestionPipeline.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/ingestionPipelines/ingestionPipeline.json
@@ -226,7 +226,7 @@
       "description": "Type of the application when pipelineType is 'application'.",
       "type": "string"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/messagingService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/messagingService.json
index 3c516b5ab20..bed348b3199 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/messagingService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/messagingService.json
@@ -152,7 +152,7 @@
       "description": "Domain the Messaging service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/metadataService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/metadataService.json
index e6269dde9de..c74ed95ba5d 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/metadataService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/metadataService.json
@@ -155,7 +155,7 @@
       "description": "Domain the asset belongs to. When not set, the asset inherits the domain from the parent it belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/mlmodelService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/mlmodelService.json
index 18c0f94a204..51e9c979505 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/mlmodelService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/mlmodelService.json
@@ -150,7 +150,7 @@
       "description": "Domain the MLModel service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/pipelineService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/pipelineService.json
index 269299c7947..e8a1fbabcea 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/pipelineService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/pipelineService.json
@@ -249,7 +249,7 @@
       "description": "Domain the Pipeline service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/searchService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/searchService.json
index 520e0c74c7e..26b5067019a 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/searchService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/searchService.json
@@ -144,7 +144,7 @@
       "description": "Domain the search service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/storageService.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/storageService.json
index ca73047a0dd..cfe84c4946f 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/storageService.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/storageService.json
@@ -151,7 +151,7 @@
       "description": "Domain the Storage service belongs to.",
       "$ref": "../../type/entityReference.json"
     },
-    "ingestionRunner" : {
+    "ingestionAgent" : {
       "description": "The ingestion agent responsible for executing the ingestion pipeline.",
       "$ref": "../../type/entityReference.json"
     }
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts
index 785af1dde1e..c9fcde76533 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createApiService.ts
@@ -35,7 +35,7 @@ export interface CreateAPIService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts
index 112b241d19a..329e0de6cc8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDashboardService.ts
@@ -34,7 +34,7 @@ export interface CreateDashboardService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
@@ -345,10 +345,6 @@ export interface Connection {
      * MicroStrategy Project Name
      */
     projectName?: string;
-    /**
-     * Space types of Qlik Cloud to filter the dashboards ingested into the platform.
-     */
-    spaceTypes?: SpaceType[];
     /**
      * token to connect to Qlik Cloud.
      */
@@ -1125,12 +1121,6 @@ export interface GCPImpersonateServiceAccountValues {
     [property: string]: any;
 }
 
-export enum SpaceType {
-    Managed = "Managed",
-    Personal = "Personal",
-    Shared = "Shared",
-}
-
 /**
  * Service Type
  *
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts
index fe0cb372341..86d36317a35 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createDatabaseService.ts
@@ -35,7 +35,7 @@ export interface CreateDatabaseService {
      * The ingestion agent responsible for executing the ingestion pipeline. It will be defined
      * at runtime based on the Ingestion Agent of the service.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
@@ -661,10 +661,6 @@ export interface ConfigClass {
      * Cost of credit for the Snowflake account.
      */
     creditCost?: number;
-    /**
-     * Optional configuration for ingestion of streams, By default, it will skip the streams.
-     */
-    includeStreams?: boolean;
     /**
      * Optional configuration for ingestion of TRANSIENT tables, By default, it will skip the
      * TRANSIENT tables.
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts
index cdf1b684421..fdb19c265aa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMessagingService.ts
@@ -35,7 +35,7 @@ export interface CreateMessagingService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts
index 07fc34e8572..d3665386912 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMetadataService.ts
@@ -30,7 +30,7 @@ export interface CreateMetadataService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts
index 988763b8fe0..0ed3147a49c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createMlModelService.ts
@@ -34,7 +34,7 @@ export interface CreateMlModelService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts
index af33328726e..4f6afc9f429 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createPipelineService.ts
@@ -34,7 +34,7 @@ export interface CreatePipelineService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Life Cycle of the entity
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts
index 264ada487d5..08e7be7faf0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createSearchService.ts
@@ -35,7 +35,7 @@ export interface CreateSearchService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts
index 39fc17b66c8..4d23d62d55c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/api/services/createStorageService.ts
@@ -35,7 +35,7 @@ export interface CreateStorageService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies the this entity instance uniquely
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts
index 856ecb480f5..f092708f0cb 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/apiService.ts
@@ -59,7 +59,7 @@ export interface APIService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this API service.
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts
index cdaafce8711..f57e7b3526f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/dashboardService.ts
@@ -58,7 +58,7 @@ export interface DashboardService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this dashboard service.
      */
@@ -458,10 +458,6 @@ export interface Connection {
      * MicroStrategy Project Name
      */
     projectName?: string;
-    /**
-     * Space types of Qlik Cloud to filter the dashboards ingested into the platform.
-     */
-    spaceTypes?: SpaceType[];
     /**
      * token to connect to Qlik Cloud.
      */
@@ -1238,12 +1234,6 @@ export interface GCPImpersonateServiceAccountValues {
     [property: string]: any;
 }
 
-export enum SpaceType {
-    Managed = "Managed",
-    Personal = "Personal",
-    Shared = "Shared",
-}
-
 /**
  * Service Type
  *
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts
index 9a8e99c6007..6b16557f26d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/databaseService.ts
@@ -60,7 +60,7 @@ export interface DatabaseService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this database service.
      */
@@ -776,10 +776,6 @@ export interface ConfigClass {
      * Cost of credit for the Snowflake account.
      */
     creditCost?: number;
-    /**
-     * Optional configuration for ingestion of streams, By default, it will skip the streams.
-     */
-    includeStreams?: boolean;
     /**
      * Optional configuration for ingestion of TRANSIENT tables, By default, it will skip the
      * TRANSIENT tables.
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts
index d4b0878b3f0..b8a0f8095b2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/ingestionPipelines/ingestionPipeline.ts
@@ -68,7 +68,7 @@ export interface IngestionPipeline {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Set the logging level for the workflow.
      */
@@ -3158,10 +3158,6 @@ export interface ConfigClass {
      * Project name to create the refreshToken. Can be anything
      */
     projectName?: string;
-    /**
-     * Space types of Qlik Cloud to filter the dashboards ingested into the platform.
-     */
-    spaceTypes?: SpaceType[];
     /**
      * If using Metastore, Key-Value pairs that will be used to add configs to the SparkSession.
      */
@@ -3460,10 +3456,6 @@ export interface ConfigClass {
      * Cost of credit for the Snowflake account.
      */
     creditCost?: number;
-    /**
-     * Optional configuration for ingestion of streams, By default, it will skip the streams.
-     */
-    includeStreams?: boolean;
     /**
      * Optional configuration for ingestion of TRANSIENT tables, By default, it will skip the
      * TRANSIENT tables.
@@ -5578,12 +5570,6 @@ export enum KafkaSecurityProtocol {
     SaslSSL = "SASL_SSL",
 }
 
-export enum SpaceType {
-    Managed = "Managed",
-    Personal = "Personal",
-    Shared = "Shared",
-}
-
 /**
  * SSL Configuration for OpenMetadata Server
  *
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts
index e171743982b..f444d7f9646 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/messagingService.ts
@@ -59,7 +59,7 @@ export interface MessagingService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this messaging service.
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts
index f833063b733..dc1b0b0264c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/metadataService.ts
@@ -55,7 +55,7 @@ export interface MetadataService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this database service.
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts
index 2abc93c181e..97ad9d14ce8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/mlmodelService.ts
@@ -59,7 +59,7 @@ export interface MlmodelService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this pipeline service.
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts
index 0efd7a210c5..50157d214ea 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/pipelineService.ts
@@ -59,7 +59,7 @@ export interface PipelineService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this pipeline service.
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts
index af26e76638c..a89a1fe2cb3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/searchService.ts
@@ -58,7 +58,7 @@ export interface SearchService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this search service.
      */
diff --git a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts
index d206af63800..edcd40eaf45 100644
--- a/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/generated/entity/services/storageService.ts
@@ -58,7 +58,7 @@ export interface StorageService {
     /**
      * The ingestion agent responsible for executing the ingestion pipeline.
      */
-    ingestionRunner?: EntityReference;
+    ingestionAgent?: EntityReference;
     /**
      * Name that identifies this storage service.
      */