Skip to content

Commit c704d65

Browse files
AndWeHaveAPlanAndWeHaveAPlan
authored
Update go to 1.26 (and packages) (#29)
* 1.26 and pkg * actions go version * minio bitnamilegacy * try checksum * insecureSkipVerify * https
1 parent 284aaa6 commit c704d65

File tree

6 files changed

+228
-70
lines changed

6 files changed

+228
-70
lines changed

‎.github/workflows/build-cargo.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
services:
1616
minio:
17-
image: bitnami/minio:2024.5.7
17+
image: bitnamilegacy/minio:2024.5.7
1818
env:
1919
MINIO_ROOT_USER: root
2020
MINIO_ROOT_PASSWORD: rootroot
@@ -48,9 +48,10 @@ jobs:
4848
[storage]
4949
type = "s3"
5050
[storage.s3]
51-
endpointUrl = "http://localhost:9000"
51+
endpointUrl = "https://localhost:9000"
5252
bucketName = "forklift"
53-
useSSL = false
53+
useSSL = true
54+
insecureSkipVerify = true
5455
[cache.extraMetadata]
5556
github_run_id="$GITHUB_RUN_ID"
5657
github_job="$GITHUB_JOB"

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ jobs:
3636
- name: Set up Go
3737
uses: actions/setup-go@v5
3838
with:
39-
go-version: '1.21'
39+
go-version: '1.26'
4040
- run: GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} CGO_ENABLED=0 go build -ldflags="-X forklift/Commands.Version=${{ github.ref_name }} -extldflags '-static'" -o bin/forklift_${{ github.ref_name }}_${{ matrix.goos }}_${{ matrix.goarch }} -tags no_lzma2
4141
- run: gh release upload ${{ github.ref_name }} bin/forklift* --clobber

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: '1.21'
25+
go-version: '1.26'
2626
- name: Run tests
2727
run: go test ./... -coverprofile=cover.out
2828
- run: go tool cover -func=cover.out

