Remove test enable auth option from tests

TykTechnologies · Jun 3, 2024 · 0af1603 · 0af1603
1 parent 12b2e50
commit 0af1603
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/modules/deployments/tests/main.tf b/modules/deployments/tests/main.tf
@@ -91,7 +91,9 @@ const addTestInfoMetrics = ({ duration, rate, virtual_users }, key_count) => {
   virtualUsersGauge.add(virtual_users);
 };
 
-export { getScenarios, addTestInfoMetrics };
+const getAuth = () => ${var.auth.enabled};
+
+export { getAuth, getScenarios, addTestInfoMetrics };
 
 EOF
   }

diff --git a/modules/tests/httpbin/main.tf b/modules/tests/httpbin/main.tf
@@ -16,7 +16,7 @@ resource "kubernetes_config_map" "httpbin-configmap" {
   data = {
     "httpbin.js" = <<EOF
 import http from 'k6/http';
-import { getScenarios, addTestInfoMetrics } from "/helpers/tests.js";
+import { getAuth, getScenarios, addTestInfoMetrics } from "/helpers/tests.js";
 import { generateKeys } from "/helpers/auth.js";
 
 const { SCENARIO } = __ENV;
@@ -27,15 +27,15 @@ export const options = {
 
 export function setup() {
   addTestInfoMetrics(${jsonencode(var.config)}, ${var.config.auth.key_count});
-  if (${var.config.auth.enabled}) {
+  if (getAuth()) {
     return generateKeys("httpbin", ${var.config.auth.key_count})
   }
   return {};
 }
 
 export default function (keys) {
   let headers = {};
-  if (${var.config.auth.enabled}) {
+  if (getAuth()) {
     const i = Math.floor(Math.random() * keys.length);
     headers = { "Authorization": keys[i] }
   }

diff --git a/modules/tests/httpbin/vars.tf b/modules/tests/httpbin/vars.tf
@@ -16,7 +16,6 @@ variable "config" {
     parallelism   = number
 
     auth = object({
-      enabled   = bool
       key_count = number
     })
   })

diff --git a/modules/tests/timestamp/main.tf b/modules/tests/timestamp/main.tf
@@ -16,7 +16,7 @@ resource "kubernetes_config_map" "timestamp-configmap" {
   data = {
     "timestamp.js" = <<EOF
 import http from 'k6/http';
-import { getScenarios, addTestInfoMetrics } from "/helpers/tests.js";
+import { getAuth, getScenarios, addTestInfoMetrics } from "/helpers/tests.js";
 import { generateKeys } from "/helpers/auth.js";
 
 const { SCENARIO } = __ENV;
@@ -27,15 +27,15 @@ export const options = {
 
 export function setup() {
   addTestInfoMetrics(${jsonencode(var.config)}, ${var.config.auth.key_count});
-  if (${var.config.auth.enabled}) {
+  if (getAuth()) {
     return generateKeys("timestamp", ${var.config.auth.key_count})
   }
   return {};
 }
 
 export default function (keys) {
   let headers = {};
-  if (${var.config.auth.enabled}) {
+  if (getAuth()) {
     const i = Math.floor(Math.random() * keys.length);
     headers = { "Authorization": keys[i] }
   }

diff --git a/modules/tests/timestamp/vars.tf b/modules/tests/timestamp/vars.tf
@@ -16,7 +16,6 @@ variable "config" {
     parallelism   = number
 
     auth = object({
-      enabled   = bool
       key_count = number
     })
   })

diff --git a/modules/tests/vars.tests.tf b/modules/tests/vars.tests.tf
@@ -11,7 +11,6 @@ variable "tests" {
       parallelism   = number
 
       auth = object({
-        enabled   = bool
         key_count = number
       })
     })

diff --git a/tests/main.tf b/tests/main.tf
@@ -25,7 +25,6 @@ module "tests" {
       parallelism   = var.tests_config_parallelism
 
       auth = {
-        enabled   = var.tests_config_auth_enabled
         key_count = var.tests_config_auth_key_count
       }
     }

diff --git a/tests/main.tfvars.example b/tests/main.tfvars.example
@@ -8,7 +8,6 @@ tests_timestamp_enabled = true
 tests_httpbin_enabled   = false
 
 tests_config_executor       = "constant-arrival-rate"
-tests_config_auth_enabled   = false
 tests_config_auth_key_count = 100
 tests_config_ramping_steps  = 10
 tests_config_duration       = 15

diff --git a/tests/vars.tests.tf b/tests/vars.tests.tf
@@ -16,12 +16,6 @@ variable "tests_config_executor" {
   description = "Choose the executor for the test. Options are: 'constant-vus', 'ramping-vus', 'constant-arrival-rate', 'ramping-arrival-rate'."
 }
 
-variable "tests_config_auth_enabled" {
-  type        = bool
-  default     = false
-  description = "Enable Token Authentication."
-}
-
 variable "tests_config_auth_key_count" {
   type        = number
   default     = 100