Skip to content

Commit 7d1d91d

Browse files
marwan-at-workmarwan-at-work
committed
Update go.mod for client upgrades
1 parent 1707cfd commit 7d1d91d

File tree

4 files changed

+36
-32
lines changed

4 files changed

+36
-32
lines changed

‎cmd/mod/main.go

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func main() {
2828
&cli.StringFlag{
2929
Name: "mod-name",
3030
Value: "",
31+
Usage: "upgrade a dependency instead of your main module",
3132
},
3233
},
3334
},
@@ -40,6 +41,7 @@ func main() {
4041
&cli.StringFlag{
4142
Name: "mod-name",
4243
Value: "",
44+
Usage: "upgrade a dependency instead of your main module",
4345
},
4446
},
4547
},

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ require (
77
github.com/google/go-github/v52 v52.0.0
88
github.com/pkg/errors v0.9.1
99
github.com/urfave/cli/v2 v2.25.1
10-
golang.org/x/mod v0.10.0
10+
golang.org/x/mod v0.13.0
1111
golang.org/x/oauth2 v0.7.0
12-
golang.org/x/tools v0.8.0
12+
golang.org/x/tools v0.13.0
1313
)
1414

1515
require (
@@ -21,9 +21,9 @@ require (
2121
github.com/google/go-querystring v1.1.0 // indirect
2222
github.com/russross/blackfriday/v2 v2.1.0 // indirect
2323
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
24-
golang.org/x/crypto v0.8.0 // indirect
25-
golang.org/x/net v0.9.0 // indirect
26-
golang.org/x/sys v0.7.0 // indirect
24+
golang.org/x/crypto v0.13.0 // indirect
25+
golang.org/x/net v0.15.0 // indirect
26+
golang.org/x/sys v0.12.0 // indirect
2727
google.golang.org/appengine v1.6.7 // indirect
2828
google.golang.org/protobuf v1.30.0 // indirect
2929
)

‎go.sum

+11-9
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
3434
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3535
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
3636
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
37-
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
38-
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
37+
golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
38+
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
3939
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
4040
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
41-
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
42-
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
41+
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
42+
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
4343
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
4444
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4545
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -48,14 +48,15 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
4848
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
4949
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
5050
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
51-
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
5251
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
52+
golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
53+
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
5354
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
5455
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
5556
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5657
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
57-
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
5858
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
59+
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
5960
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
6061
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6162
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -65,8 +66,9 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
6566
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6667
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6768
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
68-
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
6969
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
70+
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
71+
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
7072
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
7173
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
7274
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -84,8 +86,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
8486
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
8587
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
8688
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
87-
golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
88-
golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
89+
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
90+
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
8991
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
9092
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
9193
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=

‎major/major.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package major
22

33
import (
4-
"flag"
54
"fmt"
65
"go/format"
76
"go/parser"
87
"go/token"
9-
"log"
108
"os"
9+
"os/exec"
1110
"path/filepath"
1211
"strconv"
1312
"strings"
@@ -60,8 +59,17 @@ func Run(dir, op, modName string, tag int) error {
6059
}
6160
}
6261
if client {
63-
// TODO: update require clause in go.mod file
64-
return nil
62+
// It would be nicer to use modFile.AddRequire
63+
// and modFile.DropRequire, but they do not
64+
// preserve block location.
65+
for _, req := range modFile.Require {
66+
if req.Mod.Path == modName {
67+
req.Mod.Path = newModPath
68+
req.Mod.Version = "latest"
69+
break
70+
}
71+
}
72+
modFile.SetRequire(modFile.Require)
6573
} else {
6674
modFile.Module.Syntax.Token[1] = newModPath
6775
}
@@ -73,6 +81,12 @@ func Run(dir, op, modName string, tag int) error {
7381
if err != nil {
7482
return errors.Wrap(err, "could not rewrite go.mod file")
7583
}
84+
if client {
85+
fmt.Println("running go mod tidy...")
86+
cmd := exec.Command("go", "mod", "tidy")
87+
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
88+
return cmd.Run()
89+
}
7690
return nil
7791
}
7892

@@ -87,20 +101,6 @@ func getSeparator(s string) string {
87101
return "/"
88102
}
89103

90-
func getOperation() string {
91-
args := flag.Args()
92-
if len(args) != 1 {
93-
log.Fatal("Use: mod upgrade|downgrade")
94-
}
95-
96-
op := args[0]
97-
if op != "upgrade" && op != "downgrade" {
98-
log.Fatal("unknown command " + op)
99-
}
100-
101-
return op
102-
}
103-
104104
func getNext(tagNum int, s, sep string) string {
105105
ss := strings.Split(s, sep)
106106
num, isMajor := versionSuffix(ss)

0 commit comments

Comments
 (0)