Rename Aws to proper AWS

monkey/common/cloud/aws.py

@@ -3,7 +3,7 @@ import urllib2
 __author__ = 'itay.mizeretz'
 
 
-class Aws:
+class AWS:
     def __init__(self):
         try:
             self.instance_id = urllib2.urlopen('http://169.254.169.254/latest/meta-data/instance-id').read()

monkey/infection_monkey/system_info/__init__.py

@@ -5,7 +5,6 @@ import sys
 import psutil
 from enum import IntEnum
 
-from common.cloud.aws import Aws
 from infection_monkey.network.info import get_host_subnets
 from infection_monkey.system_info.aws_collector import AwsCollector
 from infection_monkey.system_info.azure_cred_collector import AzureCollector

monkey/infection_monkey/system_info/aws_collector.py

@@ -1,6 +1,6 @@
 import logging
 
-from common.cloud.aws import Aws
+from common.cloud.aws import AWS
 
 __author__ = 'itay.mizeretz'
 
@@ -15,7 +15,7 @@ class AwsCollector(object):
     @staticmethod
     def get_aws_info():
         LOG.info("Collecting AWS info")
-        aws = Aws()
+        aws = AWS()
         info = {}
         if aws.is_aws_instance():
             LOG.info("Machine is an AWS instance")

monkey/monkey_island/cc/environment/aws.py

@@ -1,6 +1,6 @@
 import cc.auth
 from cc.environment import Environment
-from common.cloud.aws import Aws
+from common.cloud.aws import AWS
 
 __author__ = 'itay.mizeretz'
 
@@ -12,7 +12,7 @@ class AwsEnvironment(Environment):
 
     @staticmethod
     def _get_instance_id():
-        return Aws.get_instance_id()
+        return AWS.get_instance_id()
 
     def is_auth_enabled(self):
         return True

monkey/monkey_island/cc/ui/package.json

@@ -86,7 +86,7 @@
     "react-graph-vis": "^1.0.2",
     "react-json-tree": "^0.11.0",
     "react-jsonschema-form": "^1.0.5",
-    "react-redux": "^5.0.7",
+    "react-redux": "^5.1.1",
     "react-router-dom": "^4.3.1",
     "react-table": "^6.8.6",
     "react-toggle": "^4.0.1",