go fmt with Go 1.17

.changes/v2.13.0/396-improvements.md

@@ -0,0 +1,2 @@
+* Align build tags to match go fmt with Go 1.17 [GH-396]
+* Improve `test-tags.sh` script to handle new build tag format [GH-396]

.github/workflows/check-code.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.15
+        go-version: ^1.17
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2

govcd/access_control_catalog_test.go

@@ -1,3 +1,4 @@
+//go:build functional || catalog || ALL
 // +build functional catalog ALL
 
 /*

govcd/access_control_test.go

@@ -1,3 +1,4 @@
+//go:build functional || vapp || catalog || ALL
 // +build functional vapp catalog ALL
 
 /*

govcd/access_control_vapp_test.go

@@ -1,3 +1,4 @@
+//go:build functional || vapp || ALL
 // +build functional vapp ALL
 
 /*

govcd/adminorg_administration_test.go

@@ -1,3 +1,4 @@
+//go:build org || functional || ALL
 // +build org functional ALL
 
 /*

govcd/adminorg_ldap_test.go

@@ -1,3 +1,4 @@
+//go:build (user || functional || ALL) && !skipLong
 // +build user functional ALL
 // +build !skipLong
 

govcd/adminorg_test.go

@@ -1,3 +1,4 @@
+//go:build org || functional || ALL
 // +build org functional ALL
 
 /*

govcd/adminorg_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 /*

govcd/adminvdc_nsxt_test.go

@@ -1,3 +1,4 @@
+//go:build org || functional || nsxt || ALL
 // +build org functional nsxt ALL
 
 /*

govcd/adminvdc_test.go

@@ -1,3 +1,4 @@
+//go:build org || functional || ALL
 // +build org functional ALL
 
 /*

govcd/api_vcd_test.go

@@ -1,3 +1,4 @@
+//go:build api || openapi || functional || catalog || vapp || gateway || network || org || query || extnetwork || task || vm || vdc || system || disk || lb || lbAppRule || lbAppProfile || lbServerPool || lbServiceMonitor || lbVirtualServer || user || search || nsxv || nsxt || auth || affinity || role || ALL
 // +build api openapi functional catalog vapp gateway network org query extnetwork task vm vdc system disk lb lbAppRule lbAppProfile lbServerPool lbServiceMonitor lbVirtualServer user search nsxv nsxt auth affinity role ALL
 
 /*

govcd/api_vcd_test_unit.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 /*

govcd/api_vcd_versions_test.go

@@ -1,3 +1,4 @@
+//go:build api || functional || ALL
 // +build api functional ALL
 
 /*

govcd/catalog_test.go

@@ -1,3 +1,4 @@
+//go:build catalog || functional || ALL
 // +build catalog functional ALL
 
 /*

govcd/catalogitem_test.go

@@ -1,3 +1,4 @@
+//go:build catalog || functional || ALL
 // +build catalog functional ALL
 
 /*

govcd/common_test.go

@@ -1,3 +1,4 @@
+//go:build api || functional || catalog || vapp || gateway || network || org || query || extnetwork || task || vm || vdc || system || disk || lb || lbAppRule || lbAppProfile || lbServerPool || lbServiceMonitor || lbVirtualServer || user || nsxv || nsxt || openapi || affinity || search || ALL
 // +build api functional catalog vapp gateway network org query extnetwork task vm vdc system disk lb lbAppRule lbAppProfile lbServerPool lbServiceMonitor lbVirtualServer user nsxv nsxt openapi affinity search ALL
 
 /*

govcd/disk_test.go

@@ -1,3 +1,4 @@
+//go:build disk || functional || ALL
 // +build disk functional ALL
 
 /*

govcd/edgegateway_test.go

@@ -1,3 +1,4 @@
+//go:build gateway || functional || ALL
 // +build gateway functional ALL
 
 /*

govcd/edgegateway_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 /*

govcd/entity_test.go

@@ -1,3 +1,4 @@
+//go:build api || functional || catalog || org || extnetwork || vm || vdc || system || user || nsxv || network || vapp || vm || affinity || ALL
 // +build api functional catalog org extnetwork vm vdc system user nsxv network vapp vm affinity ALL
 
 /*

govcd/external_network_v2_test.go

@@ -1,3 +1,4 @@
+//go:build extnetwork || network || functional || openapi || ALL
 // +build extnetwork network functional openapi ALL
 
 /*

govcd/externalnetwork_test.go

@@ -1,3 +1,4 @@
+//go:build extnetwork || network || functional || ALL
 // +build extnetwork network functional ALL
 
 /*

govcd/filter_engine_test.go

@@ -1,3 +1,4 @@
+//go:build search || functional || ALL
 // +build search functional ALL
 
 /*

govcd/filter_engine_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit
 // +build unit
 
 /*

govcd/filter_util_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 /*

govcd/global_role_test.go

@@ -1,3 +1,4 @@
+//go:build functional || openapi || role || ALL
 // +build functional openapi role ALL
 
 /*

govcd/group_test.go

@@ -1,3 +1,4 @@
+//go:build user || functional || ALL
 // +build user functional ALL
 
 /*

govcd/lb_test.go

@@ -1,3 +1,4 @@
+//go:build (lb || functional || integration || ALL) && !skipLong
 // +build lb functional integration ALL
 // +build !skipLong
 

govcd/lb_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || lb || lbAppProfile || functional || ALL
 // +build unit lb lbAppProfile functional ALL
 
 /*

govcd/lbappprofile_test.go

@@ -1,3 +1,4 @@
+//go:build lb || lbAppProfile || nsxv || functional || ALL
 // +build lb lbAppProfile nsxv functional ALL
 
 /*

govcd/lbapprule_test.go

@@ -1,3 +1,4 @@
+//go:build lb || lbAppRule || nsxv || functional || ALL
 // +build lb lbAppRule nsxv functional ALL
 
 /*

govcd/lbserverpool_test.go

@@ -1,3 +1,4 @@
+//go:build lb || lbServerPool || nsxv || functional || ALL
 // +build lb lbServerPool nsxv functional ALL
 
 /*

govcd/lbservicemonitor_test.go

@@ -1,3 +1,4 @@
+//go:build lb || lbServiceMonitor || nsxv || functional || ALL
 // +build lb lbServiceMonitor nsxv functional ALL
 
 /*

govcd/lbvirtualserver_test.go

@@ -1,3 +1,4 @@
+//go:build lb || lbVirtualServer || nsxv || functional || ALL
 // +build lb lbVirtualServer nsxv functional ALL
 
 /*

govcd/media_test.go

@@ -1,3 +1,4 @@
+//go:build catalog || functional || ALL
 // +build catalog functional ALL
 
 /*

govcd/metadata_test.go

@@ -1,3 +1,4 @@
+//go:build vapp || vdc || metadata || functional || ALL
 // +build vapp vdc metadata functional ALL
 
 /*

govcd/nsxt_application_profile_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_edge_cluster_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 /*

govcd/nsxt_edgegateway_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_firewall_group_ip_set_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_firewall_group_security_group_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_firewall_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_importable_switch_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || ALL
 // +build network nsxt functional ALL
 
 /*

govcd/nsxt_ipsec_vpn_tunnel_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_nat_rule_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 package govcd

govcd/nsxt_test.go

@@ -1,3 +1,4 @@
+//go:build ALL || openapi || functional || nsxt
 // +build ALL openapi functional nsxt
 
 /*

govcd/nsxv_dhcprelay_test.go

@@ -1,3 +1,4 @@
+//go:build nsxv || functional || ALL
 // +build nsxv functional ALL
 
 /*

govcd/nsxv_firewall_test.go

@@ -1,3 +1,4 @@
+//go:build nsxv || edge || firewall || functional || ALL
 // +build nsxv edge firewall functional ALL
 
 /*

govcd/nsxv_ipset_test.go

@@ -1,3 +1,4 @@
+//go:build nsxv || functional || ALL
 // +build nsxv functional ALL
 
 /*

govcd/nsxv_nat_test.go

@@ -1,3 +1,4 @@
+//go:build edge || nat || nsxv || functional || ALL
 // +build edge nat nsxv functional ALL
 
 /*

govcd/openapi_endpoints_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 package govcd

govcd/openapi_org_network_test.go

@@ -1,3 +1,4 @@
+//go:build network || nsxt || functional || openapi || ALL
 // +build network nsxt functional openapi ALL
 
 /*

govcd/openapi_test.go

@@ -1,3 +1,4 @@
+//go:build functional || openapi || ALL
 // +build functional openapi ALL
 
 /*

govcd/openapi_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 package govcd

govcd/org_test.go

@@ -1,3 +1,4 @@
+//go:build org || functional || ALL
 // +build org functional ALL
 
 /*

govcd/orgvdcnetwork_test.go

@@ -1,3 +1,4 @@
+//go:build network || functional || ALL
 // +build network functional ALL
 
 /*

govcd/query_test.go

@@ -1,3 +1,4 @@
+//go:build query || functional || ALL
 // +build query functional ALL
 
 /*

govcd/rights_bundle_test.go

@@ -1,3 +1,4 @@
+//go:build functional || openapi || role || ALL
 // +build functional openapi role ALL
 
 /*

govcd/rights_test.go

@@ -1,3 +1,4 @@
+//go:build functional || openapi || role || ALL
 // +build functional openapi role ALL
 
 /*

govcd/roles_test.go

@@ -1,3 +1,4 @@
+//go:build functional || openapi || role || ALL
 // +build functional openapi role ALL
 
 /*

govcd/saml_auth_test.go

@@ -1,3 +1,4 @@
+//go:build auth || functional || ALL
 // +build auth functional ALL
 
 /*

govcd/saml_auth_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 /*

govcd/system_test.go

@@ -1,3 +1,4 @@
+//go:build system || functional || ALL
 // +build system functional ALL
 
 /*

govcd/system_unit_test.go

@@ -1,3 +1,4 @@
+//go:build unit || ALL
 // +build unit ALL
 
 /*

govcd/task_test.go

@@ -1,3 +1,4 @@
+//go:build task || functional || ALL
 // +build task functional ALL
 
 /*

govcd/tenant_context_test.go

@@ -1,3 +1,4 @@
+//go:build functional || openapi || ALL
 // +build functional openapi ALL
 
 package govcd

govcd/user_test.go

@@ -1,3 +1,4 @@
+//go:build user || functional || ALL
 // +build user functional ALL
 
 /*

govcd/vapp_concurrent_test.go

@@ -1,3 +1,4 @@
+//go:build concurrent
 // +build concurrent
 
 /*

govcd/vapp_network_test.go

@@ -1,3 +1,4 @@
+//go:build vapp || functional || ALL
 // +build vapp functional ALL
 
 /*

govcd/vapp_test.go

@@ -1,3 +1,4 @@
+//go:build vapp || functional || ALL
 // +build vapp functional ALL
 
 /*

govcd/vapp_vm_test.go

@@ -1,3 +1,4 @@
+//go:build vapp || vm || functional || ALL
 // +build vapp vm functional ALL
 
 /*

govcd/vapptemplate_test.go

@@ -1,3 +1,4 @@
+//go:build vapp || functional || ALL
 // +build vapp functional ALL
 
 /*

govcd/vdc_test.go

@@ -1,3 +1,4 @@
+//go:build vdc || functional || ALL
 // +build vdc functional ALL
 
 /*

govcd/vdccomputepolicy_test.go

@@ -1,3 +1,4 @@
+//go:build vdc || functional || openapi || ALL
 // +build vdc functional openapi ALL
 
 /*

govcd/vm_affinity_rule_test.go

@@ -1,3 +1,4 @@
+//go:build vdc || affinity || functional || ALL
 // +build vdc affinity functional ALL
 
 /*

govcd/vm_concurrent_test.go

@@ -1,3 +1,4 @@
+//go:build concurrent
 // +build concurrent
 
 /*

govcd/vm_dhcp_test.go

@@ -1,3 +1,4 @@
+//go:build nsxv || vm || functional || ALL
 // +build nsxv vm functional ALL
 
 /*

govcd/vm_test.go

@@ -1,3 +1,4 @@
+//go:build vm || functional || ALL
 // +build vm functional ALL
 
 /*