Skip to content

Commit 026fb26

Browse files
authored
Update to Go 1.26 (#1214)
* Update to Go 1.26 * Replace deprecated golang.org/x/crypto/ssh/terminal
1 parent bab98a9 commit 026fb26

File tree

6 files changed

+8
-85
lines changed

6 files changed

+8
-85
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22
jobs:
33
build:
44
docker:
5-
- image: cimg/go:1.25
5+
- image: cimg/go:1.26
66

77
environment:
88
GOPATH: /home/circleci/go
@@ -32,7 +32,7 @@ jobs:
3232

3333
deploy-master:
3434
docker:
35-
- image: cimg/go:1.25
35+
- image: cimg/go:1.26
3636

3737
environment:
3838
GOPATH: /home/circleci/go
@@ -58,7 +58,7 @@ jobs:
5858

5959
deploy-release:
6060
docker:
61-
- image: cimg/go:1.25
61+
- image: cimg/go:1.26
6262

6363
environment:
6464
GOPATH: /home/circleci/go

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.5 AS build-env
1+
FROM golang:1.26.0 AS build-env
22
WORKDIR /usr/local/go/src/github.com/SpectoLabs/hoverfly
33
COPY . /usr/local/go/src/github.com/SpectoLabs/hoverfly
44

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/SpectoLabs/hoverfly
22

3-
go 1.25.5
3+
go 1.26.0
44

55
require (
66
github.com/ChrisTrenkamp/xsel v0.9.16
@@ -40,6 +40,7 @@ require (
4040
github.com/tdewolff/minify/v2 v2.24.8
4141
github.com/xeipuuv/gojsonschema v1.2.0
4242
golang.org/x/crypto v0.46.0
43+
golang.org/x/term v0.38.0
4344
gonum.org/v1/gonum v0.16.0
4445
gopkg.in/yaml.v2 v2.4.0
4546
k8s.io/client-go v0.35.0
@@ -84,7 +85,6 @@ require (
8485
go.yaml.in/yaml/v3 v3.0.4 // indirect
8586
golang.org/x/net v0.47.0 // indirect
8687
golang.org/x/sys v0.39.0 // indirect
87-
golang.org/x/term v0.38.0 // indirect
8888
golang.org/x/text v0.32.0 // indirect
8989
gopkg.in/sourcemap.v1 v1.0.5 // indirect
9090
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

hoverctl/cmd/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/SpectoLabs/hoverfly/hoverctl/configuration"
1010
"github.com/olekukonko/tablewriter"
11-
"golang.org/x/crypto/ssh/terminal"
11+
"golang.org/x/term"
1212
)
1313

1414
func handleIfError(err error) {
@@ -58,7 +58,7 @@ func askForInput(value string, sensitive bool) string {
5858
for {
5959
fmt.Printf("%s: ", value)
6060
if sensitive {
61-
responseBytes, err := terminal.ReadPassword(int(os.Stdin.Fd()))
61+
responseBytes, err := term.ReadPassword(int(os.Stdin.Fd()))
6262
handleIfError(err)
6363
fmt.Println("")
6464

vendor/golang.org/x/crypto/ssh/terminal/terminal.go

Lines changed: 0 additions & 76 deletions
This file was deleted.

vendor/modules.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ go.yaml.in/yaml/v3
319319
golang.org/x/crypto/bcrypt
320320
golang.org/x/crypto/blowfish
321321
golang.org/x/crypto/sha3
322-
golang.org/x/crypto/ssh/terminal
323322
# golang.org/x/net v0.47.0
324323
## explicit; go 1.24.0
325324
golang.org/x/net/html

0 commit comments

Comments
 (0)