2022 upgrade (#2)

* Update go-wrapper * Update Dependencies * Add Auto-Release Action * Update tests
furkilic · Oct 29, 2022 · 8e90ef5 · 8e90ef5
1 parent 26d620b
commit 8e90ef5
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 69 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,17 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
diff --git a/cmd/go-boot-web/main.go b/cmd/go-boot-web/main.go
@@ -2,12 +2,13 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/furkilic/go-boot-web/pkg/go-boot-web"
 	"log"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
+
+	gobootweb "github.com/furkilic/go-boot-web/pkg/go-boot-web"
 )
 
 func main() {
@@ -21,7 +22,7 @@ func main() {
 
 	log.Println("Routed")
 
-	termChan := make(chan os.Signal)
+	termChan := make(chan os.Signal, 1)
 	signal.Notify(termChan, syscall.SIGINT, syscall.SIGTERM)
 
 	log.Println("Waiting")

diff --git a/go.mod b/go.mod
@@ -3,8 +3,12 @@ module github.com/furkilic/go-boot-web
 go 1.14
 
 require (
-	github.com/furkilic/go-boot-config v0.0.2-alpha.1
-	github.com/gorilla/handlers v1.4.2
-	github.com/gorilla/mux v1.7.4
-	golang.org/x/net v0.0.0-20200513185701-a91f0712d120
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/furkilic/go-boot-config v0.0.3
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/handlers v1.5.1
+	github.com/gorilla/mux v1.8.0
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	golang.org/x/net v0.1.0
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,36 +1,71 @@
 github.com/cweill/gotests v1.5.3 h1:k3t4wW/x/YNixWZJhUIn+mivmK5iV1tJVOwVYkx0UcU=
 github.com/cweill/gotests v1.5.3/go.mod h1:XZYOJkGVkCRoymaIzmp9Wyi3rUgfA3oOnkuljYrjFV8=
+github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/furkilic/go-boot-config v0.0.2-alpha.1 h1:00QQUZyclcC6vduLsMgMwqmv3JvCyuYQ5ZpaO8S4/aM=
 github.com/furkilic/go-boot-config v0.0.2-alpha.1/go.mod h1:bPNITV4mRvRng3k4/lof7sPhOofdVqkvasmh6jSHpFk=
+github.com/furkilic/go-boot-config v0.0.3 h1:VHUMYwx6yz9ldlAhOlj9Uw7tRHezVwp9wehIl7GQD/k=
+github.com/furkilic/go-boot-config v0.0.3/go.mod h1:fyBfh9mGbwvjlDl0yhFKefJAT52BAGjv2ZGPB6kUTNk=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
+github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/mitchellh/mapstructure v1.3.0 h1:iDwIio/3gk2QtLLEsqU5lInaMzos0hDTz8a6lazSFVw=
 github.com/mitchellh/mapstructure v1.3.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8 h1:BMFHd4OFnFtWX46Xj4DN6vvT1btiBxyq+s0orYBqcQY=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
@@ -39,3 +74,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/gow b/gow
@@ -96,7 +96,7 @@ fi
 # This allows using the go-wrapper in projects that prohibit checking in binary data.
 ##########################################################################################
 
-goVersionUrl="https://golang.org/dl/"
+goVersionUrl="https://go.dev/dl/"
 goWrapperPath="$BASE_DIR/.go/wrapper"
 goWrapperProperties="$goWrapperPath/go-wrapper.properties"
 goInstallPath="$goWrapperPath/go"
@@ -131,7 +131,9 @@ unpack_archive(){
   else
     tar -C "$goWrapperPath" -zxvf "$goZipPath"
   fi
-  rm "$goVersionPath"
+  if [ -f "$goVersionPath" ]; then
+    rm "$goVersionPath"
+  fi
   date > "$goWrapperDate"
 }
 
@@ -151,8 +153,9 @@ get_local_go() {
         fi
         mkdir -p "$goTmpPath"
         if [ -f "$goWrapperProperties" ]; then
-            while IFS="=" read key value; do
-              case "$key" in (distributionUrl) goUrl="$value"; break ;;
+            while IFS="=" read key value  || [ "$key" ]; do
+              case "$key" in (distributionUrl) goUrl=`echo "$value" | sed 's/ *$//g'`; break ;;
+                             (goVersion) go_version=$value; break ;;
               esac
             done < "$goWrapperProperties"
         fi
@@ -162,6 +165,7 @@ get_local_go() {
               echo "Found wget ... using wget"
             fi
             if [ -z "$goUrl" ]; then
+              if [ -z "$go_version" ]; then
                 if [ ! -f "$goVersionPath" ]; then
                     if [ -z "$GOW_USERNAME" ] || [ -z "$GOW_PASSWORD" ]; then
                         wget "$goVersionUrl" -O "$goVersionPath"
@@ -170,7 +174,8 @@ get_local_go() {
                     fi
                 fi
                 go_version=`retrieve_version "$goVersionPath"`
-                goUrl="$GOW_REPOURL/go$go_version.$os-$arch.$extension"
+              fi
+              goUrl="$GOW_REPOURL/go$go_version.$os-$arch.$extension"
             fi
             if [ "$GOW_VERBOSE" = true ]; then
               echo "Downloading from: $goUrl"
@@ -186,15 +191,17 @@ get_local_go() {
               echo "Found curl ... using curl"
             fi
             if [ -z "$goUrl" ]; then
+              if [ -z "$go_version" ]; then
                 if [ ! -f "$goVersionPath" ]; then
                     if [ -z "$GOW_USERNAME" ] || [ -z "$GOW_PASSWORD" ]; then
-                        curl -o "$goVersionPath" "$goVersionUrl" -f
+                        curl -o "$goVersionPath" "$goVersionUrl" -f -s
                     else
-                        curl --user $GOW_USERNAME:$GOW_PASSWORD -o "$goVersionPath" "$goVersionUrl" -f
+                        curl --user $GOW_USERNAME:$GOW_PASSWORD -o "$goVersionPath" "$goVersionUrl" -f -s
                     fi
                 fi
                 go_version=`retrieve_version "$goVersionPath"`
-                goUrl="$GOW_REPOURL/go$go_version.$os-$arch.$extension"
+              fi
+              goUrl="$GOW_REPOURL/go$go_version.$os-$arch.$extension"
             fi
             if [ "$GOW_VERBOSE" = true ]; then
               echo "Downloading from: $goUrl"
@@ -219,15 +226,36 @@ if [ -z "$GOROOT" ]; then
     GOROOT="$goInstallPath"
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# Set GOPATH in case there is none 
+if [ -z "$GOPATH" ]; then
+    GOPATH=`$GOROOT/bin/go env GOPATH`
+fi
+
+# For Cygwin, switch paths to Windows format before running go
 if $cygwin; then
   [ -n "$GOROOT" ] &&
     GOROOT=`cygpath --path --windows "$GOROOT"`
+  [ -n "$GOPATH" ] &&
+    GOPATH=`cygpath --path --windows "$GOPATH"`
 fi
 
 # Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
 GO_CMD_LINE_ARGS="$@"
 export GO_CMD_LINE_ARGS
 
-exec "$GOROOT/bin/go" "$@"
+# Export Go Variables for downstream executions
+export GOROOT
+export GOPATH
+export PATH="$GOROOT/bin:$GOPATH/bin:$PATH"
+
+if [ "$1" = "printenv" ]; then 
+  echo "export GOROOT=\"$GOROOT\""
+  echo "export GOPATH=\"$GOPATH\""
+  echo "export PATH=\"\$GOROOT/bin:\$GOPATH/bin:\$PATH\""
+  echo ''
+  echo '# Run this command to configure your shell:'
+  echo '# eval "$(./gow printenv)"'
+else
+  exec "$GOROOT/bin/go" "$@"
+fi
diff --git a/gow.cmd b/gow.cmd
@@ -77,11 +77,11 @@ cd "%EXEC_DIR%"
 :endDetectBaseDir
 
 set GO_WRAPPER_PATH="%GO_PROJECTBASEDIR%\.go\wrapper"
-set GO_WRAPPER_PROPERTIES="%GO_PROJECTBASEDIR%\.go\wrapper\go-wrapper.properties"
-set GO_INSTALL_PATH="%GO_PROJECTBASEDIR%\.go\wrapper\go"
+set GO_WRAPPER_PROPERTIES=%GO_PROJECTBASEDIR%\.go\wrapper\go-wrapper.properties
+set GO_INSTALL_PATH=%GO_PROJECTBASEDIR%\.go\wrapper\go
 set GO_TMP_PATH="%GO_PROJECTBASEDIR%\.go\wrapper\tmp"
 set GO_WRAPPER_DATE="%GO_PROJECTBASEDIR%\.go\wrapper\go\go.date"
-set GO_VERSION_URL="https://golang.org/dl/"
+set GO_VERSION_URL="https://go.dev/dl/"
 set GO_VERSION_PATH="%GO_PROJECTBASEDIR%\.go\wrapper\tmp\go.version"
 set GO_ZIP_PATH="%GO_PROJECTBASEDIR%\.go\wrapper\tmp\go.zip"
 
@@ -91,6 +91,7 @@ set DOWNLOAD_URL=%DOWNLOAD_URL%
 if not exist "%GO_WRAPPER_PROPERTIES%" goto extension
 FOR /F "tokens=1,2 delims==" %%A IN (%GO_WRAPPER_PROPERTIES%) DO (
     IF "%%A"=="distributionUrl" SET DOWNLOAD_URL=%%B
+    IF "%%A"=="goVersion" SET GO_LATEST_VERSION=%%B
 )
 
 @REM Extension to allow automatically downloading GO
@@ -109,6 +110,7 @@ if "%GOW_VERBOSE%" == "true" (
 
 if exist %GO_ZIP_PATH% goto goZipDownloaded
 if not "%DOWNLOAD_URL%" == "" goto goZipDownloadUrlReady
+if not "%GO_LATEST_VERSION%" == "" goto buildDownloadUrl
 
 @REM BAD Hack to retrieve latest version
 
@@ -131,7 +133,7 @@ set GO_LATEST_VERSION=%GO_LATEST_VERSION:~3,-2%
 DEL %GO_VERSION_PATH%.tmp
 DEL %GO_VERSION_PATH%
 
-
+:buildDownloadUrl
 set GO_DOWNLOAD_ARCH=amd64
 echo %PROCESSOR_ARCHITECTURE% | find /i "x86" > nul
 if %ERRORLEVEL%==0 set GO_DOWNLOAD_ARCH=386
@@ -166,14 +168,31 @@ if "%GOW_VERBOSE%" == "true" (
 )
 
 set GOROOT=%GO_INSTALL_PATH%
+
+@REM Set GOPATH in case there is none 
+if "%GOPATH%" == "" (
+    for /f %%i in ('%GOROOT%\bin\go env GOPATH') do set GOPATH=%%i
+)
 @REM End of extension
 
 @REM Provide a "standardized" way to retrieve the CLI args that will
 @REM work with both Windows and non-Windows executions.
 :run
 set GO_CMD_LINE_ARGS=%*
 
-%GOROOT%\bin\go %*
+@REM Export Go Variables for downstream executions
+set "PATH=%GOROOT%\bin;%GOPATH%\bin;%PATH%"
+
+if "%1" == "printenv" (
+    echo set GOROOT=%GOROOT%
+    echo set GOPATH=%GOPATH%
+    echo set PATH=%%GOROOT%%\bin;%%GOPATH%%\bin;%%PATH%%
+    echo:
+    echo # Run this command to configure your shell: copy and paste the above values into your command prompt
+) else (
+    %GOROOT%\bin\go %*
+)
+
 if ERRORLEVEL 1 goto error
 goto end
 

diff --git a/test/cert.pem b/test/cert.pem
@@ -1,22 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIDlTCCAn2gAwIBAgIJAK388GEZIE/hMA0GCSqGSIb3DQEBCwUAMGExCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQIDAVQYXJpczEOMAwGA1UEBwwFUGF0aXMxETAPBgNVBAoM
-CEZ1cmtpbGljMQswCQYDVQQLDAJGVTESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIw
-MDUwMTE2MjA1M1oXDTMwMDQyOTE2MjA1M1owYTELMAkGA1UEBhMCRlIxDjAMBgNV
-BAgMBVBhcmlzMQ4wDAYDVQQHDAVQYXRpczERMA8GA1UECgwIRnVya2lsaWMxCzAJ
-BgNVBAsMAkZVMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC4vcCk4DiIN0m8RCNjXDUcomgXF08lkpVcXvVT4nb4fhMg
-DKcShjK/3XDHU5u49tcmZcGSP7+tADoxdvGrZa0CsEubCS1KBlqxrutzON4wUgbc
-FLBny1NRTro+rQQ0Ld6LRGWM679Yaf5DC/DhhLS2dl447yMAOMsja4yI29/6FOXN
-67SBUrn9zlGvr9uaSlzPlE+9YUd/0IEBJwcMf7+zAunmeYb+Bb+r1p9osqGmLTy/
-BC0x408HWpzf/N2RHxWVueCgvRP1POGAYgVO/JgG5WvrIXBISr0cTSXAZprRW8pq
-Vr62OeyRS+ZnDmqwfc60C4qyrFa6YzJC8Lb4L+lhAgMBAAGjUDBOMB0GA1UdDgQW
-BBTjkIlKPD1egM/nmSW1kIEsn99+nDAfBgNVHSMEGDAWgBTjkIlKPD1egM/nmSW1
-kIEsn99+nDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBsU0CeZlkM
-1lHKkEh6hbJgsryiOhra2dr7anq6rxbAArAPRZVrbkp+rKycjAda7hH27xf0t/Dl
-py9JfICuBb9CU58nzeZYBKvTtvmG5YgkbOQMk/FKVPiIyWHnodNip//fThj4Oxj4
-pexLDMLg945PlGqK5kk/Z0n1iA+mtFl2ELewUPFR+Y4Iwb0oGpoP7y+LV8PXxMsZ
-WgNbcduchJ4c0CTT6C8/jcf5IaAEj+aAAs/BSwNdJ360oRlAL5Lb0623KjDbTJHZ
-UzfGr6l5GG+q+ws/bsW7Ufx+J1bKdO1mrY69Iwd8iE9BrUKBLC9JJ6JzhQ0OCwq3
-D1BCNa1Vwm6f
+MIIEhjCCA26gAwIBAgIJANimzOL9FbpMMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
+VQQGEwJGUjEWMBQGA1UECAwNSWxlLWRlLUZyYW5jZTEOMAwGA1UEBwwFUGFyaXMx
+ETAPBgNVBAoMCEZ1cmtpbGljMQswCQYDVQQLDAJGVTESMBAGA1UEAwwJbG9jYWxo
+b3N0MSEwHwYJKoZIhvcNAQkBFhJmdXJraWxpY0BnbWFpbC5jb20wHhcNMjIxMDI5
+MTI0NjQ3WhcNMzIxMDI2MTI0NjQ3WjCBjDELMAkGA1UEBhMCRlIxFjAUBgNVBAgM
+DUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhGdXJraWxp
+YzELMAkGA1UECwwCRlUxEjAQBgNVBAMMCWxvY2FsaG9zdDEhMB8GCSqGSIb3DQEJ
+ARYSZnVya2lsaWNAZ21haWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAoqujDSvMNr2QaflTkC2cmvAUlYFlLAMf4nM2qDv3E6Js+GGc9oWdFElT
+HmKir9EcukyLsHrffiS8Pt8SqbKDTStRr1YtH5BWkcqmJuD1vYHfho4HWPX8rtHt
+UMPS2LRDdJu9YeHZYQG+N+lJKp7OrArxXZBBTqs0LsadICLEwORnGm/kSsDAiRIS
+4WvxYSEHJCxMZ6/ogbt3qOB1C3C4Gbx51IK0xzpq2igjhy+mTcnOBw7bje8Y1GqM
+ujYZftasvUWaKs7Qk3MqAq99ww2IQKxXZsINCcO6QveKNf4GSwB6stf5t8SrKSfF
+1CtISTTJtMbNxyf5zlIybv2QTt+CoQIDAQABo4HoMIHlMB0GA1UdDgQWBBSkJ0Li
+hTLavU4VDsf8wEjf4tnWlDAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIFoDB7BgNV
+HREEdDByggtleGFtcGxlLmNvbYIPd3d3LmV4YW1wbGUuY29tghBtYWlsLmV4YW1w
+bGUuY29tgg9mdHAuZXhhbXBsZS5jb22CCWxvY2FsaG9zdIIVbG9jYWxob3N0Lmxv
+Y2FsZG9tYWluggkxMjcuMC4wLjGCAjo6MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
+IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAQEAKrZ/c2X3
+hyozlWuKqtQEwt5K9lmorHTmlhhzux27PTZ/4Aa22hLB7tamuRIBazisy5DjqdGr
+bbRVej1H9rE4Y0xHM+4mjFSw18MaAigBv56GUS5M/UuzCzggJ+NAangbpfdVsbdC
+5UFCo2IKu4N9xwHZ0VVEdCpCToVJWh85krlbwsBDjousJdU7oiBcDAGJaF29rFUT
+hwgk8BhlKgXF/dUozsiSrg6gVUxn+rTURcSp6g14BnnEJB10eHUEAx+maI2XSxc+
+nyws2BYXtRNzjIm+ryMXwlpMP9zkeO9tHZRfCLZnDa6GxYT/fkE7pkdrTVL1C66V
+DdDergFQ7NMQkw==
 -----END CERTIFICATE-----