From a52f241f2a7e2ca2a9f706b607258778ba4da37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn-Andre=20Skaar?=
 <31540110+bjornandre@users.noreply.github.com>
Date: Tue, 14 Nov 2023 12:23:57 +0100
Subject: [PATCH] Fixed repo config for Maven and add docker build  (#62)

* Configure cache directly in actions/setup-java
* Remove build config for Azure Pipelines and Cloud Build
* Fixed documentation since targetUri option and export endpoint is removed
* Set up docker build
---
 .github/workflows/build.yml                   |  66 ++++-
 Dockerfile                                    |   2 +-
 README.md                                     |  46 +--
 azure-pipelines.yml                           |  47 ---
 cloudbuild.yml                                |  21 --
 pom.xml                                       | 271 ++++++++++--------
 .../service/pseudo/PseudoController.java      |   8 +-
 7 files changed, 209 insertions(+), 252 deletions(-)
 delete mode 100644 azure-pipelines.yml
 delete mode 100644 cloudbuild.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 411675f..a757609 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,9 +4,22 @@ on:
   push:
     branches:
       - master
+    paths:
+      - src/**
+      - conf/**
+      - Dockerfile
   pull_request:
     branches:
       - master
+    paths:
+      - src/**
+      - conf/**
+      - Dockerfile
+
+env:
+  REGISTRY: europe-north1-docker.pkg.dev/artifact-registry-5n/dapla-pseudo-docker/ssb/dapla
+  IMAGE: dapla-dlp-pseudo-service
+  TAG: ${{ github.ref_name }}-${{ github.sha }}
 
 jobs:
   build:
@@ -23,6 +36,7 @@ jobs:
         with:
           java-version: 21
           distribution: zulu
+          cache: maven
 
       - name: Authenticate to Google Cloud
         id: auth
@@ -32,13 +46,51 @@ jobs:
           service_account: "gh-actions-dapla-pseudo@artifact-registry-5n.iam.gserviceaccount.com"
           token_format: access_token
 
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-
       - name: Build with Maven and deploy to Artifact Registry
         run: mvn --batch-mode -P ssb-bip deploy
 
+      - name: Clean up artifacts that are no longer needed
+        run: |
+          rm -f target/dapla-dlp-pseudo-service-*-sources.jar
+          rm -f target/dapla-dlp-pseudo-service-*-javadoc.jar
+          ls -al target/dapla-dlp-pseudo-service-*.jar
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Artifact Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: "oauth2accesstoken"
+          password: "${{ steps.auth.outputs.access_token }}"
+
+      - name: Docker meta
+        id: metadata
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE }}
+          # Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
+            type=raw,value=${{ env.TAG }}, enable=true
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v4
+        with:
+          file: Dockerfile
+          push: true
+          context: .
+          tags: |
+            ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index b7f125c..76b280f 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:17
+FROM azul/zulu-openjdk:21
 RUN apt-get -qq update && apt-get -y dist-upgrade && apt-get -y --no-install-recommends install curl
 COPY target/dapla-dlp-pseudo-service-*.jar dapla-dlp-pseudo-service.jar
 COPY target/classes/logback*.xml /conf/
diff --git a/README.md b/README.md
index 160dea3..f8f1985 100644
--- a/README.md
+++ b/README.md
@@ -11,49 +11,6 @@ Browse the API docs as:
 
 ## Examples
 
-### Export a dataset
-```sh
-curl "${root_url}/export" -i -H "Authorization: Bearer ${dapla_auth_token}" --data @export-request.json
-```
-Where `root_url` points to an instance of the pseudo-service, `dapla_auth_token` is a JWT token and
-`export-request.json` is a file containing the request. E.g:
-
-```json
-{
-  "sourceDataset": {
-    "root": "gs://ssb-dev-demo-enhjoern-a-data-produkt",
-    "path": "/path/to/data",
-    "version": "123"
-  },
-  "targetContentName": "test",
-  "targetContentType":  "application/json",
-  "targetPassword": "kensentme",
-  "depseudonymize": true,
-  "pseudoRules": [
-    {
-      "name": "kontonummer",
-      "pattern": "**/kontonummer",
-      "func": "fpe-anychar(secret1)"
-    }
-  ]
-}
-```
-
-This example exports all columns matching either `**/foedsel` or `**/kontonummer` from a dataset located in a GCS
-bucket at `gs://ssb-dev-demo-enhjoern-a-data-produkt/path/to/data/123`.
-Columns matching `**/kontonummer` will be depseudonymized using the function `fpe-anychar(secret1)` and then compressed,
-encrypted and uploaded (as json) to the preconfigured data export bucket (see config).      
-
-Note that the above will export all data. If you only need a subset of fields, you can specify this with column selector
-glob expressions, like so:
-```
-  "columnSelectors": [
-    "**/foedsel*",
-    "**/kontonummer"
-  ]
-```
-
-
 ### Pseudonymize JSON file and stream back the result 
 
 ```sh
@@ -94,13 +51,12 @@ curl "${root_url}/depseudonymize/file" \
 }'
 ```
 
