From 02c5f91d94f9d119a47bda5faebb3be0c52df226 Mon Sep 17 00:00:00 2001
From: "SLW\\ARNAUA" <Arnel.Arnautovic@nttdata.com>
Date: Fri, 2 Jun 2023 08:34:16 +0200
Subject: [PATCH] modified output directory

---
 environment.yaml |  6 ++++++
 export.py        | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/environment.yaml b/environment.yaml
index b29c5dd..99c60c1 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -4,28 +4,34 @@ euprod:
     - env-url: "https://xxu26128.live.dynatrace.com"
     - env-token-name: "EUPROD_TOKEN_VAR"
     - jenkins: "https://jaws.bmwgroup.net/opapm/"
+    - output-dir: "./output/"
 eupreprod:
     - name: "eupreprod"
     - env-url: "https://qqk70169.live.dynatrace.com"
     - env-token-name: "EUPREPROD_TOKEN_VAR"
     - jenkins: "https://jaws.bmwgroup.net/opapm/"
+    - output-dir: "./output/"
 naprod:
     - name: "naprod"
     - env-url: "https://wgv50241.live.dynatrace.com"
     - env-token-name: "NAPROD_TOKEN_VAR"
     - jenkins: "https://jaws.bmwgroup.net/opapm/"
+    - output-dir: "./output/"
 napreprod:
     - name: "napreprod"
     - env-url: "https://onb44935.live.dynatrace.com"
     - env-token-name: "NAPREPROD_TOKEN_VAR"
     - jenkins: "https://jaws.bmwgroup.net/opapm/"
+    - output-dir: "./output/"
 cnprod:
     - name: "cnprod"
     - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
     - env-token-name: "CNPROD_TOKEN_VAR"
     - jenkins: "https://jaws-china.bmwgroup.net/opmaas/"
+    - output-dir: "./output/"
 cnpreprod:
     - name: "cnpreprod"
     - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35"
     - env-token-name: "CNPREPROD_TOKEN_VAR"
     - jenkins: "https://jaws-china.bmwgroup.net/opmaas/"
+    - output-dir: "./output/"
diff --git a/export.py b/export.py
index 39fe0cc..afab05f 100644
--- a/export.py
+++ b/export.py
@@ -11,11 +11,10 @@ from glob import glob
 import yaml
 
 
-def setEnv(doc, timestamp, outputFolder, configuration):
-    print(config(dict(doc[2]).get("env-token-name")))
+def setEnv(doc, timestamp, configuration):
     os.environ['DYNATRACE_ENV_URL'] = dict(doc[1]).get("env-url")
     os.environ['DYNATRACE_API_TOKEN'] = config(dict(doc[2]).get("env-token-name"))
-    os.environ['DYNATRACE_TARGET_FOLDER'] = str(outputFolder + timestamp + "_" + dict(doc[0]).get("name") + configuration)
+    os.environ['DYNATRACE_TARGET_FOLDER'] = str(dict(doc[4]).get("output-dir") + timestamp + "_" + dict(doc[0]).get("name") + configuration)
     return os.environ
 
 
@@ -46,17 +45,18 @@ def runProcess(process_name, input_params):
 
 if __name__ == "__main__":
     if(len(sys.argv) == 1):
+        bin = "/opt/workspace/coco_apm_dynatrace_terraform_backup_exporter/terraform-provider-dynatrace_v1.30.2"
         timestamp = time.strftime("%Y%m%d-%H%M%S")
-        outputFolder = "./output/"
         environments = ["euprod", "eupreprod", "naprod", "napreprod", "cnprod", "cnpreprod"]
+
         with open(os.path.basename("./environment.yaml")) as file:
             env_doc = yaml.safe_load(file)
 
         for item, doc in env_doc.items():
-            setEnv(doc, timestamp, outputFolder, "_configurations")
-            runProcess("Export", ["/opt/workspace/coco_apm_dynatrace_terraform_backup_exporter/terraform-provider-dynatrace_v1.30.2" , "-export", "-id"])
-            # setEnv(environment, timestamp, outputFolder, "_dashboards")
-            # runProcess("Export", ["sudo", bin, "-export", "-id", "dynatrace_dashboard"])
+            setEnv(doc, timestamp, "_configurations")
+            runProcess("Export", [bin , "-export", "-id"])
+            # setEnv(doc, timestamp, outputFolder, "_dashboards")
+            # runProcess("Export", [bin, "-export", "-id", "dynatrace_dashboard"])
 
         print("Finished!")
     else: