Fix docker container

Signed-off-by: Mandy Chessell <mandy.e.chessell@gmail.com>
odpi · Jun 11, 2024 · a35c8b9 · a35c8b9
1 parent 83ae34b
commit a35c8b9
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 128 deletions.
diff --git a/.github/workflows/merge-v5.yml b/.github/workflows/merge-v5.yml
@@ -87,8 +87,8 @@ jobs:
       # Publish container images(egeria) to quay.io and docker.io
       - name: Copy the distribution content to be used in docker copy command
         run: |
-          cp -f release.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
-          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
+          cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          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

diff --git a/.github/workflows/release-v5.yml b/.github/workflows/release-v5.yml
@@ -69,8 +69,8 @@ jobs:
       # Publish container images(egeria) to quay.io and docker.io
       - name: Copy the distribution content to be used in docker copy command
         run: |
-          cp -f release.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
-          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
+          cp -f container.application.properties ./open-metadata-distribution/omag-server-platform/build/unpacked/egeria-platform-${{ env.VERSION }}-distribution.tar.gz/assembly/platform/application.properties
+          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
         uses: docker/build-push-action@v5
         with:

diff --git a/application.properties b/application.properties
@@ -59,7 +59,8 @@ server.port=9443
 ################################################
 platform.placeholder.variables=\
   {\
-    "kafkaEndpoint" : "localhost:9092"\
+    "kafkaEndpoint" : "localhost:9092",\
+    "egeriaEndpoint" : "https://localhost:9443"\
   }
 
 ################################################

diff --git a/release.application.properties → container.application.properties b/release.application.properties → container.application.properties
@@ -59,7 +59,8 @@ platform.security.name=Coco Pharmaceuticals Platform
 ################################################
 platform.placeholder.variables=\
   {\
-    "kafkaEndpoint" : "localhost:9092"\
+    "kafkaEndpoint" : "host.docker.internal:9092",\
+    "egeriaEndpoint" : "https://host.docker.internal:9443"\
   }
 
 ################################################
@@ -88,7 +89,7 @@ server.ssl.trust-store-password=egeria
 # certificates from the servers it is calling.
 # Alternate you can import self-signed certificates into java truststore or set up a truststore only for this app
 # by adding the store into server.ssl.trust-store parameter
-strict.ssl=true
+strict.ssl=false
 
 
 ################################################

