Skip to content

Commit ba8bc59

Browse files
authored
Merge branch 'main' into nb-frontend-vpc
2 parents 852faf5 + 72287a0 commit ba8bc59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+13330
-5314
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
lint-tidy:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- uses: actions/setup-go@v6
1616
with:
1717
go-version: stable
@@ -38,7 +38,7 @@ jobs:
3838
EXIT_STATUS: 0
3939
steps:
4040
- name: Clone Repository
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@v6
4242
with:
4343
fetch-depth: 0
4444
submodules: 'recursive'

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build-mode: autobuild
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v5
26+
uses: actions/checkout@v6
2727

2828
- name: Initialize CodeQL
2929
uses: github/codeql-action/init@v4

.github/workflows/integration_tests_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
# Check out merge commit
3434
- name: Checkout PR
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
with:
3737
ref: ${{ inputs.sha }}
3838

@@ -106,7 +106,7 @@ jobs:
106106

107107
steps:
108108
- name: Checkout code
109-
uses: actions/checkout@v5
109+
uses: actions/checkout@v6
110110
with:
111111
fetch-depth: 0
112112
submodules: 'recursive'

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
-
2020
name: Checkout
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
-
2323
name: Run Labeler
2424
uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916

.github/workflows/nightly_smoke_tests.yml

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

1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
fetch-depth: 0
2424
submodules: 'recursive'

.github/workflows/release-cross-repo-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: checkout terraform repo
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212
with:
1313
repository: linode/terraform-provider-linode
1414
fetch-depth: 0
@@ -22,7 +22,7 @@ jobs:
2222
- run: make deps
2323

2424
- name: Clone Repository
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626
with:
2727
path: linodego
2828

.github/workflows/security_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: 'Checkout repository'
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v6
1414
- name: 'Dependency Review'
1515
uses: actions/dependency-review-action@v4
1616
with:
@@ -22,7 +22,7 @@ jobs:
2222
GO111MODULE: on
2323
steps:
2424
- name: Checkout Source
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@v6
2626

2727
- name: Run Gosec Security Scanner on root directory
2828
uses: securego/gosec@master

account_events.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ const (
122122
ActionFirewallUpdate EventAction = "firewall_update"
123123
ActionFirewallDeviceAdd EventAction = "firewall_device_add"
124124
ActionFirewallDeviceRemove EventAction = "firewall_device_remove"
125+
ActionFirewallRuleSetCreate EventAction = "firewall_ruleset_create"
126+
ActionFirewallRuleSetUpdate EventAction = "firewall_ruleset_update"
127+
ActionFirewallRuleSetDelete EventAction = "firewall_ruleset_delete"
128+
ActionFirewallRuleSetFirewallUpdate EventAction = "firewall_ruleset_firewall_update"
125129
ActionHostReboot EventAction = "host_reboot"
126130
ActionImageDelete EventAction = "image_delete"
127131
ActionImageUpdate EventAction = "image_update"

account_invoices.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type InvoiceTaxSummary struct {
2929
type InvoiceItem struct {
3030
Label string `json:"label"`
3131
Type string `json:"type"`
32-
UnitPrice float32 `json:"unit_price"`
32+
UnitPrice string `json:"unit_price"`
3333
Quantity int `json:"quantity"`
3434
Amount float32 `json:"amount"`
3535
Tax float32 `json:"tax"`

databases.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ type Database struct {
101101

102102
// DatabaseHost for Primary/Secondary of Database
103103
type DatabaseHost struct {
104-
Primary string `json:"primary"`
105-
Secondary string `json:"secondary,omitempty"`
104+
Primary string `json:"primary"`
105+
Standby string `json:"standby"`
106106
}
107107

108108
type DatabasePrivateNetwork struct {

0 commit comments

Comments
 (0)