diff --git a/.github/workflows/assist-ee.yaml b/.github/workflows/assist-ee.yaml index e3f03ef5f..f2fa32ba2 100644 --- a/.github/workflows/assist-ee.yaml +++ b/.github/workflows/assist-ee.yaml @@ -6,10 +6,10 @@ on: - dev - api-* paths: - - "ee/utilities/**" - - "utilities/**" - - "!utilities/.gitignore" - - "!utilities/*-dev.sh" + - "ee/assist/**" + - "assist/**" + - "!assist/.gitignore" + - "!assist/*-dev.sh" name: Build and Deploy Assist EE @@ -44,7 +44,7 @@ jobs: ENVIRONMENT: staging run: | skip_security_checks=${{ github.event.inputs.skip_security_checks }} - cd utilities + cd assist PUSH_IMAGE=0 bash -x ./build.sh ee [[ "x$skip_security_checks" == "xtrue" ]] || { curl -L https://github.com/aquasecurity/trivy/releases/download/v0.34.0/trivy_0.34.0_Linux-64bit.tar.gz | tar -xzf - -C ./ diff --git a/.github/workflows/assist.yaml b/.github/workflows/assist.yaml index 03ee1df5f..67bfed543 100644 --- a/.github/workflows/assist.yaml +++ b/.github/workflows/assist.yaml @@ -6,9 +6,9 @@ on: - dev - api-* paths: - - "utilities/**" - - "!utilities/.gitignore" - - "!utilities/*-dev.sh" + - "assist/**" + - "!assist/.gitignore" + - "!assist/*-dev.sh" name: Build and Deploy Assist @@ -43,7 +43,7 @@ jobs: ENVIRONMENT: staging run: | skip_security_checks=${{ github.event.inputs.skip_security_checks }} - cd utilities + cd assist PUSH_IMAGE=0 bash -x ./build.sh [[ "x$skip_security_checks" == "xtrue" ]] || { curl -L https://github.com/aquasecurity/trivy/releases/download/v0.34.0/trivy_0.34.0_Linux-64bit.tar.gz | tar -xzf - -C ./ diff --git a/utilities/.dockerignore b/assist/.dockerignore similarity index 100% rename from utilities/.dockerignore rename to assist/.dockerignore diff --git a/utilities/.gitignore b/assist/.gitignore similarity index 100% rename from utilities/.gitignore rename to assist/.gitignore diff --git a/utilities/Dockerfile b/assist/Dockerfile similarity index 100% rename from utilities/Dockerfile rename to assist/Dockerfile diff --git a/utilities/build.sh b/assist/build.sh similarity index 86% rename from utilities/build.sh rename to assist/build.sh index 87ff7f3e6..7a780cc43 100644 --- a/utilities/build.sh +++ b/assist/build.sh @@ -16,20 +16,20 @@ check_prereq() { } function build_api(){ - destination="_utilities" + destination="_assist" [[ $1 == "ee" ]] && { - destination="_utilities_ee" + destination="_assist_ee" } - cp -R ../utilities ../${destination} + cp -R ../assist ../${destination} cd ../${destination} # Copy enterprise code [[ $1 == "ee" ]] && { - cp -rf ../ee/utilities/* ./ + cp -rf ../ee/assist/* ./ } docker build -f ./Dockerfile --build-arg GIT_SHA=$git_sha -t ${DOCKER_REPO:-'local'}/assist:${image_tag} . - cd ../utilities + cd ../assist rm -rf ../${destination} [[ $PUSH_IMAGE -eq 1 ]] && { docker push ${DOCKER_REPO:-'local'}/assist:${image_tag} diff --git a/utilities/package-lock.json b/assist/package-lock.json similarity index 100% rename from utilities/package-lock.json rename to assist/package-lock.json diff --git a/utilities/package.json b/assist/package.json similarity index 100% rename from utilities/package.json rename to assist/package.json diff --git a/ee/utilities/run-dev.sh b/assist/run-dev.sh similarity index 100% rename from ee/utilities/run-dev.sh rename to assist/run-dev.sh diff --git a/utilities/server.js b/assist/server.js similarity index 100% rename from utilities/server.js rename to assist/server.js diff --git a/utilities/servers/websocket.js b/assist/servers/websocket.js similarity index 100% rename from utilities/servers/websocket.js rename to assist/servers/websocket.js diff --git a/utilities/utils/HeapSnapshot.js b/assist/utils/HeapSnapshot.js similarity index 100% rename from utilities/utils/HeapSnapshot.js rename to assist/utils/HeapSnapshot.js diff --git a/utilities/utils/assistHelper.js b/assist/utils/assistHelper.js similarity index 100% rename from utilities/utils/assistHelper.js rename to assist/utils/assistHelper.js diff --git a/utilities/utils/geoIP.js b/assist/utils/geoIP.js similarity index 100% rename from utilities/utils/geoIP.js rename to assist/utils/geoIP.js diff --git a/utilities/utils/helper.js b/assist/utils/helper.js similarity index 100% rename from utilities/utils/helper.js rename to assist/utils/helper.js diff --git a/ee/utilities/.gitignore b/ee/assist/.gitignore similarity index 100% rename from ee/utilities/.gitignore rename to ee/assist/.gitignore diff --git a/ee/utilities/Dockerfile b/ee/assist/Dockerfile similarity index 100% rename from ee/utilities/Dockerfile rename to ee/assist/Dockerfile diff --git a/ee/utilities/clean-dev.sh b/ee/assist/clean-dev.sh similarity index 100% rename from ee/utilities/clean-dev.sh rename to ee/assist/clean-dev.sh diff --git a/ee/utilities/package-lock.json b/ee/assist/package-lock.json similarity index 100% rename from ee/utilities/package-lock.json rename to ee/assist/package-lock.json diff --git a/ee/utilities/package.json b/ee/assist/package.json similarity index 100% rename from ee/utilities/package.json rename to ee/assist/package.json diff --git a/ee/utilities/prepare-dev.sh b/ee/assist/prepare-dev.sh similarity index 75% rename from ee/utilities/prepare-dev.sh rename to ee/assist/prepare-dev.sh index 2daecbfc1..8da98eac3 100755 --- a/ee/utilities/prepare-dev.sh +++ b/ee/assist/prepare-dev.sh @@ -1,2 +1,2 @@ #!/bin/bash -rsync -avr --exclude=".*" --exclude="node_modules" --ignore-existing ../../utilities/* ./ \ No newline at end of file +rsync -avr --exclude=".*" --exclude="node_modules" --ignore-existing ../../assist/* ./ \ No newline at end of file diff --git a/utilities/run-dev.sh b/ee/assist/run-dev.sh similarity index 100% rename from utilities/run-dev.sh rename to ee/assist/run-dev.sh diff --git a/ee/utilities/server.js b/ee/assist/server.js similarity index 100% rename from ee/utilities/server.js rename to ee/assist/server.js diff --git a/ee/utilities/servers/websocket-cluster.js b/ee/assist/servers/websocket-cluster.js similarity index 100% rename from ee/utilities/servers/websocket-cluster.js rename to ee/assist/servers/websocket-cluster.js diff --git a/ee/utilities/servers/websocket.js b/ee/assist/servers/websocket.js similarity index 100% rename from ee/utilities/servers/websocket.js rename to ee/assist/servers/websocket.js diff --git a/ee/utilities/utils/helper-ee.js b/ee/assist/utils/helper-ee.js similarity index 100% rename from ee/utilities/utils/helper-ee.js rename to ee/assist/utils/helper-ee.js diff --git a/peers/build.sh b/peers/build.sh index 45cc97892..746a12f9d 100644 --- a/peers/build.sh +++ b/peers/build.sh @@ -22,7 +22,7 @@ function build_api(){ } cp -R ../peers ../${destination} cd ../${destination} - cp -R ../utilities/utils . + cp -R ../assist/utils . # Copy enterprise code [[ $1 == "ee" ]] && { cp -rf ../ee/peers/* ./ diff --git a/sourcemap-reader/build.sh b/sourcemap-reader/build.sh index fbe8762e2..3025e05e4 100644 --- a/sourcemap-reader/build.sh +++ b/sourcemap-reader/build.sh @@ -30,7 +30,7 @@ function build_api(){ } cp -R ../sourcemap-reader ../${destination} cd ../${destination} - cp -R ../utilities/utils . + cp -R ../assist/utils . tag="" # Copy enterprise code [[ $1 == "ee" ]] && { diff --git a/sourcemap-reader/prepare-dev.sh b/sourcemap-reader/prepare-dev.sh index e057555db..78a315946 100755 --- a/sourcemap-reader/prepare-dev.sh +++ b/sourcemap-reader/prepare-dev.sh @@ -1,2 +1,2 @@ #!/bin/bash -rsync -avr --exclude=".*" --ignore-existing ../utilities/utils ./ \ No newline at end of file +rsync -avr --exclude=".*" --ignore-existing ../assist/utils ./ \ No newline at end of file