From 5f4b54c5d62f119681b1af4bbfa807ea0fb7f2f2 Mon Sep 17 00:00:00 2001 From: Josh Spence Date: Fri, 22 Nov 2024 11:25:47 +1100 Subject: [PATCH] Update `golangci-lint` configuration --- .golangci.yaml | 32 +++++---- internal/provider/data_account_test.go | 3 +- internal/provider/data_user_test.go | 4 +- internal/provider/lazy_client.go | 67 +++++++++++++++++++ internal/provider/resource_account.go | 1 - internal/provider/resource_device.go | 3 +- internal/provider/resource_device_test.go | 6 +- internal/provider/resource_dynamic_dns.go | 2 +- internal/provider/resource_firewall_rule.go | 8 ++- internal/provider/resource_port_profile.go | 2 +- .../provider/resource_setting_usg_test.go | 2 +- main.go | 13 ++-- 12 files changed, 101 insertions(+), 42 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 35ee77f81..bae4b697d 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,19 +1,17 @@ --- linters: - disable-all: true - enable: - - "gofmt" - - "gosimple" - - "govet" - - "ineffassign" - - "makezero" - - "misspell" - - "nakedret" - - "nilerr" - - "staticcheck" - - "structcheck" - - "unconvert" - - "unused" - -run: - timeout: '5m' + enable-all: true + disable: + # Temporary + #- 'depguard' + #- 'gomoddirectives' + #- 'nosnakecase' + #- 'paralleltest' + #- 'persprintf' + #- 'thelper' + #- 'varnamelen' + #- 'wrapcheck' + #- 'wsl' + + # Deprecated + - 'exportloopref' diff --git a/internal/provider/data_account_test.go b/internal/provider/data_account_test.go index 0286ed830..ed0f68528 100644 --- a/internal/provider/data_account_test.go +++ b/internal/provider/data_account_test.go @@ -2,8 +2,9 @@ package provider import ( "fmt" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" "testing" + + "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataAccount_default(t *testing.T) { diff --git a/internal/provider/data_user_test.go b/internal/provider/data_user_test.go index 958b1023f..929218b64 100644 --- a/internal/provider/data_user_test.go +++ b/internal/provider/data_user_test.go @@ -15,8 +15,6 @@ func TestAccDataUser_default(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { - //preCheck(t) - _, err := testClient.CreateUser(context.Background(), "default", &unifi.User{ MAC: mac, Name: "tfacc-User-Data", @@ -26,7 +24,7 @@ func TestAccDataUser_default(t *testing.T) { t.Fatal(err) } }, - //PreCheck: func() { preCheck(t) }, + // PreCheck: func() { preCheck(t) }, ProviderFactories: providerFactories, Steps: []resource.TestStep{ { diff --git a/internal/provider/lazy_client.go b/internal/provider/lazy_client.go index 284451034..1a9f731f6 100644 --- a/internal/provider/lazy_client.go +++ b/internal/provider/lazy_client.go @@ -82,366 +82,427 @@ func (c *lazyClient) Version() string { } return c.inner.Version() } + func (c *lazyClient) ListUserGroup(ctx context.Context, site string) ([]unifi.UserGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListUserGroup(ctx, site) } + func (c *lazyClient) ListWLANGroup(ctx context.Context, site string) ([]unifi.WLANGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListWLANGroup(ctx, site) } + func (c *lazyClient) ListAPGroup(ctx context.Context, site string) ([]unifi.APGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListAPGroup(ctx, site) } + func (c *lazyClient) DeleteNetwork(ctx context.Context, site, id, name string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteNetwork(ctx, site, id, name) } + func (c *lazyClient) CreateNetwork(ctx context.Context, site string, d *unifi.Network) (*unifi.Network, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateNetwork(ctx, site, d) } + func (c *lazyClient) GetNetwork(ctx context.Context, site, id string) (*unifi.Network, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetNetwork(ctx, site, id) } + func (c *lazyClient) ListNetwork(ctx context.Context, site string) ([]unifi.Network, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListNetwork(ctx, site) } + func (c *lazyClient) UpdateNetwork(ctx context.Context, site string, d *unifi.Network) (*unifi.Network, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateNetwork(ctx, site, d) } + func (c *lazyClient) DeleteWLAN(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteWLAN(ctx, site, id) } + func (c *lazyClient) CreateWLAN(ctx context.Context, site string, d *unifi.WLAN) (*unifi.WLAN, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateWLAN(ctx, site, d) } + func (c *lazyClient) GetWLAN(ctx context.Context, site, id string) (*unifi.WLAN, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetWLAN(ctx, site, id) } + func (c *lazyClient) UpdateWLAN(ctx context.Context, site string, d *unifi.WLAN) (*unifi.WLAN, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateWLAN(ctx, site, d) } + func (c *lazyClient) DeleteUserGroup(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteUserGroup(ctx, site, id) } + func (c *lazyClient) CreateUserGroup(ctx context.Context, site string, d *unifi.UserGroup) (*unifi.UserGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateUserGroup(ctx, site, d) } + func (c *lazyClient) GetUserGroup(ctx context.Context, site, id string) (*unifi.UserGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetUserGroup(ctx, site, id) } + func (c *lazyClient) UpdateUserGroup(ctx context.Context, site string, d *unifi.UserGroup) (*unifi.UserGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateUserGroup(ctx, site, d) } + func (c *lazyClient) GetDevice(ctx context.Context, site, id string) (*unifi.Device, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetDevice(ctx, site, id) } + func (c *lazyClient) GetDeviceByMAC(ctx context.Context, site, mac string) (*unifi.Device, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetDeviceByMAC(ctx, site, mac) } + func (c *lazyClient) CreateDevice(ctx context.Context, site string, d *unifi.Device) (*unifi.Device, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateDevice(ctx, site, d) } + func (c *lazyClient) UpdateDevice(ctx context.Context, site string, d *unifi.Device) (*unifi.Device, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateDevice(ctx, site, d) } + func (c *lazyClient) DeleteDevice(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteDevice(ctx, site, id) } + func (c *lazyClient) ListDevice(ctx context.Context, site string) ([]unifi.Device, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListDevice(ctx, site) } + func (c *lazyClient) AdoptDevice(ctx context.Context, site, mac string) error { if err := c.init(ctx); err != nil { return err } return c.inner.AdoptDevice(ctx, site, mac) } + func (c *lazyClient) ForgetDevice(ctx context.Context, site, mac string) error { if err := c.init(ctx); err != nil { return err } return c.inner.ForgetDevice(ctx, site, mac) } + func (c *lazyClient) GetUser(ctx context.Context, site, id string) (*unifi.User, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetUser(ctx, site, id) } + func (c *lazyClient) GetUserByMAC(ctx context.Context, site, mac string) (*unifi.User, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetUserByMAC(ctx, site, mac) } + func (c *lazyClient) CreateUser(ctx context.Context, site string, d *unifi.User) (*unifi.User, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateUser(ctx, site, d) } + func (c *lazyClient) UpdateUser(ctx context.Context, site string, d *unifi.User) (*unifi.User, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateUser(ctx, site, d) } + func (c *lazyClient) DeleteUserByMAC(ctx context.Context, site, mac string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteUserByMAC(ctx, site, mac) } + func (c *lazyClient) BlockUserByMAC(ctx context.Context, site, mac string) error { if err := c.init(ctx); err != nil { return err } return c.inner.BlockUserByMAC(ctx, site, mac) } + func (c *lazyClient) UnblockUserByMAC(ctx context.Context, site, mac string) error { if err := c.init(ctx); err != nil { return err } return c.inner.UnblockUserByMAC(ctx, site, mac) } + func (c *lazyClient) OverrideUserFingerprint(ctx context.Context, site, mac string, devIdOveride int) error { if err := c.init(ctx); err != nil { return err } return c.inner.OverrideUserFingerprint(ctx, site, mac, devIdOveride) } + func (c *lazyClient) ListFirewallGroup(ctx context.Context, site string) ([]unifi.FirewallGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListFirewallGroup(ctx, site) } + func (c *lazyClient) DeleteFirewallGroup(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteFirewallGroup(ctx, site, id) } + func (c *lazyClient) CreateFirewallGroup(ctx context.Context, site string, d *unifi.FirewallGroup) (*unifi.FirewallGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateFirewallGroup(ctx, site, d) } + func (c *lazyClient) GetFirewallGroup(ctx context.Context, site, id string) (*unifi.FirewallGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetFirewallGroup(ctx, site, id) } + func (c *lazyClient) UpdateFirewallGroup(ctx context.Context, site string, d *unifi.FirewallGroup) (*unifi.FirewallGroup, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateFirewallGroup(ctx, site, d) } + func (c *lazyClient) ListFirewallRule(ctx context.Context, site string) ([]unifi.FirewallRule, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListFirewallRule(ctx, site) } + func (c *lazyClient) DeleteFirewallRule(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteFirewallRule(ctx, site, id) } + func (c *lazyClient) CreateFirewallRule(ctx context.Context, site string, d *unifi.FirewallRule) (*unifi.FirewallRule, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateFirewallRule(ctx, site, d) } + func (c *lazyClient) GetFirewallRule(ctx context.Context, site, id string) (*unifi.FirewallRule, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetFirewallRule(ctx, site, id) } + func (c *lazyClient) UpdateFirewallRule(ctx context.Context, site string, d *unifi.FirewallRule) (*unifi.FirewallRule, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateFirewallRule(ctx, site, d) } + func (c *lazyClient) GetPortForward(ctx context.Context, site, id string) (*unifi.PortForward, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetPortForward(ctx, site, id) } + func (c *lazyClient) DeletePortForward(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeletePortForward(ctx, site, id) } + func (c *lazyClient) CreatePortForward(ctx context.Context, site string, d *unifi.PortForward) (*unifi.PortForward, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreatePortForward(ctx, site, d) } + func (c *lazyClient) UpdatePortForward(ctx context.Context, site string, d *unifi.PortForward) (*unifi.PortForward, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdatePortForward(ctx, site, d) } + func (c *lazyClient) ListRADIUSProfile(ctx context.Context, site string) ([]unifi.RADIUSProfile, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListRADIUSProfile(ctx, site) } + func (c *lazyClient) GetRADIUSProfile(ctx context.Context, site, id string) (*unifi.RADIUSProfile, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetRADIUSProfile(ctx, site, id) } + func (c *lazyClient) DeleteRADIUSProfile(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteRADIUSProfile(ctx, site, id) } + func (c *lazyClient) CreateRADIUSProfile(ctx context.Context, site string, d *unifi.RADIUSProfile) (*unifi.RADIUSProfile, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateRADIUSProfile(ctx, site, d) } + func (c *lazyClient) UpdateRADIUSProfile(ctx context.Context, site string, d *unifi.RADIUSProfile) (*unifi.RADIUSProfile, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateRADIUSProfile(ctx, site, d) } + func (c *lazyClient) ListAccounts(ctx context.Context, site string) ([]unifi.Account, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListAccount(ctx, site) } + func (c *lazyClient) GetAccount(ctx context.Context, site, id string) (*unifi.Account, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetAccount(ctx, site, id) } + func (c *lazyClient) DeleteAccount(ctx context.Context, site, id string) error { if err := c.init(ctx); err != nil { return err } return c.inner.DeleteAccount(ctx, site, id) } + func (c *lazyClient) CreateAccount(ctx context.Context, site string, d *unifi.Account) (*unifi.Account, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateAccount(ctx, site, d) } + func (c *lazyClient) UpdateAccount(ctx context.Context, site string, d *unifi.Account) (*unifi.Account, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateAccount(ctx, site, d) } + func (c *lazyClient) GetSite(ctx context.Context, id string) (*unifi.Site, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetSite(ctx, id) } + func (c *lazyClient) ListSites(ctx context.Context) ([]unifi.Site, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.ListSites(ctx) } + func (c *lazyClient) CreateSite(ctx context.Context, description string) ([]unifi.Site, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.CreateSite(ctx, description) } + func (c *lazyClient) DeleteSite(ctx context.Context, id string) ([]unifi.Site, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.DeleteSite(ctx, id) } + func (c *lazyClient) UpdateSite(ctx context.Context, name, description string) ([]unifi.Site, error) { if err := c.init(ctx); err != nil { return nil, err @@ -553,36 +614,42 @@ func (c *lazyClient) UpdateDynamicDNS(ctx context.Context, site string, d *unifi } return c.inner.UpdateDynamicDNS(ctx, site, d) } + func (c *lazyClient) GetSettingMgmt(ctx context.Context, site string) (*unifi.SettingMgmt, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetSettingMgmt(ctx, site) } + func (c *lazyClient) UpdateSettingMgmt(ctx context.Context, site string, d *unifi.SettingMgmt) (*unifi.SettingMgmt, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateSettingMgmt(ctx, site, d) } + func (c *lazyClient) GetSettingUsg(ctx context.Context, site string) (*unifi.SettingUsg, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetSettingUsg(ctx, site) } + func (c *lazyClient) UpdateSettingUsg(ctx context.Context, site string, d *unifi.SettingUsg) (*unifi.SettingUsg, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.UpdateSettingUsg(ctx, site, d) } + func (c *lazyClient) GetSettingRadius(ctx context.Context, site string) (*unifi.SettingRadius, error) { if err := c.init(ctx); err != nil { return nil, err } return c.inner.GetSettingRadius(ctx, site) } + func (c *lazyClient) UpdateSettingRadius(ctx context.Context, site string, d *unifi.SettingRadius) (*unifi.SettingRadius, error) { if err := c.init(ctx); err != nil { return nil, err diff --git a/internal/provider/resource_account.go b/internal/provider/resource_account.go index 473769abf..7e7ab9f94 100644 --- a/internal/provider/resource_account.go +++ b/internal/provider/resource_account.go @@ -122,7 +122,6 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, meta int func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { c := meta.(*client) - //name := d.Get("name").(string) site := d.Get("site").(string) if site == "" { site = c.site diff --git a/internal/provider/resource_device.go b/internal/provider/resource_device.go index bf13404d1..d4894fb48 100644 --- a/internal/provider/resource_device.go +++ b/internal/provider/resource_device.go @@ -154,7 +154,6 @@ func resourceDeviceImport(ctx context.Context, d *schema.ResourceData, meta inte // look up id by mac mac := cleanMAC(id) device, err := c.c.GetDeviceByMAC(ctx, site, mac) - if err != nil { return nil, err } @@ -314,7 +313,7 @@ func resourceDeviceGetResourceData(d *schema.ResourceData) (*unifi.Device, error return nil, fmt.Errorf("unable to process port_override block: %w", err) } - //TODO: pass Disabled once we figure out how to enable the device afterwards + // TODO: pass Disabled once we figure out how to enable the device afterwards return &unifi.Device{ MAC: d.Get("mac").(string), diff --git a/internal/provider/resource_device_test.go b/internal/provider/resource_device_test.go index e187114a6..6d6592762 100644 --- a/internal/provider/resource_device_test.go +++ b/internal/provider/resource_device_test.go @@ -63,7 +63,6 @@ func allocateDevice(t *testing.T) (*unifi.Device, func()) { return nil }) - if err != nil { t.Fatal(err) } @@ -81,7 +80,6 @@ func allocateDevice(t *testing.T) (*unifi.Device, func()) { return nil }) - if err != nil { t.Fatal(err) } @@ -276,11 +274,11 @@ func TestAccDevice_switch_portOverrides(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "port_override.1.number", "1"), resource.TestCheckResourceAttr(resourceName, "port_override.1.name", "Port 1"), resource.TestCheckResourceAttr(resourceName, "port_override.1.port_profile_id", ""), - //resource.TestCheckResourceAttr(resourceName, "port_override.1.op_mode", "switch"), + resource.TestCheckResourceAttr(resourceName, "port_override.2.number", "2"), resource.TestCheckResourceAttr(resourceName, "port_override.2.name", "Port 2"), - //resource.TestCheckResourceAttr(resourceName, "port_override.2.port_profile_id", ""), + //resource.TestCheckResourceAttr(resourceName, "port_override.2.op_mode", "switch"), resource.TestCheckResourceAttr(resourceName, "port_override.3.number", "4"), diff --git a/internal/provider/resource_dynamic_dns.go b/internal/provider/resource_dynamic_dns.go index c0e850b34..84dbaa2e4 100644 --- a/internal/provider/resource_dynamic_dns.go +++ b/internal/provider/resource_dynamic_dns.go @@ -68,7 +68,7 @@ func resourceDynamicDNS() *schema.Resource { Sensitive: true, }, - //TODO: options support? + // TODO: options support? }, } } diff --git a/internal/provider/resource_firewall_rule.go b/internal/provider/resource_firewall_rule.go index 6d7f794fc..08effcb65 100644 --- a/internal/provider/resource_firewall_rule.go +++ b/internal/provider/resource_firewall_rule.go @@ -11,9 +11,11 @@ import ( "github.com/paultyng/go-unifi/unifi" ) -var firewallRuleProtocolRegexp = regexp.MustCompile("^$|all|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|tcp_udp|ah|ax.25|dccp|ddp|egp|eigrp|encap|esp|etherip|fc|ggp|gre|hip|hmp|icmp|idpr-cmtp|idrp|igmp|igp|ip|ipcomp|ipencap|ipip|ipv6|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|isis|iso-tp4|l2tp|manet|mobility-header|mpls-in-ip|ospf|pim|pup|rdp|rohc|rspf|rsvp|sctp|shim6|skip|st|tcp|udp|udplite|vmtp|vrrp|wesp|xns-idp|xtp") -var firewallRuleProtocolV6Regexp = regexp.MustCompile("^$|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|ah|all|dccp|eigrp|esp|gre|icmpv6|ipcomp|ipv6|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|isis|l2tp|manet|mobility-header|mpls-in-ip|ospf|pim|rsvp|sctp|shim6|tcp|tcp_udp|udp|vrrp") -var firewallRuleICMPv6TypenameRegexp = regexp.MustCompile("^$|address-unreachable|bad-header|beyond-scope|communication-prohibited|destination-unreachable|echo-reply|echo-request|failed-policy|neighbor-advertisement|neighbor-solicitation|no-route|packet-too-big|parameter-problem|port-unreachable|redirect|reject-route|router-advertisement|router-solicitation|time-exceeded|ttl-zero-during-reassembly|ttl-zero-during-transit|unknown-header-type|unknown-option") +var ( + firewallRuleProtocolRegexp = regexp.MustCompile("^$|all|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|tcp_udp|ah|ax.25|dccp|ddp|egp|eigrp|encap|esp|etherip|fc|ggp|gre|hip|hmp|icmp|idpr-cmtp|idrp|igmp|igp|ip|ipcomp|ipencap|ipip|ipv6|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|isis|iso-tp4|l2tp|manet|mobility-header|mpls-in-ip|ospf|pim|pup|rdp|rohc|rspf|rsvp|sctp|shim6|skip|st|tcp|udp|udplite|vmtp|vrrp|wesp|xns-idp|xtp") + firewallRuleProtocolV6Regexp = regexp.MustCompile("^$|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|ah|all|dccp|eigrp|esp|gre|icmpv6|ipcomp|ipv6|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|isis|l2tp|manet|mobility-header|mpls-in-ip|ospf|pim|rsvp|sctp|shim6|tcp|tcp_udp|udp|vrrp") + firewallRuleICMPv6TypenameRegexp = regexp.MustCompile("^$|address-unreachable|bad-header|beyond-scope|communication-prohibited|destination-unreachable|echo-reply|echo-request|failed-policy|neighbor-advertisement|neighbor-solicitation|no-route|packet-too-big|parameter-problem|port-unreachable|redirect|reject-route|router-advertisement|router-solicitation|time-exceeded|ttl-zero-during-reassembly|ttl-zero-during-transit|unknown-header-type|unknown-option") +) func resourceFirewallRule() *schema.Resource { return &schema.Resource{ diff --git a/internal/provider/resource_port_profile.go b/internal/provider/resource_port_profile.go index dcf1fe33a..d1a3e5b41 100644 --- a/internal/provider/resource_port_profile.go +++ b/internal/provider/resource_port_profile.go @@ -95,7 +95,7 @@ func resourcePortProfile() *schema.Resource { Description: "Enable LLDP-MED topology change notifications for the port profile.", Type: schema.TypeBool, Optional: true, - //ValidateFunc: , + // ValidateFunc: , }, // TODO: rename to native_network_id "native_networkconf_id": { diff --git a/internal/provider/resource_setting_usg_test.go b/internal/provider/resource_setting_usg_test.go index 505d1db50..c5b4204b4 100644 --- a/internal/provider/resource_setting_usg_test.go +++ b/internal/provider/resource_setting_usg_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) -// using an additional lock to the one around the resource to avoid deadlocking accidentally +// using an additional lock to the one around the resource to avoid deadlocking accidentally. var settingUsgLock = sync.Mutex{} func TestAccSettingUsg_mdns_v6(t *testing.T) { diff --git a/main.go b/main.go index f753eb1e8..1e37e6291 100644 --- a/main.go +++ b/main.go @@ -4,21 +4,18 @@ import ( "flag" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" - "github.com/paultyng/terraform-provider-unifi/internal/provider" ) // Generate docs for website //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs -var ( - // these will be set by the goreleaser configuration - // to appropriate values for the compiled binary - version string = "dev" +// these will be set by the goreleaser configuration +// to appropriate values for the compiled binary. +var version = "dev" - // goreleaser can also pass the specific commit if you want - // commit string = "" -) +// goreleaser can also pass the specific commit if you want +// commit string = "" func main() { var debugMode bool