fix apple runtime lint issues

Author: jsj

internal/utils/apple_analytics.go

@@ -112,7 +112,7 @@ func StartAppleAnalyticsForwarders(containerIDs []string) error {
 			return err
 		}
 		pidPath := filepath.Join(pidDir, containerID+".pid")
-		if err := os.WriteFile(pidPath, []byte(strconv.Itoa(pid)), 0644); err != nil {
+		if err := os.WriteFile(pidPath, []byte(strconv.Itoa(pid)), 0600); err != nil {
 			return errors.Errorf("failed to write apple analytics pid: %w", err)
 		}
 	}

internal/utils/apple_container.go

@@ -244,7 +244,7 @@ func appleListVolumes(ctx context.Context) ([]VolumeInfo, error) {
 	}
 	result := make([]VolumeInfo, 0, len(records))
 	for _, item := range records {
-		result = append(result, VolumeInfo{Name: item.Name, Labels: item.Labels})
+		result = append(result, VolumeInfo(item))
 	}
 	return result, nil
 }
@@ -415,7 +415,7 @@ func appleEnsureImage(ctx context.Context, imageName string) error {
 	return runContainerCommand(ctx, io.Discard, io.Discard, "image", "pull", imageName)
 }
 
-func buildAppleContainerArgs(ctx context.Context, config container.Config, hostConfig container.HostConfig, networkingConfig network.NetworkingConfig, containerName string, detach bool, remove bool) ([]string, error) {
+func buildAppleContainerArgs(ctx context.Context, config container.Config, hostConfig container.HostConfig, _ network.NetworkingConfig, containerName string, detach bool, remove bool) ([]string, error) {
 	applyContainerLabels(&config)
 	imageName := GetRegistryImageUrl(config.Image)
 	if err := appleEnsureImage(ctx, imageName); err != nil {
@@ -446,11 +446,11 @@ func buildAppleContainerArgs(ctx context.Context, config container.Config, hostC
 	if hostConfig.ReadonlyRootfs {
 		args = append(args, "--read-only")
 	}
-	if hostConfig.Resources.NanoCPUs > 0 {
-		args = append(args, "--cpus", strconv.FormatInt(hostConfig.Resources.NanoCPUs/1_000_000_000, 10))
+	if hostConfig.NanoCPUs > 0 {
+		args = append(args, "--cpus", strconv.FormatInt(hostConfig.NanoCPUs/1_000_000_000, 10))
 	}
-	if hostConfig.Resources.Memory > 0 {
-		args = append(args, "--memory", strconv.FormatInt(hostConfig.Resources.Memory, 10))
+	if hostConfig.Memory > 0 {
+		args = append(args, "--memory", strconv.FormatInt(hostConfig.Memory, 10))
 	}
 	for path := range hostConfig.Tmpfs {
 		args = append(args, "--tmpfs", path)

internal/utils/runtime.go

@@ -219,7 +219,7 @@ func InspectContainer(ctx context.Context, containerId string) (ContainerInfo, e
 		info.Status = resp.State.Status
 		info.Running = resp.State.Running
 		if resp.State.Health != nil {
-			info.HealthStatus = string(resp.State.Health.Status)
+			info.HealthStatus = resp.State.Health.Status
 		}
 	}
 	if resp.NetworkSettings != nil {
@@ -370,7 +370,7 @@ func AssertServiceHealthy(ctx context.Context, containerId string) error {
 		}
 		return nil
 	}
-	if len(info.HealthStatus) > 0 && info.HealthStatus != string(types.Healthy) {
+	if len(info.HealthStatus) > 0 && info.HealthStatus != types.Healthy {
 		return errors.Errorf("%s container is not ready: %s", containerId, info.HealthStatus)
 	}
 	return nil