refactored a bit

deploymenttheory · Nov 15, 2024 · db5cbb7 · db5cbb7
1 parent c69f6b0
commit db5cbb7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 61 deletions.
diff --git a/...er_working_dir/configurations/config.json → importer_working_dir/config.json b/...er_working_dir/configurations/config.json → importer_working_dir/config.json
@@ -1,16 +1,5 @@
 {
     "exclude_ids": {
-        "jamfpro_script": [
-            7761,
-            7759,
-            7723,
-            7725,
-            7724,
-            7760,
-            7761,
-            7770,
-            7771
-        ],
         "jamfpro_category": [
             224
         ]
@@ -19,7 +8,7 @@
         "jamfpro_script": {
             "active": true,
             "validate": true,
-            "use_resource_type_as_name": false
+            "use_resource_type_as_name": true
         },
         "jamfpro_category": {
             "active": true,

diff --git a/importer_working_dir/outputs/jamfpro_category.tf b/importer_working_dir/outputs/jamfpro_category.tf
diff --git a/importer_working_dir/outputs/jamfpro_policy.tf b/importer_working_dir/outputs/jamfpro_policy.tf
diff --git a/importer_working_dir/outputs/jamfpro_script.tf b/importer_working_dir/outputs/jamfpro_script.tf
diff --git a/scripts/import_via_config_file.py b/scripts/import_via_config_file.py
@@ -9,7 +9,7 @@
 
 
 # Consts
-CONFIG_FN = "jamftf_config.json"
+CONFIG_FN = "config.json"
 
 # Environment vars
 JP_TENANT_NAME = os.environ.get("JP_TENANT_NAME")
@@ -51,7 +51,7 @@ def get_hcl() -> dict:
     target_resources = jamftf.parse_config_file(f"{WORKING_DIR}/{CONFIG_FN}")
 
     importer = jamftf.Importer(
-        client=JP_CLIENT(),
+        client=JP_CLIENT,
         targetted=target_resources,
         debug=False
     )
@@ -67,8 +67,6 @@ def write_out(hcl_dict: dict) -> None:
 
         path = f"{WORKING_DIR}/{res_type}.tf"
 
-        os.mkdir(os.path.dirname(path), exist_ok=True)
-
         with open(path, "w+", encoding="UTF-8") as f:
             f.write(v)