Made elasticsearch URL an environment variable passed to the Fargate docker containers. Also restructured elasticsearch directory.

Author: ferdingler

bin/runner.py

@@ -16,6 +16,10 @@
 import uuid
 
 
+# Will be passed as environment variable to the Fargate docker containers.
+# Useful with the Elasticsearch example as the test suite will read the cluster URL from this variable.
+ENDPOINT_UNDER_TEST = 'http://strawberry.banana.com'
+
 # List of regions where we have deployed the CloudFormation stack
 regions = [
     {
@@ -70,6 +74,18 @@ def start_distributed_load_test():
             startedBy=run_id,
             group=run_id,
             launchType='FARGATE',
+            overrides={
+                'containerOverrides': [
+                    {
+                        'environment': [
+                            {
+                                'name': 'ENDPOINT_UNDER_TEST',
+                                'value': ENDPOINT_UNDER_TEST
+                            },
+                        ],
+                    },
+                ]
+            },
             networkConfiguration={
                 'awsvpcConfiguration': {
                     'assignPublicIp': 'ENABLED',

examples/elasticsearch/consumer.test.js

@@ -1,23 +1,26 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: MIT-0
-const elasticsearch = require('elasticsearch');
-const awsElasticSearch = require('http-aws-es');
+/* Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+const elasticsearch = require('./es-client');
 const ChanceJs = require('chance');
 const chance = new ChanceJs();
 
 describe('Elasticsearch Document Consumer', () => {
-
-  const elasticSearchUrl = 'https://banana.us-west-2.es.amazonaws.com';
-  const index = 'performance-testing';
-  const client = new elasticsearch.Client({
-    hosts: [elasticSearchUrl],
-    connectionClass: awsElasticSearch,
-    apiVersion: "6.3",
-  });
-
   it('searches documents based on random text', () => {
-    return client.search({
-      index: index,
+    return elasticsearch.client.search({
+      index: elasticsearch.index,
       q: chance.word(),
     });
   });

examples/elasticsearch/es-client.js

@@ -0,0 +1,28 @@
+/* Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+const elasticsearch = require('elasticsearch');
+const awsElasticSearch = require('http-aws-es');
+
+const elasticSearchUrl = process.env.ENDPOINT_UNDER_TEST;
+const index = 'performance-testing';
+const client = new elasticsearch.Client({
+  hosts: [elasticSearchUrl],
+  connectionClass: awsElasticSearch,
+  apiVersion: "6.3",
+});
+
+module.exports.index = index;
+module.exports.client = client;

examples/elasticsearch/package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {},
   "scripts": {
-    "test": "mocha producer.test.js"
+    "test": "mocha ."
   },
   "author": "Fernando Dingler",
   "license": "MIT-0",

examples/elasticsearch/producer.test.js

@@ -1,23 +1,26 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: MIT-0
-const elasticsearch = require('elasticsearch');
-const awsElasticSearch = require('http-aws-es');
+/* Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 const ChanceJs = require('chance');
+const elasticsearch = require('./es-client');
 const chance = new ChanceJs();
 
 describe('Elasticsearch Document Producer', () => {
-
-  const elasticSearchUrl = 'https://banana.us-west-2.es.amazonaws.com';
-  const index = 'performance-testing';
-  const client = new elasticsearch.Client({
-    hosts: [elasticSearchUrl],
-    connectionClass: awsElasticSearch,
-    apiVersion: "6.3",
-  });
-
   it('stores a JSON document', () => {
-    return client.index({
-      index: index,
+    return elasticsearch.client.index({
+      index: elasticsearch.index,
       type: 'dummyType',
       id: chance.hash(),
       body: {