Merge pull request #8404 from mandy-chessell/oak2024

fixes to content packs
odpi · Sep 27, 2024 · 94d85a7 · 94d85a7
2 parents 78e776a + b03b97f
commit 94d85a7
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 10 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
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/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.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/...ain/java/org/odpi/openmetadata/archiveutilities/openconnectors/RequestTypeDefinition.java b/...ain/java/org/odpi/openmetadata/archiveutilities/openconnectors/RequestTypeDefinition.java
@@ -414,6 +414,19 @@ public enum RequestTypeDefinition
                      null,
                      ContentPackDefinition.UNITY_CATALOG_CONTENT_PACK),
 
+    /**
+     * create-databricks-unity-catalog-server
+     */
+    CREATE_DB_UC_SERVER("create-databricks-unity-catalog-server",
+                     null,
+                     getCreateServerRequestParameters(SoftwareServerTemplateDefinition.DATABRICKS_UC_SERVER_TEMPLATE.getTemplateGUID()),
+                     null,
+                     GovernanceEngineDefinition.UNITY_CATALOG_GOVERNANCE_ENGINE,
+                     GovernanceServiceDefinition.CREATE_SERVER,
+                     "323d8a5c-4f79-4bc0-a35a-0c39d1990a9e",
+                     null,
+                     ContentPackDefinition.UNITY_CATALOG_CONTENT_PACK),
+
     /**
      * catalog-unity-catalog-server
      */

diff --git a/.../odpi/openmetadata/archiveutilities/openconnectors/base/ContentPackBaseArchiveWriter.java b/.../odpi/openmetadata/archiveutilities/openconnectors/base/ContentPackBaseArchiveWriter.java
@@ -1551,7 +1551,7 @@ protected void createAndSurveyServerGovernanceActionProcess(String
 
         if (step2GUID != null)
         {
-            addStepExecutor(step1GUID, surveyRequestType, surveyEngineDefinition);
+            addStepExecutor(step2GUID, surveyRequestType, surveyEngineDefinition);
 
             archiveHelper.addNextGovernanceActionProcessStep(step1GUID, CreateServerGuard.SET_UP_COMPLETE.getName(), false, step2GUID);
         }

diff --git a/...nmetadata/archiveutilities/openconnectors/unitycatalog/UnityCatalogPackArchiveWriter.java b/...nmetadata/archiveutilities/openconnectors/unitycatalog/UnityCatalogPackArchiveWriter.java
@@ -105,7 +105,7 @@ public void getArchiveContent()
         super.createRequestTypes(ContentPackDefinition.UNITY_CATALOG_CONTENT_PACK);
 
         /*
-         * Create a sample process
+         * Create Processes for working with Unity Catalog
          */
         this.createAndSurveyServerGovernanceActionProcess("UnityCatalogServer",
                                                           UnityCatalogDeployedImplementationType.OSS_UNITY_CATALOG_SERVER.getDeployedImplementationType(),
@@ -120,6 +120,19 @@ public void getArchiveContent()
                                                            RequestTypeDefinition.CATALOG_UC_SERVER,
                                                            GovernanceEngineDefinition.UNITY_CATALOG_GOVERNANCE_ENGINE);
 
+        this.createAndSurveyServerGovernanceActionProcess("DatabricksUnityCatalogServer",
+                                                          UnityCatalogDeployedImplementationType.DB_UNITY_CATALOG_SERVER.getDeployedImplementationType(),
+                                                          RequestTypeDefinition.CREATE_DB_UC_SERVER,
+                                                          GovernanceEngineDefinition.UNITY_CATALOG_GOVERNANCE_ENGINE,
+                                                          RequestTypeDefinition.SURVEY_UC_SERVER,
+                                                          GovernanceEngineDefinition.UNITY_CATALOG_SURVEY_ENGINE);
+        this.createAndCatalogServerGovernanceActionProcess("DatabricksUnityCatalogServer",
+                                                           UnityCatalogDeployedImplementationType.DB_UNITY_CATALOG_SERVER.getDeployedImplementationType(),
+                                                           RequestTypeDefinition.CREATE_DB_UC_SERVER,
+                                                           GovernanceEngineDefinition.UNITY_CATALOG_GOVERNANCE_ENGINE,
+                                                           RequestTypeDefinition.CATALOG_UC_SERVER,
+                                                           GovernanceEngineDefinition.UNITY_CATALOG_GOVERNANCE_ENGINE);
+
         /*
          * Saving the GUIDs means tha the guids in the archive are stable between runs of the archive writer.
          */