diff --git a/open-metadata-distribution/omag-server-platform/build.gradle b/open-metadata-distribution/omag-server-platform/build.gradle
@@ -40,7 +40,6 @@ dependencies {
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors')
-    //implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:elasticsearch-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:file-survey-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:report-generating-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:dynamic-archiver-connectors')
@@ -55,12 +54,10 @@ dependencies {
     implementation project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-kafka-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:system-connectors:postgres-server-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector')
-//    implementation project(':open-metadata-implementation:access-services:asset-catalog:asset-catalog-client')
     implementation project(':open-metadata-implementation:access-services:asset-consumer:asset-consumer-client')
     implementation project(':open-metadata-implementation:access-services:asset-lineage:asset-lineage-client')
     implementation project(':open-metadata-implementation:access-services:asset-manager:asset-manager-client')
     implementation project(':open-metadata-implementation:access-services:asset-owner:asset-owner-client')
-//    implementation project(':open-metadata-implementation:access-services:data-engine:data-engine-client')
     implementation project(':open-metadata-implementation:access-services:it-infrastructure:it-infrastructure-client')
     implementation project(':open-metadata-implementation:access-services:data-manager:data-manager-client')
     implementation project(':open-metadata-implementation:access-services:digital-architecture:digital-architecture-client')
@@ -71,7 +68,6 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:project-management:project-management-client')
     implementation project(':open-metadata-implementation:access-services:security-manager:security-manager-client')
     implementation project(':open-metadata-implementation:access-services:software-developer:software-developer-client')
-//    implementation project(':open-metadata-implementation:access-services:subject-area:subject-area-client')
     implementation project(':open-metadata-implementation:engine-services:repository-governance:repository-governance-client')
     implementation project(':open-metadata-implementation:engine-services:survey-action:survey-action-client')
     implementation project(':open-metadata-implementation:engine-services:governance-action:governance-action-client')
@@ -85,12 +81,10 @@ dependencies {
     implementation project(':open-metadata-implementation:integration-services:organization-integrator:organization-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:security-integrator:security-integrator-client')
     implementation project(':open-metadata-implementation:integration-services:topic-integrator:topic-integrator-client')
-//    implementation project(':open-metadata-implementation:integration-services:search-integrator:search-integrator-client')
     implementation project(':open-metadata-implementation:governance-server-services:engine-host-services:engine-host-services-client')
     implementation project(':open-metadata-implementation:governance-server-services:integration-daemon-services:integration-daemon-services-client')
     implementation project(':open-metadata-implementation:governance-server-services:lineage-warehouse-services:lineage-warehouse-services-client')
     implementation project(':open-metadata-implementation:admin-services:admin-services-client')
-//    implementation project(':open-metadata-implementation:user-interfaces:ui-chassis:ui-chassis-spring')
     implementation project(':open-metadata-conformance-suite:open-metadata-conformance-suite-client')
     implementation project(':open-metadata-resources:open-metadata-samples:admin-services-samples:config-metadata-server-sample')
     implementation project(':open-metadata-resources:open-metadata-archives:open-metadata-types-utility')
@@ -108,7 +102,6 @@ dependencies {
     implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:governance-program-client-samples:governance-leadership-sample')
     implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:governance-program-client-samples:governance-subject-area-sample')
     implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:governance-program-client-samples:governance-zone-create-sample')
-//    implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:subject-area-client-samples:subject-area-categories-sample')
 }
 
 distributions {
@@ -212,7 +205,6 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors').jar }
-                //from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:elasticsearch-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:inmemory-open-metadata-topic-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:kafka-open-metadata-topic-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:lineage-warehouse-connectors:lineage-warehouse-janus-connector').jar }
@@ -286,6 +278,7 @@ distributions {
                 from(rootProject.projectDir) {
                     include 'content-packs/CoreContentPack.omarchive'
                     include 'content-packs/SimpleCatalog.omarchive'
+                    include 'content-packs/CocoComboArchive.omarchive'
                 }
                 fileMode = 0755
             }
@@ -324,7 +317,6 @@ distributions {
                 from { project(':open-metadata-resources:open-metadata-samples:access-services-samples:governance-program-client-samples:governance-leadership-sample').shadowJar }
                 from { project(':open-metadata-resources:open-metadata-samples:access-services-samples:governance-program-client-samples:governance-subject-area-sample').shadowJar }
                 from { project(':open-metadata-resources:open-metadata-samples:access-services-samples:governance-program-client-samples:governance-zone-create-sample').shadowJar }
-                //from { project(':open-metadata-resources:open-metadata-samples:access-services-samples:subject-area-client-samples:subject-area-categories-sample').shadowJar }
                 from { project(':open-metadata-resources:open-metadata-samples:access-services-samples:glossary-workflow-samples').shadowJar }
                 from { project(':open-metadata-resources:open-metadata-samples:admin-services-samples:config-metadata-server-sample').shadowJar }
                 rename { String fileName ->

diff --git a/...n/java/org/odpi/openmetadata/adminservices/configuration/properties/OMAGServerConfig.java b/...n/java/org/odpi/openmetadata/adminservices/configuration/properties/OMAGServerConfig.java
@@ -69,7 +69,7 @@ public class OMAGServerConfig extends AdminServicesConfigHeader
      */
     public  static final String  defaultLocalServerType                   = null;
     private static final String  defaultLocalOrganizationName             = null;
-    private static final String  defaultLocalServerURL                    = "https://localhost:9443";
+    private static final String  defaultLocalServerURL                    = "{{egeriaEndpoint}}";
     private static final String  defaultLocalServerUserId                 = "OMAGServer";
     public  static final int     defaultMaxPageSize                       = 1000;
 

diff --git a/open-metadata-implementation/platform-services/Egeria-platform-services.http b/open-metadata-implementation/platform-services/Egeria-platform-services.http
@@ -8,13 +8,13 @@ GET {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/server-pla
 ###
 # @name Get Platform Security Connection
 # Retrieve the Connection object used to create the connector that verifies the authorization of users calling the platform and admin services.
-GET {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/platform/security/connection
+GET {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/server-platform/security/connection
 
 ###
 # @name Set Platform Security Connection
 # Set up the connection for the platform security connector.  This connector verifies the authorization of any user calling the platform or admin services.  This call is preconfigured to set up the sample platform security connector.  This allows only the Coco Pharmaceuticals IT administrator, `garygeeke`, to issue platform calls.
 # Once you have set up this security connector in your OMAG Server Platform, the default user `me` in the `Egeria` environment will no longer be authorized to issue REST calls to the server (try some of the requests that were "working" earlier to verify this).  To switch the user to one that the OMAG Server Platform will accept, click on the eye symbol (top right), then click on `edit` and change the current value of `user` to `garygeeke`.
-POST {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/platform/security/connection
+POST {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/server-platform/security/connection
 Content-Type: application/json
 
 {
@@ -32,7 +32,7 @@ Content-Type: application/json
 ###
 # @name Delete Platform Security Connection
 # Remove the currently configured Platform Security Connection.  This means that no security checks will be performed by the OMAG Server Platform.
-DELETE {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/platform/security/connection
+DELETE {{baseURL}}/open-metadata/platform-services/users/{{adminUserId}}/server-platform/security/connection
 
 ###
 # @name Get registered access services

diff --git a/...g/odpi/openmetadata/viewservices/feedbackmanager/handler/CollaborationManagerHandler.java b/...g/odpi/openmetadata/viewservices/feedbackmanager/handler/CollaborationManagerHandler.java
@@ -16,6 +16,7 @@
 import org.odpi.openmetadata.frameworks.governanceaction.properties.RelatedMetadataElements;
 import org.odpi.openmetadata.frameworks.governanceaction.search.ElementProperties;
 import org.odpi.openmetadata.frameworks.governanceaction.search.PropertyHelper;
+import org.odpi.openmetadata.frameworks.governanceaction.search.SequencingOrder;
 import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating;
 import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty;
 import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
@@ -24,6 +25,7 @@
 import org.odpi.openmetadata.viewservices.feedbackmanager.properties.*;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -977,10 +979,37 @@ public List<InformalTagElement> getTagsByName(String userId,
                                                                           PropertyServerException,
                                                                           UserNotAuthorizedException
     {
+        final String methodName = "getTagsByName";
+        final String nameParameterName = "tag";
+
+        invalidParameterHandler.validateUserId(userId, methodName);
+        invalidParameterHandler.validateName(tag, nameParameterName, methodName);
+        invalidParameterHandler.validatePaging(startFrom, pageSize, methodName);
+
+        List<String> propertyNames = Arrays.asList(OpenMetadataProperty.QUALIFIED_NAME.name,
+                                                   OpenMetadataProperty.NAME.name);
+
+        List<OpenMetadataElement> openMetadataElements = client.findMetadataElements(userId,
+                                                                                     OpenMetadataType.COLLECTION.typeName,
+                                                                                     null,
+                                                                                     propertyHelper.getSearchPropertiesByName(propertyNames, tag),
+                                                                                     null,
+                                                                                     null,
+                                                                                     OpenMetadataProperty.QUALIFIED_NAME.name,
+                                                                                     SequencingOrder.PROPERTY_ASCENDING,
+                                                                                     false,
+                                                                                     false,
+                                                                                     new Date(),
+                                                                                     startFrom,
+                                                                                     pageSize);
+
+
         return null;
     }
 
 
+
+
     /**
      * Return the list of the calling user's private tags exactly matching the supplied name.
      *