Improved structure of k6 test suite (#57)

* initial commit

* updated filenames, moved rancher files

* updated paths, adjusted filenames

* updated filenames

* path fix

---------

Co-authored-by: Michael Spencer <MSpencer87@users.noreply.github.com>

k6/crds/crd_utils.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
 import http from 'k6/http'
-import { retryUntilExpected } from "./rancher_utils.js";
+import { retryUntilExpected } from "../rancher/rancher_utils.js";
-import * as YAML from './lib/js-yaml-4.1.0.mjs'
+import * as YAML from '../lib/js-yaml-4.1.0.mjs'
 
 export const baseCRDPath = "v1/apiextensions.k8s.io.customresourcedefinitions"
 export const crdTag = { url: `/v1/apiextensions.k8s.io.customresourcedefinitions/<CRD ID>` }

k6/crds/create_crds.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
-import http from 'k6/http';
+import http from 'k6/http'
 import { Trend } from 'k6/metrics';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import exec from "k6/execution";
 import { randomString } from 'https://jslib.k6.io/k6-utils/1.4.0/index.js';
 import * as crdUtil from "./crd_utils.js";

k6/crds/delete_crds.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
 import http from 'k6/http'
 import { Trend } from 'k6/metrics';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import { vu as metaVU } from 'k6/execution'
 import * as crdUtil from "./crd_utils.js";
 

k6/crds/get_crds.js

@@ -2,8 +2,8 @@ import http from 'k6/http'
 import { check, fail, sleep } from 'k6';
 import exec from 'k6/execution';
 import { Trend } from 'k6/metrics';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
-import * as k8s from './k8s.js'
+import * as k8s from '../generic/k8s.js'
 import * as crdUtil from "./crd_utils.js";
 
 

k6/crds/load_crds.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
 import http from 'k6/http'
 import { Trend } from 'k6/metrics';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import { vu as metaVU } from 'k6/execution'
 import * as crdUtil from "./crd_utils.js";
 

k6/crds/update_crds.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
 import http from 'k6/http'
 import { Trend } from 'k6/metrics';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import { vu as metaVU } from 'k6/execution'
 import * as crdUtil from "./crd_utils.js";
 

k6/crds/update_destructive_crds.js

@@ -1,10 +1,10 @@
 import { check, fail, sleep } from 'k6';
 import http from 'k6/http'
 import { Trend } from 'k6/metrics';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import { vu as metaVU } from 'k6/execution'
 import * as crdUtil from "./crd_utils.js";
-import * as k8s from './k8s.js'
+import * as k8s from '../generic/k8s.js'
 
 
 const vus = __ENV.K6_VUS || 20

k6/generic/create_projects.js

@@ -2,8 +2,8 @@ import {check, fail, sleep} from 'k6';
 import exec from 'k6/execution';
 import http from 'k6/http';
 import {Gauge} from 'k6/metrics';
-import {getCookies, login} from "./rancher_utils.js";
+import {getCookies, login} from "../rancher/rancher_utils.js";
-import {getPrincipalIds, getCurrentUserPrincipalId, getClusterIds} from "./rancher_users_utils.js"
+import {getPrincipalIds, getCurrentUserPrincipalId, getClusterIds} from "../rancher/rancher_users_utils.js"
 
 // Parameters
 const projectCount = Number(__ENV.PROJECT_COUNT)

k6/generic/create_roles_users.js

@@ -2,7 +2,7 @@ import { check, sleep } from 'k6'
 import exec from 'k6/execution';
 import http from 'k6/http';
 import {Gauge} from 'k6/metrics';
-import {retryOnConflict} from "./rancher_utils.js";
+import {retryOnConflict} from "../rancher/rancher_utils.js";
 
 // Parameters
 const roleCount = Number(__ENV.ROLE_COUNT)

k6/generic/k8s.js

@@ -2,9 +2,9 @@ import { check } from 'k6';
 import { sleep } from 'k6';
 import encoding from 'k6/encoding';
 import http from 'k6/http';
-import * as YAML from './lib/js-yaml-4.1.0.mjs'
+import * as YAML from '../lib/js-yaml-4.1.0.mjs'
 
-import { URL } from './lib/url-1.0.0.js';
+import { URL } from '../lib/url-1.0.0.js';
 
 const timeout = '3600s'
 

k6/schemas/verify_schema_definitions.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import { Trend } from 'k6/metrics';
-import * as crdUtil from "./crd_utils.js";
+import * as crdUtil from "../crds/crd_utils.js";
 import { verifySchemaExistsPolling, verifySchemaDefinitionExistsPolling } from "./schema_utils.js"
 
 const vus = __ENV.K6_VUS || 1

k6/schemas/verify_schemas.js

@@ -1,7 +1,7 @@
 import { check, fail, sleep } from 'k6';
-import { getCookies, login } from "./rancher_utils.js";
+import { getCookies, login } from "../rancher/rancher_utils.js";
 import { Trend } from 'k6/metrics';
-import * as crdUtil from "./crd_utils.js";
+import * as crdUtil from "../crds/crd_utils.js";
 import { verifySchemaExistsPolling } from "./schema_utils.js"
 
 const vus = __ENV.K6_VUS || 1

k6/tests/tokens.js

@@ -1,8 +1,8 @@
 import { check, fail, sleep } from 'k6';
 import exec from 'k6/execution';
 import http from 'k6/http';
-import { getCookies, login, generateAuthorizationHeader, addMinutes } from "./rancher_utils.js";
+import { getCookies, login, generateAuthorizationHeader, addMinutes } from "../rancher/rancher_utils.js";
-import { getPrincipalIds, getCurrentUserId, getClusterIds, getCurrentUserPrincipal, createUser } from "./rancher_users_utils.js"
+import { getPrincipalIds, getCurrentUserId, getClusterIds, getCurrentUserPrincipal, createUser } from "../rancher/rancher_users_utils.js"
 
 
 // Parameters