Skip to content

Commit 5c5d533

Browse files
authored
Merge branch 'main' into feature/TPT-3909-iam-volumes-io-ready-add-integration-tests-for-sdks
2 parents f7fb758 + b0f235e commit 5c5d533

4 files changed

Lines changed: 27 additions & 33 deletions

File tree

.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@v8
15+
uses: actions/github-script@v9
1616
with:
1717
script: |
1818
const release = context.payload.release;

.github/workflows/integration_tests_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
env:
7272
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7373

74-
- uses: actions/github-script@v8
74+
- uses: actions/github-script@v9
7575
id: update-check-run
7676
if: ${{ inputs.pull_request_number != '' && fromJson(steps.commit-hash.outputs.data).repository.pullRequest.headRef.target.oid == inputs.sha }}
7777
env:

account_settings.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ type AccountSettings struct {
3030
// A string like "disabled", "suspended", or "active" describing the status of this account’s Object Storage service enrollment.
3131
ObjectStorage *string `json:"object_storage"`
3232

33-
// NOTE: Interfaces for new linode setting may not currently be available to all users.
3433
// A new configuration flag defines whether new Linodes can use Linode and/or legacy config interfaces.
3534
InterfacesForNewLinodes InterfacesForNewLinodes `json:"interfaces_for_new_linodes"`
3635

instances.go

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,31 @@ const (
4949

5050
// Instance represents a linode object
5151
type Instance struct {
52-
ID int `json:"id"`
53-
Created *time.Time `json:"-"`
54-
Updated *time.Time `json:"-"`
55-
Region string `json:"region"`
56-
Alerts *InstanceAlert `json:"alerts"`
57-
Backups *InstanceBackup `json:"backups"`
58-
Image string `json:"image"`
59-
Group string `json:"group"`
60-
IPv4 []*net.IP `json:"ipv4"`
61-
IPv6 string `json:"ipv6"`
62-
Label string `json:"label"`
63-
Type string `json:"type"`
64-
Status InstanceStatus `json:"status"`
65-
HasUserData bool `json:"has_user_data"`
66-
Hypervisor string `json:"hypervisor"`
67-
HostUUID string `json:"host_uuid"`
68-
Specs *InstanceSpec `json:"specs"`
69-
WatchdogEnabled bool `json:"watchdog_enabled"`
70-
Tags []string `json:"tags"`
71-
PlacementGroup *InstancePlacementGroup `json:"placement_group"`
72-
DiskEncryption InstanceDiskEncryption `json:"disk_encryption"`
73-
74-
LKEClusterID int `json:"lke_cluster_id"`
75-
Capabilities []string `json:"capabilities"`
76-
77-
// Note: Linode interfaces may not currently be available to all users.
78-
InterfaceGeneration InterfaceGeneration `json:"interface_generation"`
79-
80-
MaintenancePolicy string `json:"maintenance_policy"`
52+
ID int `json:"id"`
53+
Created *time.Time `json:"-"`
54+
Updated *time.Time `json:"-"`
55+
Region string `json:"region"`
56+
Alerts *InstanceAlert `json:"alerts"`
57+
Backups *InstanceBackup `json:"backups"`
58+
Image string `json:"image"`
59+
Group string `json:"group"`
60+
IPv4 []*net.IP `json:"ipv4"`
61+
IPv6 string `json:"ipv6"`
62+
Label string `json:"label"`
63+
Type string `json:"type"`
64+
Status InstanceStatus `json:"status"`
65+
HasUserData bool `json:"has_user_data"`
66+
Hypervisor string `json:"hypervisor"`
67+
HostUUID string `json:"host_uuid"`
68+
Specs *InstanceSpec `json:"specs"`
69+
WatchdogEnabled bool `json:"watchdog_enabled"`
70+
Tags []string `json:"tags"`
71+
PlacementGroup *InstancePlacementGroup `json:"placement_group"`
72+
DiskEncryption InstanceDiskEncryption `json:"disk_encryption"`
73+
LKEClusterID int `json:"lke_cluster_id"`
74+
Capabilities []string `json:"capabilities"`
75+
InterfaceGeneration InterfaceGeneration `json:"interface_generation"`
76+
MaintenancePolicy string `json:"maintenance_policy"`
8177

8278
// NOTE: Locks can only be used with v4beta.
8379
Locks []LockType `json:"locks"`
@@ -204,7 +200,6 @@ type InstanceCreateOptions struct {
204200

205201
// Linode Interfaces to create the new instance with.
206202
// Conflicts with Interfaces.
207-
// NOTE: Linode Interfaces may not currently be available to all users.
208203
LinodeInterfaces []LinodeInterfaceCreateOptions `json:"-"`
209204

210205
// Legacy (config) Interfaces to create the new instance with.

0 commit comments

Comments
 (0)