Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for missing User-related fields #622

Merged
merged 6 commits into from
Dec 2, 2024
Merged

Added support for missing User-related fields #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
295b6ad
Added support for missing user fields
ezilber-akamai Nov 20, 2024
3f64ebf
Merge branch 'main' into TPT-3245-support-user-fields
ezilber-akamai Nov 22, 2024
58e9237
Merge branch 'main' into TPT-3245-support-user-fields
ezilber-akamai Nov 22, 2024
9f90ed2
Merge branch 'main' into TPT-3245-support-user-fields
ezilber-akamai Nov 26, 2024
808580c
Merge branch 'main' into TPT-3245-support-user-fields
ezilber-akamai Dec 2, 2024
2619700
Reran GetMonthlyTransfer fixture
ezilber-akamai Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions account_user_grants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ type GlobalUserGrants struct {
AddLinodes bool `json:"add_linodes"`
AddLongview bool `json:"add_longview"`
AddNodeBalancers bool `json:"add_nodebalancers"`
AddPlacementGroups bool `json:"add_placement_groups"`
AddStackScripts bool `json:"add_stackscripts"`
AddVolumes bool `json:"add_volumes"`
AddVPCs bool `json:"add_vpcs"`
CancelAccount bool `json:"cancel_account"`
ChildAccountAccess bool `json:"child_account_access"`
LongviewSubscription bool `json:"longview_subscription"`
}

Expand All @@ -38,29 +41,33 @@ type GrantedEntity struct {
}

type UserGrants struct {
Database []GrantedEntity `json:"database"`
Domain []GrantedEntity `json:"domain"`
Firewall []GrantedEntity `json:"firewall"`
Image []GrantedEntity `json:"image"`
Linode []GrantedEntity `json:"linode"`
Longview []GrantedEntity `json:"longview"`
NodeBalancer []GrantedEntity `json:"nodebalancer"`
StackScript []GrantedEntity `json:"stackscript"`
Volume []GrantedEntity `json:"volume"`
Database []GrantedEntity `json:"database"`
Domain []GrantedEntity `json:"domain"`
Firewall []GrantedEntity `json:"firewall"`
Image []GrantedEntity `json:"image"`
Linode []GrantedEntity `json:"linode"`
Longview []GrantedEntity `json:"longview"`
NodeBalancer []GrantedEntity `json:"nodebalancer"`
PlacementGroup []GrantedEntity `json:"placement_group"`
StackScript []GrantedEntity `json:"stackscript"`
Volume []GrantedEntity `json:"volume"`
VPC []GrantedEntity `json:"vpc"`

Global GlobalUserGrants `json:"global"`
}

type UserGrantsUpdateOptions struct {
Database []GrantedEntity `json:"database,omitempty"`
Domain []EntityUserGrant `json:"domain,omitempty"`
Firewall []EntityUserGrant `json:"firewall,omitempty"`
Image []EntityUserGrant `json:"image,omitempty"`
Linode []EntityUserGrant `json:"linode,omitempty"`
Longview []EntityUserGrant `json:"longview,omitempty"`
NodeBalancer []EntityUserGrant `json:"nodebalancer,omitempty"`
StackScript []EntityUserGrant `json:"stackscript,omitempty"`
Volume []EntityUserGrant `json:"volume,omitempty"`
Database []GrantedEntity `json:"database,omitempty"`
Domain []EntityUserGrant `json:"domain,omitempty"`
Firewall []EntityUserGrant `json:"firewall,omitempty"`
Image []EntityUserGrant `json:"image,omitempty"`
Linode []EntityUserGrant `json:"linode,omitempty"`
Longview []EntityUserGrant `json:"longview,omitempty"`
NodeBalancer []EntityUserGrant `json:"nodebalancer,omitempty"`
PlacementGroup []EntityUserGrant `json:"placement_group,omitempty"`
StackScript []EntityUserGrant `json:"stackscript,omitempty"`
Volume []EntityUserGrant `json:"volume,omitempty"`
VPC []EntityUserGrant `json:"vpc,omitempty"`

Global GlobalUserGrants `json:"global"`
}
Expand Down
2 changes: 2 additions & 0 deletions account_users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type UserCreateOptions struct {
type UserUpdateOptions struct {
Username string `json:"username,omitempty"`
Restricted *bool `json:"restricted,omitempty"`
Email string `json:"email,omitempty"`
}

// UnmarshalJSON implements the json.Unmarshaler interface
Expand Down Expand Up @@ -102,6 +103,7 @@ func (i User) GetCreateOptions() (o UserCreateOptions) {
func (i User) GetUpdateOptions() (o UserUpdateOptions) {
o.Username = i.Username
o.Restricted = copyBool(&i.Restricted)
o.Email = i.Email

return
}
Expand Down
26 changes: 15 additions & 11 deletions test/integration/account_user_grants_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,19 @@ func TestUserGrants_Update(t *testing.T) {
accessLevel := linodego.AccessLevelReadOnly

globalGrants := linodego.GlobalUserGrants{
AccountAccess: &accessLevel,
AddDomains: false,
AddDatabases: true,
AddFirewalls: true,
AddImages: true,
AddLinodes: false,
AddLongview: true,
AddNodeBalancers: false,
AddStackScripts: true,
AddVolumes: true,
CancelAccount: false,
AccountAccess: &accessLevel,
AddDomains: false,
AddDatabases: true,
AddFirewalls: true,
AddImages: true,
AddLinodes: false,
AddLongview: true,
AddNodeBalancers: false,
AddPlacementGroups: false,
AddStackScripts: true,
AddVolumes: true,
AddVPCs: true,
CancelAccount: false,
}

grants, err := client.UpdateUserGrants(context.TODO(), username, linodego.UserGrantsUpdateOptions{
Expand Down Expand Up @@ -83,8 +85,10 @@ func TestUserGrants_UpdateNoAccess(t *testing.T) {
grants.Linode,
grants.Longview,
grants.NodeBalancer,
grants.PlacementGroup,
grants.StackScript,
grants.Volume,
grants.VPC,
}

for _, grantField := range grantFields {
Expand Down
Loading