refactor: simplify run_command and run_service examples

Author: akosyakov

examples/run_command.py

@@ -4,36 +4,40 @@
 import asyncio
 from gitpod import Gitpod
 import gitpod.lib as util
+from gitpod.types.environment_spec_param import EnvironmentSpecParam
 
-# Example: ./examples/run_command.py https://github.com/gitpod-io/empty 'echo "Hello World!"'
+# Examples:
+# - ./examples/run_command.py 'echo "Hello World!"'
+# - ./examples/run_command.py 'echo "Hello World!"' https://github.com/gitpod-io/empty
 async def main() -> None:
     client = Gitpod()
 
-    if len(sys.argv) < 3:
-        print("Usage: ./examples/run_command.py <CONTEXT_URL> <COMMAND>")
+    if len(sys.argv) < 2:
+        print("Usage: ./examples/run_command.py '<COMMAND>' [CONTEXT_URL]")
         sys.exit(1)
-    context_url = sys.argv[1]
-    command = " ".join(sys.argv[2:])
+
+    command = sys.argv[1]
+    context_url = sys.argv[2] if len(sys.argv) > 2 else None
 
     env_class = util.find_most_used_environment_class(client)
     if not env_class:
         print("Error: No environment class found. Please create one first.")
         sys.exit(1)
 
-    environment_id = client.environments.create(
-        spec={
-            "desired_phase": "ENVIRONMENT_PHASE_RUNNING",
-            "content": {
-                "initializer": {"specs": [{
-                    "contextUrl": {
-                        "url": context_url
-                    }
-                }]}
-            },
-            "machine": {"class": env_class.id},
+    spec: EnvironmentSpecParam = {
+        "desired_phase": "ENVIRONMENT_PHASE_RUNNING",
+        "machine": {"class": env_class.id},
+    }
+    if context_url:
+        spec["content"] = {
+            "initializer": {"specs": [{
+                "contextUrl": {
+                    "url": context_url
+                }
+            }]}
         }
-    ).environment.id
 
+    environment_id = client.environments.create(spec=spec).environment.id
     try:
         util.wait_for_environment_ready(client, environment_id)
 

examples/run_service.py

@@ -4,15 +4,15 @@
 import asyncio
 from gitpod import Gitpod
 import gitpod.lib as util
+from gitpod.types.environment_spec_param import EnvironmentSpecParam
 
-# Example: ./examples/run_service.py https://github.com/gitpod-io/empty
+# Examples:
+# - ./examples/run_service.py
+# - ./examples/run_service.py https://github.com/gitpod-io/empty
 async def main() -> None:
     client = Gitpod()
 
-    if len(sys.argv) < 2:
-        print("Usage: ./examples/run_service.py <CONTEXT_URL>")
-        sys.exit(1)
-    context_url = sys.argv[1]
+    context_url = sys.argv[1] if len(sys.argv) > 1 else None
 
     env_class = util.find_most_used_environment_class(client)
     if not env_class:
@@ -21,27 +21,25 @@ async def main() -> None:
 
     port = 8888
 
-    environment_id = client.environments.create(
-        spec={
-            "desired_phase": "ENVIRONMENT_PHASE_RUNNING",
-            "content": {
-                "initializer": {"specs": [{
-                    "contextUrl": {
-                        "url": context_url
-                    }
-                }]}
-            },
-            "machine": {"class": env_class.id},
-            "ports": [
-                {
-                    "name": "Lama Service",
-                    "port": port,
-                    "admission": "ADMISSION_LEVEL_EVERYONE"
+    spec: EnvironmentSpecParam = {
+        "desired_phase": "ENVIRONMENT_PHASE_RUNNING",
+        "machine": {"class": env_class.id},
+        "ports": [{
+            "name": "Lama Service",
+            "port": port,
+            "admission": "ADMISSION_LEVEL_EVERYONE"
+        }]
+    }
+    if context_url:
+        spec["content"] = {
+            "initializer": {"specs": [{
+                "contextUrl": {
+                    "url": context_url
                 }
-            ]
-        }   
-    ).environment.id
+            }]}
+        }
 
+    environment_id = client.environments.create(spec=spec).environment.id
     try:
         util.wait_for_environment_ready(client, environment_id)