@@ -130,14 +130,31 @@ def grep_logs(pattern: str, show_k8s_timestamps: bool, no_sort: bool):
130
130
@click .argument ("tank_a" , type = str , required = True )
131
131
@click .argument ("tank_b" , type = str , required = True )
132
132
@click .option ("--chain" , default = "regtest" , show_default = True )
133
- @click .option ("--namespace_a" , default = None , show_default = True )
134
- @click .option ("--namespace_b" , default = None , show_default = True )
135
- def messages (
136
- tank_a : str , tank_b : str , chain : str , namespace_a : Optional [str ], namespace_b : Optional [str ]
137
- ):
133
+ def messages (tank_a : str , tank_b : str , chain : str ):
138
134
"""
139
135
Fetch messages sent between <tank_a pod name> and <tank_b pod name> in [chain]
136
+
137
+ Optionally, include a namespace like so: tank-name.namespace
140
138
"""
139
+
140
+ def parse_name_and_namespace (tank : str ) -> tuple [str , Optional [str ]]:
141
+ tank_split = tank .split ("." )
142
+ try :
143
+ namespace = tank_split [1 ]
144
+ except IndexError :
145
+ namespace = None
146
+ return tank_split [0 ], namespace
147
+
148
+ tank_a_split = tank_a .split ("." )
149
+ tank_b_split = tank_b .split ("." )
150
+ if len (tank_a_split ) > 2 or len (tank_b_split ) > 2 :
151
+ click .secho ("Accepted formats: tank-name OR tank-name.namespace" )
152
+ click .secho (f"Foramts found: { tank_a } { tank_b } " )
153
+ sys .exit (1 )
154
+
155
+ tank_a , namespace_a = parse_name_and_namespace (tank_a )
156
+ tank_b , namespace_b = parse_name_and_namespace (tank_b )
157
+
141
158
try :
142
159
namespace_a = get_default_namespace_or (namespace_a )
143
160
namespace_b = get_default_namespace_or (namespace_b )
0 commit comments