Skip to content

Commit 995857c

Browse files
authored
fix(ci): remove platform from dataprocessinstance gql (#12408)
1 parent c2a071b commit 995857c

File tree

8 files changed

+12
-40
lines changed

8 files changed

+12
-40
lines changed

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java

-10
Original file line numberDiff line numberDiff line change
@@ -3108,16 +3108,6 @@ private void configureDataProcessInstanceResolvers(final RuntimeWiring.Builder b
31083108
? dataProcessInstance.getDataPlatformInstance().getUrn()
31093109
: null;
31103110
}))
3111-
.dataFetcher(
3112-
"platform",
3113-
new LoadableTypeResolver<>(
3114-
dataPlatformType,
3115-
(env) -> {
3116-
final DataProcessInstance dataProcessInstance = env.getSource();
3117-
return dataProcessInstance.getPlatform() != null
3118-
? dataProcessInstance.getPlatform().getUrn()
3119-
: null;
3120-
}))
31213111
.dataFetcher("parentContainers", new ParentContainersResolver(entityClient))
31223112
.dataFetcher(
31233113
"container",

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java

-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.linkedin.data.DataMap;
99
import com.linkedin.data.template.RecordTemplate;
1010
import com.linkedin.datahub.graphql.QueryContext;
11-
import com.linkedin.datahub.graphql.generated.DataPlatform;
1211
import com.linkedin.datahub.graphql.generated.DataProcessInstance;
1312
import com.linkedin.datahub.graphql.generated.EntityType;
1413
import com.linkedin.datahub.graphql.types.common.mappers.AuditStampMapper;
@@ -80,10 +79,6 @@ public DataProcessInstance apply(
8079
DataPlatformInstance dataPlatformInstance = new DataPlatformInstance(dataMap);
8180
dataProcessInstance.setDataPlatformInstance(
8281
DataPlatformInstanceAspectMapper.map(context, dataPlatformInstance));
83-
DataPlatform dataPlatform = new DataPlatform();
84-
dataPlatform.setUrn(dataPlatformInstance.getPlatform().toString());
85-
dataPlatform.setType(EntityType.DATA_PLATFORM);
86-
dataProcessInstance.setPlatform(dataPlatform);
8782
});
8883
mappingHelper.mapToResult(
8984
SUB_TYPES_ASPECT_NAME,

datahub-graphql-core/src/main/resources/entity.graphql

-5
Original file line numberDiff line numberDiff line change
@@ -13029,11 +13029,6 @@ extend type DataProcessInstance {
1302913029
"""
1303013030
container: Container
1303113031

13032-
"""
13033-
Standardized platform urn where the data process instance is defined
13034-
"""
13035-
platform: DataPlatform!
13036-
1303713032
"""
1303813033
Recursively get the lineage of containers for this entity
1303913034
"""

datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapperTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ public void testMapPlatformInstance() throws Exception {
8080
DataProcessInstance instance = DataProcessInstanceMapper.map(null, entityResponse);
8181

8282
assertNotNull(instance.getDataPlatformInstance());
83-
assertNotNull(instance.getPlatform());
84-
assertEquals(instance.getPlatform().getUrn(), TEST_PLATFORM_URN);
85-
assertEquals(instance.getPlatform().getType(), EntityType.DATA_PLATFORM);
83+
assertNotNull(instance.getDataPlatformInstance().getPlatform());
84+
assertEquals(instance.getDataPlatformInstance().getPlatform().getUrn(), TEST_PLATFORM_URN);
85+
assertEquals(
86+
instance.getDataPlatformInstance().getPlatform().getType(), EntityType.DATA_PLATFORM);
8687
}
8788

8889
@Test

datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
161161
return {
162162
name,
163163
externalUrl,
164+
platform: processInstance?.dataPlatformInstance?.platform,
164165
};
165166
};
166167

@@ -201,9 +202,10 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
201202
subType={data.subTypes?.typeNames?.[0]}
202203
description=""
203204
platformName={
204-
data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
205+
data?.dataPlatformInstance?.platform?.properties?.displayName ||
206+
capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name)
205207
}
206-
platformLogo={data.platform.properties?.logoUrl}
208+
platformLogo={data.dataPlatformInstance?.platform?.properties?.logoUrl}
207209
platformInstanceId={data.dataPlatformInstance?.instanceId}
208210
owners={null}
209211
globalTags={null}
@@ -231,8 +233,8 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
231233
name: this.displayName(entity),
232234
type: EntityType.DataProcessInstance,
233235
subtype: entity?.subTypes?.typeNames?.[0],
234-
icon: entity?.platform?.properties?.logoUrl || undefined,
235-
platform: entity?.platform,
236+
icon: entity?.dataPlatformInstance?.platform?.properties?.logoUrl || undefined,
237+
platform: entity?.dataPlatformInstance?.platform,
236238
container: entity?.container,
237239
// health: entity?.health || undefined,
238240
};

datahub-web-react/src/graphql/dataProcessInstance.graphql

-6
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ fragment processInstanceRelationshipResults on EntityRelationshipsResult {
6767
fragment dataProcessInstanceFields on DataProcessInstance {
6868
urn
6969
type
70-
platform {
71-
...platformFields
72-
}
7370
parentContainers {
7471
...parentContainersFields
7572
}
@@ -125,9 +122,6 @@ query getDataProcessInstance($urn: String!) {
125122
dataProcessInstance(urn: $urn) {
126123
urn
127124
type
128-
platform {
129-
...platformFields
130-
}
131125
parentContainers {
132126
...parentContainersFields
133127
}

docs/how/updating-datahub.md

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ This file documents any backwards-incompatible changes in DataHub and assists pe
2020

2121
### Breaking Changes
2222

23+
- #12408: The `platform` field in the DataPlatformInstance GraphQL type is removed. Clients need to retrieve the platform via the optional `dataPlatformInstance` field.
24+
2325
### Potential Downtime
2426

2527
### Deprecations

smoke-test/tests/data_process_instance/test_data_process_instance.py

-7
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,6 @@ def test_search_dpi(auth_session, ingest_cleanup_data):
210210
name
211211
}
212212
}
213-
platform {
214-
urn
215-
name
216-
properties {
217-
type
218-
}
219-
}
220213
subTypes {
221214
typeNames
222215
}

0 commit comments

Comments
 (0)