Refactor, RDFJS, Caching, tests and config

.dockerignore

@@ -0,0 +1,8 @@
+node_modules
+test
+.git
+README.md
+hooks
+docs
+.editorconfig
+.openshift

.gitignore

@@ -1,5 +1,21 @@
 /node_modules
 /yarn.lock
 
+.DS_Store
+.clinic/
+coverage/
+
 /resources/*
 !/resources/.keep
+**/lib/**/*.js
+**/lib/**/*.js.map
+**/lib/**/*.d.ts
+**/test/**/*.js
+**/test/**/*.js.map
+**/test/**/*.d.ts
+**/main.js
+**/main.js.map
+**/main.d.ts
+**/validateConfig.js
+**/validateConfig.js.map
+**/validateConfig.d.ts

.openshift/Jenkinsfile

@@ -0,0 +1,187 @@
+pipeline {
+    agent {
+        kubernetes {
+            defaultContainer 'default'
+            yaml """\
+        apiVersion: v1
+        kind: Pod
+        metadata:
+          labels:
+            component: builder
+            lang: ${getBaseImageName()}
+            app: grasp
+        spec:
+          containers:
+          - name: default
+            image: ${getImageFromDockerfile()}
+            command:
+            - cat
+            tty: true
+          - name: oc
+            image: image-registry.openshift-image-registry.svc:5000/ci-cd/py:3.7
+            command:
+            - cat
+            tty: true
+            imagePullPolicy: Always
+        """.stripIndent()
+        }
+    }
+    options {
+        timeout(time: 45, unit: 'MINUTES')
+        disableConcurrentBuilds()
+    }
+    environment {
+        OC_PROJECT = 'metadata-mgm'
+        BASE_IMG = "${getImageFromDockerfile()}"
+        BASE_IMG_NAME = "${getBaseImageName()}"
+        OC_URL = 'https://c113-e.private.eu-de.containers.cloud.ibm.com:30227'
+        JIRA_URL = 'meemoo.atlassian.net'
+        APP_NAME = 'grasp'
+    }
+
+    stages {
+        stage('Calculate extra ENV vars') {
+            steps {
+                container('oc') {
+                    script {
+                        env.GIT_SHORT_COMMIT = sh(script: "printf \$(git rev-parse --short ${GIT_COMMIT})", returnStdout: true)
+                        env.IMAGE_TAG = sh(script: 'git describe --tags || echo latest', returnStdout: true)
+                        // The name used for the build config based on the image tag
+                        // Replace '.' with '_' as '.' is not allowed.
+                        env.BUILD_CONFIG_NAME = sh(script: 'echo "${IMAGE_TAG}" | sed -r "s/\\./\\-/g"', returnStdout: true)
+                    }
+                }
+            }
+        }
+        stage('Test code') {
+            steps {
+                sh 'make -f ./.openshift/Makefile test'
+            }
+        }
+        stage('Build code') {
+            when {
+                not {
+                    buildingTag()
+                }
+            }
+            steps {
+                container('oc') {
+                    script {
+                        sh '''#!/bin/bash
+                        oc project $OC_PROJECT
+                        oc import-image $BASE_IMG --confirm
+                        oc set image-lookup $BASE_IMG_NAME
+                        oc new-build -l ref=$BRANCH_NAME --strategy=docker --name $APP_NAME-$GIT_SHORT_COMMIT --to $APP_NAME:$GIT_SHORT_COMMIT --binary --context-dir="" || echo "Probably already exists, start new build"
+                        sleep 3
+                        oc annotate --overwrite buildconfig/$APP_NAME-$GIT_SHORT_COMMIT ref=$BRANCH_NAME shortcommit=$GIT_SHORT_COMMIT
+                        oc start-build $APP_NAME-$GIT_SHORT_COMMIT --from-dir=. --follow=true --wait=true
+                        '''
+                    }
+                }
+            }
+        }
+        stage('Deploy INT') {
+            when {
+                anyOf {
+                    changeRequest target: 'master'
+                    changeRequest target: 'main'
+                }
+            }
+            steps {
+                container('oc') {
+                    tagNewImage('int')
+                }
+            }
+            post {
+                always {
+                    script {
+                        env.BRANCH_NAME = env.CHANGE_BRANCH
+                    }
+                    jiraSendDeploymentInfo site: "${JIRA_URL}", environmentId: 'int', environmentName: 'int', environmentType: 'testing'
+                }
+            }
+        }
+        stage('Deploy QAS') {
+            when {
+                anyOf { branch 'master'; branch 'main' }
+            }
+            steps {
+                container('oc') {
+                    tagNewImage('qas')
+                }
+            }
+            post {
+                always {
+                    jiraSendDeploymentInfo site: "${JIRA_URL}", environmentId: 'qas', environmentName: 'qas', environmentType: 'staging'
+                }
+            }
+        }
+        stage('Deploy PRD') {
+            when {
+                buildingTag()
+            }
+            steps {
+                container('oc') {
+                    tagNewImage('prd')
+                }
+            }
+        }
+    }
+    post {
+        success {
+            script {
+                if (env.BRANCH_NAME.startsWith('PR')) {
+                    setGitHubBuildStatus('Build', 'SUCCESS')
+                }
+            }
+        }
+        failure {
+            script {
+                if (env.BRANCH_NAME.startsWith('PR')) {
+                    setGitHubBuildStatus('Build', 'FAILURE')
+                }
+            }
+        }
+        always {
+            jiraSendBuildInfo site: "${JIRA_URL}"
+            container('default') {
+                // Archive tets results
+                script {
+                    if (fileExists('./test/test_results.xml')) {
+                        junit 'test/test_results.xml'
+                    } else {
+                        echo 'No test results found'
+                    }
+                }
+            }
+        }
+    }
+}
+
+void getImageFromDockerfile() {
+    return 'node:18'
+}
+void getBaseImageName() {
+    return getImageFromDockerfile().split(':')[0]
+}
+
+void setGitHubBuildStatus(String message, String state) {
+    step([
+        $class: 'GitHubCommitStatusSetter',
+        reposSource: [$class: 'ManuallyEnteredRepositorySource', url: "${GIT_URL}"],
+        commitShaSource: [$class: 'ManuallyEnteredShaSource', sha: "${GIT_COMMIT}"],
+        errorHandlers: [[$class: 'ChangingBuildStatusErrorHandler', result: 'UNSTABLE']],
+        statusResultSource: [ $class: 'ConditionalStatusResultSource', results: [[$class: 'AnyBuildResult', message: message, state: state]] ]
+    ])
+}
+
+
+void tagNewImage(String environment) {
+    echo "Deploying to ${environment}"
+    sh """#!/bin/bash
+    oc project $OC_PROJECT
+    oc tag $APP_NAME:$GIT_SHORT_COMMIT $APP_NAME:${environment}
+    # Check the status of the rollout
+    oc rollout status deployment/$APP_NAME-${environment} --watch=true --timeout=10m
+    """
+}

