Merge branch 'master' of github.com:neicnordic/sda-doa into dependabo…

…t/github_actions/snok/container-retention-policy-2.1.2
neicnordic · Aug 29, 2023 · 9fa84ee · 9fa84ee
2 parents 7d6bfd4 + c17cf38
commit 9fa84ee
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/build-and-scan-PR-container.yml b/.github/workflows/build-and-scan-PR-container.yml
@@ -12,8 +12,24 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Add Maven Github authentication
-        run: echo "<settings xmlns='http://maven.apache.org/SETTINGS/1.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd'> <servers> <server> <id>github-clearinghouse</id> <username>${{ github.actor }}</username> <password>${{ secrets.GITHUB_TOKEN }}</password> </server> <server> <id>github-tsd-file-api-client</id> <username>${{ github.actor }}</username> <password>${{ secrets.GITHUB_TOKEN }}</password> </server> </servers> </settings>" > settings.xml
+      - name: create maven settings.xml
+        uses: s4u/[email protected]
+        with:
+          servers: |
+            [{
+              "id":"github-clearinghouse",
+              "username": "${{github.actor}}",
+              "password": "${{ secrets.GITHUB_TOKEN }}"
+            },
+            {
+              "id":"github-crypt4gh",
+              "username": "${{github.actor}}",
+              "password": "${{ secrets.GITHUB_TOKEN }}"
+            }]
+
+      - name: Copy settings.xml to project root
+        shell: bash
+        run: cp /home/runner/.m2/settings.xml ./settings.xml
 
       - name: Log in to the Github Container registry
         uses: docker/login-action@v2

diff --git a/pom.xml b/pom.xml
@@ -92,6 +92,23 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.konghq</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>3.6.01</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
           <groupId>no.uio.ifi</groupId>
           <artifactId>crypt4gh</artifactId>
@@ -106,7 +123,7 @@
         <dependency>
             <groupId>no.uio.ifi</groupId>
             <artifactId>clearinghouse</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.1</version>
             <exclusions>
              <exclusion>
                 <groupId>org.slf4j</groupId>

diff --git a/test/mock_auth.py b/test/mock_auth.py
@@ -9,7 +9,7 @@
 
 def generate_token():
     """Generate RSA Key pair to be used to sign token and the JWT Token itself."""
-    private_key = rsa.generate_private_key(public_exponent=65537, key_size=1024, backend=default_backend())
+    private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048, backend=default_backend())
     public_key = private_key.public_key().public_bytes(encoding=serialization.Encoding.PEM,
                                                        format=serialization.PublicFormat.SubjectPublicKeyInfo)
     pem = private_key.private_bytes(encoding=serialization.Encoding.PEM,