Merge remote-tracking branch 'origin/master' into release/1.10.0

OpenBAS-Platform · Dec 11, 2024 · 374b4d7 · 374b4d7
2 parents 75dc426 + 2dc0b1b
commit 374b4d7
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -176,7 +176,7 @@ jobs:
     steps:
       - checkout
       - kubernetes/install-kubectl
-      - run: kubectl --server=https://api.staging.eu-west.filigran.io --token=$K8S_TOKEN_PRE_RELEASE -n customer-prerelease-openbas rollout restart deployment -l app=openbas
+      - run: kubectl --server=https://api.staging.eu-west.filigran.io --token=$K8S_TOKEN_PRE_RELEASE -n customer-prerelease-obas rollout restart deployment -l app=openbas
 
   docker_build_platform:
     working_directory: ~/openbas_docker
@@ -293,7 +293,7 @@ jobs:
           working_directory: ~/openbas_docker
           name: Build Docker image openbas/platform
           command: docker buildx build --progress=plain --platform $BUILDX_PLATFORMS -f Dockerfile_circleci -t openbas/platform:rolling --push .
-          no_output_timeout: 30
+          no_output_timeout: 30m
       - slack/notify:
           event: fail
           template: basic_fail_1
@@ -354,7 +354,7 @@ jobs:
           working_directory: ~/openbas_docker
           name: Build Docker image openbas/platform
           command: docker buildx build --progress=plain --platform $BUILDX_PLATFORMS -f Dockerfile_circleci -t openbas/platform:prerelease --push .
-          no_output_timeout: 30
+          no_output_timeout: 30m
       - slack/notify:
           event: fail
           template: basic_fail_1

diff --git a/openbas-api/src/main/java/io/openbas/rest/executor/ExecutorApi.java b/openbas-api/src/main/java/io/openbas/rest/executor/ExecutorApi.java
@@ -182,11 +182,11 @@ public Executor registerExecutor(
       InputStream in = null;
       String resourcePath = "/openbas-agent/windows/" + architecture + "/";
       if (executorOpenbasBinariesOrigin.equals("local")) { // if we want the local binaries
-        filename = "openbas-agent-" + version + ".exe";
+        filename = "openbas-agent-installer-" + version + ".exe";
         in = getClass().getResourceAsStream("/agents" + resourcePath + filename);
       } else if (executorOpenbasBinariesOrigin.equals(
           "repository")) { // if we want a specific version from artifactory
-        filename = "openbas-agent-" + executorOpenbasBinariesVersion + ".exe";
+        filename = "openbas-agent-installer-" + executorOpenbasBinariesVersion + ".exe";
         in = new BufferedInputStream(new URL(JFROG_BASE + resourcePath + filename).openStream());
       }
       if (in == null) {

diff --git a/openbas-front/package.json b/openbas-front/package.json
@@ -117,7 +117,7 @@
     "swagger-typescript-api": "13.0.22",
     "typescript": "5.6.2",
     "typescript-eslint": "8.15.0",
-    "vite": "5.4.7",
+    "vite": "6.0.3",
     "vite-plugin-istanbul": "6.0.2",
     "vitest": "2.1.1"
   },