Skip to content

Commit 74d7bfb

Browse files
committed
Merge mantle/go.mod into go.mod
To do this, I manually copied the contents of the former into the latter and sorted them into two `require` blocks: one for direct dependencies and another for indirect. This seems to follow what `go mod tidy` does. Versioning information has been retained. Where duplicates existed, they were matching. I didn't keep the `replace` directive for `google.golang.org/cloud`. It dates from when mantle originally moved to go module in 1b70d97 ("vendor: switch to go modules") and no one really knows anymore why it was necessary.
1 parent 7f4f952 commit 74d7bfb

File tree

3 files changed

+70
-98
lines changed

3 files changed

+70
-98
lines changed

.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
33
- package-ecosystem: gomod
4-
directory: "/mantle"
4+
directory: "/"
55
schedule:
66
interval: daily
77
allow:

go.mod

+69-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,82 @@ module github.com/coreos/coreos-assembler
33
go 1.17
44

55
require (
6+
github.com/Azure/azure-sdk-for-go v8.1.0-beta+incompatible
7+
github.com/Azure/go-autorest v9.1.0+incompatible
8+
github.com/IBM-Cloud/bluemix-go v0.0.0-20210419045805-b50610722085
9+
github.com/IBM/ibm-cos-sdk-go v1.6.1
10+
github.com/Microsoft/azure-vhd-utils v0.0.0-20161127050200-43293b8d7646
11+
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1442
12+
github.com/aliyun/aliyun-oss-go-sdk v2.0.3+incompatible
13+
github.com/aws/aws-sdk-go v1.34.28
14+
github.com/coreos/butane v0.17.0
15+
github.com/coreos/go-semver v0.3.0
16+
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
17+
github.com/coreos/go-systemd/v22 v22.5.0
18+
github.com/coreos/ignition/v2 v2.14.0
19+
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
620
github.com/coreos/stream-metadata-go v0.4.0
7-
github.com/spf13/cobra v1.5.0
8-
)
9-
10-
require (
21+
github.com/coreos/vcontext v0.0.0-20220810162454-88bd546c634c
22+
github.com/digitalocean/go-qemu v0.0.0-20200529005954-1b453d036a9c
23+
github.com/digitalocean/godo v1.33.0
24+
github.com/gophercloud/gophercloud v0.22.0
25+
github.com/gophercloud/utils v0.0.0-20210323225332-7b186010c04f
26+
github.com/kballard/go-shellquote v0.0.0-20150810074751-d8ec1a69a250
27+
github.com/kylelemons/godebug v0.0.0-20150519154555-21cb3784d9bd
28+
github.com/packethost/packngo v0.0.0-20180426081943-80f62d78849d
29+
github.com/pborman/uuid v1.2.0
30+
github.com/pin/tftp v2.1.0+incompatible
1131
github.com/pkg/errors v0.9.1
1232
github.com/sirupsen/logrus v1.9.0
13-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
14-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
33+
github.com/spf13/cobra v1.5.0
34+
github.com/vincent-petithory/dataurl v1.0.0
35+
github.com/vishvananda/netlink v0.0.0-20150710184826-9cff81214893
36+
github.com/vishvananda/netns v0.0.0-20150710222425-604eaf189ee8
37+
github.com/vmware/govmomi v0.15.0
1538
github.com/xeipuuv/gojsonschema v1.2.0
16-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
39+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
40+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2
41+
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
42+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
43+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
44+
golang.org/x/text v0.3.6
45+
google.golang.org/api v0.34.0
46+
gopkg.in/yaml.v2 v2.4.0
1747
)
1848

1949
require (
50+
cloud.google.com/go v0.65.0 // indirect
51+
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
52+
github.com/clarketm/json v1.17.1 // indirect
53+
github.com/coreos/go-json v0.0.0-20220810161552-7cce03887f34 // indirect
54+
github.com/davecgh/go-spew v1.1.1 // indirect
55+
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
56+
github.com/digitalocean/go-libvirt v0.0.0-20200810224808-b9c702499bf7 // indirect
57+
github.com/dimchansky/utfbom v1.1.1 // indirect
58+
github.com/godbus/dbus/v5 v5.0.4 // indirect
59+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
60+
github.com/golang/protobuf v1.4.2 // indirect
61+
github.com/google/go-querystring v1.0.0 // indirect
62+
github.com/google/uuid v1.1.1 // indirect
63+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
2064
github.com/inconshreveable/mousetrap v1.0.0 // indirect
65+
github.com/jmespath/go-jmespath v0.4.0 // indirect
66+
github.com/json-iterator/go v1.1.10 // indirect
67+
github.com/mitchellh/go-homedir v1.1.0 // indirect
68+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
69+
github.com/modern-go/reflect2 v1.0.1 // indirect
70+
github.com/pmezard/go-difflib v1.0.0 // indirect
71+
github.com/satori/go.uuid v1.2.0 // indirect
2172
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
73+
github.com/stretchr/testify v1.8.1 // indirect
74+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
75+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
76+
go.opencensus.io v0.22.5 // indirect
77+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
78+
google.golang.org/appengine v1.6.6 // indirect
79+
google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
80+
google.golang.org/grpc v1.31.1 // indirect
81+
google.golang.org/protobuf v1.25.0 // indirect
82+
gopkg.in/ini.v1 v1.66.2 // indirect
83+
gopkg.in/yaml.v3 v3.0.1 // indirect
2284
)

mantle/go.mod

-90
This file was deleted.

0 commit comments

Comments
 (0)