Merge pull request #41 from hatchet-dev/belanger/set-module-monitor-c…

…orrectly Set module monitor in runner env properly
hatchet-dev · Mar 24, 2023 · 8904b3f · 8904b3f
2 parents 669b7d6 + be89e66
commit 8904b3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/provisioner/local/provisioner.go b/internal/provisioner/local/provisioner.go
@@ -159,7 +159,7 @@ func (l *LocalProvisioner) getMonitorFunc(opts *provisioner.ProvisionOpts, monit
 		env := opts.Env
 		env = append(env, cmdProv.Environ()...)
 
-		env = append(env, fmt.Sprintf("MODULE_MONITOR_ID=%s", monitorID))
+		env = append(env, fmt.Sprintf("RUNNER_MODULE_MONITOR_ID=%s", monitorID))
 
 		env = append(env, "PATH=/usr/local/bin:/usr/bin:/bin")
 

diff --git a/internal/runner/action/monitor.go b/internal/runner/action/monitor.go
@@ -55,7 +55,7 @@ func RunMonitorFunc(f MonitorFunc, action *RunnerAction, rc *runner.Config) (str
 }
 
 func DownloadMonitorPolicy(config *runner.Config) ([]byte, error) {
-	resp, _, err := config.FileClient.GetMonitorPolicy(config.ConfigFile.Resources.TeamID, config.ConfigFile.Resources.ModuleMonitorID)
+	resp, apiErr, err := config.FileClient.GetMonitorPolicy(config.ConfigFile.Resources.TeamID, config.ConfigFile.Resources.ModuleMonitorID)
 
 	if resp != nil {
 		defer resp.Close()
@@ -65,5 +65,13 @@ func DownloadMonitorPolicy(config *runner.Config) ([]byte, error) {
 		return nil, err
 	}
 
+	if apiErr != nil {
+		return nil, fmt.Errorf(apiErr.Description)
+	}
+
+	if resp == nil {
+		return nil, fmt.Errorf("empty body from server")
+	}
+
 	return ioutil.ReadAll(resp)
 }