diff --git a/fields/api.go.tmpl b/fields/api.go.tmpl index 86fdb8f..bded5ff 100644 --- a/fields/api.go.tmpl +++ b/fields/api.go.tmpl @@ -21,7 +21,6 @@ {{ else }}{{- template "field-embed" $fv }}{{ end }}{{ end }} }{{ end }} `json:"{{ .JSONName }}{{ if .OmitEmpty }},omitempty{{ end }}"` {{ if .FieldValidation }}// {{ .FieldValidation }}{{ end }} {{- end }} // Code generated from ace.jar fields *.json files -// Controller Version {{ .ControllerVersion }} // DO NOT EDIT. package unifi diff --git a/fields/main.go b/fields/main.go index be9a262..f0d30b5 100644 --- a/fields/main.go +++ b/fields/main.go @@ -92,11 +92,10 @@ var fileReps = []replacement{ var embedTypes bool type Resource struct { - ControllerVersion string - StructName string - ResourcePath string - Types map[string]*FieldInfo - FieldProcessor func(name string, f *FieldInfo) error + StructName string + ResourcePath string + Types map[string]*FieldInfo + FieldProcessor func(name string, f *FieldInfo) error } type FieldInfo struct { @@ -110,11 +109,9 @@ type FieldInfo struct { CustomUnmarshalType string } -func NewResource(version string, structName string, resourcePath string) *Resource { +func NewResource(structName string, resourcePath string) *Resource { baseType := NewFieldInfo(structName, resourcePath, "struct", "", false, false, "") resource := &Resource{ - ControllerVersion: version, - StructName: structName, ResourcePath: resourcePath, Types: map[string]*FieldInfo{ @@ -301,7 +298,7 @@ func main() { continue } - resource := NewResource(fmt.Sprintf("v%s", unifiVersion), structName, urlPath) + resource := NewResource(structName, urlPath) switch resource.StructName { case "Account": diff --git a/fields/main_test.go b/fields/main_test.go index 8418849..58e79d4 100644 --- a/fields/main_test.go +++ b/fields/main_test.go @@ -2,9 +2,8 @@ package main import ( "fmt" - "testing" - assert "github.com/stretchr/testify/assert" + "testing" ) func TestFieldInfoFromValidation(t *testing.T) { @@ -146,7 +145,7 @@ func TestResourceTypes(t *testing.T) { } t.Run("structural test", func(t *testing.T) { - resource := NewResource("v1.1", "Struct", "path") + resource := NewResource("Struct", "path") resource.FieldProcessor = expectation.FieldProcessor err := resource.processJSON(([]byte)(testData)) diff --git a/unifi/account.generated.go b/unifi/account.generated.go index 699692c..8fee6a0 100644 --- a/unifi/account.generated.go +++ b/unifi/account.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/broadcast_group.generated.go b/unifi/broadcast_group.generated.go index c8d643a..643a818 100644 --- a/unifi/broadcast_group.generated.go +++ b/unifi/broadcast_group.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/channel_plan.generated.go b/unifi/channel_plan.generated.go index 977611d..ccb2929 100644 --- a/unifi/channel_plan.generated.go +++ b/unifi/channel_plan.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/dashboard.generated.go b/unifi/dashboard.generated.go index 8cdcb64..f8270a6 100644 --- a/unifi/dashboard.generated.go +++ b/unifi/dashboard.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/device.generated.go b/unifi/device.generated.go index 05410dc..aed4320 100644 --- a/unifi/device.generated.go +++ b/unifi/device.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/dhcp_option.generated.go b/unifi/dhcp_option.generated.go index c468767..329012e 100644 --- a/unifi/dhcp_option.generated.go +++ b/unifi/dhcp_option.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/dpi_app.generated.go b/unifi/dpi_app.generated.go index d212005..518a4d6 100644 --- a/unifi/dpi_app.generated.go +++ b/unifi/dpi_app.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/dpi_group.generated.go b/unifi/dpi_group.generated.go index f1db510..ee1e345 100644 --- a/unifi/dpi_group.generated.go +++ b/unifi/dpi_group.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/dynamic_dns.generated.go b/unifi/dynamic_dns.generated.go index 251e7d7..1e66ccf 100644 --- a/unifi/dynamic_dns.generated.go +++ b/unifi/dynamic_dns.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/firewall_group.generated.go b/unifi/firewall_group.generated.go index 9d65a7c..e3d24b5 100644 --- a/unifi/firewall_group.generated.go +++ b/unifi/firewall_group.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/firewall_rule.generated.go b/unifi/firewall_rule.generated.go index 32b7f21..2a9170e 100644 --- a/unifi/firewall_rule.generated.go +++ b/unifi/firewall_rule.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/heat_map.generated.go b/unifi/heat_map.generated.go index 63c5f15..431d998 100644 --- a/unifi/heat_map.generated.go +++ b/unifi/heat_map.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/heat_map_point.generated.go b/unifi/heat_map_point.generated.go index 8bd7fe4..cebaa0c 100644 --- a/unifi/heat_map_point.generated.go +++ b/unifi/heat_map_point.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/hotspot_2_conf.generated.go b/unifi/hotspot_2_conf.generated.go index ead8635..661583d 100644 --- a/unifi/hotspot_2_conf.generated.go +++ b/unifi/hotspot_2_conf.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/hotspot_op.generated.go b/unifi/hotspot_op.generated.go index 2de3aca..83cfa1f 100644 --- a/unifi/hotspot_op.generated.go +++ b/unifi/hotspot_op.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/hotspot_package.generated.go b/unifi/hotspot_package.generated.go index 2113cb9..59ec6a6 100644 --- a/unifi/hotspot_package.generated.go +++ b/unifi/hotspot_package.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/map.generated.go b/unifi/map.generated.go index 0476b98..329093a 100644 --- a/unifi/map.generated.go +++ b/unifi/map.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/media_file.generated.go b/unifi/media_file.generated.go index 3f834d8..0cf4117 100644 --- a/unifi/media_file.generated.go +++ b/unifi/media_file.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/network.generated.go b/unifi/network.generated.go index cf54a3d..14b321e 100644 --- a/unifi/network.generated.go +++ b/unifi/network.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/port_forward.generated.go b/unifi/port_forward.generated.go index f62b388..6517260 100644 --- a/unifi/port_forward.generated.go +++ b/unifi/port_forward.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/port_profile.generated.go b/unifi/port_profile.generated.go index 369a857..4bb62ef 100644 --- a/unifi/port_profile.generated.go +++ b/unifi/port_profile.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/radius_profile.generated.go b/unifi/radius_profile.generated.go index 17d8485..f90dd74 100644 --- a/unifi/radius_profile.generated.go +++ b/unifi/radius_profile.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/routing.generated.go b/unifi/routing.generated.go index 8488578..b82313a 100644 --- a/unifi/routing.generated.go +++ b/unifi/routing.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/schedule_task.generated.go b/unifi/schedule_task.generated.go index b05a3b4..5e2e261 100644 --- a/unifi/schedule_task.generated.go +++ b/unifi/schedule_task.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_auto_speedtest.generated.go b/unifi/setting_auto_speedtest.generated.go index b25e1fc..96c39fd 100644 --- a/unifi/setting_auto_speedtest.generated.go +++ b/unifi/setting_auto_speedtest.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_baresip.generated.go b/unifi/setting_baresip.generated.go index 3459712..2b81b21 100644 --- a/unifi/setting_baresip.generated.go +++ b/unifi/setting_baresip.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_broadcast.generated.go b/unifi/setting_broadcast.generated.go index 4517b3c..beed669 100644 --- a/unifi/setting_broadcast.generated.go +++ b/unifi/setting_broadcast.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_connectivity.generated.go b/unifi/setting_connectivity.generated.go index f6a6387..1a3ef05 100644 --- a/unifi/setting_connectivity.generated.go +++ b/unifi/setting_connectivity.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_country.generated.go b/unifi/setting_country.generated.go index 9a10b29..765f6ff 100644 --- a/unifi/setting_country.generated.go +++ b/unifi/setting_country.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_dpi.generated.go b/unifi/setting_dpi.generated.go index 4e670fd..1493c57 100644 --- a/unifi/setting_dpi.generated.go +++ b/unifi/setting_dpi.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_element_adopt.generated.go b/unifi/setting_element_adopt.generated.go index 29af101..ce67adc 100644 --- a/unifi/setting_element_adopt.generated.go +++ b/unifi/setting_element_adopt.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_guest_access.generated.go b/unifi/setting_guest_access.generated.go index 65ce50f..f02cbb5 100644 --- a/unifi/setting_guest_access.generated.go +++ b/unifi/setting_guest_access.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_ips.generated.go b/unifi/setting_ips.generated.go index 604173a..7501c31 100644 --- a/unifi/setting_ips.generated.go +++ b/unifi/setting_ips.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_lcm.generated.go b/unifi/setting_lcm.generated.go index 544e564..f2bc404 100644 --- a/unifi/setting_lcm.generated.go +++ b/unifi/setting_lcm.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_locale.generated.go b/unifi/setting_locale.generated.go index 96b48c3..e026498 100644 --- a/unifi/setting_locale.generated.go +++ b/unifi/setting_locale.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_mgmt.generated.go b/unifi/setting_mgmt.generated.go index ea150a0..821c4a4 100644 --- a/unifi/setting_mgmt.generated.go +++ b/unifi/setting_mgmt.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_network_optimization.generated.go b/unifi/setting_network_optimization.generated.go index 5d77922..7b28ce7 100644 --- a/unifi/setting_network_optimization.generated.go +++ b/unifi/setting_network_optimization.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_ntp.generated.go b/unifi/setting_ntp.generated.go index ac2f92e..569b75e 100644 --- a/unifi/setting_ntp.generated.go +++ b/unifi/setting_ntp.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_porta.generated.go b/unifi/setting_porta.generated.go index d33eefa..294df7b 100644 --- a/unifi/setting_porta.generated.go +++ b/unifi/setting_porta.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_radio_ai.generated.go b/unifi/setting_radio_ai.generated.go index 40d282d..8ebea4b 100644 --- a/unifi/setting_radio_ai.generated.go +++ b/unifi/setting_radio_ai.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_radius.generated.go b/unifi/setting_radius.generated.go index 769c53c..6be652d 100644 --- a/unifi/setting_radius.generated.go +++ b/unifi/setting_radius.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_rsyslogd.generated.go b/unifi/setting_rsyslogd.generated.go index fdda658..c12be12 100644 --- a/unifi/setting_rsyslogd.generated.go +++ b/unifi/setting_rsyslogd.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_snmp.generated.go b/unifi/setting_snmp.generated.go index 406732f..f251b20 100644 --- a/unifi/setting_snmp.generated.go +++ b/unifi/setting_snmp.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_cloudaccess.generated.go b/unifi/setting_super_cloudaccess.generated.go index 8b586d2..7a7872f 100644 --- a/unifi/setting_super_cloudaccess.generated.go +++ b/unifi/setting_super_cloudaccess.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_events.generated.go b/unifi/setting_super_events.generated.go index dec180d..0982803 100644 --- a/unifi/setting_super_events.generated.go +++ b/unifi/setting_super_events.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_fwupdate.generated.go b/unifi/setting_super_fwupdate.generated.go index dbf388b..256d85a 100644 --- a/unifi/setting_super_fwupdate.generated.go +++ b/unifi/setting_super_fwupdate.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_identity.generated.go b/unifi/setting_super_identity.generated.go index 545dbe7..a491238 100644 --- a/unifi/setting_super_identity.generated.go +++ b/unifi/setting_super_identity.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_mail.generated.go b/unifi/setting_super_mail.generated.go index 2e72efc..4cc05b3 100644 --- a/unifi/setting_super_mail.generated.go +++ b/unifi/setting_super_mail.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_mgmt.generated.go b/unifi/setting_super_mgmt.generated.go index b45a2cb..cd9a4ee 100644 --- a/unifi/setting_super_mgmt.generated.go +++ b/unifi/setting_super_mgmt.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_sdn.generated.go b/unifi/setting_super_sdn.generated.go index d0b9946..70d2d26 100644 --- a/unifi/setting_super_sdn.generated.go +++ b/unifi/setting_super_sdn.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_super_smtp.generated.go b/unifi/setting_super_smtp.generated.go index e470984..0522335 100644 --- a/unifi/setting_super_smtp.generated.go +++ b/unifi/setting_super_smtp.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_usg.generated.go b/unifi/setting_usg.generated.go index 241c14f..0447b31 100644 --- a/unifi/setting_usg.generated.go +++ b/unifi/setting_usg.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/setting_usw.generated.go b/unifi/setting_usw.generated.go index 0c1709e..2d48ae3 100644 --- a/unifi/setting_usw.generated.go +++ b/unifi/setting_usw.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/spatial_record.generated.go b/unifi/spatial_record.generated.go index b35c939..04f2495 100644 --- a/unifi/spatial_record.generated.go +++ b/unifi/spatial_record.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/tag.generated.go b/unifi/tag.generated.go index 1a7074e..a916dcf 100644 --- a/unifi/tag.generated.go +++ b/unifi/tag.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/user.generated.go b/unifi/user.generated.go index 6e109eb..86eab50 100644 --- a/unifi/user.generated.go +++ b/unifi/user.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/user_group.generated.go b/unifi/user_group.generated.go index b1e35fd..3b843e9 100644 --- a/unifi/user_group.generated.go +++ b/unifi/user_group.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/virtual_device.generated.go b/unifi/virtual_device.generated.go index a681173..2c6e40f 100644 --- a/unifi/virtual_device.generated.go +++ b/unifi/virtual_device.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/wlan.generated.go b/unifi/wlan.generated.go index eafecdd..95dc8db 100644 --- a/unifi/wlan.generated.go +++ b/unifi/wlan.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi diff --git a/unifi/wlan_group.generated.go b/unifi/wlan_group.generated.go index 8e3eac3..52990c5 100644 --- a/unifi/wlan_group.generated.go +++ b/unifi/wlan_group.generated.go @@ -1,5 +1,4 @@ // Code generated from ace.jar fields *.json files -// Controller Version v6.4.54 // DO NOT EDIT. package unifi