paasta-tools 1.30.5__tar.gz → 1.30.7__tar.gz

{paasta_tools-1.30.5/paasta_tools.egg-info → paasta_tools-1.30.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paasta-tools
-Version: 1.30.5
+Version: 1.30.7
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com

{paasta_tools-1.30.5 → paasta_tools-1.30.7}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.30.5"
+__version__ = "1.30.7"

{paasta_tools-1.30.5 → paasta_tools-1.30.7}/paasta_tools/cli/cmds/info.py

@@ -78,8 +78,9 @@ def get_smartstack_endpoints(service, soa_dir):
         service, full_name=False, soa_dir=soa_dir
     ):
         mode = config.get("mode", "http")
+        url_scheme = "http" if mode == "http2" else mode
         port = config.get("proxy_port")
-        endpoints.append(f"{mode}://169.254.255.254:{port} ({name})")
+        endpoints.append(f"{url_scheme}://169.254.255.254:{port} ({name})")
     return endpoints
 
 
@@ -96,10 +97,12 @@ def get_deployments_strings(service: str, soa_dir: str) -> List[str]:
             service=service, namespace="main", soa_dir=soa_dir
         )
         service_mode = service_config.get_mode()
+        url_scheme = "http" if service_mode == "http2" else service_mode
+
         for cluster in deployments_to_clusters(deployments):
             if service_mode in TESTABLE_SERVICE_MODES:
                 link = PaastaColors.cyan(
-                    f"{service_mode}://{service}.proxy.{cluster}.paasta/"
+                    f"{url_scheme}://{service}.proxy.{cluster}.paasta/"
                 )
             else:
                 link = "N/A"

{paasta_tools-1.30.5 → paasta_tools-1.30.7}/paasta_tools/cli/cmds/remote_run.py

@@ -369,7 +369,7 @@ def add_subparser(subparsers: argparse._SubParsersAction) -> None:
             "automatically stopped (capped by the API backend)"
         ),
         type=int,
-        default=1800,
+        default=7200,
     )
     start_parser.add_argument(
         "-f",

{paasta_tools-1.30.5 → paasta_tools-1.30.7}/paasta_tools/cli/schemas/smartstack_schema.json

@@ -37,6 +37,7 @@
                 "enum": [
                     "http",
                     "https",
+                    "http2",
                     "tcp"
                 ]
             },
@@ -117,6 +118,7 @@
                 "enum": [
                     "http",
                     "https",
+                    "http2",
                     "tcp"
                 ]
             },

{paasta_tools-1.30.5 → paasta_tools-1.30.7}/paasta_tools/long_running_service_tools.py

@@ -95,9 +95,12 @@ class ServiceNamespaceConfig(dict):
         """
         healthcheck_mode = self.get("healthcheck_mode", None)
         if not healthcheck_mode:
-            return self.get_mode()
-        else:
-            return healthcheck_mode
+            mode = self.get_mode()
+            if mode == "http2":
+                healthcheck_mode = "http"
+            else:
+                healthcheck_mode = mode
+        return healthcheck_mode
 
     def get_mode(self) -> str:
         """Get the mode that the service runs in and check that we support it.
@@ -112,7 +115,7 @@ class ServiceNamespaceConfig(dict):
                 return None
             else:
                 return "http"
-        elif mode in ["http", "tcp", "https"]:
+        elif mode in ["http", "http2", "tcp", "https"]:
             return mode
         else:
             raise InvalidSmartstackMode("Unknown mode: %s" % mode)

{paasta_tools-1.30.5 → paasta_tools-1.30.7/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: paasta-tools
-Version: 1.30.5
+Version: 1.30.7
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com