Remove references to MINDER_PROVIDER. (#27)

Currently tested API do not need `context.provider` to be set, so
let's make things simpler.

Also, removed a few keywords that were either unused or unnecessary,
to facilitate future refactoring.

Author: blkt

minder-tests/api-history.robot

@@ -13,15 +13,13 @@ Test Teardown   Default Teardown
 
 *** Keywords ***
 Default Setup
-    Set Provider as Environment Variable with Test Name
     Set Project as Environment Variable with Test Name
     Ruletypes are ready
     Ruletypes are created
     ${MINDER_TEST_ORG}=    Get Environment Variable    MINDER_TEST_ORG
     Set Suite Variable    $MINDER_TEST_ORG
 
 Default Teardown
-    Remove Provider Environment Variable for Test
     Remove Project Environment Variable for Test
 
 *** Test Cases ***

minder-tests/api-profiles.robot

@@ -21,13 +21,11 @@ Test Teardown    Default Teardown
 
 *** Keywords ***
 Default Setup
-    Set Provider as Environment Variable with Test Name
     Set Project as Environment Variable with Test Name
     Ruletypes are ready
     Ruletypes are created
 
 Default Teardown
-    Remove Provider Environment Variable for Test
     Remove Project Environment Variable for Test
 
 *** Test Cases ***

minder-tests/api-repositories.robot

@@ -21,13 +21,11 @@ Test Teardown   Default Teardown
 
 *** Keywords ***
 Default Setup
-    Set Provider as Environment Variable with Test Name
     Set Project as Environment Variable with Test Name
     ${MINDER_TEST_ORG}=    Get Environment Variable    MINDER_TEST_ORG
     Set Suite Variable    $MINDER_TEST_ORG
 
 Default Teardown
-    Remove Provider Environment Variable for Test
     Remove Project Environment Variable for Test
 
 *** Test Cases ***

minder-tests/api-tests.robot

@@ -11,8 +11,7 @@ Library    resources.minder_restapi_lib.MinderRestApiLib
 Library    resources.eval_results_service.EvalResultsService
 Library    resources.rule_type_service.RuleTypeService
 
-Suite Setup       Set Rest Base URL And Provider Environment Variables
-Suite Teardown    Remove Provider Environment Variable
+Suite Setup       Set Rest Base URL From Config
 
 Test Setup      Create Project And Ruletypes
 Test Teardown   Delete Ruletypes And Project

resources/eval_history_service.py

@@ -31,11 +31,7 @@ def client_retrieves_eval_history(self):
         if not project:
             raise ConfigurationError("MINDER_PROJECT environment variable is not set")
 
-        provider = os.getenv("MINDER_PROVIDER")
-        if not provider:
-            raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
-
-        params = {"provider": provider, "context.project": project}
+        params = {"context.project": project}
 
         try:
             rest_api = MinderRestApiLib()
@@ -111,11 +107,7 @@ def client_retrieves_non_empty_eval_history(self):
         if not project:
             raise ConfigurationError("MINDER_PROJECT environment variable is not set")
 
-        provider = os.getenv("MINDER_PROVIDER")
-        if not provider:
-            raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
-
-        params = {"provider": provider, "context.project": project}
+        params = {"context.project": project}
 
         try:
             rest_api = MinderRestApiLib()
@@ -168,11 +160,7 @@ def client_retrieves_eval_history_by_id(self, history_id):
         if not project:
             raise ConfigurationError("MINDER_PROJECT environment variable is not set")
 
-        provider = os.getenv("MINDER_PROVIDER")
-        if not provider:
-            raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
-
-        params = {"provider": provider, "context.project": project}
+        params = {"context.project": project}
 
         try:
             rest_api = MinderRestApiLib()

resources/eval_results_service.py

@@ -25,11 +25,7 @@ def client_retrieves_eval_results(self):
         if not project:
             raise ConfigurationError("MINDER_PROJECT environment variable is not set")
 
-        provider = os.getenv("MINDER_PROVIDER")
-        if not provider:
-            raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
-
-        params = {"provider": provider, "context.project": project}
+        params = {"context.project": project}
 
         try:
             rest_api = MinderRestApiLib()

resources/github.py

@@ -57,3 +57,8 @@ def create_pr(self, repo_name, pr_title):
                 repo_name,
             )
         )
+
+    @keyword
+    def clone_ruletypes_from_github(self, path):
+        """Clone the ruletypes repository from GitHub to the specified folder."""
+        logger.info(gh.repo.clone("mindersec/minder-rules-and-profiles", self.path))

resources/keywords.robot

@@ -12,44 +12,24 @@ Library    BuiltIn
 Library    RequestsLibrary
 
 *** Keywords ***
-Set Rest Base URL And Provider Environment Variables
-    Set Rest Base URL From Config
-    Set Provider as Environment Variable With Test Name
-
-Remove Provider Environment Variable
-    Remove Provider Environment Variable For Test
-
 Set Rest Base URL From Config
     [Documentation]    Reads the BASE_URL from the config file and sets it for all tests.
     ${BASE_URL}=    Get Rest URL From Config
     Set Suite Variable    ${BASE_URL}
 
-Set Provider As Environment Variable With Test Name
-    [Documentation]    Set the MINDER_PROVIDER environment variable to the first github-app provider
-
-    # We might want to make this more dynamic in the future, but for now this is good enough
-    ${GITHUB_APP_PROVIDER}=    Get Github App Provider ID
-    Set Environment Variable    MINDER_PROVIDER    ${GITHUB_APP_PROVIDER}
-
-Remove Provider Environment Variable For Test
-    [Documentation]    Remove the provider environment variable after the test.
-    Remove Environment Variable    MINDER_PROVIDER
-
 Create Ruletypes
     [Documentation]    Create the ruletypes for the current project.
 
     Given I Am Logged Into Minder
     Given Ruletypes Are Ready
     When Ruletypes Are Created
-    Then Installed Ruletypes Are Listed
 
 Delete Ruletypes
     [Documentation]    Delete the ruletypes for the current project.
 
     Given I Am Logged Into Minder
     Given Ruletypes Are Ready
     When All Ruletypes Are Deleted
-    Then Installed Ruletypes Are Listed
 
 Set Project as Environment Variable With Test Name
     [Documentation]  Set the environment variable for the current test and log the test name.

resources/repositories_service.py

@@ -26,14 +26,7 @@ def client_lists_repositories(self):
         if not project:
             raise ConfigurationError("MINDER_PROJECT environment variable is not set")
 
-        provider = os.getenv("MINDER_PROVIDER")
-        if not provider:
-            raise ConfigurationError("MINDER_PROVIDER environment variable is not set")
-
-        params = {
-            # "provider": provider,
-            "context.project": project
-        }
+        params = {"context.project": project}
 
         try:
             self.results = self.rest_api.get_request("/repositories", params=params)

resources/ruletypes.py

@@ -41,13 +41,6 @@ def all_ruletypes_are_deleted(self):
         """
         logger.info(minder.ruletype.delete("--all", "--yes"))
 
-    @keyword
-    def installed_ruletypes_are_listed(self):
-        """
-        List the ruletypes from minder.
-        """
-        logger.info(minder.ruletype.list())
-
     def _clone_ruletypes_from_github(self):
         """
         Clone the ruletypes repository from GitHub.