Revert "Rename ingestion agent to ingestion runner entity reference (#20588)" (#20599)

This reverts commit d1f8b30a0688a18c0ab8b59efa1b1940ab83346b.
This commit is contained in:
Pere Miquel Brull 2025-04-03 09:04:11 +02:00 committed by GitHub
parent fb54565ef8
commit 1a99f2e85e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
50 changed files with 61 additions and 103 deletions

View File

@ -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);
}
}

View File

@ -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);
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -33,7 +33,7 @@ public interface ServiceEntityInterface extends EntityInterface {
EnumInterface getServiceType();
default EntityReference getIngestionRunner() {
default EntityReference getIngestionAgent() {
return null;
}
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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"
}

View File

@ -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
*/

View File

@ -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
*

View File

@ -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.

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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
*/

View File

@ -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.
*/

View File

@ -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
*

View File

@ -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.

View File

@ -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
*

View File

@ -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.
*/

View File

@ -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.
*/

View File

@ -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.
*/

View File

@ -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.
*/

View File

@ -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.
*/

View File

@ -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.
*/