chore(performance): run tests in k8s

.github/workflows/ci-cd-yt01.yml

@@ -134,9 +134,6 @@ jobs:
     secrets:
       TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
       TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
-      K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
-      K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
-
     strategy:
       max-parallel: 1
       matrix:
@@ -150,8 +147,6 @@ jobs:
       apiVersion: v1
       vus: 1
       duration: 30s
-      tokens: both
-      numberOfTokens: 100
       testSuitePath: ${{ matrix.files }}
     permissions:
       checks: write

.github/workflows/dispatch-k6-performance.yml

@@ -16,16 +16,6 @@ on:
           - test
           - staging
           - yt01
-      tokens:
-        description: 'Tokens to generate; for create dialog, search, none, or both'
-        required: true
-        default: 'both'
-        type: choice
-        options:
-          - both
-          - enterprise
-          - personal
-          - none
       tag:
         description: 'tag the performance test'
         required: true
@@ -52,6 +42,7 @@ on:
           - 'tests/k6/tests/serviceowner/performance/serviceowner-search.js'
           - 'tests/k6/tests/enduser/performance/enduser-search.js'
           - 'tests/k6/tests/graphql/performance/graphql-search.js'
+          - 'tests/k6/tests/serviceowner/performance/create-transmissions.js'
 
 run-name: ${{ inputs.tag }} vus ${{ inputs.vus }} duration ${{ inputs.duration }}
 jobs:
@@ -61,13 +52,10 @@ jobs:
     secrets:
       TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
       TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
-      K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
-      K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
     with:
       environment: ${{ inputs.environment }}
       apiVersion: ${{ inputs.apiVersion }}
       testSuitePath: ${{ inputs.testSuitePath }}
       vus: ${{ fromJson(inputs.vus) }}
       duration: ${{ inputs.duration }}
-      tokens: ${{ inputs.tokens }}
 

.github/workflows/workflow-run-k6-performance.yml

@@ -18,27 +18,11 @@ on:
       duration:
         required: true
         type: string
-      tokens:
-        required: true
-        type: string
-      numberOfTokens:
-        required: false
-        type: number
-        default: 0  
-      ttl:
-        required: false
-        type: number
-        default: 3600  
     secrets:
       TOKEN_GENERATOR_USERNAME:
         required: true
       TOKEN_GENERATOR_PASSWORD:
         required: true
-      K6_CLOUD_TOKEN:
-        required: true
-      K6_CLOUD_PROJECT_ID:
-        required: true
-
 jobs:
   k6-test:
     runs-on: ubuntu-latest
@@ -53,7 +37,6 @@ jobs:
       uses: grafana/setup-k6-action@v1
     - name: Run K6 tests (${{ inputs.testSuitePath }})
       run: |
-        ./tests/k6/tests/scripts/generate_tokens.sh ./tests/k6/tests/performancetest_data ${{ inputs.tokens }} ${{ inputs.numberOfTokens }} ${{ inputs.ttl }}
         echo "Running k6 test suite ${{ inputs.testSuitePath }} with ${{ inputs.vus }} VUs for ${{ inputs.duration }}"
         k6 run ${{ inputs.testSuitePath }} --quiet --log-output=stdout --include-system-env-vars \
           --vus=${{ inputs.vus }} --duration=${{ inputs.duration }} --out csv=./results.csv
@@ -63,5 +46,3 @@ jobs:
         API_VERSION: ${{ inputs.apiVersion }}
         TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
         TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
-        K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
-        K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}

tests/k6/common/token.js

@@ -31,7 +31,7 @@ function getCacheKey(tokenType, tokenOptions) {
   return `${tokenType}|${tokenOptions.scopes}|${tokenOptions.orgName}|${tokenOptions.orgNo}|${tokenOptions.ssn}`;
 }
 
