Consolidated secrets creation code, removed SecretHandler.

Author: susanxhuynh

tests/test_spark.py

@@ -32,6 +32,7 @@ def setup_module(module):
         utils.require_hdfs()
     utils.require_spark()
     utils.upload_file(os.environ["SCALA_TEST_JAR_PATH"])
+    shakedown.run_dcos_command('package install --cli dcos-enterprise-cli --yes')
 
 
 def teardown_module(module):
@@ -299,11 +300,12 @@ def test_marathon_group():
 
 
 @pytest.mark.sanity
+@pytest.mark.secrets
 def test_secrets():
     properties_file_path = os.path.join(THIS_DIR, "resources", "secrets-opts.txt")
-    secrets_handler = utils.SecretHandler(SECRET_NAME, SECRET_CONTENTS)
-    r = secrets_handler.create_secret()
-    assert r.ok, "Error creating secret, {}".format(r.content)
+    # Create secret
+    shakedown.run_dcos_command('security secrets create /{} --value {}'.format(SECRET_NAME, SECRET_CONTENTS))
+
     secret_file_name = "secret_file"
     output = "Contents of file {}: {}".format(secret_file_name, SECRET_CONTENTS)
     args = ["--properties-file", properties_file_path,
@@ -313,9 +315,9 @@ def test_secrets():
                     expected_output=output,
                     app_name="/spark",
                     args=args)
-    r = secrets_handler.delete_secret()
-    if not r.ok:
-        LOGGER.warn("Error when deleting secret, {}".format(r.content))
+
+    # Delete secret
+    shakedown.run_dcos_command('security secrets delete /{}'.format(SECRET_NAME))
 
 
 # Skip DC/OS < 1.10, because it doesn't have support for file-based secrets.
@@ -328,7 +330,6 @@ def test_driver_executor_tls():
     Put keystore and truststore as secrets in DC/OS secret store.
     Run SparkPi job with TLS enabled, referencing those secrets.
     '''
-    shakedown.run_dcos_command('package install --cli dcos-enterprise-cli --yes')
     resources_folder = os.path.join(
         os.path.dirname(os.path.realpath(__file__)), 'resources'
     )
@@ -363,6 +364,8 @@ def test_driver_executor_tls():
                           "--conf", "spark.mesos.executor.secret.filenames={},{}".format(keystore_file, truststore_file),
                           "--conf", "spark.mesos.task.labels=DCOS_SPACE:/spark"
                           ])
+    shakedown.run_dcos_command('security secrets delete /{}'.format(keystore_secret))
+    shakedown.run_dcos_command('security secrets delete /{}'.format(truststore_secret))
 
 
 def _run_janitor(service_name):

tests/utils.py

@@ -170,21 +170,6 @@ def check_job_output(task_id, expected_output):
         raise Exception("{} not found in stdout".format(expected_output))
 
 
-class SecretHandler():
-    def __init__(self, path, value):
-        self.payload = json.dumps({"value": value})
-        self.api_url = urllib.parse.urljoin(dcos.config.get_config_val("core.dcos_url"),
-                                            "secrets/v1/secret/default/{}".format(path))
-        self.token = dcos.config.get_config_val("core.dcos_acs_token")
-        self.headers = {"Content-Type": "application/json", "Authorization": "token={}".format(self.token)}
-
-    def create_secret(self):
-        return requests.put(self.api_url, data=self.payload, headers=self.headers, verify=False)
-
-    def delete_secret(self):
-        return requests.delete(self.api_url, headers=self.headers, verify=False)
-
-
 def upload_file(file_path):
     LOGGER.info("Uploading {} to s3://{}/{}".format(
         file_path,