Merge pull request #165 from splitio/development

Release v2.5.0

Author: emmaz90

.github/workflows/cd.yml

@@ -17,13 +17,13 @@ jobs:
           password: ${{ secrets.ARTIFACTORY_DOCKER_PASS }}
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create build version
         run: echo "BUILD_VERSION=$(cat package.json | grep version | head -1 | awk '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')" >> $GITHUB_ENV
 
       - name: Docker Build and Push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

.github/workflows/ci.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18.16.0
+          node-version: 18.18.0
 
       - run: npm ci
       - run: npm run lint
@@ -26,10 +26,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker Build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: false

.github/workflows/unstable.yml

@@ -17,14 +17,17 @@ jobs:
           password: ${{ secrets.ARTIFACTORY_DOCKER_PASS }}
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create build version
         run: echo "BUILD_VERSION=$(cat package.json | grep version | head -1 | awk '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')" >> $GITHUB_ENV
 
+      - name: Get short hash
+        run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+
       - name: Docker Build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          tags: splitio-docker-dev.jfrog.io/${{ github.event.repository.name }}:${{ env.BUILD_VERSION}}
+          tags: splitio-docker-dev.jfrog.io/${{ github.event.repository.name }}:${{ env.SHORT_SHA}}

.github/workflows/update-license-year.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -38,7 +38,7 @@ jobs:
           git commit -m "Updated License Year" -a
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           title: Update License Year

.jest/setEnvVars.js

@@ -1,5 +1,12 @@
 // Environments for testing
-process.env.SPLIT_EVALUATOR_ENVIRONMENTS='[{"API_KEY":"localhost","AUTH_TOKEN":"test"},{"API_KEY":"apikey1","AUTH_TOKEN":"key_blue"},{"API_KEY":"apikey2","AUTH_TOKEN":"key_red"}]'
+process.env.SPLIT_EVALUATOR_ENVIRONMENTS = `[
+  {"API_KEY":"localhost","AUTH_TOKEN":"test"},
+  {"API_KEY":"apikey1","AUTH_TOKEN":"key_blue"},
+  {"API_KEY":"apikey2","AUTH_TOKEN":"key_red"},
+  {"API_KEY":"apikey3","AUTH_TOKEN":"key_green","FLAG_SET_FILTER":"set_green"},
+  {"API_KEY":"apikey4","AUTH_TOKEN":"key_purple","FLAG_SET_FILTER":"set_purple"},
+  {"API_KEY":"apikey5","AUTH_TOKEN":"key_pink","FLAG_SET_FILTER":"set_green,set_purple"}
+]`;
 
 // Before all tests, sdk module is mocked to create a wrapper where a different yaml file is assigned to each environment
 // sdk factory mock to set a different yaml for each apikey and localhost mode
@@ -33,6 +40,13 @@ jest.mock('../sdk', () => ({
         ...settings.core,
         authorizationKey: authorizationKey,
       },
+      urls: {
+        sdk: 'https://sdk.test.io/api',
+        events: 'https://events.test.io/api',
+        auth: 'https://auth.test.io/api',
+        streaming: 'https://streaming.test.io',
+        telemetry: 'https://telemetry.test.io/api',
+      },
       startup: {
         readyTimeout: 1,
       },
@@ -47,7 +61,7 @@ jest.mock('../sdk', () => ({
     };
 
     let sdk = jest.requireActual('../sdk');
-    const { factory, telemetry, impressionsMode } = sdk.getSplitFactory(configForMock);
+    const { factory, impressionsMode } = sdk.getSplitFactory(configForMock);
 
     const mockedTelemetry = {
       splits: {

.nvmrc

@@ -1 +1 @@
-v18.13
+v18.18

CHANGES.txt

@@ -1,3 +1,6 @@
+2.5.0 (Oct 31, 2023)
+  - Updated base image to node:18.18.2-alpine3.18
+
 2.4.0 (Jul 18, 2023)
   - Updated @splitsoftware/splitio package to version 10.23.0 that includes:
     - Updated streaming architecture implementation to apply feature flag updates from the notification received which is now enhanced, improving efficiency and reliability of the whole update system.

Dockerfile

@@ -1,5 +1,5 @@
 # Builder stage
-FROM node:18.16.0-alpine3.18 AS builder
+FROM node:18.18.2-alpine3.18 AS builder
 
 WORKDIR /usr/src/split-evaluator
 
@@ -8,7 +8,7 @@ COPY package.json package-lock.json ./
 RUN npm install --only=production
 
 # Runner stage
-FROM node:18.16.0-alpine3.18 AS runner
+FROM node:18.18.2-alpine3.18 AS runner
 
 WORKDIR /usr/src/split-evaluator
 

admin/__tests__/stats.test.js

@@ -78,6 +78,7 @@ describe('stats', () => {
         const authToken = environment.AUTH_TOKEN;
         const apiKey = environment.API_KEY;
         const mock = apiKeyMocksMap[apiKey];
+        if (!mock) return;
         expect(stats.environments[utils.obfuscate(authToken)]).toEqual({
           splitCount: mock.splitNames.length,
           segmentCount: mock.segments.length,