-### Depseudonymize JSON file and upload to google cloud storage as zipped CSV-file
+### Depseudonymize JSON file and download a zipped CSV-file
 ```sh
 curl "${root_url}/depseudonymize/file" \
 --header "Authorization: Bearer ${dapla_auth_token}" \
 --form 'data=@src/test/resources/data/15k-pseudonymized.json' \
 --form 'request={
-  "targetUri": "gs://ssb-dev-demo-enhjoern-a-data-export/path/to/depseudonymized-csv.zip",
   "targetContentType": "text/csv",
   "pseudoConfig": {
     "rules": [
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 12553b3..0000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: $(Build.SourceBranch)-$(date:yyyyMMdd)$(rev:.r)
-# Pipeline triggers on any branch and tag
-trigger:
-  branches:
-    include:
-      - '*'
-  tags:
-    include:
-      - '*'
-
-resources:
-  repositories:
-    - repository: templates
-      type:       github
-      name:       statisticsnorway/azure-pipelines-templates
-      ref:        refs/heads/java-app-complete-build
-      endpoint:   statisticsnorway
-
-# Pipeline will be run on this base image
-pool:
-  vmImage: 'ubuntu-latest'
-
-# Variables global to this pipeline
-# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables
-variables:
-  # Variables defined in Pipelines->Library->Variable Groups in your project in
-  # Azure Pipelines
-  - group: Hemmeligheter
-  # Variables defined here
-  - name:  MAVEN_CACHE_FOLDER
-    value: $(Pipeline.Workspace)/.m2/repository
-  - name: MAVEN_OPTS
-    value: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
-
-
-# Job which will run mvn build, mvn install and Sonar Analysis (if branch is master)
-jobs:
-
-  - template: java/app-complete-build.yml@templates
-    parameters:
-      artifactName: dapla-dlp-pseudo-service
-      gcrNamespace: dapla
-      mavenContainer: maven:3.8-openjdk-17
-      checkStyleRunAnalysis: true
-      pmdRunAnalysis: true
-      sonarQubeRunAnalysis: false
-      sonarCloud: bipSonarCloud-Dapla
diff --git a/cloudbuild.yml b/cloudbuild.yml
deleted file mode 100644
index 7b453f5..0000000
--- a/cloudbuild.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-steps:
-
-  # Build jar file
-  - name: 'gcr.io/cloud-builders/mvn'
-    entrypoint: 'mvn'
-    args: ['package','-Dmaven.test.skip=true', '-P ssb-bip']
-
-  # Build Docker image
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-t', 
-           'europe-north1-docker.pkg.dev/artifact-registry-14da/ssb-docker/ssb/statistikktjenester/automation/dapla-dlp-pseudo', 
-           '.']
-    
-  # Push Docker image to the ssb-docker Artifact Registry
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['push', 
-           'europe-north1-docker.pkg.dev/artifact-registry-14da/ssb-docker/ssb/statistikktjenester/automation/dapla-dlp-pseudo']
-
-options:
-  logging: CLOUD_LOGGING_ONLY
diff --git a/pom.xml b/pom.xml
index 39eaa43..1be9710 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>no.ssb.dlp.pseudo.service</groupId>
+  <groupId>no.ssb.dapla.dlp.pseudo</groupId>
   <artifactId>dapla-dlp-pseudo-service</artifactId>
   <version>3.0.0-SNAPSHOT</version>
+  <name>dapla-dlp-pseudo-service</name>
 
   <parent>
     <groupId>io.micronaut</groupId>
@@ -17,18 +18,21 @@
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <artifact-registry.url>artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dapla-pseudo-maven/</artifact-registry.url>
+    <artifact-registry.url>artifactregistry://europe-north1-maven.pkg.dev/artifact-registry-5n/dapla-pseudo-maven</artifact-registry.url>
     <github.repository>statisticsnorway/dapla-dlp-pseudo-service</github.repository>
+    <exec.mainClass>no.ssb.dlp.pseudo.service.Application</exec.mainClass>
 
-    <artifactregistry-maven-wagon.version>2.1.4</artifactregistry-maven-wagon.version>
+    <artifactregistry-maven-wagon.version>2.2.1</artifactregistry-maven-wagon.version>
     <dapla-dlp-pseudo-core.version>2.0.0</dapla-dlp-pseudo-core.version>
     <micronaut.version>3.8.7</micronaut.version>
     <micronaut.openapi.version>4.6.0</micronaut.openapi.version>
     <micronaut-data.version>3.8.1</micronaut-data.version>
     <micronaut.object.storage.version>1.1.0</micronaut.object.storage.version>
     <auto-service.version>1.0.1</auto-service.version>
-    <exec.mainClass>no.ssb.dlp.pseudo.service.Application</exec.mainClass>
+    <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
+    <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
     <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+    <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
     <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
     <maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
@@ -44,33 +48,20 @@
 
   <repositories>
     <repository>
-      <id>artifact-registry</id>
-      <url>${artifact-registry.url}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
+      <id>central</id>
+      <url>https://repo.maven.apache.org/maven2</url>
     </repository>
     <repository>
-      <id>artifact-registry-snapshot</id>
+      <id>artifact-registry</id>
       <url>${artifact-registry.url}</url>
       <releases>
-        <enabled>false</enabled>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
       </releases>
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </repository>
-    <repository>
-      <id>jcenter.bintray.com</id>
-      <url>https://jcenter.bintray.com</url>
-    </repository>
   </repositories>
 
   <dependencies>
@@ -246,43 +237,139 @@
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>${maven-shade-plugin.version}</version>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${maven-resources-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>${maven-source-plugin.version}</version>
           <executions>
             <execution>
-              <id>default-shade</id>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven-compiler-plugin.version}</version>
+          <configuration>
+            <release>${jdk.version}</release>
+            <annotationProcessorPaths>
+              <path>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+              </path>
+              <path>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-inject-java</artifactId>
+                <version>${micronaut.version}</version>
+              </path>
+              <path>
+                <groupId>io.micronaut</groupId>
+                <artifactId>micronaut-validation</artifactId>
+                <version>${micronaut.version}</version>
+              </path>
+              <path>
+                <groupId>io.micronaut.security</groupId>
+                <artifactId>micronaut-security-annotations</artifactId>
+                <version>${micronaut.security.version}</version>
+              </path>
+              <path>
+                <groupId>io.micronaut.openapi</groupId>
+                <artifactId>micronaut-openapi</artifactId>
+                <version>${micronaut.openapi.version}</version>
+              </path>
+              <path>
+                <groupId>com.google.auto.service</groupId>
+                <artifactId>auto-service</artifactId>
+                <version>${auto-service.version}</version>
+              </path>
+            </annotationProcessorPaths>
+          </configuration>
+          <executions>
+            <execution>
+              <id>test-compile</id>
+              <goals>
+                <goal>testCompile</goal>
+              </goals>
               <configuration>
-                <createDependencyReducedPom>false</createDependencyReducedPom>
-                <transformers>
-                  <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                    <mainClass>${exec.mainClass}</mainClass>
-                  </transformer>
-                  <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                </transformers>
-                <filters>
-                  <filter>
-                    <artifact>*:*</artifact>
-                    <excludes>
-                      <exclude>module-info.class</exclude>
-                      <exclude>META-INF/*.MF</exclude>
-                      <exclude>META-INF/*.txt</exclude>
-                      <exclude>META-INF/LICENSE</exclude>
-                      <exclude>META-INF/DEPENDENCIES</exclude>
-                      <exclude>META-INF/NOTICE</exclude>
-                      <exclude>META-INF/*.SF</exclude>
-                      <exclude>META-INF/*.DSA</exclude>
-                      <exclude>META-INF/*.RSA</exclude>
-                    </excludes>
-                  </filter>
-                </filters>
+                <annotationProcessorPaths>
+                  <path>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                    <version>${lombok.version}</version>
+                  </path>
+                  <path>
+                    <groupId>io.micronaut</groupId>
+                    <artifactId>micronaut-inject-java</artifactId>
+                    <version>${micronaut.version}</version>
+                  </path>
+                  <path>
+                    <groupId>io.micronaut</groupId>
+                    <artifactId>micronaut-validation</artifactId>
+                    <version>${micronaut.version}</version>
+                  </path>
+                  <path>
+                    <groupId>io.micronaut.security</groupId>
+                    <artifactId>micronaut-security-annotations</artifactId>
+                    <version>${micronaut.security.version}</version>
+                  </path>
+                </annotationProcessorPaths>
               </configuration>
             </execution>
           </executions>
         </plugin>
-
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>${maven-release-plugin.version}</version>
+          <configuration>
+            <tagNameFormat>@{project.version}</tagNameFormat>
+          </configuration>
+        </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-shade-plugin</artifactId>
+              <version>${maven-shade-plugin.version}</version>
+              <executions>
+                <execution>
+                  <id>default-shade</id>
+                  <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <transformers>
+                      <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                        <mainClass>${exec.mainClass}</mainClass>
+                      </transformer>
+                      <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                    </transformers>
+                    <filters>
+                      <filter>
+                        <artifact>*:*</artifact>
+                        <excludes>
+                          <exclude>module-info.class</exclude>
+                          <exclude>META-INF/*.MF</exclude>
+                          <exclude>META-INF/*.txt</exclude>
+                          <exclude>META-INF/LICENSE</exclude>
+                          <exclude>META-INF/DEPENDENCIES</exclude>
+                          <exclude>META-INF/NOTICE</exclude>
+                          <exclude>META-INF/*.SF</exclude>
+                          <exclude>META-INF/*.DSA</exclude>
+                          <exclude>META-INF/*.RSA</exclude>
+                        </excludes>
+                      </filter>
+                    </filters>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
       </plugins>
     </pluginManagement>
-
     <plugins>
       <plugin>
         <groupId>io.micronaut.build</groupId>
@@ -291,15 +378,16 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
+        <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>${maven-release-plugin.version}</version>
-        <configuration>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-        </configuration>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -325,77 +413,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <release>${jdk.version}</release>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>org.projectlombok</groupId>
-              <artifactId>lombok</artifactId>
-              <version>${lombok.version}</version>
-            </path>
-            <path>
-              <groupId>io.micronaut</groupId>
-              <artifactId>micronaut-inject-java</artifactId>
-              <version>${micronaut.version}</version>
-            </path>
-            <path>
-              <groupId>io.micronaut</groupId>
-              <artifactId>micronaut-validation</artifactId>
-              <version>${micronaut.version}</version>
-            </path>
-            <path>
-              <groupId>io.micronaut.security</groupId>
-              <artifactId>micronaut-security-annotations</artifactId>
-              <version>${micronaut.security.version}</version>
-            </path>
-            <path>
-              <groupId>io.micronaut.openapi</groupId>
-              <artifactId>micronaut-openapi</artifactId>
-              <version>${micronaut.openapi.version}</version>
-            </path>
-            <path>
-              <groupId>com.google.auto.service</groupId>
-              <artifactId>auto-service</artifactId>
-              <version>${auto-service.version}</version>
-            </path>
-          </annotationProcessorPaths>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test-compile</id>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-            <configuration>
-              <annotationProcessorPaths>
-                <path>
-                  <groupId>org.projectlombok</groupId>
-                  <artifactId>lombok</artifactId>
-                  <version>${lombok.version}</version>
-                </path>
-                <path>
-                  <groupId>io.micronaut</groupId>
-                  <artifactId>micronaut-inject-java</artifactId>
-                  <version>${micronaut.version}</version>
-                </path>
-                <path>
-                  <groupId>io.micronaut</groupId>
-                  <artifactId>micronaut-validation</artifactId>
-                  <version>${micronaut.version}</version>
-                </path>
-                <path>
-                  <groupId>io.micronaut.security</groupId>
-                  <artifactId>micronaut-security-annotations</artifactId>
-                  <version>${micronaut.security.version}</version>
-                </path>
-              </annotationProcessorPaths>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
diff --git a/src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoController.java b/src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoController.java
index b02d890..dc9509d 100644
--- a/src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoController.java
+++ b/src/main/java/no/ssb/dlp/pseudo/service/pseudo/PseudoController.java
@@ -100,7 +100,7 @@ public HttpResponse<Flowable> pseudonymizeField(@Schema(implementation = PseudoF
     @Operation(summary = "Pseudonymize file", description = """
             Pseudonymize a file (JSON or CSV - or a zip with potentially multiple such files) by uploading the file.
                         
-            Choose between streaming the pseudonymized result back, or storing it as a file in GCS (by providing a `targetUri`).
+            The pseudonymized result will be streamed back.
                         
             Notice that you can specify the `targetContentType` if you want to convert to either of the supported file
             formats. E.g. your source could be a CSV file and the result could be a JSON file.
@@ -146,8 +146,8 @@ Depseudonymize a file (JSON or CSV - or a zip with potentially multiple such fil
                                 
                     Notice that only certain whitelisted users can depseudonymize data.
                                 
-                    Choose between streaming the result back, or storing it as a file in GCS (by providing a `targetUri`).
-                                
+                    The pseudonymized result will be streamed back.
+
                     Notice that you can specify the `targetContentType` if you want to convert to either of the supported file
                     formats. E.g. your source could be a CSV file and the result could be a JSON file.
 
@@ -194,7 +194,7 @@ public HttpResponse<Flowable> depseudonymizeFile(@Schema(implementation = Pseudo
                     Repseudonymize a file (JSON or CSV - or a zip with potentially multiple such files) by uploading the file.
                     Repseudonymization is done by first applying depseudonuymization and then pseudonymization to fields of the file.
                                 
-                    Choose between streaming the result back, or storing it as a file in GCS (by providing a `targetUri`).
+                    The pseudonymized result will be streamed back.
                                 
                     Notice that you can specify the `targetContentType` if you want to convert to either of the supported file
                     formats. E.g. your source could be a CSV file and the result could be a JSON file.