‎CacheStorage/Storages/S3Storage.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import (
99
"io"
1010
"strings"
1111

12+
"crypto/tls"
13+
"net/http"
14+
1215
"github.com/aws/aws-sdk-go-v2/aws"
1316
"github.com/aws/aws-sdk-go-v2/config"
1417
"github.com/aws/aws-sdk-go-v2/credentials"
@@ -54,6 +57,15 @@ func NewS3Storage(params *map[string]interface{}) *S3Storage {
5457
// Configure endpoint URL if provided
5558
endpointUrl := Helpers.MapGet(params, "endpointUrl", "")
5659
useSsl := Helpers.MapGet(params, "useSsl", true)
60+
insecureSkipVerify := Helpers.MapGet(params, "insecureSkipVerify", false)
61+
62+
if useSsl && insecureSkipVerify {
63+
cfg.HTTPClient = &http.Client{
64+
Transport: &http.Transport{
65+
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
66+
},
67+
}
68+
}
5769

5870
// Modify endpoint URL based on SSL setting
5971
if endpointUrl != "" && !useSsl {
@@ -72,6 +84,10 @@ func NewS3Storage(params *map[string]interface{}) *S3Storage {
7284
// Create S3 client with the configuration
7385
s3Client := s3.NewFromConfig(cfg, func(o *s3.Options) {
7486
o.UsePathStyle = true // Force path style addressing
87+
if !useSsl {
88+
o.RequestChecksumCalculation = aws.RequestChecksumCalculationWhenRequired
89+
o.ResponseChecksumValidation = aws.ResponseChecksumValidationWhenRequired
90+
}
7591
})
7692

7793
s3s.client = s3Client

‎go.mod‎

Lines changed: 66 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,67 @@
11
module forklift
22

3-
go 1.24.7
3+
go 1.26.0
44

55
require (
6-
cloud.google.com/go/storage v1.56.1
7-
github.com/aws/aws-sdk-go-v2 v1.39.0
8-
github.com/aws/aws-sdk-go-v2/config v1.31.8
9-
github.com/aws/aws-sdk-go-v2/credentials v1.18.12
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1
11-
github.com/aws/smithy-go v1.23.0
6+
cloud.google.com/go/storage v1.60.0
7+
github.com/aws/aws-sdk-go-v2 v1.41.1
8+
github.com/aws/aws-sdk-go-v2/config v1.32.8
9+
github.com/aws/aws-sdk-go-v2/credentials v1.19.8
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0
11+
github.com/aws/smithy-go v1.24.0
1212
github.com/castai/promwrite v0.6.0
1313
github.com/jamespfennell/xz v0.1.2
14-
github.com/klauspost/compress v1.18.0
14+
github.com/klauspost/compress v1.18.4
1515
github.com/knadh/koanf/parsers/toml v0.1.0
1616
github.com/knadh/koanf/providers/env v1.1.0
17-
github.com/knadh/koanf/providers/file v1.2.0
18-
github.com/knadh/koanf/v2 v2.2.2
19-
github.com/spf13/cobra v1.10.1
17+
github.com/knadh/koanf/providers/file v1.2.1
18+
github.com/knadh/koanf/v2 v2.3.2
19+
github.com/spf13/cobra v1.10.2
2020
github.com/ulikunitz/xz v0.5.15
21-
google.golang.org/api v0.248.0
21+
google.golang.org/api v0.267.0
2222
)
2323

2424
require (
25-
cel.dev/expr v0.24.0 // indirect
26-
cloud.google.com/go v0.122.0 // indirect
27-
cloud.google.com/go/auth v0.16.5 // indirect
25+
cel.dev/expr v0.25.1 // indirect
26+
cloud.google.com/go v0.123.0 // indirect
27+
cloud.google.com/go/auth v0.18.2 // indirect
2828
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
29-
cloud.google.com/go/compute/metadata v0.8.0 // indirect
30-
cloud.google.com/go/iam v1.5.2 // indirect
31-
cloud.google.com/go/monitoring v1.24.2 // indirect
32-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
33-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
34-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
35-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
36-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect
37-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect
38-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect
39-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
40-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect
45-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect
46-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
47-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 // indirect
29+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
30+
cloud.google.com/go/iam v1.5.3 // indirect
31+
cloud.google.com/go/monitoring v1.24.3 // indirect
32+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
33+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 // indirect
34+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
35+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
36+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
37+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
38+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
39+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
40+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 // indirect
41+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
42+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 // indirect
43+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
44+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 // indirect
45+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
46+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
47+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.14 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
4849
github.com/cespare/xxhash/v2 v2.3.0 // indirect
49-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
50-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
51-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
50+
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect
51+
github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect
52+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
5253
github.com/felixge/httpsnoop v1.0.4 // indirect
5354
github.com/fsnotify/fsnotify v1.9.0 // indirect
54-
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
55+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
5556
github.com/go-logr/logr v1.4.3 // indirect
5657
github.com/go-logr/stdr v1.2.2 // indirect
57-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
58+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
5859
github.com/gogo/protobuf v1.3.2 // indirect
5960
github.com/golang/snappy v1.0.0 // indirect
6061
github.com/google/s2a-go v0.1.9 // indirect
6162
github.com/google/uuid v1.6.0 // indirect
62-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
63-
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
63+
github.com/googleapis/enterprise-certificate-proxy v0.3.12 // indirect
64+
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
6465
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
6566
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6667
github.com/knadh/koanf/maps v0.1.2 // indirect
@@ -69,30 +70,30 @@ require (
6970
github.com/pelletier/go-toml v1.9.5 // indirect
7071
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
7172
github.com/prometheus/client_model v0.6.2 // indirect
72-
github.com/prometheus/common v0.66.1 // indirect
73-
github.com/prometheus/prometheus v0.305.0 // indirect
73+
github.com/prometheus/common v0.67.5 // indirect
74+
github.com/prometheus/prometheus v0.309.1 // indirect
7475
github.com/spf13/pflag v1.0.10 // indirect
7576
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
76-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
77-
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
78-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
79-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
80-
go.opentelemetry.io/otel v1.38.0 // indirect
81-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
82-
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
83-
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
84-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
85-
go.yaml.in/yaml/v2 v2.4.2 // indirect
86-
golang.org/x/crypto v0.41.0 // indirect
87-
golang.org/x/net v0.43.0 // indirect
88-
golang.org/x/oauth2 v0.30.0 // indirect
89-
golang.org/x/sync v0.16.0 // indirect
90-
golang.org/x/sys v0.35.0 // indirect
91-
golang.org/x/text v0.28.0 // indirect
92-
golang.org/x/time v0.12.0 // indirect
93-
google.golang.org/genproto v0.0.0-20250826171959-ef028d996bc1 // indirect
94-
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
95-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
96-
google.golang.org/grpc v1.75.0 // indirect
97-
google.golang.org/protobuf v1.36.8 // indirect
77+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
78+
go.opentelemetry.io/contrib/detectors/gcp v1.40.0 // indirect
79+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
80+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
81+
go.opentelemetry.io/otel v1.40.0 // indirect
82+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
83+
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
84+
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
85+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
86+
go.yaml.in/yaml/v2 v2.4.3 // indirect
87+
golang.org/x/crypto v0.48.0 // indirect
88+
golang.org/x/net v0.50.0 // indirect
89+
golang.org/x/oauth2 v0.35.0 // indirect
90+
golang.org/x/sync v0.19.0 // indirect
91+
golang.org/x/sys v0.41.0 // indirect
92+
golang.org/x/text v0.34.0 // indirect
93+
golang.org/x/time v0.14.0 // indirect
94+
google.golang.org/genproto v0.0.0-20260217215200-42d3e9bedb6d // indirect
95+
google.golang.org/genproto/googleapis/api v0.0.0-20260217215200-42d3e9bedb6d // indirect
96+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
97+
google.golang.org/grpc v1.79.1 // indirect
98+
google.golang.org/protobuf v1.36.11 // indirect
9899
)

0 commit comments

Comments
 (0)