Skip to content

Commit 52f201e

Browse files
mawilk90mawilk90
authored
Merge branch 'main' into proj/nb-front-end-ip-in-vpc
2 parents 17068fd + 6bc7de6 commit 52f201e

20 files changed

Lines changed: 232 additions & 252 deletions

‎.github/workflows/security_pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: 'Checkout repository'
1313
uses: actions/checkout@v6
1414
- name: 'Dependency Review'
15-
uses: actions/dependency-review-action@v4
15+
uses: actions/dependency-review-action@v5
1616
with:
1717
comment-summary-in-pr: on-failure
1818

‎go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ require (
55
github.com/google/go-querystring v1.2.0
66
github.com/jarcoal/httpmock v1.4.1
77
github.com/stretchr/testify v1.11.1
8-
golang.org/x/net v0.54.0
8+
golang.org/x/net v0.55.0
99
golang.org/x/oauth2 v0.36.0
1010
golang.org/x/text v0.37.0
1111
gopkg.in/ini.v1 v1.67.2
1212
)
1313

1414
require (
15-
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/pmezard/go-difflib v1.0.0 // indirect
15+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
16+
github.com/kr/pretty v0.3.1 // indirect
17+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
18+
github.com/rogpeppe/go-internal v1.14.1 // indirect
19+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
1720
gopkg.in/yaml.v3 v3.0.1 // indirect
1821
)
1922

2023
go 1.25.0
21-
22-
toolchain go1.25.1

‎go.sum‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
1+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
12
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
5+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
46
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
57
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
68
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
79
github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0=
810
github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU=
911
github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=
1012
github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
13+
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
14+
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
15+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
16+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
17+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
18+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
19+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
1120
github.com/maxatome/go-testdeep v1.14.0 h1:rRlLv1+kI8eOI3OaBXZwb3O7xY3exRzdW5QyX48g9wI=
1221
github.com/maxatome/go-testdeep v1.14.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
13-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
22+
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
1423
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
24+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
25+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
26+
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
27+
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
28+
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
1529
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1630
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
1731
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -21,14 +35,15 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
2135
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
2236
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
2337
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
24-
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
25-
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
38+
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
39+
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
2640
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
2741
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
2842
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
2943
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
30-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
3144
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
45+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
46+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
3247
gopkg.in/ini.v1 v1.67.2 h1:JtOSMb9OuaCZKr7h5D/h6iii14sK0hLbplTc6frx4Ss=
3348
gopkg.in/ini.v1 v1.67.2/go.mod h1:x/cyOwCgZqOkJoDIJ3c1KNHMo10+nLGAhh+kn3Zizss=
3449
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎instances.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type Instance struct {
7575
InterfaceGeneration InterfaceGeneration `json:"interface_generation"`
7676
MaintenancePolicy string `json:"maintenance_policy"`
7777

78-
// NOTE: Locks can only be used with v4beta.
78+
// NOTE: Both cannot_delete and cannot_delete_with_subresources apply to Instances and can only be used with v4beta.
7979
Locks []LockType `json:"locks"`
8080
}
8181

‎k8s/go.mod‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,50 @@ module github.com/linode/linodego/v2/k8s
22

33
require (
44
github.com/linode/linodego/v2 v2.0.0
5-
k8s.io/api v0.29.4
6-
k8s.io/apimachinery v0.29.4
7-
k8s.io/client-go v0.29.4
5+
k8s.io/api v0.35.5
6+
k8s.io/apimachinery v0.35.5
7+
k8s.io/client-go v0.35.5
88
)
99

1010
require (
11-
github.com/davecgh/go-spew v1.1.1 // indirect
12-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
13-
github.com/go-logr/logr v1.3.0 // indirect
14-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
11+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
12+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
13+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
14+
github.com/go-logr/logr v1.4.3 // indirect
15+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
1516
github.com/go-openapi/jsonreference v0.20.2 // indirect
16-
github.com/go-openapi/swag v0.22.3 // indirect
17-
github.com/gogo/protobuf v1.3.2 // indirect
18-
github.com/golang/protobuf v1.5.4 // indirect
19-
github.com/google/gnostic-models v0.6.8 // indirect
17+
github.com/go-openapi/swag v0.23.0 // indirect
18+
github.com/google/gnostic-models v0.7.0 // indirect
2019
github.com/google/go-querystring v1.2.0 // indirect
21-
github.com/google/gofuzz v1.2.0 // indirect
22-
github.com/google/uuid v1.3.0 // indirect
23-
github.com/imdario/mergo v0.3.6 // indirect
20+
github.com/google/uuid v1.6.0 // indirect
2421
github.com/josharian/intern v1.0.0 // indirect
2522
github.com/json-iterator/go v1.1.12 // indirect
2623
github.com/mailru/easyjson v0.7.7 // indirect
2724
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
28-
github.com/modern-go/reflect2 v1.0.2 // indirect
25+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
2926
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
30-
github.com/spf13/pflag v1.0.5 // indirect
31-
golang.org/x/net v0.54.0 // indirect
27+
github.com/spf13/pflag v1.0.9 // indirect
28+
github.com/x448/float16 v0.8.4 // indirect
29+
go.yaml.in/yaml/v2 v2.4.3 // indirect
30+
go.yaml.in/yaml/v3 v3.0.4 // indirect
31+
golang.org/x/net v0.55.0 // indirect
3232
golang.org/x/oauth2 v0.36.0 // indirect
33-
golang.org/x/sys v0.44.0 // indirect
33+
golang.org/x/sys v0.45.0 // indirect
3434
golang.org/x/term v0.43.0 // indirect
3535
golang.org/x/text v0.37.0 // indirect
36-
golang.org/x/time v0.12.0 // indirect
37-
google.golang.org/protobuf v1.33.0 // indirect
36+
golang.org/x/time v0.14.0 // indirect
37+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
38+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
3839
gopkg.in/inf.v0 v0.9.1 // indirect
3940
gopkg.in/ini.v1 v1.67.2 // indirect
40-
gopkg.in/yaml.v2 v2.4.0 // indirect
4141
gopkg.in/yaml.v3 v3.0.1 // indirect
42-
k8s.io/klog/v2 v2.110.1 // indirect
43-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
44-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
45-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
46-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
47-
sigs.k8s.io/yaml v1.3.0 // indirect
42+
k8s.io/klog/v2 v2.140.0 // indirect
43+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
44+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
45+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
46+
sigs.k8s.io/randfill v1.0.0 // indirect
47+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
48+
sigs.k8s.io/yaml v1.6.0 // indirect
4849
)
4950

5051
replace github.com/linode/linodego/v2 => ../

0 commit comments

Comments
 (0)