Merge pull request #177 from unexist/main

Replaced generic error messages

Author: lgfa29

CHANGELOG.md

@@ -10,6 +10,9 @@ FEATURES:
 * config: Allow setting `image_pull_timeout` and `client_http_timeout ` [[GH-131](https://github.com/hashicorp/nomad-driver-podman/pull/131)]
 * runtime: Add support for host and CSI volumes and using podman tasks as CSI plugins [[GH-169](https://github.com/hashicorp/nomad-driver-podman/pull/169)][[GH-152](https://github.com/hashicorp/nomad-driver-podman/pull/152)]
 
+IMPROVEMENTS:
+* log: Improve log messages on errors. [[GH-177](https://github.com/hashicorp/nomad-driver-podman/pull/177)]
+
 BUG FIXES:
 * log: Use error key context to log errors rather than Go err style. [[GH-126](https://github.com/hashicorp/nomad-driver-podman/pull/126)]
 * telemetry: respect telemetry.collection_interval to reduce cpu churn when running many containers [[GH-130](https://github.com/hashicorp/nomad-driver-podman/pull/130)]

api/container_create.go

@@ -28,7 +28,7 @@ func (c *API) ContainerCreate(ctx context.Context, create SpecGenerator) (Contai
 
 	if res.StatusCode != http.StatusCreated {
 		body, _ := ioutil.ReadAll(res.Body)
-		return response, fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return response, fmt.Errorf("cannot create container, status code: %d: %s", res.StatusCode, body)
 	}
 
 	body, err := ioutil.ReadAll(res.Body)

api/container_delete.go

@@ -20,5 +20,5 @@ func (c *API) ContainerDelete(ctx context.Context, name string, force bool, dele
 	if res.StatusCode == http.StatusNoContent {
 		return nil
 	}
-	return fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+	return fmt.Errorf("cannot delete container, status code: %d", res.StatusCode)
 }

api/container_inspect.go

@@ -25,7 +25,7 @@ func (c *API) ContainerInspect(ctx context.Context, name string) (InspectContain
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return inspectData, fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+		return inspectData, fmt.Errorf("cannot inspect container, status code: %d", res.StatusCode)
 	}
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {

api/container_kill.go

@@ -19,5 +19,5 @@ func (c *API) ContainerKill(ctx context.Context, name string, signal string) err
 	if res.StatusCode == http.StatusNoContent {
 		return nil
 	}
-	return fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+	return fmt.Errorf("cannot kill container, status code: %d", res.StatusCode)
 }

api/container_logs.go

@@ -19,7 +19,7 @@ func (c *API) ContainerLogs(ctx context.Context, name string, since time.Time, s
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+		return fmt.Errorf("cannot get logs from container, status code: %d", res.StatusCode)
 	}
 
 	defer func() {

api/container_start.go

@@ -20,7 +20,7 @@ func (c *API) ContainerStart(ctx context.Context, name string) error {
 
 	if res.StatusCode != http.StatusNoContent {
 		body, _ := ioutil.ReadAll(res.Body)
-		return fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return fmt.Errorf("cannot start container, status code: %d: %s", res.StatusCode, body)
 	}
 
 	// wait max 10 seconds for running state

api/container_stats.go

@@ -31,7 +31,7 @@ func (c *API) ContainerStats(ctx context.Context, name string) (Stats, error) {
 		return stats, ContainerWrongState
 	}
 	if res.StatusCode != http.StatusOK {
-		return stats, fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+		return stats, fmt.Errorf("cannot get stats of container, status code: %d", res.StatusCode)
 	}
 
 	body, err := ioutil.ReadAll(res.Body)

api/container_stop.go

@@ -26,5 +26,5 @@ func (c *API) ContainerStop(ctx context.Context, name string, timeout int, ignor
 	if res.StatusCode == http.StatusNoContent {
 		return nil
 	}
-	return fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+	return fmt.Errorf("cannot stop container, status code: %d", res.StatusCode)
 }

api/container_wait.go

@@ -20,5 +20,5 @@ func (c *API) ContainerWait(ctx context.Context, name string, conditions []strin
 	if res.StatusCode == http.StatusOK {
 		return nil
 	}
-	return fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+	return fmt.Errorf("cannot wait for container, status code: %d", res.StatusCode)
 }

api/exec_create.go

@@ -69,7 +69,7 @@ func (c *API) ExecCreate(ctx context.Context, name string, config ExecConfig) (s
 
 	if res.StatusCode != http.StatusCreated {
 		body, _ := ioutil.ReadAll(res.Body)
-		return "", fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return "", fmt.Errorf("cannot create exec session, status code: %d: %s", res.StatusCode, body)
 	}
 
 	body, err := ioutil.ReadAll(res.Body)

api/exec_inspect.go

@@ -21,7 +21,7 @@ func (c *API) ExecInspect(ctx context.Context, sessionId string) (InspectExecSes
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		return inspectData, fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+		return inspectData, fmt.Errorf("cannot inspect exec session, status code: %d", res.StatusCode)
 	}
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {

api/exec_resize.go

@@ -18,7 +18,7 @@ func (c *API) ExecResize(ctx context.Context, execId string, height int, width i
 
 	if res.StatusCode != http.StatusCreated {
 		body, _ := ioutil.ReadAll(res.Body)
-		return fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return fmt.Errorf("cannot resize exec session, status code: %d: %s", res.StatusCode, body)
 	}
 
 	return err

api/image_inspect.go

@@ -34,7 +34,7 @@ func (c *API) ImageInspectID(ctx context.Context, image string) (string, error)
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return "", fmt.Errorf("cannot inspect image, status code: %d: %s", res.StatusCode, body)
 	}
 	err = json.Unmarshal(body, &inspectData)
 	if err != nil {

api/image_load.go

@@ -33,7 +33,7 @@ func (c *API) ImageLoad(ctx context.Context, path string) (string, error) {
 		return "", err
 	}
 	if res.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return "", fmt.Errorf("cannot load image, status code: %d: %s", res.StatusCode, body)
 	}
 	err = json.Unmarshal(body, &response)
 	if err != nil {

api/image_pull.go

@@ -32,7 +32,7 @@ func (c *API) ImagePull(ctx context.Context, nameWithTag string, auth ImageAuthC
 	defer res.Body.Close()
 	if res.StatusCode != http.StatusOK {
 		body, _ := ioutil.ReadAll(res.Body)
-		return "", fmt.Errorf("unknown error, status code: %d: %s", res.StatusCode, body)
+		return "", fmt.Errorf("cannot pull image, status code: %d: %s", res.StatusCode, body)
 	}
 
 	dec := json.NewDecoder(res.Body)

api/system_info.go

@@ -21,7 +21,7 @@ func (c *API) SystemInfo(ctx context.Context) (Info, error) {
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		return infoData, fmt.Errorf("unknown error, status code: %d", res.StatusCode)
+		return infoData, fmt.Errorf("cannot fetch Podman system info, status code: %d", res.StatusCode)
 	}
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {