Refactoring modules and major rewrite of internal calls

.circleci/config.yml

@@ -0,0 +1,28 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/python:3.8.3
+        environment:
+          PIPENV_VENV_IN_PROJECT: true
+      - image: mockserver/mockserver
+        name: mockserver.mockserver
+    steps:
+      - checkout # check out source code to working directory
+      - run:
+          command: |
+            sudo chown -R circleci:circleci /usr/local/bin
+            sudo chown -R circleci:circleci /usr/local/lib/python3.8/site-packages
+      - run:
+          command: |
+            cp .circleci/mockserver.py user_variables.py
+            pip install pipenv
+            pipenv install --dev
+      - run:
+          command: |
+            pipenv run python -m unittest discover
+      - store_test_results:
+          path: test-results
+      - store_artifacts:
+          path: test-results
+          destination: tr1

.circleci/mockserver.py

@@ -0,0 +1,42 @@
+"""User variables to use toolkit for Dynatrace"""
+FULL_SET = {
+    "mockserver1": {
+        "url": "mockserver:1080",
+        "tenant": {
+            "tenant1": "mockserver",
+        },
+        "api_token": {
+            "tenant1": "sample_api_token",
+        },
+        "verify_ssl": False,
+        "is_managed": False,
+        "cluster_token": "Required for Cluster Operations in Managed"
+    }
+}
+
+LOG_LEVEL="INFO"
+
+# ROLE TYPE KEYS
+# access_env
+# change_settings
+# install_agent
+# view_logs
+# view_senstive
+# change_sensitive
+
+USER_GROUPS = {
+    "role_types": {
+        "access_env": "accessenv",
+        "change_settings": "changesettings",
+        "view_logs": "logviewer",
+        "view_sensitive": "viewsensitive"
+    },
+    "role_tenants": [
+        "nonprod",
+        "prod"
+    ]
+}
+
+USER_GROUP_TEMPLATE = "prefix_{USER_TYPE}_{TENANT}_{APP_NAME}_suffix"
+
+DEFAULT_TIMEZONE = "America/Chicago"

.coveragerc

@@ -0,0 +1,9 @@
+[run]
+omit =
+    # omit anything in a .local directory anywhere
+    */.local/*
+    # omit everything in /usr
+    /usr/*
+    # omit in the test tools
+    tests/*
+    user_variables.py

.github/workflows/linter.yml

@@ -0,0 +1,51 @@
+###########################
+###########################
+## Linter GitHub Actions ##
+###########################
+###########################
+name: Lint Code Base
+
+#
+# Documentation:
+# https://help.github.com/en/articles/workflow-syntax-for-github-actions
+#
+
+#############################
+# Start the job on all push #
+#############################
+on:
+  push:
+    branches-ignore: [master]
+    # Remove the line above to run when pushing to master
+  pull_request:
+    branches: [master, test, dev]
+
+###############
+# Set the Job #
+###############
+jobs:
+  build:
+    # Name the Job
+    name: Lint Code Base
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: docker://github/super-linter:v3
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: master
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -6,7 +6,11 @@ variable_sets/*
 scripts/*
 templates/*
 
-.vscode/
+# Workspace settings and virtual environments
+**.vscode**
+**venv**
+# Framework log files
+***.log**
 
 user_variables.py
 sandbox_script.py

.pylintrc

@@ -0,0 +1 @@
+init-hook='from sys.path import append; from os import getcwd; append(getcwd())'

Pipfile

@@ -6,9 +6,10 @@ verify_ssl = true
 [dev-packages]
 pylint = "*"
 autopep8 = "*"
+coverage = "*"
 
 [packages]
 requests = "*"
 
 [requires]
-python_version = "3.4"
+python_version = "3.8"

change_variables.py

@@ -3,23 +3,28 @@
 import argparse
 import os
 
+
 def replace_set(set_file):
-  """Replace Variable File"""
-  # Options are Darwin, Linux, Java and Windows. Java not supported
-  if "Windows" in system():
-    os.system("copy variable_sets\\" + str(set_file) + ".py user_variables.py")
-  else:
-    os.system("cp variable_sets/" + str(set_file) + ".py user_variables.py")
+    """Replace Variable File"""
+    # Options are Darwin, Linux, Java and Windows. Java not supported
+    if "Windows" in system():
+        os.system("copy variable_sets\\" +
+                  str(set_file) + ".py user_variables.py")
+    else:
+        os.system("cp variable_sets/" + str(set_file) +
+                  ".py user_variables.py")
+
 
 def get_variable_set_file(variable_set_arg):
-  """Checks if the set file was provided via arg else prompt"""
-  if variable_set_arg:
-    return variable_set_arg
-  return input("Enter Set to Import: ")
+    """Checks if the set file was provided via arg else prompt"""
+    if variable_set_arg:
+        return variable_set_arg
+    return input("Enter Set to Import: ")
+
 
 if __name__ == '__main__':
-  parser = argparse.ArgumentParser()
-  parser.add_argument('--set-file', '-s')
-  args = parser.parse_args()
-  set_file = get_variable_set_file(args.set_file)
-  replace_set(set_file)
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--set-file', '-s')
+    args = parser.parse_args()
+    set_file = get_variable_set_file(args.set_file)
+    replace_set(set_file)

dynatrace/cluster/config.py

@@ -1,13 +1,21 @@
 import dynatrace.requests.request_handler as rh
 
+
 def get_node_info(cluster):
-  response = rh.cluster_get(cluster,"cluster")
-  return response.json()
+    response = rh.make_api_call(cluster=cluster,
+                                endpoint=rh.ClusterAPIs.CLUSTER)
+    return response.json()
+
 
 def get_node_config(cluster):
-  response = rh.cluster_get(cluster,"cluster/configuration")
-  return response.json()
+    response = rh.make_api_call(cluster=cluster,
+                                endpoint=rh.ClusterAPIs.CONFIG)
+    return response.json()
+
 
 def set_node_config(cluster, json):
-  response = rh.cluster_post(cluster,"cluster/configuration", json=json)
-  return response.status_code
+    response = rh.make_api_call(cluster=cluster,
+                                endpoint=rh.ClusterAPIs.CONFIG,
+                                method=rh.HTTP.POST,
+                                json=json)
+    return response.status_code