klauvsteinen/go-unifi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix type of x_ssh_keys

Browse Source 
The `unifi_settings_mgmt` resource fails for me with the following error:

```
Error: unable to decode body: GET s/default/get/setting/mgmt unable to unmarshal alias: json: cannot unmarshal object into Go struct field .x_ssh_keys of type string
```

My `x_ssh_keys` looks like this:

```
[
  {
    "name": "Laptop",
    "type": "ssh-rsa",
    "key": "REDACTED",
    "comment": "REDACTED",
    "date": "2021-02-25T08:26:04Z",
    "fingerprint": "REDACTED"
  }
]
```
This commit is contained in:
Joshua Spence
2021-06-12 14:04:32 +10:00
committed by Paul Tyng
parent fbed685c37
commit dd685c0447
2 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
unifi/setting_mgmt.generated.go
View File

@@ -27,23 +27,23 @@ type SettingMgmt struct {
Key string `json:"key"`
AdvancedFeatureEnabled bool `json:"advanced_feature_enabled"`
AlertEnabled bool `json:"alert_enabled"`
AutoUpgrade bool `json:"auto_upgrade"`
BootSound bool `json:"boot_sound"`
LedEnabled bool `json:"led_enabled"`
OutdoorModeEnabled bool `json:"outdoor_mode_enabled"`
UnifiIDpEnabled bool `json:"unifi_idp_enabled"`
WifimanEnabled bool `json:"wifiman_enabled"`
XMgmtKey string `json:"x_mgmt_key,omitempty"` // [0-9a-f]{32}
XSshAuthPasswordEnabled bool `json:"x_ssh_auth_password_enabled"`
XSshBindWildcard bool `json:"x_ssh_bind_wildcard"`
XSshEnabled bool `json:"x_ssh_enabled"`
XSshKeys []string `json:"x_ssh_keys,omitempty"`
XSshMd5Passwd string `json:"x_ssh_md5passwd,omitempty"`
XSshPassword string `json:"x_ssh_password,omitempty"` // .{1,128}
XSshSha512Passwd string `json:"x_ssh_sha512passwd,omitempty"`
XSshUsername string `json:"x_ssh_username,omitempty"` // ^[_A-Za-z0-9][-_.A-Za-z0-9]{0,29}$
AdvancedFeatureEnabled bool `json:"advanced_feature_enabled"`
AlertEnabled bool `json:"alert_enabled"`
AutoUpgrade bool `json:"auto_upgrade"`
BootSound bool `json:"boot_sound"`
LedEnabled bool `json:"led_enabled"`
OutdoorModeEnabled bool `json:"outdoor_mode_enabled"`
UnifiIDpEnabled bool `json:"unifi_idp_enabled"`
WifimanEnabled bool `json:"wifiman_enabled"`
XMgmtKey string `json:"x_mgmt_key,omitempty"` // [0-9a-f]{32}
XSshAuthPasswordEnabled bool `json:"x_ssh_auth_password_enabled"`
XSshBindWildcard bool `json:"x_ssh_bind_wildcard"`
XSshEnabled bool `json:"x_ssh_enabled"`
XSshKeys []SettingMgmtXSshKeys `json:"x_ssh_keys,omitempty"`
XSshMd5Passwd string `json:"x_ssh_md5passwd,omitempty"`
XSshPassword string `json:"x_ssh_password,omitempty"` // .{1,128}
XSshSha512Passwd string `json:"x_ssh_sha512passwd,omitempty"`
XSshUsername string `json:"x_ssh_username,omitempty"` // ^[_A-Za-z0-9][-_.A-Za-z0-9]{0,29}$
}
func (dst *SettingMgmt) UnmarshalJSON(b []byte) error {
@@ -62,6 +62,31 @@ func (dst *SettingMgmt) UnmarshalJSON(b []byte) error {
return nil
}
type SettingMgmtXSshKeys struct {
comment string `json:"comment"`
date string `json:"date"`
fingerprint string `json:"fingerprint"`
key string `json:"key"`
keyType string `json:"type"`
name string `json:"name"`
}
func (dst *SettingMgmtXSshKeys) UnmarshalJSON(b []byte) error {
type Alias SettingMgmtXSshKeys
aux := &struct {
*Alias
}{
Alias: (*Alias)(dst),
}
err := json.Unmarshal(b, &aux)
if err != nil {
return fmt.Errorf("unable to unmarshal alias: %w", err)
}
return nil
}
func (c *Client) getSettingMgmt(ctx context.Context, site string) (*SettingMgmt, error) {
var respBody struct {
Meta meta `json:"meta"`