Upgrade go (#149)

* update golangci * update dependencies * update ci * pin wait plugin image tag
arcalot · Feb 5, 2024 · b96141f · b96141f
1 parent 88417aa
commit b96141f
Show file tree

Hide file tree

Showing 8 changed files with 241 additions and 273 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,18 +6,23 @@ on:
     tags:
       - v*
   pull_request:
+env:
+  go_version: 1.21.6
 jobs:
   golangci-lint:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - name: Set up Go
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5
+        with:
+          go-version: ${{ env.go_version }}
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3
         with:
-          # Hard-coding version due to this bug: https://github.com/golangci/golangci-lint-action/issues/535
-          version: v1.52.2
+          version: v1.55.2
   test:
     name: go test
     runs-on: ubuntu-latest
@@ -27,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5
         with:
-          go-version: 1.18
+          go-version: ${{ env.go_version }}
       - name: Set up gotestfmt
         uses: GoTestTools/gotestfmt-action@v2
       - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
@@ -70,7 +75,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5
         with:
-          go-version: 1.18
+          go-version: ${{ env.go_version }}
       - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
         with:
           path: |
@@ -97,7 +102,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5
         with:
-          go-version: 1.18
+          go-version: ${{ env.go_version }}
       - name: Login to Quay.io
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
         if: startsWith(github.event.ref, 'refs/tags/')

diff --git a/.golangci.yml b/.golangci.yml
@@ -72,18 +72,20 @@ linters:
     # endregion
 linters-settings:
   depguard:
-    list-type: whitelist
-    include-go-root: false
-    packages:
-      - go.flow.arcalot.io/
-      - go.arcalot.io/
-      - github.com/docker/
-      - github.com/opencontainers/
-      - gopkg.in/yaml.v3
-      - github.com/fxamacker/cbor
-      - k8s.io/
-      - sigs.k8s.io/
-      - golang.org/
+    rules:
+      main:
+        list-mode: strict
+        allow:
+          - $gostd
+          - go.flow.arcalot.io/
+          - go.arcalot.io/
+          - github.com/docker/
+          - github.com/opencontainers/
+          - gopkg.in/yaml.v3
+          - github.com/fxamacker/cbor
+          - k8s.io/
+          - sigs.k8s.io/
+          - golang.org/
   govet:
     enable-all: true
     check-shadowing: false

diff --git a/fixtures/test-subworkflow/depth-1_workflow-1.yaml b/fixtures/test-subworkflow/depth-1_workflow-1.yaml
@@ -12,7 +12,7 @@ input:
 steps:
   wait_1:
     plugin:
-      src: quay.io/arcalot/arcaflow-plugin-wait:atp-v3_cc3e02b
+      src: quay.io/arcalot/arcaflow-plugin-wait:0.2.0
       deployment_type: image
     step: wait
     input:

diff --git a/fixtures/test-subworkflow/depth-1_workflow-2.yaml b/fixtures/test-subworkflow/depth-1_workflow-2.yaml
@@ -12,7 +12,7 @@ input:
 steps:
   wait_1:
     plugin:
-      src: quay.io/arcalot/arcaflow-plugin-wait:atp-v3_cc3e02b
+      src: quay.io/arcalot/arcaflow-plugin-wait:0.2.0
       deployment_type: image
     step: wait
     input:

diff --git a/fixtures/test-subworkflow/depth-2_workflow-1.yaml b/fixtures/test-subworkflow/depth-2_workflow-1.yaml
@@ -12,7 +12,7 @@ input:
 steps:
   wait_1:
     plugin:
-      src: quay.io/arcalot/arcaflow-plugin-wait:atp-v3_cc3e02b
+      src: quay.io/arcalot/arcaflow-plugin-wait:0.2.0
       deployment_type: image
     step: wait
     input:

diff --git a/fixtures/test-subworkflow/depth-3_workflow-1.yaml b/fixtures/test-subworkflow/depth-3_workflow-1.yaml
@@ -12,7 +12,7 @@ input:
 steps:
   wait_1:
     plugin:
-      src: quay.io/arcalot/arcaflow-plugin-wait:atp-v3_cc3e02b
+      src: quay.io/arcalot/arcaflow-plugin-wait:0.2.0
       deployment_type: image
     step: wait
     input:

diff --git a/go.mod b/go.mod
@@ -1,76 +1,90 @@
 module go.flow.arcalot.io/engine
 
-go 1.18
+go 1.21
+
+toolchain go1.21.6
 
 require (
-	go.arcalot.io/assert v1.6.1
-	go.arcalot.io/dgraph v1.1.0
-	go.arcalot.io/lang v1.0.0
-	go.arcalot.io/log/v2 v2.0.0
-	go.flow.arcalot.io/deployer v0.4.0
-	go.flow.arcalot.io/dockerdeployer v0.5.0
+	go.arcalot.io/assert v1.7.0
+	go.arcalot.io/dgraph v1.2.0
+	go.arcalot.io/lang v1.1.0
+	go.arcalot.io/log/v2 v2.1.0
+	go.flow.arcalot.io/deployer v0.5.0
+	go.flow.arcalot.io/dockerdeployer v0.6.1
 	go.flow.arcalot.io/expressions v0.2.1
-	go.flow.arcalot.io/kubernetesdeployer v0.8.0
-	go.flow.arcalot.io/pluginsdk v0.7.1
-	go.flow.arcalot.io/podmandeployer v0.7.0
-	go.flow.arcalot.io/pythondeployer v0.5.0
-	go.flow.arcalot.io/testdeployer v0.5.0
+	go.flow.arcalot.io/kubernetesdeployer v0.9.1
+	go.flow.arcalot.io/pluginsdk v0.8.0
+	go.flow.arcalot.io/podmandeployer v0.8.1
+	go.flow.arcalot.io/pythondeployer v0.6.0
+	go.flow.arcalot.io/testdeployer v0.6.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v24.0.7+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/docker v25.0.2+incompatible // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.2 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
+	github.com/go-openapi/swag v0.22.9 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.arcalot.io/exex v0.1.0 // indirect
-	go.flow.arcalot.io/testplugin v0.3.0 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/oauth2 v0.2.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	go.arcalot.io/exex v0.2.0 // indirect
+	go.flow.arcalot.io/testplugin v0.4.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
+	go.opentelemetry.io/otel v1.22.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
+	go.opentelemetry.io/otel/metric v1.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.22.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.25.4 // indirect
-	k8s.io/apimachinery v0.25.4 // indirect
-	k8s.io/client-go v0.25.4 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
+	k8s.io/api v0.29.1 // indirect
+	k8s.io/apimachinery v0.29.1 // indirect
+	k8s.io/client-go v0.29.1 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec // indirect
+	k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )