Merge branch 'master' into feature/dan_integration_tests

Author: dan-amzulescu

.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Triggers the workflow on push or pull request events
+on: [push, pull_request]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Install dependencies
+        run: |
+          cd package
+          echo "Installing requirements.txt and test_requirements.txt:"
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if [ -f test_requirements.txt ]; then pip install -r test_requirements.txt; fi
+      - name: Lint with flake8
+        run: |
+            pwd
+            python -m pip install flake8
+            # stop the build if there are Python syntax errors or undefined names
+            # E722 bare 'except'
+            # W605 invalid escape sequence '\.'
+            # E501 line too long
+            # F841 local variable 'e' is assigned to but never used
+            python -m flake8 . --count --ignore=E722,W605,E501,F841 --exclude=*__init__.py,*tag_terraform_resources.py,*data_model.py --statistics --show-source
+
+      - name: Create package and install it
+        run: |
+          python -m pip install --upgrade pip
+          chmod +x ci_deploy.sh
+          ./ci_deploy.sh
+      - name: Test with unittest
+        run: |
+          python -m unittest
+

ci_deploy.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+cd package
+python setup.py sdist
+cd dist
+# package_name=$(find ./ -maxdepth 1 -type f -name "cloudshell-iac-terraform-*.tar.gz" -printf "%f\n")
+pip install --no-index -f . cloudshell-iac-terraform
+cd ../..

package/cloudshell/__init__.py

@@ -1,3 +1,3 @@
 __author__ = 'quali'
 from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
+__path__ = extend_path(__path__, __name__)

package/cloudshell/iac/__init__.py

@@ -1,3 +1,3 @@
 __author__ = 'quali'
 from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
+__path__ = extend_path(__path__, __name__)

package/cloudshell/iac/terraform/constants.py

@@ -4,10 +4,10 @@
 
 # OS types defined by sys.platform
 OS_TYPES = {
- 'darwin': 'darwin_amd64',
- 'linux': 'linux_amd64',
- 'win32': 'windows_amd64'
- }
+    'darwin': 'darwin_amd64',
+    'linux': 'linux_amd64',
+    'win32': 'windows_amd64'
+}
 
 # Log levels
 ERROR_LOG_LEVEL = 40

package/cloudshell/iac/terraform/downloaders/__init__.py

@@ -1,3 +1,3 @@
 __author__ = 'quali'
 from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
+__path__ = extend_path(__path__, __name__)

package/cloudshell/iac/terraform/downloaders/tf_exec_downloader.py

@@ -38,7 +38,7 @@ def download_terraform_executable(tf_workingdir: str, version='latest'):
             if 'current_version' in cont.keys():
                 version = cont['current_version']
             else:
-                raise ValueError(f'Could not find latest TF version from hashicorp site')
+                raise ValueError('Could not find latest TF version from hashicorp site')
 
         # Verifying values
         if not os.path.exists(tf_workingdir):

package/cloudshell/iac/terraform/models/__init__.py

@@ -1,3 +1,3 @@
 __author__ = 'quali'
 from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
+__path__ = extend_path(__path__, __name__)

package/cloudshell/iac/terraform/models/config.py

@@ -8,4 +8,3 @@ def __init__(self, write_sandbox_messages: bool = False, update_live_status: boo
         self.update_live_status = update_live_status
         self.inputs_map = inputs_map
         self.outputs_map = outputs_map
-

package/cloudshell/iac/terraform/models/tf_service.py

@@ -34,4 +34,3 @@ def _set_context_resource_attributes(self) -> dict:
                     attr_dict[attribute.Name] = attribute.Value
                 return attr_dict
         raise ValueError(f"Service:{self.name} was not found in order to construct data object")
-