make ports configurable for local testing

Author: tomklapiscak

bin/mas-devops-create-initial-users-for-saas

@@ -36,6 +36,12 @@ if __name__ == "__main__":
     parser.add_argument("--log-level", required=False, choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], default="WARNING")
     parser.add_argument("--dry-run", required=False, help="When specified, nothing will actually be deleted from the cluster", action="store_true")
 
+
+    parser.add_argument("--coreapi-port", required=False, default=443)
+    parser.add_argument("--admin-dashboard-port", required=False, default=443)
+    parser.add_argument("--manage-api-port", required=False, default=443)
+
+
     args, unknown = parser.parse_known_args()
 
     log_level = getattr(logging, args.log_level)
@@ -56,6 +62,10 @@ if __name__ == "__main__":
     mas_workspace_id = args.mas_workspace_id
     initial_users_yaml_file = args.initial_users_yaml_file
     dry_run = args.dry_run
+    coreapi_port = args.coreapi_port
+    admin_dashboard_port = args.admin_dashboard_port
+    manage_api_port = args.manage_api_port
+
 
     logger.info("Configuration:")
     logger.info("--------------")
@@ -64,6 +74,9 @@ if __name__ == "__main__":
     logger.info(f"initial_users_yaml_file: {initial_users_yaml_file}")
     logger.info(f"log_level:               {log_level}")
     logger.info(f"dry_run:                 {dry_run}")
+    logger.info(f"coreapi_port:            {coreapi_port}")
+    logger.info(f"admin_dashboard_port:    {admin_dashboard_port}")
+    logger.info(f"manage_api_port:         {manage_api_port}")
     logger.info("")
 
     try:
@@ -75,7 +88,7 @@ if __name__ == "__main__":
         config.load_kube_config()
         logger.debug("Loaded kubeconfig file")
 
-    user_utils = MASUserUtils(mas_instance_id, mas_workspace_id, client.api_client.ApiClient())
+    user_utils = MASUserUtils(mas_instance_id, mas_workspace_id, client.api_client.ApiClient(), coreapi_port=coreapi_port, admin_dashboard_port=admin_dashboard_port, manage_api_port=manage_api_port)
 
     with open(initial_users_yaml_file, 'r') as file:
        initial_users_yaml = yaml.safe_load(file)

src/mas/devops/users.py

@@ -27,6 +27,8 @@
     MVI / other apps?
     unit tests
 
+    dry-run support
+
     where are we going to run this from? Needs to run in cluster, so a Job in an app
     which app though? Manage?
     Perhaps we do the core bits in a core app (suite workspace?)
@@ -46,12 +48,16 @@ class MASUserUtils():
 
     MAXADMIN = "MAXADMIN"
 
-    def __init__(self, mas_instance_id: str, mas_workspace_id: str, k8s_client: client.api_client.ApiClient):
+    def __init__(self, mas_instance_id: str, mas_workspace_id: str, k8s_client: client.api_client.ApiClient, coreapi_port: int = 443, admin_dashboard_port: int = 443, manage_api_port: int = 443):
         self.mas_instance_id = mas_instance_id
         self.mas_workspace_id = mas_workspace_id
         self.k8s_client = k8s_client
         self.logger = logging.getLogger(f"{__name__}.{self.__class__.__name__}")
 
+        self.coreapi_port = coreapi_port
+        self.admin_dashboard_port = admin_dashboard_port
+        self.manage_api_port = manage_api_port
+
         self.mas_core_namespace = f"mas-{self.mas_instance_id}-core"
         self.manage_namespace = f"mas-{self.mas_instance_id}-manage"
         self.dyn_client = DynamicClient(self.k8s_client)
@@ -90,16 +96,12 @@ def mas_superuser_credentials(self):
     @property
     def mas_admin_url_internal(self):
         if self._mas_admin_url_internal is None:
-            self._mas_admin_url_internal = f'https://admin-dashboard.{self.mas_core_namespace}.svc.cluster.local'
+            self._mas_admin_url_internal = f'https://admin-dashboard.{self.mas_core_namespace}.svc.cluster.local:{self.admin_dashboard_port}'
 
             # for local testing:
             # add to /etc/hosts:
             #    127.0.0.1               admin-dashboard.mas-tgk01-core.svc.cluster.local
             # oc port-forward service/admin-dashboard 8445:443 -n mas-tgk01-core
-
-            # uncomment for local testing
-            # TODO: make configurable
-            self._mas_admin_url_internal = f"{self._mas_admin_url_internal}:8445"
         return self._mas_admin_url_internal
 
     @property
@@ -123,16 +125,12 @@ def admin_internal_ca_pem_file_path(self):
     @property
     def mas_api_url_internal(self):
         if self._mas_api_url_internal is None:
-            self._mas_api_url_internal = f'https://coreapi.{self.mas_core_namespace}.svc.cluster.local'
+            self._mas_api_url_internal = f'https://coreapi.{self.mas_core_namespace}.svc.cluster.local:{self.coreapi_port}'
 
             # for local testing:
             # add to /etc/hosts:
             #    127.0.0.1               coreapi.mas-tgk01-core.svc.cluster.local
             # oc port-forward service/coreapi 8444:443 -n mas-tgk01-core
-
-            # uncomment for local testing
-            # TODO: make configurable
-            self._mas_api_url_internal = f"{self._mas_api_url_internal}:8444"
         return self._mas_api_url_internal
 
     @property
@@ -162,11 +160,7 @@ def manage_api_url_internal(self):
 
             # oc port-forward service/tgk01-masdev 8443:443 -n mas-tgk01-manage
 
-            self._manage_api_url_internal = f'https://{self.mas_instance_id}-{self.mas_workspace_id}.{self.manage_namespace}.svc.cluster.local'
-
-            # uncomment for local testing
-            # TODO: make configurable
-            self._manage_api_url_internal = f"{self._manage_api_url_internal}:8443"
+            self._manage_api_url_internal = f'https://{self.mas_instance_id}-{self.mas_workspace_id}.{self.manage_namespace}.svc.cluster.local:{self.manage_api_port}'
         return self._manage_api_url_internal
 
     @property