Bump pkg (and other deps) to fix importing from current module using …

…full path (#264)
arr-ai · Sep 12, 2022 · da34998 · da34998
1 parent bc0dd18
commit da34998
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 463 deletions.
diff --git a/.github/workflows/generate-tag.yml b/.github/workflows/generate-tag.yml
@@ -15,15 +15,9 @@ jobs:
         with:
           fetch-depth: '0'
 
-      # Generate tag if commit message contains #major or #patch or #patch
       - name: Bump version and push tag
         id: generate_tag
-        uses: anothrNick/github-tag-action@1.36.0
+        uses: anz-bank/github-tag-action@1.40.0
         env:
-          # An action in a workflow run can't trigger a new workflow run.
-          # When you use GITHUB_TOKEN in your actions, all of the interactions
-          # with the repository are on behalf of the Github-actions bot.
-          # The operations act by Github-actions bot cannot trigger a new workflow run.
-          # More details: https://help.github.com/en/actions/reference/events-that-trigger-workflows#about-workflow-events
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3.1.0
         with:
-          version: v1.48.0
+          version: v1.49.0
 
       - name: Check clean
         run: make check-clean

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Install golangci-lint
         run: |
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.48.0
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
           git restore go.mod go.sum
 
       - name: Build

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,14 +1,13 @@
+run:
+  timeout: 5m
+
 linters-settings:
   errcheck:
     check-blank: true
   govet:
-    check-shadowing: true
-  golint:
+    check-shadowing: false
+  revive:
     min-confidence: 0
-  goimports:
-    local-prefixes: github.com/arr-ai/arrai
-  maligned:
-    suggest-new: true
   dupl:
     threshold: 100
   lll:
@@ -27,8 +26,7 @@ linters:
   disable-all: true
   enable:
   - bodyclose
-  - deadcode
-  # - depguard
+  - depguard
   - dogsled
   - dupl
   - errcheck
@@ -40,26 +38,23 @@ linters:
   - goconst
   # - godox
   # - gocritic
-  # - gocyclo
+  - gocyclo
   - gofmt
   - goimports
   - gosec
   - gosimple
-  # - govet
+  - govet
   - ineffassign
-  # - interfacer
   - lll
   - misspell
   - nakedret
   - prealloc
   - revive
   - staticcheck
-  - structcheck
   - stylecheck
   - typecheck
   - unconvert
   - unparam
   - unused
-  - varcheck
   - whitespace
   # - wsl
diff --git a/Makefile b/Makefile
@@ -19,10 +19,10 @@ check-clean: generate
 .PHONY: bindata
 bindata: syntax/embed/implicit_import.arrai syntax/embed/stdlib-safe.arraiz syntax/embed/stdlib-unsafe.arraiz
 
-syntax/embed/stdlib-safe.arraiz: $(shell find syntax/stdlib -type f)
+syntax/embed/stdlib-safe.arraiz: go.mod $(shell find syntax/stdlib -type f)
 	go run ./cmd/arrai bundle -o $@ syntax/stdlib/stdlib-safe.arrai
 
-syntax/embed/stdlib-unsafe.arraiz: $(shell find syntax/stdlib -type f)
+syntax/embed/stdlib-unsafe.arraiz: go.mod $(shell find syntax/stdlib -type f)
 	go run ./cmd/arrai bundle -o $@ syntax/stdlib/stdlib-unsafe.arrai
 
 build: generate

diff --git a/cmd/arrai/observe.go b/cmd/arrai/observe.go
@@ -8,6 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/arr-ai/arrai/pkg/arraictx"
 	"github.com/arr-ai/arrai/rel"
@@ -27,7 +28,7 @@ func observe(c *cli.Context) error {
 	logrus.Infof("Server: %s", server)
 	logrus.Infof("Source: %s", source)
 
-	conn, err := grpc.Dial(server, grpc.WithInsecure())
+	conn, err := grpc.Dial(server, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return err
 	}

diff --git a/cmd/arrai/sync_other.go b/cmd/arrai/sync_other.go
@@ -23,6 +23,7 @@ import (
 	"github.com/spf13/afero"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/arr-ai/arrai/pkg/arraictx"
 	"github.com/arr-ai/arrai/pkg/ctxfs"
@@ -41,7 +42,7 @@ func sync(c *cli.Context) error {
 	log.Infof("xServer: %s", server)
 	log.Infof("Directory: %s", dir)
 
-	conn, err := grpc.Dial(server, grpc.WithInsecure())
+	conn, err := grpc.Dial(server, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return err
 	}

diff --git a/cmd/arrai/update.go b/cmd/arrai/update.go
@@ -7,6 +7,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/arr-ai/arrai/pkg/arraictx"
 )
@@ -25,7 +26,7 @@ func update(c *cli.Context) error {
 	logrus.Infof("Server: %s", server)
 	logrus.Infof("Source: %s", source)
 
-	conn, err := grpc.Dial(server, grpc.WithInsecure())
+	conn, err := grpc.Dial(server, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return err
 	}

diff --git a/go.mod b/go.mod
@@ -1,32 +1,52 @@
 module github.com/arr-ai/arrai
 
-go 1.16
+go 1.18
 
 replace github.com/spf13/afero => github.com/anz-bank/afero v1.2.4
 
 require (
-	github.com/anz-bank/pkg v0.0.45
+	github.com/anz-bank/pkg v0.0.48
 	github.com/arr-ai/frozen v0.20.1
 	github.com/arr-ai/hash v0.8.0
 	github.com/arr-ai/proto v0.0.0-20180422074755-2ffbedebee50
-	github.com/arr-ai/wbnf v0.34.0
+	github.com/arr-ai/wbnf v0.35.1
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
 	github.com/go-errors/errors v1.4.2
 	github.com/gorilla/websocket v1.4.2
-	github.com/iancoleman/strcase v0.1.3
-	github.com/mattn/go-isatty v0.0.12
+	github.com/iancoleman/strcase v0.2.0
+	github.com/mattn/go-isatty v0.0.16
 	github.com/pkg/errors v0.9.1
 	github.com/rjeczalik/notify v0.9.2
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sethvargo/go-retry v0.1.0
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.4.0
-	github.com/stretchr/testify v1.7.1
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/afero v1.9.2
+	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.2.0
 	github.com/xuri/excelize/v2 v2.4.1
 	golang.org/x/text v0.3.7
-	google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d // indirect
-	google.golang.org/grpc v1.38.0
-	google.golang.org/protobuf v1.26.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	google.golang.org/grpc v1.49.0
+	google.golang.org/protobuf v1.28.1
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/chzyer/test v1.0.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-github/v32 v32.1.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/richardlehane/mscfb v1.0.3 // indirect
+	github.com/richardlehane/msoleps v1.0.1 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/stretchr/objx v0.4.0 // indirect
+	github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
+	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
+	golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20220902135211-223410557253 // indirect
 )