renamed acs_deploy to deploy_acs

Author: josehelps

contentctl/actions/api_deploy.py

@@ -61,7 +61,7 @@ def inspectAppAPI(self, config: inspect)->str:
         if not package_path.is_file():
             raise Exception(f"Cannot run Appinspect API on App '{config.app.title}' - "
                             f"no package exists as expected path '{package_path}'.\nAre you "
-                            "trying to 'contentctl acs_deploy' the package BEFORE running 'contentctl build'?")
+                            "trying to 'contentctl deploy_acs' the package BEFORE running 'contentctl build'?")
 
         files = {
             "app_package": open(package_path,"rb"),

contentctl/actions/acs_deploy.py renamed to contentctl/actions/deploy_acs.py

@@ -1,6 +1,11 @@
-from contentctl.actions.initialize import Initialize
+import traceback
+import sys
+import warnings
+import pathlib
 import tyro
-from contentctl.objects.config import init, validate, build,  new, deploy_acs, deploy_rest, test, test_servers, inspect, report, test_common, release_notes
+
+from contentctl.actions.initialize import Initialize
+from contentctl.objects.config import init, validate, build,  new, deploy_acs, test, test_servers, inspect, report, test_common, release_notes
 from contentctl.actions.validate import Validate
 from contentctl.actions.new_content import NewContent
 from contentctl.actions.detection_testing.GitService import GitService
@@ -9,15 +14,10 @@
      DirectorOutputDto,
      Build,
 )
-
 from contentctl.actions.test import Test
 from contentctl.actions.test import TestInputDto
 from contentctl.actions.reporting import ReportingInputDto, Reporting
 from contentctl.actions.inspect import Inspect
-from contentctl.actions.acs_deploy import Deploy
-import sys
-import warnings
-import pathlib
 from contentctl.input.yml_reader import YmlReader
 from contentctl.actions.release_notes import ReleaseNotes
 
@@ -82,8 +82,8 @@ def build_func(config:build)->DirectorOutputDto:
 def inspect_func(config:inspect)->str:
     #Make sure that we have built the most recent version of the app
     _ = build_func(config)
-    appinspect_token = Inspect().execute(config)
-    return appinspect_token
+    inspect_token = Inspect().execute(config)
+    return inspect_token
 
 
 def release_notes_func(config:release_notes)->None:
@@ -95,14 +95,8 @@ def new_func(config:new):
 
 
 def deploy_acs_func(config:deploy_acs):
-    appinspect_token = inspect_func(config)
-    Deploy().execute(config, appinspect_token)
-
-    
-
-def deploy_rest_func(config:deploy_rest):
-    raise Exception("deploy rest not yet implemented")
-    
+    #This is a bit challenging to get to work with the default values.
+    raise Exception("deploy acs not yet implemented") 
 
 def test_common_func(config:test_common):
     director_output_dto = build_func(config)
@@ -178,15 +172,14 @@ def main():
             "test":test.model_validate(config_obj),
             "test_servers":test_servers.model_construct(**t.__dict__),
             "release_notes": release_notes.model_construct(**config_obj),
-            "deploy_acs": deploy_acs.model_construct(**config_obj),
-            #"deploy_rest":deploy_rest()
+            "deploy_acs": deploy_acs.model_construct(**t.__dict__)
         }
     )
 
 
 
 
-    
+    config = None
     try:
         # Since some model(s) were constructed and not model_validated, we have to catch
         # warnings again when creating the cli
@@ -212,8 +205,6 @@ def main():
         elif type(config) == deploy_acs:
             updated_config = deploy_acs.model_validate(config)
             deploy_acs_func(updated_config)
-        elif type(config) == deploy_rest:
-            deploy_rest_func(config)
         elif type(config) == test or type(config) == test_servers:
             if type(config) == test:
                 #construct the container Infrastructure objects
@@ -223,9 +214,18 @@ def main():
         else:
             raise Exception(f"Unknown command line type '{type(config).__name__}'")
     except Exception as e:
-        import traceback
-        traceback.print_exc()
-        traceback.print_stack()
-        #print(e)
+        if config is None:
+            print("There was a serious issue where the config file could not be created.\n"
+                  "The entire stack trace is provided below (please include it if filing a bug report).\n")
+            traceback.print_exc()
+        elif config.verbose:
+            print("Verbose error logging is ENABLED.\n"
+                  "The entire stack trace has been provided below (please include it if filing a bug report):\n")
+            traceback.print_exc()
+        else:
+            print("Verbose error logging is DISABLED.\n"
+                  "Please use the --verbose command line argument if you need more context for your error or file a bug report.")
+            print(e)
+            
         sys.exit(1)