bump godel to 2.17.0 and go to 1.13

.circleci/config.yml

@@ -4,7 +4,7 @@ working_dir: &working_dir
 darwin-linux-no-cgo: &darwin-linux-no-cgo
   <<: *working_dir
   docker:
-    - image: nmiyake/go:go-darwin-linux-no-cgo-1.11.2-java-8u181-t138
+    - image: palantirtechnologies/go:go-darwin-linux-no-cgo-1.13-java-8u212-t23
       environment:
         CGO_ENABLED: 0
 

conjureplugin/config/config.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/palantir/godel-conjure-plugin/conjureplugin"
-	"github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v1"
+	v1 "github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v1"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 )

conjureplugin/config/config_test.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/palantir/godel-conjure-plugin/conjureplugin"
 	"github.com/palantir/godel-conjure-plugin/conjureplugin/config"
-	"github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v1"
+	v1 "github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"

conjureplugin/config/internal/legacy/config.go

@@ -15,7 +15,7 @@
 package legacy
 
 import (
-	"github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v0"
+	v0 "github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v0"
 	"github.com/palantir/godel/pkg/versionedconfig"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"

conjureplugin/config/upgradeconfig.go

@@ -16,7 +16,7 @@ package config
 
 import (
 	"github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/legacy"
-	"github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v1"
+	v1 "github.com/palantir/godel-conjure-plugin/conjureplugin/config/internal/v1"
 	"github.com/palantir/godel/pkg/versionedconfig"
 	"github.com/pkg/errors"
 )

conjureplugin/conjureplugin.go

@@ -61,18 +61,22 @@ func Run(params ConjureProjectParams, verify bool, projectDir string, stdout io.
 	}
 
 	if verify && len(verifyFailedIndex) > 0 {
-		fmt.Fprintf(stdout, "Conjure output differs from what currently exists: %v\n", verifyFailedIndex)
+		logMessage(stdout, fmt.Sprintf("Conjure output differs from what currently exists: %v\n", verifyFailedIndex))
 		for _, currKey := range verifyFailedIndex {
-			fmt.Fprintf(stdout, "%s%d:\n", strings.Repeat(" ", indentLen), currKey)
+			logMessage(stdout, fmt.Sprintf("%s%d:\n", strings.Repeat(" ", indentLen), currKey))
 			for _, currErrLine := range strings.Split(verifyFailedErrors[currKey], "\n") {
-				fmt.Fprintf(stdout, "%s%s\n", strings.Repeat(" ", indentLen*2), currErrLine)
+				logMessage(stdout, fmt.Sprintf("%s%s\n", strings.Repeat(" ", indentLen*2), currErrLine))
 			}
 		}
 		return fmt.Errorf("conjure verify failed")
 	}
 	return nil
 }
 
+func logMessage(w io.Writer, message string) {
+	_, _ = fmt.Fprintf(w, message)
+}
+
 func conjureDefinitionFromParam(param ConjureProjectParam) (spec.ConjureDefinition, error) {
 	bytes, err := param.IRProvider.IRBytes()
 	if err != nil {

godel/config/godel.properties

@@ -1,2 +1,2 @@
-distributionURL=https://palantir.bintray.com/releases/com/palantir/godel/godel/2.10.0/godel-2.10.0.tgz
-distributionSHA256=503074b9177d05152f3225a4bd8fa1516182f9c35d88796fbbdc975637e06c45
+distributionURL=https://palantir.bintray.com/releases/com/palantir/godel/godel/2.17.0/godel-2.17.0.tgz
+distributionSHA256=

godelw

@@ -3,9 +3,9 @@
 set -euo pipefail
 
 # Version and checksums for godel. Values are populated by the godel "dist" task.
-VERSION=2.10.0
-DARWIN_CHECKSUM=2f2d8a62e598f8a7784c92a0e6325251efa347d3550187a290ab72a9ed44917c
-LINUX_CHECKSUM=36f963816d8e06ab6f41711fd66a75706d3ddb376de4edef80e4fd09688c97f5
+VERSION=2.17.0
+DARWIN_CHECKSUM=d6294049b7edc3795d1d5517583f20c087422a8b8b52e8cbcc39ce2b575427ff
+LINUX_CHECKSUM=23bca1ce55bd321686e06e0b6959ad8160ef1dfa9fe0a68a515e65d19401094d
 
 # Downloads file at URL to destination path using wget or curl. Prints an error and exits if wget or curl is not present.
 function download {

integration_test/integration_test.go

@@ -83,7 +83,8 @@ projects:
 	)
 
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprint(w, conjureSpecJSON)
+		_, err := fmt.Fprint(w, conjureSpecJSON)
+		require.NoError(t, err)
 	}))
 	defer ts.Close()
 

ir-gen-cli-bundler/conjureircli/run.go

@@ -24,7 +24,7 @@ import (
 	"runtime"
 
 	"github.com/mholt/archiver"
-	"github.com/palantir/godel-conjure-plugin/ir-gen-cli-bundler/conjureircli/internal"
+	conjureircli_internal "github.com/palantir/godel-conjure-plugin/ir-gen-cli-bundler/conjureircli/internal"
 	"github.com/pkg/errors"
 )