.openshift/Makefile

@@ -0,0 +1,11 @@
+.ONESHELL:
+SHELL = /bin/bash
+
+.PHONY: all test
+
+test:
+	npm install
+	npm run build
+	npm run test
+	mv junit.xml test/test_results.xml
+

.openshift/README.md

@@ -0,0 +1,7 @@
+# the org api files 
+- mounted in the pod via configmap and created by Jenkins 
+## git clone https://github.com/viaacode/datamodels.git
+- cd datamodels/
+- oc project metadata-mgm
+- cd graphql/organizations-api/
+- oc create configmap --from-file=. organizations-api-${env}

.openshift/grasp-multibranch-pipeline.xml

@@ -0,0 +1,94 @@
+<?xml version='1.1' encoding='UTF-8'?>
+<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch">
+    <actions/>
+    <description>Job for grasp</description>
+    <properties>
+        <org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig plugin="docker-workflow">
+            <dockerLabel></dockerLabel>
+            <registry plugin="docker-commons"/>
+        </org.jenkinsci.plugins.docker.workflow.declarative.FolderConfig>
+        <org.csanchez.jenkins.plugins.kubernetes.KubernetesFolderProperty plugin="kubernetes">
+            <permittedClouds/>
+        </org.csanchez.jenkins.plugins.kubernetes.KubernetesFolderProperty>
+    </properties>
+    <folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api">
+        <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+    </folderViews>
+    <healthMetrics>
+        <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder">
+            <nonRecursive>false</nonRecursive>
+        </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+    </healthMetrics>
+    <icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api">
+        <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+    </icon>
+    <orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder">
+        <pruneDeadBranches>true</pruneDeadBranches>
+        <daysToKeep>-1</daysToKeep>
+        <numToKeep>-1</numToKeep>
+    </orphanedItemStrategy>
+    <triggers/>
+    <disabled>false</disabled>
+    <sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">
+        <data>
+            <jenkins.branch.BranchSource>
+                <source class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source">
+                    <id>0191c2de-dc62-45db-922f-a348f8931e32</id>
+                    <apiUri>https://api.github.com</apiUri>
+                    <credentialsId>meemoo-ci</credentialsId>
+                    <repoOwner>viaacode</repoOwner>
+                    <repository>grasp</repository>
+                    <repositoryUrl>https://github.com/viaacode/grasp</repositoryUrl>
+                    <traits>
+                        <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
+                            <strategyId>3</strategyId>
+                        </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
+                        <org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
+                            <strategyId>2</strategyId>
+                        </org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
+                        <org.jenkinsci.plugins.github__branch__source.TagDiscoveryTrait/>
+                        <jenkins.scm.impl.trait.WildcardSCMHeadFilterTrait plugin="scm-api">
+                            <includes>main v*.*.* PR*</includes>
+                            <excludes></excludes>
+                        </jenkins.scm.impl.trait.WildcardSCMHeadFilterTrait>
+                    </traits>
+                </source>
+                <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
+                    <properties class="empty-list"/>
+                </strategy>
+                <buildStrategies>
+                    <jenkins.branch.buildstrategies.basic.AllBranchBuildStrategyImpl plugin="basic-branch-build-strategies">
+                        <strategies>
+                            <jenkins.branch.buildstrategies.basic.SkipInitialBuildOnFirstBranchIndexing/>
+                            <jenkins.branch.buildstrategies.basic.AnyBranchBuildStrategyImpl>
+                                <strategies>
+                                    <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl>
+                                        <filters>
+                                            <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl_-ExactNameFilter>
+                                                <name>main</name>
+                                                <caseSensitive>false</caseSensitive>
+                                            </jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl_-ExactNameFilter>
+                                        </filters>
+                                    </jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl>
+                                    <jenkins.branch.buildstrategies.basic.TagBuildStrategyImpl>
+                                        <atLeastMillis>-1</atLeastMillis>
+                                        <atMostMillis>172800000</atMostMillis>
+                                    </jenkins.branch.buildstrategies.basic.TagBuildStrategyImpl>
+                                    <jenkins.branch.buildstrategies.basic.ChangeRequestBuildStrategyImpl>
+                                        <ignoreTargetOnlyChanges>true</ignoreTargetOnlyChanges>
+                                        <ignoreUntrustedChanges>false</ignoreUntrustedChanges>
+                                    </jenkins.branch.buildstrategies.basic.ChangeRequestBuildStrategyImpl>
+                                </strategies>
+                            </jenkins.branch.buildstrategies.basic.AnyBranchBuildStrategyImpl>
+                        </strategies>
+                    </jenkins.branch.buildstrategies.basic.AllBranchBuildStrategyImpl>
+                </buildStrategies>
+            </jenkins.branch.BranchSource>
+        </data>
+        <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+    </sources>
+    <factory class="org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory">
+        <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+        <scriptPath>openshift/Jenkinsfile</scriptPath>
+    </factory>
+</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject>