Merge branch '11070-ws-listener-problem'

[arvados.git] / sdk / go / crunchrunner / crunchrunner.go

diff --git a/sdk/go/crunchrunner/crunchrunner.go b/sdk/go/crunchrunner/crunchrunner.go
index 8dffd4594f1393e87dae91d1a0ee12c285826a25..5d7e10be4beb34fef1892b2d2d7c150fd9906176 100644 (file)
--- a/sdk/go/crunchrunner/crunchrunner.go
+++ b/sdk/go/crunchrunner/crunchrunner.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-       "crypto/x509"
        "encoding/json"
        "fmt"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
@@ -10,7 +9,6 @@ import (
        "io"
        "io/ioutil"
        "log"
-       "net/http"
        "os"
        "os/exec"
        "os/signal"
@@ -115,10 +113,12 @@ func setupCommand(cmd *exec.Cmd, taskp TaskDef, outdir string, replacements map[
                                return "", "", "", err
                        }
                        if taskp.KeepTmpOutput {
-                               // Is there an os.Copy?
-                               copyFile(v, outdir+"/"+k)
+                               err = copyFile(v, outdir+"/"+k)
                        } else {
-                               os.Symlink(v, outdir+"/"+k)
+                               err = os.Symlink(v, outdir+"/"+k)
+                       }
+                       if err != nil {
+                               return "", "", "", err
                        }
                }
        }
@@ -222,8 +222,8 @@ func getKeepTmp(outdir string) (manifest string, err error) {
                return "", err
        }
        collection := arvados.Collection{}
-       json.Unmarshal(buf, &collection)
-       return collection.ManifestText, nil
+       err = json.Unmarshal(buf, &collection)
+       return collection.ManifestText, err
 }
 
 func runner(api IArvadosClient,
@@ -364,9 +364,9 @@ func runner(api IArvadosClient,
                manifest, err = getKeepTmp(outdir)
        } else {
                manifest, err = WriteTree(kc, outdir)
-               if err != nil {
-                       return TempFail{err}
-               }
+       }
+       if err != nil {
+               return TempFail{err}
        }
 
        // Set status
@@ -394,24 +394,6 @@ func main() {
                log.Fatal(err)
        }
 
-       // Container may not have certificates installed, so need to look for
-       // /etc/arvados/ca-certificates.crt in addition to normal system certs.
-       var certFiles = []string{
-               "/etc/ssl/certs/ca-certificates.crt", // Debian
-               "/etc/pki/tls/certs/ca-bundle.crt",   // Red Hat
-               "/etc/arvados/ca-certificates.crt",
-       }
-
-       certs := x509.NewCertPool()
-       for _, file := range certFiles {
-               data, err := ioutil.ReadFile(file)
-               if err == nil {
-                       log.Printf("Using TLS certificates at %v", file)
-                       certs.AppendCertsFromPEM(data)
-               }
-       }
-       api.Client.Transport.(*http.Transport).TLSClientConfig.RootCAs = certs
-
        jobUuid := os.Getenv("JOB_UUID")
        taskUuid := os.Getenv("TASK_UUID")
        tmpdir := os.Getenv("TASK_WORK")