Merge pull request #130 from kamyarz-aws/release/v3.2.2

update to version v3.2.2

Author: kamyarz-aws

.gitignore

@@ -8,6 +8,7 @@ open-source/
 console_new/
 **/aws_config.js
 deployment/ecr/*.jar
+test/
 
 .pnp
 .pnp.js

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.2] - 2023-06-29
+
+### Fixed
+
+- Bug fix to resolve issue with Start button on Details page
+- Bug fix to resolve issue with Sign Out button not working
+- Updated to react-scripts "5.0.1"
+- Removed @aws-amplify/ui-componenet as it was deprecated
+
 ## [3.2.1] - 2023-04-17
 
 ### Fixed

README.md

@@ -90,7 +90,7 @@ export BUCKET_PREFIX=my-bucket-name # prefix of the bucket name without the regi
 export BUCKET_NAME=$BUCKET_PREFIX-$REGION # full bucket name where the code will reside
 export SOLUTION_NAME=my-solution-name
 export VERSION=my-version # version number for the customized code
-export PUBLIC_ECR_REGISTRY=public.ecr.aws/awssolutions/distributed-load-testing-on-aws-load-tester # replace with the container registry and image if you want to use a different container image
+export PUBLIC_ECR_REGISTRY=public.ecr.aws/aws-solutions # replace with the container registry and image if you want to use a different container image
 export PUBLIC_ECR_TAG=v3.2.1 # replace with the container image tag if you want to use a different container image
 ```
 

source/api-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-services",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "REST API micro services",
   "repository": {
     "type": "git",
@@ -27,4 +27,4 @@
     "node": "^16.x"
   },
   "readme": "./README.md"
-}
+}

source/console/package.json

@@ -1,50 +1,64 @@
-{
-  "name": "distributed-load-testing-on-aws-ui",
-  "version": "3.2.1",
-  "private": true,
-  "license": "Apache-2.0",
-  "author": "aws-solution-builders",
-  "scripts": {
-    "build": "GENERATE_SOURCEMAP=false INLINE_RUNTIME_CHUNK=false react-scripts build",
-    "clean": "rm -rf node_modules package-lock.json",
-    "eject": "react-scripts eject",
-    "start": "react-scripts start",
-    "test": "react-scripts test"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "dependencies": {
-    "@aws-amplify/pubsub": "4.4.10",
-    "@aws-amplify/ui-components": "^1.9.6",
-    "@aws-amplify/ui-react": "^1.0.2",
-    "aws-amplify": "4.3.31",
-    "aws-sdk": "^2.1082.0",
-    "bootstrap": "^5.1.0",
-    "bootstrap-icons": "^1.8.1",
-    "brace": "^0.11.1",
-    "chart.js": "^3.7.1",
-    "chartjs-adapter-moment": "^1.0.0",
-    "moment": "^2.29.1",
-    "react": "^17.0.1",
-    "react-ace": "^9.3.0",
-    "react-dom": "^17.0.1",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "^4.0.3",
-    "reactstrap": "^9.0.0",
-    "solution-utils": "file:../solution-utils"
-  },
-  "readme": "./README.md"
-}
+{
+  "name": "distributed-load-testing-on-aws-ui",
+  "version": "3.2.2",
+  "private": true,
+  "license": "Apache-2.0",
+  "author": "aws-solution-builders",
+  "scripts": {
+    "build": "GENERATE_SOURCEMAP=false INLINE_RUNTIME_CHUNK=false react-scripts build",
+    "clean": "rm -rf node_modules package-lock.json",
+    "eject": "react-scripts eject",
+    "start": "react-scripts start",
+    "test": "react-scripts test"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "dependencies": {
+    "@aws-amplify/pubsub": "4.4.10",
+    "@aws-amplify/ui-react": "^1.0.2",
+    "aws-amplify": "4.3.31",
+    "aws-sdk": "^2.1392.0",
+    "bootstrap": "^5.1.0",
+    "bootstrap-icons": "^1.8.1",
+    "brace": "^0.11.1",
+    "chart.js": "^3.7.1",
+    "chartjs-adapter-moment": "^1.0.0",
+    "moment": "^2.29.1",
+    "react": "^17.0.1",
+    "react-ace": "^10.1.0",
+    "react-dom": "^17.0.1",
+    "react-router-dom": "^5.2.0",
+    "react-scripts": "^5.0.1",
+    "reactstrap": "^9.0.0",
+    "solution-utils": "file:../solution-utils"
+  },
+  "overrides": {
+    "fast-xml-parser": "4.2.5",
+    "nth-check": "2.0.1",
+    "semver": "7.5.2",
+    "optionator": "0.9.3"
+  },
+  "resolutions": {
+    "fast-xml-parser": "4.2.5",
+    "nth-check": "2.0.1",
+    "semver": "7.5.2",
+    "optionator": "0.9.3"
+  },
+  "readme": "./README.md",
+  "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+  }
+}

source/console/public/index.html

@@ -35,5 +35,4 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
   </body>
-
 </html>

source/console/src/App.js

@@ -6,9 +6,8 @@ import { BrowserRouter as Router, Route, Switch, Link } from "react-router-dom";
 import { Collapse, Navbar, NavbarToggler, NavbarBrand, Nav, NavItem } from "reactstrap";
 
 //Amplify
-import Amplify, { Auth } from "aws-amplify";
+import { Amplify, Auth } from "aws-amplify";
 import { withAuthenticator } from "@aws-amplify/ui-react";
-import { AuthState, onAuthUIStateChange } from "@aws-amplify/ui-components";
 import { PubSub, AWSIoTProvider } from "@aws-amplify/pubsub";
 import AWS from "aws-sdk";
 
@@ -28,43 +27,44 @@ Amplify.addPluggable(
 PubSub.configure(awsConfig);
 Amplify.configure(awsConfig);
 
-/**
- * Need to attach IoT Policy to Identity in order to subscribe.
- */
-onAuthUIStateChange(async (nextAuthState) => {
-  if (nextAuthState === AuthState.SignedIn) {
+class App extends React.Component {
+  constructor(props) {
+    super(props);
+    this.noMatch = this.noMatch.bind(this);
+    this.signOut = this.signOut.bind(this);
+    this.toggleNavbar = this.toggleNavbar.bind(this);
+    this.toggleRegionalModal = this.toggleRegionalModal.bind(this);
+    this.state = {
+      collapsed: true,
+      regionalModal: false,
+    };
+  }
+
+  /**
+   * Need to attach IoT Policy to Identity in order to subscribe.
+   */
+  async componentDidMount() {
+    try {
+      await Auth.currentAuthenticatedUser();
+    } catch (error) {
+      console.log("User is not signed in");
+    }
     const credentials = await Auth.currentCredentials();
     const identityId = credentials.identityId;
     AWS.config.update({
       region: awsConfig.aws_project_region,
       credentials: Auth.essentialCredentials(credentials),
     });
-
     const params = {
       policyName: awsConfig.aws_iot_policy_name,
       principal: identityId,
     };
-
     try {
       await new AWS.Iot().attachPrincipalPolicy(params).promise();
     } catch (error) {
       console.error("Error occurred while attaching principal policy", error);
     }
   }
-});
-
-class App extends React.Component {
-  constructor(props) {
-    super(props);
-    this.noMatch = this.noMatch.bind(this);
-    this.signOut = this.signOut.bind(this);
-    this.toggleNavbar = this.toggleNavbar.bind(this);
-    this.toggleRegionalModal = this.toggleRegionalModal.bind(this);
-    this.state = {
-      collapsed: true,
-      regionalModal: false,
-    };
-  }
 
   noMatch({ location }) {
     return (
@@ -88,8 +88,8 @@ class App extends React.Component {
     });
   }
 
-  signOut() {
-    Auth.signOut();
+  async signOut() {
+    await Auth.signOut();
     window.location.reload();
   }
 

source/console/src/Components/Create/Create.js

@@ -48,7 +48,6 @@ class Create extends React.Component {
           fileType = "script";
         }
       }
-
       this.state = {
         isLoading: false,
         runningTasks: false,
@@ -440,7 +439,12 @@ class Create extends React.Component {
     const heading = (
       <PageHeader
         title={`${this.state.testId === null ? "Create" : "Update"} Load Test`}
-        refreshButton={<RefreshButtons refreshFunction={this.getvCPUDetails} />}
+        refreshButton={
+          <RefreshButtons
+            refreshFunction={this.getvCPUDetails}
+            key={`${this.state.testId === null ? "Create" : "Update"} Load Test`}
+          />
+        }
       />
     );
     const currentDate = new Date().toISOString().split("T")[0];
@@ -699,7 +703,7 @@ class Create extends React.Component {
                 <FormText color="muted">Time to hold target concurrency.</FormText>
               </FormGroup>
               <FormGroup>
-                <Row inline>
+                <Row>
                   <Col xs="auto">
                     <Input
                       type="radio"
@@ -760,7 +764,6 @@ class Create extends React.Component {
                           Date:
                         </Label>
                         <Input
-                          inline="true"
                           type="date"
                           name="scheduleDate"
                           id="scheduleDate"
@@ -774,7 +777,6 @@ class Create extends React.Component {
                           Time:
                         </Label>
                         <Input
-                          inline="true"
                           type="time"
                           name="scheduleTime"
                           id="scheduleTime"
@@ -789,12 +791,11 @@ class Create extends React.Component {
                   </TabPane>
                   <TabPane tabId="2">
                     <FormGroup>
-                      <InputGroup className="schedule-date-time" inline="true">
+                      <InputGroup className="schedule-date-time">
                         <Label className="inline-label-left" for="scheduleDate">
                           Date:
                         </Label>
                         <Input
-                          inline="true"
                           type="date"
                           name="scheduleDate"
                           id="scheduleDate"
@@ -808,7 +809,6 @@ class Create extends React.Component {
                           Time:
                         </Label>
                         <Input
-                          inline="true"
                           type="time"
                           name="scheduleTime"
                           id="time"
@@ -826,7 +826,6 @@ class Create extends React.Component {
                           <Label className="mb-0">Recurrence:&nbsp;</Label>
                           &nbsp;
                           <Input
-                            inline
                             type="radio"
                             name="recurrence"
                             id="daily"
@@ -841,7 +840,6 @@ class Create extends React.Component {
                         </Col>
                         <Col xs="auto">
                           <Input
-                            inline
                             type="radio"
                             name="recurrence"
                             id="weekly"
@@ -856,7 +854,6 @@ class Create extends React.Component {
                         </Col>
                         <Col xs="auto">
                           <Input
-                            inline
                             type="radio"
                             name="recurrence"
                             id="biweekly"
@@ -871,7 +868,6 @@ class Create extends React.Component {
                         </Col>
                         <Col xs="auto">
                           <Input
-                            inline
                             type="radio"
                             name="recurrence"
                             id="monthly"
@@ -967,10 +963,9 @@ class Create extends React.Component {
                     <Label for="testDescription">HTTP Headers (Optional)</Label>
                     <AceEditor
                       id="headers"
-                      mode="json"
+                      mode="text"
                       theme="github"
                       value={this.state.formValues.headers}
-                      highlightActiveLine={true}
                       onChange={this.handleHeadersChange}
                       name="headers"
                       width="100%"
@@ -989,9 +984,8 @@ class Create extends React.Component {
                     <Label>Body Payload (Optional)</Label>
                     <AceEditor
                       id="bodyPayload"
-                      mode="json"
+                      mode="text"
                       theme="github"
-                      highlightActiveLine={true}
                       onChange={this.handleBodyPayloadChange}
                       name="bodyPayload"
                       value={this.state.formValues.body}

source/console/src/Components/Details/Details.js

@@ -51,6 +51,7 @@ class Details extends React.Component {
         scheduleDate: null,
         scheduleTime: null,
         recurrence: null,
+        regionalTaskDetails: {},
       },
     };
     this.handleDownload = this.handleDownload.bind(this);
@@ -103,6 +104,7 @@ class Details extends React.Component {
         data.recurrence = data.scheduleRecurrence;
         delete data.nextRun;
       }
+      data.regionalTaskDetails = await API.get("dlts", "/vCPUDetails");
       this.setTestData(data);
     } catch (err) {
       console.error(err);