feat: add binding to service provider for use in Groovy script

Add an additional binding for the Service Provider to Groovy scripts. ING-4265
halestudio · Apr 29, 2024 · 748937d · 748937d
1 parent 4ba10d0
commit 748937d
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 6 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Trivy vulnerability scanner
+
+on:
+  push:
+    branches: 
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+  #schedule:
+  #  - cron: '39 17 * * 3'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      #- name: Build an image from Dockerfile
+      #  run: |
+      #    docker build -t docker.io/my-organization/my-app:${{ github.sha }} .
+
+      - name: Run Trivy vulnerability scanner in fs mode
+        uses: aquasecurity/trivy-action@master
+        with:
+          # image-ref: 'docker.io/my-organization/my-app:${{ github.sha }}'
+          scan-type: 'fs'
+          scan-ref: '.'
+          #exit-code: '0'
+          #ignore-unfixed: true
+          format: 'sarif'
+          #vuln-type: 'os,library'
+          severity: 'CRITICAL,HIGH,MEDIUM'
+          #template: '/sarif.tpl'
+          output: 'trivy-results.sarif'
+          #skip-dirs: "ignored-dir"
+          #trivy-config: trivy.yaml
+
+      #- name: Upload Trivy scan results as artifact
+      #  uses: actions/upload-artifact@v2
+      #  with:
+      #    name: trivy-results
+      #    path: trivy-results.sarif
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-results.sarif'
+
+
+      #- name: Create Pull Request
+      #  uses: peter-evans/create-pull-request@v5
+      #  with:
+      #    commit-message: update vulnerability list
+      #    title: 'ci: Update vulnerability list'
+      #    body: Update the vulnerability list
+      #    branch: update-vulnerabilities
+      #    base: master
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Import-Package: com.google.common.base;version="9.0.0",
  eu.esdihumboldt.hale.common.instance.model,
  eu.esdihumboldt.hale.common.instance.model.impl,
  eu.esdihumboldt.hale.common.instance.orient;resolution:=optional,
- eu.esdihumboldt.hale.common.lookup,
  eu.esdihumboldt.hale.common.schema.geometry,
  eu.esdihumboldt.hale.common.schema.model,
  eu.esdihumboldt.hale.common.schema.model.constraint,

diff --git a/...mboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/GroovyConstants.java b/...mboldt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/GroovyConstants.java
@@ -70,9 +70,9 @@ public interface GroovyConstants {
 	public static final String BINDING_INSTANCE_INDEX = "_instanceIndex";
 
 	/**
-	 * Name of the lookup service in the binding.
+	 * Name of the service provider in the binding.
 	 */
-	public static final String BINDING_LOOKUP_SERVICE = "_lookup";
+	public static final String BINDING_SERVICE_PROVIDER = "_serviceProvider";
 
 	/**
 	 * Name of the helper functions accessor.

diff --git a/...dt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/internal/GroovyUtil.java b/...dt.cst.functions.groovy/src/eu/esdihumboldt/cst/functions/groovy/internal/GroovyUtil.java
@@ -43,11 +43,11 @@
 import eu.esdihumboldt.hale.common.core.io.Text;
 import eu.esdihumboldt.hale.common.core.io.project.ProjectInfoService;
 import eu.esdihumboldt.hale.common.core.report.SimpleLog;
+import eu.esdihumboldt.hale.common.core.service.ServiceProvider;
 import eu.esdihumboldt.hale.common.instance.groovy.InstanceBuilder;
 import eu.esdihumboldt.hale.common.instance.index.InstanceIndexService;
 import eu.esdihumboldt.hale.common.instance.index.spatial.SpatialIndexService;
 import eu.esdihumboldt.hale.common.instance.model.MutableInstance;
-import eu.esdihumboldt.hale.common.lookup.LookupService;
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
 import eu.esdihumboldt.hale.io.groovy.snippets.GroovySnippets;
 import eu.esdihumboldt.util.groovy.sandbox.GroovyService;
@@ -306,8 +306,8 @@ public static Binding createBinding(InstanceBuilder builder, Cell cell, Cell typ
 		binding.setVariable(BINDING_INSTANCE_INDEX,
 				executionContext.getService(InstanceIndexService.class));
 
-		binding.setVariable(BINDING_LOOKUP_SERVICE,
-				executionContext.getService(LookupService.class));
+		binding.setVariable(BINDING_SERVICE_PROVIDER,
+				executionContext.getService(ServiceProvider.class));
 
 		return binding;
 	}