Merge pull request #8576 from mandy-chessell/oak2025

Add specifications to governance action processes
odpi · Jan 13, 2025 · 6aa4d3c · 6aa4d3c
2 parents 2a1d298 + 56fa898
commit 6aa4d3c
Show file tree

Hide file tree

Showing 247 changed files with 3,176 additions and 31,342 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/codeql-v4.yml b/codeql-v4.yml
diff --git a/content-packs/APIsContentPack.omarchive b/content-packs/APIsContentPack.omarchive
diff --git a/content-packs/ApacheAtlasContentPack.omarchive b/content-packs/ApacheAtlasContentPack.omarchive
diff --git a/content-packs/ApacheKafkaContentPack.omarchive b/content-packs/ApacheKafkaContentPack.omarchive
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.omarchive
diff --git a/content-packs/OpenMetadataTypes.omarchive b/content-packs/OpenMetadataTypes.omarchive
diff --git a/content-packs/PostgresContentPack.omarchive b/content-packs/PostgresContentPack.omarchive
diff --git a/content-packs/UnityCatalogContentPack.omarchive b/content-packs/UnityCatalogContentPack.omarchive
diff --git a/open-metadata-distribution/omag-server-platform/build.gradle b/open-metadata-distribution/omag-server-platform/build.gradle
@@ -66,7 +66,6 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:data-manager:data-manager-client')
     implementation project(':open-metadata-implementation:access-services:digital-architecture:digital-architecture-client')
     implementation project(':open-metadata-implementation:access-services:digital-service:digital-service-client')
-    implementation project(':open-metadata-implementation:access-services:governance-engine:governance-engine-client')
     implementation project(':open-metadata-implementation:access-services:governance-server:governance-server-client')
     implementation project(':open-metadata-implementation:access-services:governance-program:governance-program-client')
     implementation project(':open-metadata-implementation:access-services:project-management:project-management-client')

diff --git a/...java/org/odpi/openmetadata/accessservices/assetmanager/client/AssetManagerBaseClient.java b/...java/org/odpi/openmetadata/accessservices/assetmanager/client/AssetManagerBaseClient.java
@@ -359,6 +359,7 @@ protected UpdateRequestBody getUpdateRequestBody(String assetManagerGUID,
      * @param assetManagerName unique name of software server capability representing the caller
      * @param externalIdentifier unique identifier of the element in the external asset manager
      * @param externalIdentifierName name of property for the external identifier in the external asset manager
+     * @param externalIdentifierTypeName the type of element described by this external identifier in the external asset manager
      * @param externalIdentifierUsage optional usage description for the external identifier when calling the external asset manager
      * @param externalIdentifierSource component that issuing this request.
      * @param externalIdentifierKeyPattern pattern for the external identifier within the external asset manager (default is LOCAL_KEY)
@@ -370,6 +371,7 @@ protected UpdateRequestBody getUpdateRequestBody(String assetManagerGUID,
     protected MetadataCorrelationProperties getCorrelationProperties(String              assetManagerGUID,
                                                                      String              assetManagerName,
                                                                      String              externalIdentifier,
+                                                                     String              externalIdentifierTypeName,
                                                                      String              externalIdentifierName,
                                                                      String              externalIdentifierUsage,
                                                                      String              externalIdentifierSource,
@@ -389,6 +391,7 @@ protected MetadataCorrelationProperties getCorrelationProperties(String
                 correlationProperties.setKeyPattern(KeyPattern.LOCAL_KEY);
                 correlationProperties.setExternalIdentifier(externalIdentifier);
                 correlationProperties.setExternalIdentifierName(externalIdentifierName);
+                correlationProperties.setExternalInstanceTypeName(externalIdentifierTypeName);
                 correlationProperties.setExternalIdentifierUsage(externalIdentifierUsage);
                 correlationProperties.setExternalIdentifierSource(externalIdentifierSource);
                 correlationProperties.setKeyPattern(externalIdentifierKeyPattern);

diff --git a/...odpi/openmetadata/accessservices/assetmanager/converters/ExternalIdentifierConverter.java b/...odpi/openmetadata/accessservices/assetmanager/converters/ExternalIdentifierConverter.java
@@ -120,6 +120,7 @@ public B getNewComplexBean(Class<B>           beanClass,
                     InstanceProperties instanceProperties = new InstanceProperties(primaryEntity.getProperties());
 
                     bean.setExternalIdentifier(this.removeIdentifier(instanceProperties));
+                    bean.setExternalInstanceTypeName(this.removeIdentifierTypeName(instanceProperties));
                     bean.setKeyPattern(this.removeKeyPattern(instanceProperties));
                     bean.setExternalInstanceCreatedBy(this.removeExternalInstanceCreatedBy(instanceProperties));
                     bean.setExternalInstanceCreationTime(this.removeExternalInstanceCreationTime(instanceProperties));

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ExchangeHandlerBase.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ExchangeHandlerBase.java
@@ -311,6 +311,7 @@ void createExternalIdentifier(String                        userId,
                                                                   correlationProperties.getExternalIdentifierUsage(),
                                                                   correlationProperties.getExternalIdentifierSource(),
                                                                   correlationProperties.getMappingProperties(),
+                                                                  correlationProperties.getExternalInstanceTypeName(),
                                                                   correlationProperties.getExternalInstanceCreatedBy(),
                                                                   correlationProperties.getExternalInstanceCreationTime(),
                                                                   correlationProperties.getExternalInstanceLastUpdatedBy(),

diff --git a/...adata-implementation/access-services/governance-engine/Egeria-governance-engine-omas.http b/...adata-implementation/access-services/governance-engine/Egeria-governance-engine-omas.http