removed redundent nil error checking in pkg/runfileconfig/run_file_co…

…nfig_parser.go and added proper error handling while unmarshalling json in pkg/runfileconfig/standalone/publish.go
dapr · Sep 18, 2024 · 695abd3 · 695abd3
1 parent aa0436e
commit 695abd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/runfileconfig/run_file_config_parser.go b/pkg/runfileconfig/run_file_config_parser.go
@@ -212,9 +212,7 @@ func (a *RunFileConfig) resolvePathToAbsAndValidate(baseDir string, paths ...*st
 			return err
 		}
 		absPath := utils.GetAbsPath(baseDir, *path)
-		if err != nil {
-			return err
-		}
+
 		*path = absPath
 		if err = utils.ValidateFilePath(*path); err != nil {
 			return err

diff --git a/pkg/standalone/publish.go b/pkg/standalone/publish.go
@@ -69,7 +69,7 @@ func (s *Standalone) Publish(publishAppID, pubsubName, topic string, payload []b
 
 	// Detect publishing with CloudEvents envelope.
 	var cloudEvent map[string]interface{}
-	if json.Unmarshal(payload, &cloudEvent); err == nil {
+	if err := json.Unmarshal(payload, &cloudEvent); err == nil {
 		_, hasID := cloudEvent["id"]
 		_, hasSource := cloudEvent["source"]
 		_, hasSpecVersion := cloudEvent["specversion"]
@@ -78,6 +78,8 @@ func (s *Standalone) Publish(publishAppID, pubsubName, topic string, payload []b
 		if hasID && hasSource && hasSpecVersion && hasType && hasData {
 			contentType = "application/cloudevents+json"
 		}
+	} else {
+		return err
 	}
 
 	r, err := httpc.Post(url, contentType, bytes.NewBuffer(payload))