Merge branch 'main' into services/loterre-resolvers/migrate

.editorconfig

@@ -12,3 +12,19 @@ indent_size = 4
 [*.{json,yml}]
 indent_style = space
 indent_size = 4
+
+[.github/**/*.yml]
+indent_style = space
+indent_size = 2
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[tests.hurl]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset

.gitattributes

@@ -0,0 +1,6 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+services/**/*.hurl text eol=lf
+# Use CRLF on terms-tools test file.
+services/terms-tools/*.hurl text eol=crlf

.github/workflows/test-and-publish-on-tag.yml

@@ -0,0 +1,68 @@
+# .github/workflows/docker-build-on-tag.yml
+
+name: Build, Test & Push
+
+on:
+  push:
+    tags:
+      - "ws-*@*"
+
+jobs:
+  test-on-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout from Git
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install Hurl
+        run: |
+          curl --location --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/4.3.0/hurl_4.3.0_amd64.deb
+          sudo dpkg -i hurl_4.3.0_amd64.deb
+          hurl --version
+
+      - name: Build .env from Github Actions secrets
+        shell: bash
+        run: |
+          bin/create-env.sh ${{ github.ref_name }} ${{ secrets.WEBDAV_LOGIN }} ${{ secrets.WEBDAV_PASSWORD }} ${{ secrets.WEBDAV_URL }} ${{secrets.OPENALEX_API_KEY}} ${{secrets.UNPAYWALL_API_KEY}}
+          ls -l services/*/.env
+
+      - name: Build Docker Image & Test
+        shell: bash
+        run: |
+          bin/test-on-tag.sh ${{ github.ref_name }}
+
+  build-on-tag:
+    needs:
+      - test-on-tag
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout from Git
+        uses: actions/checkout@v4
+
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Build .env from Github Actions secrets
+        shell: bash
+        run: |
+          bin/create-env.sh ${{ github.ref_name }} ${{ secrets.WEBDAV_LOGIN }} ${{ secrets.WEBDAV_PASSWORD }} ${{ secrets.WEBDAV_URL }} ${{secrets.OPENALEX_API_KEY}} ${{secrets.UNPAYWALL_API_KEY}}
+          ls -l services/*/.env
+
+      - name: Build & Push Docker Image
+        shell: bash
+        run: |
+          echo "Building and pushing image for ${{ github.ref_name }}"
+          bin/build-and-push.sh ${{ github.ref_name }}

.github/workflows/test-on-branch.yml

@@ -0,0 +1,41 @@
+# .github/workflows/docker-build-on-push.yml
+
+name: Build & Test
+
+on:
+  push:
+    branches:
+      - "services/*/*"
+    paths-ignore:
+      - "**.md"
+      - "**/swagger.json"
+
+jobs:
+  test-on-commit:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout from Git
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install Hurl
+        run: |
+          curl --location --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/4.3.0/hurl_4.3.0_amd64.deb
+          sudo dpkg -i hurl_4.3.0_amd64.deb
+          hurl --version
+
+      - name: Build .env from Github Actions secrets
+        shell: bash
+        run: |
+          bin/create-env.sh ${{ github.ref_name }} ${{ secrets.WEBDAV_LOGIN }} ${{ secrets.WEBDAV_PASSWORD }} ${{ secrets.WEBDAV_URL }} ${{secrets.OPENALEX_API_KEY}} ${{secrets.UNPAYWALL_API_KEY}}
+          ls -l services/*/.env
+
+      - name: Build Docker Image & Test
+        shell: bash
+        run: |
+          bin/test-on-branch.sh ${{ github.ref_name }}

.gitignore

@@ -42,8 +42,8 @@ build/Release
 node_modules/
 jspm_packages/
 
-# Don't mess with npm versions
-package-lock.json
+## Don't mess with npm versions
+#package-lock.json
 
 # Snowpack dependency directory (https://snowpack.dev/)
 web_modules/
@@ -129,9 +129,16 @@ dist
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
 
+# Jetbrains IDEs
+.idea
+
 # yarn v2
 .yarn/cache
 .yarn/unplugged
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+services/data-termsuite/NOTES.md

.shellcheckrc

@@ -0,0 +1 @@
+external-sources=true

.vscode/extensions.json

@@ -4,10 +4,14 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"EditorConfig.EditorConfig"
+        "anweber.vscode-httpyac",
+        "davidanson.vscode-markdownlint",
+		"EditorConfig.EditorConfig",
+        "streetsidesoftware.code-spell-checker",
+        "streetsidesoftware.code-spell-checker-french"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
-
+        "humao.rest-client"
 	]
 }

.vscode/settings.json

@@ -5,11 +5,25 @@
         "MD041": false, // MD041: First line in file should be a top level header
         "MD051": false  // MD051: Broken link fragment (ex: #v1/teeft instead of #v1teeft)
     },
+    "cSpell.enableFiletypes": [
+        "ini",
+        "properties"
+    ],
+    "cSpell.language": "en,fr-FR",
     "cSpell.words": [
+        "Bigramme",
+        "concat",
         "cnrs",
         "foaf",
+        "inist",
+        "Lodex",
         "loterre",
         "Loterre",
-        "skos"
+        "skos",
+        "openapi",
+        "prometheus",
+        "stopwords",
+        "ungroup",
+        "uuid"
     ]
 }