Fix deployment

- Adds gitlab-ci.yml
- Rename helm chart folder
- Update bintray repository path

build.gradle

@@ -33,7 +33,7 @@ ext {
 
 dependencies {
     implementation 'org.memobase:memobase-service-utilities:1.4.0'
-    implementation 'org.memobase:fedora-client:0.1.2'
+    implementation 'org.memobase:fedora-client:0.3.0'
 
     // Logging Framework
     implementation "org.apache.logging.log4j:log4j-api:${log4jV}"

gitlab-ci.yml

+variables:
+  DOCKER_TLS_CERTDIR: ""
+
+stages:
+  - test
+  - publish
+
+test:
+  stage: test
+  image: gradle:6.3-jdk8
+  tags:
+    - mbr
+  script:
+    - gradle --no-daemon --no-scan --no-build-cache test --fail-fast --tests "org.memobase.Tests"
+
+
+.build-image:
+  stage: publish
+  image: docker:stable
+  services:
+    - docker:dind
+  script:
+    - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" "$REGISTRY"
+    - docker build --pull -t "$IMAGE_TAG" -f "$DOCKERFILE" .
+    - docker push "$IMAGE_TAG"
+    - docker logout
+
+build-tagged-image:
+  extends: .build-image
+  variables:
+    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
+    REGISTRY_USER: "$CI_REGISTRY_USER"
+    REGISTRY: "$CI_REGISTRY"
+    DOCKERFILE: "Dockerfile"
+  only:
+    - tags
+
+build-latest-image:
+  extends: .build-image
+  variables:
+    IMAGE_TAG: "$CI_REGISTRY_IMAGE:latest"
+    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
+    REGISTRY_USER: "$CI_REGISTRY_USER"
+    REGISTRY: "$CI_REGISTRY"
+    DOCKERFILE: "Dockerfile"
+  only:
+    - master
+
+build-feature-branch-image:
+  extends: .build-image
+  variables:
+    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
+    REGISTRY_USER: "$CI_REGISTRY_USER"
+    REGISTRY: "$CI_REGISTRY"
+    DOCKERFILE: "Dockerfile"
+  except:
+    - master
+    - tags
+
+test-chart:
+  stage: test
+  image: dtzar/helm-kubectl:3.2.0
+  tags:
+    - mbr
+  script:
+    - helm lint helm-charts/
+
+publish-chart:
+  stage: publish
+  image: dtzar/helm-kubectl:3.2.0
+  tags:
+    - mbr
+  script:
+    - export HELM_EXPERIMENTAL_OCI=1
+    - helm registry login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+    - ./insert_chart_versions.sh
+    - helm chart save helm-charts/ "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
+    - helm chart push "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
+    - helm registry logout "$CI_REGISTRY"
+  only:
+    - tags
\ No newline at end of file

insert_chart_versions.sh

 #!/usr/bin/env bash
 
 echo Creating release: $1
-sed -i "s/version: 0.0.0/version: $CI_COMMIT_TAG/g" ./chart/Chart.yaml
-sed -i "s/appVersion: 0.0.0/appVersion: $CI_COMMIT_TAG/g" ./chart/Chart.yaml
-sed -i "s/tag: \"latest\"/tag: $CI_COMMIT_TAG/g" ./chart/values.yaml
\ No newline at end of file
+sed -i "s/version: 0.0.0/version: $CI_COMMIT_TAG/g" ./helm-charts/Chart.yaml
+sed -i "s/appVersion: 0.0.0/appVersion: $CI_COMMIT_TAG/g" ./helm-charts/Chart.yaml
+sed -i "s/tag: \"latest\"/tag: $CI_COMMIT_TAG/g" ./helm-charts/values.yaml
\ No newline at end of file

src/main/kotlin/KafkaTopology.kt

@@ -33,6 +33,7 @@ import org.apache.kafka.streams.Topology
 import org.apache.kafka.streams.kstream.Predicate
 import org.apache.logging.log4j.LogManager
 import org.memobase.fedora.FedoraClientImpl
+import org.memobase.fedora.RdfResponseTypes
 import org.memobase.model.EventMessage
 import org.memobase.rdf.*
 import org.memobase.settings.SettingsLoader
@@ -98,7 +99,7 @@ class KafkaTopology(
     }
 
     private fun requestPrimaryResource(message: EventMessage): Pair<EventMessage, String> {
-        return Pair(message, fedora.fetchRdfResourceIntoString(URI.create(message.objectPath), "text/plain"))
+        return Pair(message, fedora.fetchRdfResourceIntoString(URI.create(message.objectPath), RdfResponseTypes.NTRIPLES))
     }
 
     private fun parseModel(input: Pair<EventMessage, String>): Pair<EventMessage, Model> {
@@ -142,7 +143,7 @@ class KafkaTopology(
             subject.listProperties(property).forEach {
                 if (it.`object`.isResource) {
                     val uri = it.`object`.asResource().uri
-                    val data = fedora.fetchRdfResourceIntoString(URI(uri), "text/plain")
+                    val data = fedora.fetchRdfResourceIntoString(URI(uri), RdfResponseTypes.NTRIPLES)
                     RDFDataMgr.read(model, data.byteInputStream(StandardCharsets.UTF_8), Lang.NT)
                 }
             }