fixed issue with cgid

Author: nobodynate

cloudgoat/core/python/commands.py

@@ -373,7 +373,7 @@ def configure_or_check_whitelist(self, auto=False, print_values=False):
 
     def _get_tf_vars(self, cgid=None):
         if not cgid:
-            cgid = os.path.basename(self.instance_path)
+            cgid = extract_cgid_from_dir_name(self.instance_path)
 
         tf_vars = {"cgid": cgid, "cg_whitelist": self.cg_whitelist}
         if self.scenario_cloud_platform == 'aws':