ping workload subjects

Signed-off-by: Jordan Rash <jordan@synadia.com>
synadia-io · Jan 7, 2025 · 2c37a2b · 2c37a2b
1 parent a771d8e
commit 2c37a2b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/api/go/shared.go b/api/go/shared.go
diff --git a/api/stop-workload-response.json b/api/stop-workload-response.json
@@ -7,9 +7,6 @@
     "id": {
       "type": "string"
     },
-    "issuer": {
-      "type": "string"
-    },
     "stopped": {
       "type": "boolean"
     },
@@ -19,7 +16,6 @@
   },
   "required": [
     "id",
-    "issuer",
     "stopped",
     "message"
   ],

diff --git a/models/agents.go b/models/agents.go
@@ -29,15 +29,15 @@ func AgentAPISetLameduckSubject(inAgentName string) string {
 	return fmt.Sprintf("%s.%s.%s.SETLAMEDUCK", AgentAPIPrefix, NodeSystemNamespace, inAgentName)
 }
 
-func AgentAPIPingWorkloadSubject(inAgentName string) string {
-	return fmt.Sprintf("%s.%s.%s.PINGWORKLOAD", AgentAPIPrefix, NodeSystemNamespace, inAgentName)
-}
-
 func AgentAPIPingSubject(inAgentName string) string {
 	return fmt.Sprintf("%s.%s.%s.PING", AgentAPIPrefix, NodeSystemNamespace, inAgentName)
 }
 
 // User based
+func AgentAPIPingWorkloadSubject(inAgentName string) string {
+	return fmt.Sprintf("%s.*.%s.PINGWORKLOAD.*", AgentAPIPrefix, inAgentName)
+}
+
 func AgentAPIStartWorkloadSubject(inAgentName string) string {
 	return fmt.Sprintf("%s.*.%s.STARTWORKLOAD.*", AgentAPIPrefix, inAgentName)
 }

diff --git a/node/internal/actors/control_api_conversions.go b/node/internal/actors/control_api_conversions.go
@@ -69,7 +69,6 @@ func startResponseFromProto(response *actorproto.WorkloadStarted) *api.StartWork
 func stopResponseFromProto(response *actorproto.WorkloadStopped) *api.StopWorkloadResponse {
 	return &api.StopWorkloadResponse{
 		Id:      response.Id,
-		Issuer:  response.Issuer,
 		Stopped: response.Stopped,
 	}
 }

diff --git a/node/internal/actors/subjects.go b/node/internal/actors/subjects.go
@@ -41,3 +41,7 @@ func WorkloadPingSubscribeSubject() string {
 func AgentAPIStartWorkloadRequestSubject(inNamespace, inAgentName, inWorkloadId string) string {
 	return fmt.Sprintf("%s.%s.%s.STARTWORKLOAD.%s", models.AgentAPIPrefix, inNamespace, inAgentName, inWorkloadId)
 }
+
+func AgentAPIPingWorkloadRequestSubject(inNamespace, inAgentName, inWorkloadId string) string {
+	return fmt.Sprintf("%s.%s.%s.PINGWORKLOAD.%s", models.AgentAPIPrefix, inNamespace, inAgentName, inWorkloadId)
+}