clean up

Author: molly-moen

cicd/3-app/load-test.template.yml

@@ -33,11 +33,6 @@ Resources:
           Image: !Ref LoadTestImage
           Cpu: 0
           Memory: 512
-          Environment:
-            - Name: PRIVATE_KEY
-              Value: arn:aws:secretsmanager:us-east-1:475661607190:secret:production/cdo/javabuilder_load_test_key-O3hwTg
-            - Name: PRIVATE_KEY_PASSWORD
-              Value: arn:aws:secretsmanager:us-east-1:475661607190:secret:production/cdo/javabuilder_load_test_key_password-MFH2XA
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -62,16 +57,3 @@ Resources:
       ManagedPolicyArns:
         # AWS-managed policy for executing an ECS task
         - arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy
-      Policies:
-        - PolicyName: JavabuilderLoadTestSecretPolicy
-          PolicyDocument:
-            Statement:
-              # secrets needed for creating JWT tokens for load testing
-              - Effect: Allow
-                Action:
-                  - 'secretsmanager:GetSecretValue'
-                Resource: 'arn:aws:secretsmanager:us-east-1:475661607190:secret:production/cdo/javabuilder_load_test_key-O3hwTg'
-              - Effect: Allow
-                Action:
-                  - 'secretsmanager:GetSecretValue'
-                Resource: 'arn:aws:secretsmanager:us-east-1:475661607190:secret:production/cdo/javabuilder_load_test_key_password-MFH2XA'

javabuilder-authorizer/jwt_helper.rb

@@ -9,7 +9,7 @@ def decode_token(token, origin)
     begin
       if IS_LOAD_TEST
         puts "in load test"
-        # load tests use a simpler authentication scheme  
+        # load tests use a simpler authentication algorithm  
         return JWT.decode(
           token,
           LOAD_TEST_KEY,

load-test/scripts/configuration.js

@@ -1,4 +1,4 @@
-export const basicTestOptions = {
+export const BASIC_TEST_OPTIONS = {
   scenarios: {
     // ramp up to 5 VUs over 30 seconds
     rampUp: {
@@ -29,26 +29,33 @@ export const basicTestOptions = {
 };
 
 // TODO: Update to a load testing instance of Javabuilder
-export const uploadUrl = `https://javabuilder-molly-http.dev-code.org/seedsources/sources.json?Authorization=`;
-export const url = `wss://javabuilder-molly.dev-code.org?Authorization=`;
+export const UPLOAD_URL = `https://javabuilder-molly-http.dev-code.org/seedsources/sources.json?Authorization=`;
+export const WEBSOCKET_URL = `wss://javabuilder-molly.dev-code.org?Authorization=`;
 const origin = "load-test";
 
-export const websocketParams = {
+export const WEBSOCKET_PARAMS = {
   headers: {
     Origin: origin,
   },
 };
 
-export const uploadParams = {
+export const UPLOAD_PARAMS = {
   headers: {
     Origin: origin,
     "Content-Type": "application/json",
   },
 };
 
-// These will be used for generating the JWT token
+// This will be used for generating the JWT token
 export const PRIVATE_KEY = null;
 
 // Thresholds for metrics
 export const LONG_REQUEST_MS = 5000;
 export const EXTRA_LONG_REQUEST_MS = 10000;
+
+// Mini-app types
+export const MiniAppType = {
+  CONSOLE: 'console',
+  NEIGHBORHOOD: 'neighborhood',
+  THEATER: 'theater'
+};

load-test/scripts/generateToken.js

@@ -22,8 +22,7 @@ export default function generateToken(miniAppType) {
     options: "{}",
     sid: uuidv4()
   };
-  let token = encode(payload);
-  return token;
+  return encodeAsJWT(payload);
 }
 
 // Generate a JWT using the HS256 algorithm, which relies on a shared secret
@@ -32,7 +31,7 @@ export default function generateToken(miniAppType) {
 // so we need to generate the token ourselves using k6's crypto package.
 // Logic is modified from: https://gist.github.com/robingustafsson/7dd6463d85efdddbb0e4bcd3ecc706e1
 // JWT details: https://jwt.io/introduction
-function encode(payload) {
+function encodeAsJWT(payload) {
     let algorithm = "HS256";
     let header = encoding.b64encode(JSON.stringify({ typ: "JWT", alg: algorithm }), "rawurl");
     let payloadEncoded = encoding.b64encode(JSON.stringify(payload), "rawurl");

load-test/scripts/hello-world-load-test.js

@@ -4,17 +4,18 @@ import { check, sleep } from "k6";
 import { Counter, Trend } from "k6/metrics";
 import { helloWorld } from "./sources.js";
 import {
-  basicTestOptions,
-  uploadParams,
-  uploadUrl,
-  websocketParams,
-  url,
   LONG_REQUEST_MS,
-  EXTRA_LONG_REQUEST_MS
+  EXTRA_LONG_REQUEST_MS,
+  BASIC_TEST_OPTIONS,
+  MiniAppType,
+  UPLOAD_URL,
+  UPLOAD_PARAMS,
+  WEBSOCKET_URL,
+  WEBSOCKET_PARAMS
 } from "./configuration.js";
 import generateToken from "./generateToken.js";
 
-export const options = basicTestOptions;
+export const options = BASIC_TEST_OPTIONS;
 
 const exceptionCounter = new Counter("exceptions");
 const errorCounter = new Counter("errors");
@@ -28,13 +29,13 @@ const longWebsocketSessions = new Counter("long_websocket_sessions");
 const extraLongWebsocketSessions = new Counter("extra_long_websocket_sessions");
 
 export default function () {
-  const authToken = generateToken("console");
+  const authToken = generateToken(MiniAppType.CONSOLE);
   const uploadResult = http.put(
-    uploadUrl + authToken,
+    UPLOAD_URL + authToken,
     helloWorld,
-    uploadParams
+    UPLOAD_PARAMS
   );
-  const res = ws.connect(url + authToken, websocketParams, (socket) =>
+  const res = ws.connect(WEBSOCKET_URL + authToken, WEBSOCKET_PARAMS, (socket) =>
     onSocketConnect(socket, Date.now())
   );