From b19314bc6e75e8a567ed553b7a55aaefe1e75df5 Mon Sep 17 00:00:00 2001 From: Mateusz Filipowicz Date: Thu, 6 Feb 2025 23:45:03 +0100 Subject: [PATCH] use filipowm/go-unifi instead of paultyng/go-unifi --- go.mod | 4 ++-- go.sum | 4 ++-- internal/provider/data_user_test.go | 2 +- internal/provider/lazy_client.go | 2 +- internal/provider/provider.go | 2 +- internal/provider/provider_test.go | 2 +- internal/provider/resource_account.go | 2 +- internal/provider/resource_device.go | 2 +- internal/provider/resource_device_test.go | 2 +- internal/provider/resource_dynamic_dns.go | 2 +- internal/provider/resource_firewall_group.go | 2 +- internal/provider/resource_firewall_rule.go | 2 +- internal/provider/resource_network.go | 4 +--- internal/provider/resource_port_forward.go | 2 +- internal/provider/resource_port_profile.go | 2 +- internal/provider/resource_radius_profile.go | 2 +- internal/provider/resource_setting_mgmt.go | 2 +- internal/provider/resource_setting_radius.go | 2 +- internal/provider/resource_setting_usg.go | 2 +- internal/provider/resource_site.go | 2 +- internal/provider/resource_static_route.go | 2 +- internal/provider/resource_user.go | 2 +- internal/provider/resource_user_group.go | 2 +- internal/provider/resource_user_test.go | 2 +- internal/provider/resource_wlan.go | 2 +- 25 files changed, 27 insertions(+), 29 deletions(-) diff --git a/go.mod b/go.mod index ceaf53b..ca8f67d 100644 --- a/go.mod +++ b/go.mod @@ -2,19 +2,19 @@ module github.com/paultyng/terraform-provider-unifi go 1.23.4 -// replace github.com/paultyng/go-unifi => ../go-unifi +// replace github.com/filipowm/go-unifi => ../go-unifi // replace github.com/hashicorp/terraform-plugin-docs => ../../hashicorp/terraform-plugin-docs // replace github.com/hashicorp/terraform-plugin-sdk/v2 => ../../hashicorp/terraform-plugin-sdk require ( github.com/apparentlymart/go-cidr v1.1.0 github.com/deckarep/golang-set/v2 v2.7.0 + github.com/filipowm/go-unifi v0.0.1 github.com/golangci/golangci-lint v1.63.4 github.com/hashicorp/go-version v1.7.0 github.com/hashicorp/terraform-plugin-docs v0.20.1 github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 github.com/hashicorp/terraform-plugin-testing v1.11.0 - github.com/paultyng/go-unifi v1.34.0 github.com/testcontainers/testcontainers-go v0.35.0 github.com/testcontainers/testcontainers-go/modules/compose v0.35.0 ) diff --git a/go.sum b/go.sum index 1991d5e..de145e0 100644 --- a/go.sum +++ b/go.sum @@ -277,6 +277,8 @@ github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/filipowm/go-unifi v0.0.1 h1:9hJL3n0VXhWExY42GvtZAIN/CyfYIiPSXafqJfvlD6I= +github.com/filipowm/go-unifi v0.0.1/go.mod h1:acHQHCdA+Z9TuTzkm5p65H/TYSkCQHXU02uXCajSPkg= github.com/firefart/nonamedreturns v1.0.5 h1:tM+Me2ZaXs8tfdDw3X6DOX++wMCOqzYUho6tUTYIdRA= github.com/firefart/nonamedreturns v1.0.5/go.mod h1:gHJjDqhGM4WyPt639SOZs+G89Ko7QKH5R5BhnO6xJhw= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -726,8 +728,6 @@ github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/paultyng/go-unifi v1.34.0 h1:nOZCpsi3pORlv8oo6i1df/RplfpTNTOPKSWf4EEGAQk= -github.com/paultyng/go-unifi v1.34.0/go.mod h1:3FmhUpZPfGrYkBo7yKfXresqrkKAQKano3Hg8ffv8LU= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= diff --git a/internal/provider/data_user_test.go b/internal/provider/data_user_test.go index f907966..71a7a47 100644 --- a/internal/provider/data_user_test.go +++ b/internal/provider/data_user_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "testing" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/paultyng/go-unifi/unifi" ) func TestAccDataUser_default(t *testing.T) { diff --git a/internal/provider/lazy_client.go b/internal/provider/lazy_client.go index 2844510..fb5cfec 100644 --- a/internal/provider/lazy_client.go +++ b/internal/provider/lazy_client.go @@ -11,8 +11,8 @@ import ( "sync" "time" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging" - "github.com/paultyng/go-unifi/unifi" ) type lazyClient struct { diff --git a/internal/provider/provider.go b/internal/provider/provider.go index e1e65ba..b599df5 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/paultyng/go-unifi/unifi" ) func init() { diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index 4058aa6..b6d9cfb 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/apparentlymart/go-cidr/cidr" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/paultyng/go-unifi/unifi" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/modules/compose" ) diff --git a/internal/provider/resource_account.go b/internal/provider/resource_account.go index 473769a..3a9cebe 100644 --- a/internal/provider/resource_account.go +++ b/internal/provider/resource_account.go @@ -3,10 +3,10 @@ package provider import ( "context" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceAccount() *schema.Resource { diff --git a/internal/provider/resource_device.go b/internal/provider/resource_device.go index bf13404..7fa72dc 100644 --- a/internal/provider/resource_device.go +++ b/internal/provider/resource_device.go @@ -7,11 +7,11 @@ import ( "strings" "time" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceDevice() *schema.Resource { diff --git a/internal/provider/resource_device_test.go b/internal/provider/resource_device_test.go index e187114..b909942 100644 --- a/internal/provider/resource_device_test.go +++ b/internal/provider/resource_device_test.go @@ -9,10 +9,10 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/paultyng/go-unifi/unifi" ) var ( diff --git a/internal/provider/resource_dynamic_dns.go b/internal/provider/resource_dynamic_dns.go index c0e850b..e3a82ac 100644 --- a/internal/provider/resource_dynamic_dns.go +++ b/internal/provider/resource_dynamic_dns.go @@ -3,9 +3,9 @@ package provider import ( "context" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/paultyng/go-unifi/unifi" ) func resourceDynamicDNS() *schema.Resource { diff --git a/internal/provider/resource_firewall_group.go b/internal/provider/resource_firewall_group.go index 4cb54c7..2fdd34b 100644 --- a/internal/provider/resource_firewall_group.go +++ b/internal/provider/resource_firewall_group.go @@ -4,10 +4,10 @@ import ( "context" "errors" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceFirewallGroup() *schema.Resource { diff --git a/internal/provider/resource_firewall_rule.go b/internal/provider/resource_firewall_rule.go index 6d7f794..8c98260 100644 --- a/internal/provider/resource_firewall_rule.go +++ b/internal/provider/resource_firewall_rule.go @@ -5,10 +5,10 @@ import ( "errors" "regexp" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "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") diff --git a/internal/provider/resource_network.go b/internal/provider/resource_network.go index bda5a86..18a1344 100644 --- a/internal/provider/resource_network.go +++ b/internal/provider/resource_network.go @@ -6,10 +6,10 @@ import ( "regexp" "strings" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) var ( @@ -338,14 +338,12 @@ func resourceNetwork() *schema.Resource { Description: "Specifies the IPV4 WAN username.", Type: schema.TypeString, Optional: true, - Default: "whatever", ValidateFunc: validateWANUsername, }, "x_wan_password": { Description: "Specifies the IPV4 WAN password.", Type: schema.TypeString, Optional: true, - Default: "whatever", ValidateFunc: validateWANPassword, }, "wan_type_v6": { diff --git a/internal/provider/resource_port_forward.go b/internal/provider/resource_port_forward.go index 47b6aa9..408426e 100644 --- a/internal/provider/resource_port_forward.go +++ b/internal/provider/resource_port_forward.go @@ -3,10 +3,10 @@ package provider import ( "context" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourcePortForward() *schema.Resource { diff --git a/internal/provider/resource_port_profile.go b/internal/provider/resource_port_profile.go index 65e9f6b..f1e810a 100644 --- a/internal/provider/resource_port_profile.go +++ b/internal/provider/resource_port_profile.go @@ -3,10 +3,10 @@ package provider import ( "context" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourcePortProfile() *schema.Resource { diff --git a/internal/provider/resource_radius_profile.go b/internal/provider/resource_radius_profile.go index 973434c..3d17c25 100644 --- a/internal/provider/resource_radius_profile.go +++ b/internal/provider/resource_radius_profile.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceRadiusProfile() *schema.Resource { diff --git a/internal/provider/resource_setting_mgmt.go b/internal/provider/resource_setting_mgmt.go index a56983b..7ec5c81 100644 --- a/internal/provider/resource_setting_mgmt.go +++ b/internal/provider/resource_setting_mgmt.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/paultyng/go-unifi/unifi" ) // TODO: probably need to update this to be more like setting_usg, diff --git a/internal/provider/resource_setting_radius.go b/internal/provider/resource_setting_radius.go index 984d9dd..5393aa7 100644 --- a/internal/provider/resource_setting_radius.go +++ b/internal/provider/resource_setting_radius.go @@ -3,10 +3,10 @@ package provider import ( "context" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceSettingRadius() *schema.Resource { diff --git a/internal/provider/resource_setting_usg.go b/internal/provider/resource_setting_usg.go index 3a57935..521ae92 100644 --- a/internal/provider/resource_setting_usg.go +++ b/internal/provider/resource_setting_usg.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) var resourceSettingUsgLock = sync.Mutex{} diff --git a/internal/provider/resource_site.go b/internal/provider/resource_site.go index 2b9b647..5d1bfd9 100644 --- a/internal/provider/resource_site.go +++ b/internal/provider/resource_site.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/paultyng/go-unifi/unifi" ) func resourceSite() *schema.Resource { diff --git a/internal/provider/resource_static_route.go b/internal/provider/resource_static_route.go index 58fa021..98defbb 100644 --- a/internal/provider/resource_static_route.go +++ b/internal/provider/resource_static_route.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceStaticRoute() *schema.Resource { diff --git a/internal/provider/resource_user.go b/internal/provider/resource_user.go index 0a34fcf..725d662 100644 --- a/internal/provider/resource_user.go +++ b/internal/provider/resource_user.go @@ -4,10 +4,10 @@ import ( "context" "errors" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) func resourceUser() *schema.Resource { diff --git a/internal/provider/resource_user_group.go b/internal/provider/resource_user_group.go index 7d9a445..9e2e48e 100644 --- a/internal/provider/resource_user_group.go +++ b/internal/provider/resource_user_group.go @@ -3,9 +3,9 @@ package provider import ( "context" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/paultyng/go-unifi/unifi" ) func resourceUserGroup() *schema.Resource { diff --git a/internal/provider/resource_user_test.go b/internal/provider/resource_user_test.go index 6f1af46..53f0591 100644 --- a/internal/provider/resource_user_test.go +++ b/internal/provider/resource_user_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/apparentlymart/go-cidr/cidr" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/paultyng/go-unifi/unifi" ) func userImportStep(name string) resource.TestStep { diff --git a/internal/provider/resource_wlan.go b/internal/provider/resource_wlan.go index e575b9b..6cb29de 100644 --- a/internal/provider/resource_wlan.go +++ b/internal/provider/resource_wlan.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/filipowm/go-unifi/unifi" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" - "github.com/paultyng/go-unifi/unifi" ) var (