Merge branch 'main' into dependabot/gradle/nettyVersion-4.1.111.Final

odpi · Jun 15, 2024 · 2ee6201 · 2ee6201
2 parents 608b325 + 8f51205
commit 2ee6201
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 14 deletions.
diff --git a/.github/workflows/merge-v5.yml b/.github/workflows/merge-v5.yml
@@ -84,25 +84,26 @@ jobs:
       - name: Set Release version env variable
         run: |
           echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
-      # Publish container images(egeria) to quay.io and docker.io
+      # Publish container images(egeria-platform) to quay.io and docker.io
       - name: Copy the distribution content to be used in docker copy command
         run: |
           cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
           cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
       - name: Build and push(egeria) to quay.io and docker.io (tag latest only for main!)
         if: ${{ github.ref == 'refs/heads/main'}}
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:latest, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:latest
+          tags: odpi/egeria-platform:${{ env.VERSION }}, odpi/egeria-platform:latest, quay.io/odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:latest
           context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
           platforms: linux/amd64,linux/arm64
-      - name: Build and push(egeria) to quay.io and docker.io (no tag latest)
+      - name: Build and push(egeria-platform) to quay.io and docker.io (no tag latest)
         if: ${{ github.ref != 'refs/heads/main'}}
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:${{ env.VERSION }}
+          tags: odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:${{ env.VERSION }}
           context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
           platforms: linux/amd64,linux/arm64
       # Publish container images(egeria-configure) to quay.io and docker.io

diff --git a/.github/workflows/release-v5.yml b/.github/workflows/release-v5.yml
@@ -66,16 +66,17 @@ jobs:
       - name: Set Release version env variable
         run: |
           echo "VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
-      # Publish container images(egeria) to quay.io and docker.io
+      # Publish container images(egeria-platform) to quay.io and docker.io
       - name: Copy the distribution content to be used in docker copy command
         run: |
           cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          mkdir -p ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-5.0-distribution.tar.gz/assembly/platform/data/servers
           cp -r ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/opt/sample-configs/*-* ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/data/servers
-      - name: Build and push(egeria) to quay.io and docker.io
+      - name: Build and push(egeria-platform) to quay.io and docker.io
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: odpi/egeria:${{ env.VERSION }}, odpi/egeria:stable, quay.io/odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria:stable
+          tags: odpi/egeria-platform:${{ env.VERSION }}, odpi/egeria-platform:stable, quay.io/odpi/egeria-platform:${{ env.VERSION }}, quay.io/odpi/egeria-platform:stable
           context: ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz
           platforms: linux/amd64,linux/arm64
       # Publish container images(egeria-configure) to quay.io and docker.io

diff --git a/.../odpi/openmetadata/adminservices/configuration/registration/AccessServiceDescription.java b/.../odpi/openmetadata/adminservices/configuration/registration/AccessServiceDescription.java
@@ -28,7 +28,7 @@ public enum AccessServiceDescription implements Serializable
      * Publish asset lineage.
      */
     ASSET_LINEAGE_OMAS               (203,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
                                       "Asset Lineage",
                                       "Asset Lineage OMAS",
                                       "asset-lineage",
@@ -106,7 +106,7 @@ public enum AccessServiceDescription implements Serializable
      * Exchange process models and lineage with a data engine.
      */
     DATA_ENGINE_OMAS                 (209,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.DEPRECATED,
                                       "Data Engine",
                                       "Data Engine OMAS",
                                       "data-engine",
@@ -158,7 +158,7 @@ public enum AccessServiceDescription implements Serializable
      * Design of the digital services for an organization.
      */
     DIGITAL_ARCHITECTURE_OMAS        (215,
-                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
+                                      ComponentDevelopmentStatus.STABLE,
                                       "Digital Architecture",
                                       "Digital Architecture OMAS",
                                       "digital-architecture",
@@ -223,7 +223,7 @@ public enum AccessServiceDescription implements Serializable
      * Manage the governance program.
      */
     GOVERNANCE_PROGRAM_OMAS          (220,
-                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
+                                      ComponentDevelopmentStatus.STABLE,
                                       "Governance Program",
                                       "Governance Program OMAS",
                                       "governance-program",
@@ -236,7 +236,7 @@ public enum AccessServiceDescription implements Serializable
      * Manage governance related projects.
      */
     PROJECT_MANAGEMENT_OMAS          (221,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
                                       "Project Management",
                                       "Project Management OMAS",
                                       "project-management",

diff --git a/.../openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java b/.../openmetadata/adminservices/configuration/registration/GovernanceServicesDescription.java
@@ -13,7 +13,7 @@ public enum GovernanceServicesDescription
      * Store and query asset lineage.
      */
     LINEAGE_WAREHOUSE_SERVICES(190,
-                               ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                               ComponentDevelopmentStatus.TECHNICAL_PREVIEW,
                                "Lineage Warehouse Services",
                                "lineage-warehouse",
                                "Store and query asset lineage",
@@ -39,7 +39,7 @@ public enum GovernanceServicesDescription
      * Integrate Data Engines that are not self-capable of integrating directly with the Data Engine OMAS.
      */
     DATA_ENGINE_PROXY_SERVICES       (192,
-                                      ComponentDevelopmentStatus.IN_DEVELOPMENT,
+                                      ComponentDevelopmentStatus.DEPRECATED,
                                       "Data Engine Proxy Services",
                                       "data-engine-proxy",
                                       "Integrate Data Engines that are not self-capable of integrating directly with the Data Engine OMAS.",

diff --git a/...a/org/odpi/openmetadata/viewservices/assetcatalog/server/spring/AssetCatalogResource.java b/...a/org/odpi/openmetadata/viewservices/assetcatalog/server/spring/AssetCatalogResource.java
@@ -9,6 +9,7 @@
 import org.odpi.openmetadata.accessservices.assetconsumer.rest.AssetSearchMatchesListResponse;
 import org.odpi.openmetadata.commonservices.ffdc.rest.FilterRequestBody;
 import org.odpi.openmetadata.frameworkservices.ocf.metadatamanagement.rest.AssetsResponse;
+import org.odpi.openmetadata.viewservices.assetcatalog.rest.AssetCatalogSupportedTypes;
 import org.odpi.openmetadata.viewservices.assetcatalog.server.AssetCatalogRESTServices;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,6 +39,28 @@ public AssetCatalogResource()
     }
 
 
+    /**
+     * Return the subtypes for asset.
+     *
+     * @param serverName name of the server to route the request to
+     * @return the supported types from Asset Consumer OMAS or
+     *  PropertyServerException if a configuration on the backend
+     *  InvalidParameterException if parameter validation fails
+     *  UserNotAuthorizedException security access problem
+     */
+    @GetMapping( path = "/assets/types")
+
+    @Operation(summary="getAssetTypes",
+            description="Return the subtypes for asset.",
+            externalDocs=@ExternalDocumentation(description="Assets",
+                    url="https://egeria-project.org/concepts/asset/"))
+
+    public AssetCatalogSupportedTypes getAssetTypes(@PathVariable String serverName)
+    {
+        return restAPI.getSupportedTypes(serverName);
+    }
+
+
     /**
      * Return all the elements that are anchored to an asset plus relationships between these elements and to other elements.
      *