-function fetchToken(url, tokenOptions, type) {
+export function fetchToken(url, tokenOptions, type) {
   const currentTime = Math.floor(Date.now() / 1000);  
   const cacheKey = getCacheKey(type, tokenOptions);
 

tests/k6/tests/enduser/performance/enduser-search.js

@@ -1,6 +1,6 @@
 import { enduserSearch } from '../../performancetest_common/simpleSearch.js'
 import { getDefaultThresholds } from '../../performancetest_common/getDefaultThresholds.js';
-import { endUsersWithTokens } from '../../performancetest_common/readTestdata.js';
+import { endUsers } from '../../performancetest_common/readTestdata.js';
 
 const isSingleUserMode = (__ENV.isSingleUserMode ?? 'false') === 'true';
 const traceCalls = (__ENV.traceCalls ?? 'false') === 'true';
@@ -20,16 +20,16 @@ export let options = {
 };
 
 export default function() {
-    if (!endUsersWithTokens || endUsersWithTokens.length === 0) {
+    if (!endUsers || endUsers.length === 0) {
         throw new Error('No end users loaded for testing');
     }
 
     if (isSingleUserMode) {
-        enduserSearch(endUsersWithTokens[0], traceCalls);
+        enduserSearch(endUsers[0], traceCalls);
     }
     else {
-        for (let i = 0; i < endUsersWithTokens.length; i++) {
-            enduserSearch(endUsersWithTokens[i], traceCalls);
+        for (let i = 0; i < endUsers.length; i++) {
+            enduserSearch(endUsers[i], traceCalls);
         }
     }
 }

tests/k6/tests/graphql/performance/graphql-search.js

@@ -4,7 +4,7 @@
  */
 
 import { getDefaultThresholds } from '../../performancetest_common/getDefaultThresholds.js';
-import { endUsersWithTokens as endUsers } from '../../performancetest_common/readTestdata.js';
+import { endUsers } from '../../performancetest_common/readTestdata.js';
 import { graphqlSearch } from "../../performancetest_common/simpleSearch.js";
 
 const isSingleUserMode = (__ENV.isSingleUserMode ?? 'false') === 'true';    
@@ -17,7 +17,7 @@ const traceCalls = (__ENV.traceCalls ?? 'false') === 'true';
  * @property {string[]} summaryTrendStats - The summary trend statistics to include in the test results.
  * @property {object} thresholds - The thresholds for the test metrics.
  */
-export let options = {
+export const options = {
     summaryTrendStats: ['avg', 'min', 'med', 'max', 'p(95)', 'p(99)', 'p(99.5)', 'p(99.9)', 'count'],
     thresholds: getDefaultThresholds(['http_req_duration', 'http_reqs'],['graphql search'])
 };

tests/k6/tests/performancetest_common/createDialog.js

@@ -6,23 +6,27 @@ import { describe } from "../../common/describe.js";
 import { postSO, purgeSO } from "../../common/request.js";
 import { expect } from "../../common/testimports.js";
 import dialogToInsert from "../performancetest_data/01-create-dialog.js";
+import { default as transmissionToInsert } from "../performancetest_data/create-transmission.js";
+import { getEnterpriseToken } from "./getTokens.js";
 
 /**
  * Creates a dialog.
  * 
  * @param {Object} serviceOwner - The service owner object.
  * @param {Object} endUser - The end user object.
  */
+
 export function createDialog(serviceOwner, endUser, traceCalls) {
     var traceparent = uuidv4();
 
     var paramsWithToken = {
         headers: {
-            Authorization: "Bearer " + serviceOwner.token,
+            Authorization: "Bearer " + getEnterpriseToken(serviceOwner),
             traceparent: traceparent
         },
         tags: { name: 'create dialog' }
     };
+
     if (traceCalls) {
         paramsWithToken.tags.traceparent = traceparent;
         paramsWithToken.tags.enduser = endUser.ssn;
@@ -32,7 +36,6 @@ export function createDialog(serviceOwner, endUser, traceCalls) {
         let r = postSO('dialogs', dialogToInsert(endUser.ssn, endUser.resource), paramsWithToken);
         expect(r.status, 'response status').to.equal(201);
     });
-
 }
 
 /**
@@ -45,7 +48,7 @@ export function createAndRemoveDialog(serviceOwner, endUser, traceCalls) {
     var traceparent = uuidv4(); 
     var paramsWithToken = {
         headers: {
-            Authorization: "Bearer " + serviceOwner.token,
+            Authorization: "Bearer " + getEnterpriseToken(serviceOwner),
             traceparent: traceparent
         },
         tags: { name: 'create dialog' }
@@ -72,3 +75,64 @@ export function createAndRemoveDialog(serviceOwner, endUser, traceCalls) {
       }
   });
 }
+
+/**
+ * Creates a dialog and add a number of transmissions
+ * 
+ * @param {Object} serviceOwner - The service owner object.
+ * @param {Object} endUser - The end user object.
+ */
+export function createTransmissions(serviceOwner, endUser, traceCalls, numberOfTransmissions, maxTransmissionsInThread, testid) {
+    let traceparent = uuidv4();
+
+    let paramsWithToken = {
+        headers: {
+            Authorization: "Bearer " + getEnterpriseToken(serviceOwner),
+            traceparent: traceparent
+        },
+        tags: { name: 'create dialog', testid: testid }
+    };
+    if (traceCalls) {
+        paramsWithToken.tags.traceparent = traceparent;
+        paramsWithToken.tags.enduser = endUser.ssn;
+    }
+
+    let dialogId = 0;
+    describe('create dialog', () => {
+        let r = postSO('dialogs', dialogToInsert(endUser.ssn, endUser.resource), paramsWithToken);
+        dialogId = r.json();
+        expect(r.status, 'response status').to.equal(201);
+    });
+
+    let relatedTransmissionId = 0;
+    for (let i = 0; i < numberOfTransmissions; i++) {
+
+        relatedTransmissionId = createTransmission(dialogId, relatedTransmissionId, serviceOwner, traceCalls, testid);
+        // Max transmissions in thread reached, start new thread
+        if (i%maxTransmissionsInThread === 0) {
+            relatedTransmissionId = 0;
+        }
+    }
+
+}
+
+export function createTransmission(dialogId, relatedTransmissionId, serviceOwner, traceCalls, testid) {
+    let traceparent = uuidv4();
+
+    let paramsWithToken = {
+        headers: {
+            Authorization: "Bearer " + getEnterpriseToken(serviceOwner),
+            traceparent: traceparent
+        },
+        tags: { name: 'create transmission', testid: testid }
+    };
+
+    let newRelatedTransmissionId;
+    describe('create transmission', () => {
+        let r = postSO('dialogs/' + dialogId + '/transmissions', transmissionToInsert(relatedTransmissionId), paramsWithToken);
+        expect(r.status, 'response status').to.equal(201);
+        newRelatedTransmissionId = r.json();
+    });
+    return newRelatedTransmissionId;
+}
+

tests/k6/tests/performancetest_common/getTokens.js

@@ -0,0 +1,23 @@
+import { fetchToken } from "../../common/token.js";
+
+const tokenGeneratorEnv = __ENV.API_ENVIRONMENT || 'yt01';
+const tokenTtl = __ENV.TTL || 3600;
+
+export function getEnterpriseToken(serviceOwner) {  
+    const tokenOptions = {
+        scopes: serviceOwner.scopes, 
+        orgName: serviceOwner.org,
+        orgNo: serviceOwner.orgno
+    }
+    const url = `https://altinn-testtools-token-generator.azurewebsites.net/api/GetEnterpriseToken?env=${tokenGeneratorEnv}&scopes=${encodeURIComponent(tokenOptions.scopes)}&org=${tokenOptions.orgName}&orgNo=${tokenOptions.orgNo}&ttl=${tokenTtl}`;
+    return fetchToken(url, tokenOptions, `service owner (orgno:${tokenOptions.orgNo} orgName:${tokenOptions.orgName} tokenGeneratorEnv:${tokenGeneratorEnv})`);
+}
+
+export function getPersonalToken(endUser) {
+    const tokenOptions = {
+        scopes: endUser.scopes, 
+        ssn: endUser.ssn
+    }
+    const url = `https://altinn-testtools-token-generator.azurewebsites.net/api/GetPersonalToken?env=${tokenGeneratorEnv}&scopes=${encodeURIComponent(tokenOptions.scopes)}&pid=${tokenOptions.ssn}&ttl=${tokenTtl}`;
+    return fetchToken(url, tokenOptions, `end user (ssn:${tokenOptions.ssn}, tokenGeneratorEnv:${tokenGeneratorEnv})`);
+  }

tests/k6/tests/performancetest_common/readTestdata.js

@@ -23,12 +23,11 @@ function readCsv(filename) {
   } 
 }
 
-const filenameServiceowners = '../performancetest_data/.serviceowners-with-tokens.csv';
 if (!__ENV.API_ENVIRONMENT) {
   throw new Error('API_ENVIRONMENT must be set');
 }
 const filenameEndusers = `../performancetest_data/endusers-${__ENV.API_ENVIRONMENT}.csv`;
-const filenameEndusersWithTokens = '../performancetest_data/.endusers-with-tokens.csv';
+const filenameServiceowners = `../performancetest_data/serviceowners-${__ENV.API_ENVIRONMENT}.csv`;
 
 /**
  * SharedArray variable that stores the service owners data.
@@ -53,14 +52,4 @@ export const endUsers = new SharedArray('endUsers', function () {
   return readCsv(filenameEndusers); 
 });
 
-/**
- * SharedArray variable that stores the end users with tokens data.
- * The data is parsed from the CSV file specified by the filenameEndusersWithTokens variable.
- * 
- * @name endUsersWithTokens
- * @type {SharedArray}
- */
-export const endUsersWithTokens = new SharedArray('endUsersWithTokens', function () {
-  return readCsv(filenameEndusersWithTokens);
-});
 

tests/k6/tests/performancetest_common/simpleSearch.js

@@ -7,6 +7,7 @@ import { expect, expectStatusFor } from "../../common/testimports.js";
 import { describe } from '../../common/describe.js';
 import { getEU, postGQ, getSO } from '../../common/request.js';
 import { getGraphqlParty } from '../performancetest_data/graphql-search.js';
+import { getEnterpriseToken, getPersonalToken } from './getTokens.js';
 
 /**
  * Retrieves the content for a dialog.
@@ -20,7 +21,6 @@ function retrieveDialogContent(response, paramsWithToken, getFunction = getEU) {
     if (!items?.length) return;
     const dialogId = items[0].id;
     if (!dialogId) return;
-
     getContent(dialogId, paramsWithToken, 'get dialog', '', getFunction);
     getContentChain(dialogId, paramsWithToken, 'get dialog activities', 'get dialog activity', '/activities/', getFunction);
     getContentChain(dialogId, paramsWithToken, 'get seenlogs', 'get seenlog', '/seenlog/', getFunction);
@@ -45,7 +45,7 @@ export function enduserSearch(enduser, traceCalls) {
     var traceparent = uuidv4();
     let paramsWithToken = {
         headers: {
-            Authorization: "Bearer " + enduser.token,
+            Authorization: "Bearer " + getPersonalToken(enduser),
             traceparent: traceparent
         },
         tags: { name: 'enduser search' } 
@@ -132,7 +132,7 @@ export function graphqlSearch(enduser, traceCalls) {
     let traceparent = uuidv4();
     let paramsWithToken = {
         headers: {
-            Authorization: "Bearer " + enduser.token,
+            Authorization: "Bearer " + getPersonalToken(enduser),
             traceparent: traceparent,
             'User-Agent': 'dialogporten-k6-graphql-search'
         },
@@ -160,7 +160,7 @@ export function serviceownerSearch(serviceowner, enduser, tag_name, traceCalls,
     let traceparent = uuidv4();
     let paramsWithToken = {
         headers: {
-            Authorization: "Bearer " + serviceowner.token,
+            Authorization: "Bearer " + getEnterpriseToken(serviceowner),
             traceparent: traceparent
         },
         tags: { name: tag_name }

tests/k6/tests/performancetest_data/01-create-dialog.js

@@ -54,5 +54,6 @@ export default function (endUser, resource) {
     let payload = createDialogPayload();
     payload.serviceResource = "urn:altinn:resource:" +resource;
     payload.party = "urn:altinn:person:identifier-no:" + endUser;
+
     return cleanUp(payload);
 }