Skip to content

Commit 30e3964

Browse files
yec-akamaiyec-akamai
committed
Merge branch 'main' into fix-update-alerts-empty
2 parents 54d0303 + 09803f2 commit 30e3964

38 files changed

Lines changed: 5152 additions & 3717 deletions

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127

128128
steps:
129129
- name: Notify Slack
130-
uses: slackapi/slack-github-action@v2.1.1
130+
uses: slackapi/slack-github-action@v3
131131
with:
132132
method: chat.postMessage
133133
token: ${{ secrets.SLACK_BOT_TOKEN }}

‎.github/workflows/clean-release-notes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Remove ticket prefixes from release notes
15-
uses: actions/github-script@v7
15+
uses: actions/github-script@v8
1616
with:
1717
script: |
1818
const release = context.payload.release;

‎.github/workflows/nightly_smoke_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
- name: Notify Slack
4040
if: (success() || failure()) && github.repository == 'linode/linodego'
41-
uses: slackapi/slack-github-action@v2.1.1
41+
uses: slackapi/slack-github-action@v3
4242
with:
4343
method: chat.postMessage
4444
token: ${{ secrets.SLACK_BOT_TOKEN }}

‎.github/workflows/release-notify-slack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Notify Slack - Main Message
13-
uses: slackapi/slack-github-action@v2.1.1
13+
uses: slackapi/slack-github-action@v3
1414
with:
1515
method: chat.postMessage
1616
token: ${{ secrets.SLACK_BOT_TOKEN }}

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @linode/dx
1+
* @linode/dx @linode/dx-sdets

‎firewall_devices.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ func (device *FirewallDevice) UnmarshalJSON(b []byte) error {
5757

5858
// FirewallDeviceEntity contains information about a device associated with a Firewall
5959
type FirewallDeviceEntity struct {
60-
ID int `json:"id"`
61-
Type FirewallDeviceType `json:"type"`
62-
Label string `json:"label"`
63-
URL string `json:"url"`
60+
ID int `json:"id"`
61+
Type FirewallDeviceType `json:"type"`
62+
Label string `json:"label"`
63+
URL string `json:"url"`
64+
ParentEntity *FirewallDeviceEntity `json:"parent_entity"`
6465
}
6566

6667
// ListFirewallDevices get devices associated with a given Firewall

‎firewalls.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,21 @@ const (
2020

2121
// A Firewall is a set of networking rules (iptables) applied to Devices with which it is associated
2222
type Firewall struct {
23-
ID int `json:"id"`
24-
Label string `json:"label"`
25-
Status FirewallStatus `json:"status"`
26-
Tags []string `json:"tags,omitempty"`
27-
Rules FirewallRuleSet `json:"rules"`
28-
Created *time.Time `json:"-"`
29-
Updated *time.Time `json:"-"`
23+
ID int `json:"id"`
24+
Label string `json:"label"`
25+
Status FirewallStatus `json:"status"`
26+
Tags []string `json:"tags"`
27+
Rules FirewallRuleSet `json:"rules"`
28+
Entities []FirewallDeviceEntity `json:"entities"`
29+
Created *time.Time `json:"-"`
30+
Updated *time.Time `json:"-"`
3031
}
3132

3233
// DevicesCreationOptions fields are used when adding devices during the Firewall creation process.
3334
type DevicesCreationOptions struct {
34-
Linodes []int `json:"linodes,omitempty"`
35-
NodeBalancers []int `json:"nodebalancers,omitempty"`
36-
Interfaces []int `json:"interfaces,omitempty"`
35+
Linodes []int `json:"linodes,omitempty"`
36+
NodeBalancers []int `json:"nodebalancers,omitempty"`
37+
LinodeInterfaces []int `json:"linode_interfaces,omitempty"`
3738
}
3839

3940
// FirewallCreateOptions fields are those accepted by CreateFirewall

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ require (
55
github.com/google/go-cmp v0.7.0
66
github.com/google/go-querystring v1.2.0
77
github.com/jarcoal/httpmock v1.4.1
8-
golang.org/x/net v0.51.0
8+
golang.org/x/net v0.52.0
99
golang.org/x/oauth2 v0.36.0
10-
golang.org/x/text v0.34.0
10+
golang.org/x/text v0.35.0
1111
gopkg.in/ini.v1 v1.67.1
1212
)
1313

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
2323
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
2424
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
2525
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
26-
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
27-
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
26+
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
27+
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
2828
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
2929
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
30-
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
31-
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
30+
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
31+
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
3232
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
3333
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
3434
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎instance_disks.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ import (
1010

1111
// InstanceDisk represents an Instance Disk object
1212
type InstanceDisk struct {
13-
ID int `json:"id"`
14-
Label string `json:"label"`
15-
Status DiskStatus `json:"status"`
16-
Size int `json:"size"`
17-
Filesystem DiskFilesystem `json:"filesystem"`
18-
Created *time.Time `json:"-"`
19-
Updated *time.Time `json:"-"`
20-
21-
// NOTE: Disk encryption may not currently be available to all users.
13+
ID int `json:"id"`
14+
Label string `json:"label"`
15+
Status DiskStatus `json:"status"`
16+
Size int `json:"size"`
17+
Filesystem DiskFilesystem `json:"filesystem"`
18+
Created *time.Time `json:"-"`
19+
Updated *time.Time `json:"-"`
2220
DiskEncryption InstanceDiskEncryption `json:"disk_encryption"`
2321
}
2422

0 commit comments

Comments
 (0)