Merge pull request #248 from cesar-rodriguez/bugfix/dependency

Bugfix/dependency

HISTORY.rst

@@ -2,9 +2,9 @@
 History
 =======
 
-Unreleased
+0.2.1
 -----------
-* Update pytest from 5.3.2 to 5.3.3
+* Bugfix: The pyhcl hard dependency in the requirements.txt file caused issues if a higher version was installed. This was fixed by using the ">=" operator.
 
 0.2.0 (2020-01-11)
 -------------------

LICENSE

@@ -3,7 +3,7 @@ GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 
     Security and best practices test for terraform
-    Copyright (C) 2017  Cesar Rodriguez
+    Copyright (C) 2020  Accurics, Inc.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

requirements.txt

@@ -1 +1 @@
-pyhcl==0.4.4
+pyhcl>=0.4.4

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.1
 commit = True
 tag = True
 

setup.py

@@ -40,19 +40,19 @@
     history = history_file.read()
 
 requirements = [
-    'pyhcl==0.4.0',
+    'pyhcl>=0.4.4',
 ]
 
 setup(
     name='terrascan',
-    version='0.2.0',
+    version='0.2.1',
     description="Best practices tests for terraform",
     long_description=readme,
     author="Cesar Rodriguez",
     author_email='therasec@gmail.com',
     url='https://github.com/cesar-rodriguez/terrascan',
     download_url='https://github.com/cesar-rodriguez/terrascan' +
-    '/archive/v0.2.0.tar.gz',
+    '/archive/v0.2.1.tar.gz',
     packages=find_packages(where='.'),
     entry_points={
         'console_scripts': [

terrascan/terrascan.py

@@ -2,7 +2,7 @@
 """
     terrascan: A collection of security and best practice tests for static code analysis of terraform templates using terraform_validate.
 
-    Copyright (C) 2017  Cesar Rodriguez
+    Copyright (C) 2020 Accurics, Inc.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@
 #   should_contain_valid_json(): fails if the value of the property doesn't contain valid json.
 ###############################################################################################################################################################################
 class Rules(unittest.TestCase):
-    
+
     rules = []
 
     def setUp(self):
@@ -901,10 +901,10 @@ def terrascan(args):
         startIndex += len(versionStr)
         endIndex = stdout.find("\r", startIndex)
         version = stdout[startIndex:endIndex]
-    
+
     # process the arguments
     if args.warranty or args.gpl:
-        print("terrascan  Copyright (C) 2020  Cesar Rodriguez\n")
+        print("terrascan  Copyright (C) 2020 Accurics, Inc.\n")
         if args.warranty:
             print("This program is distributed in the hope that it will be useful,")
             print("but WITHOUT ANY WARRANTY; without even the implied warranty of")
@@ -962,7 +962,7 @@ def terrascan(args):
         config = args.config[0]
     else:
         config = None
-        
+
     # set logging based on logging.config if present (default is error)
     if config == "none":
         logging.basicConfig(level=logging.CRITICAL)
@@ -1113,13 +1113,13 @@ def main(args=None):
     """
     parser = create_parser()
     args = parser.parse_args(args)
-    
+
     #tests = args.tests[0]
     #location = path.abspath(args.location[0])
-    
+
     #if not path.exists(location):
         #print("ERROR: The specified location doesn't exists")
         #exit(1)
-        
+
     #exit(run_test(location, tests))
     terrascan(args)