Workaround for CloudControl bug (UNEXPECTED_ERROR when listing past the last page of server tags).

Author: tintoy

.gitignore

@@ -29,7 +29,7 @@ _testmain.go
 .DS_Store
 
 # Version info
-version-info.go
+version_info.go
 
 # Terraform
 terraform.tfvars

Makefile

@@ -1,10 +1,10 @@
-VERSION = 0.1.0-alpha6
+VERSION = 0.1.0-beta1
 
 SERVER_DIRECTORY	= ./server
 BIN_DIRECTORY   = ./_bin
 EXECUTABLE_NAME = mcp2-dhcp-server
 DIST_ZIP_PREFIX = $(EXECUTABLE_NAME).v$(VERSION)
-VERSION_INFO_FILE = $(SERVER_DIRECTORY)/version-info.go
+VERSION_INFO_FILE = $(SERVER_DIRECTORY)/version_info.go
 
 REPO_BASE	= github.com/DimensionDataResearch
 REPO_ROOT	= $(REPO_BASE)/mcp2-dhcp-server

installer/group_vars/net-boot-service.yml

@@ -1,7 +1,7 @@
 ---
 
 # Server versions
-mcp2_dhcp_server_version:   "0.1.0-alpha6"
+mcp2_dhcp_server_version:   "0.1.0-beta1"
 coreos_ipxe_server_version: "0.3.0"
 
 # CloudControl connection details.

server/cloudcontrol-cache.go renamed to server/cloudcontrol_cache.go

@@ -131,10 +131,6 @@ func (service *Service) getAllServerTags() (map[string][]compute.TagDetail, erro
 	for {
 		tags, err := service.Client.GetAssetTagsByType(compute.AssetTypeServer, service.NetworkDomain.DatacenterID, tagPage)
 		if err != nil {
-			if compute.IsAPIErrorCode(err, compute.ResponseCodeUnexpectedError) {
-				break // CloudControl bug - going past last page of tags returns UNEXPECTED_ERROR (i.e. there are no more tags).
-			}
-
 			return nil, err
 		}
 		if tags.IsEmpty() {
@@ -151,6 +147,12 @@ func (service *Service) getAllServerTags() (map[string][]compute.TagDetail, erro
 			allServerTags[tag.AssetID] = serverTags
 		}
 
+		// CloudControl bug - going past last page of tags returns UNEXPECTED_ERROR (i.e. there are no more tags).
+		// We therefore manually determine whether this is the last page of results.
+		if tags.IsLastPage() {
+			break
+		}
+
 		tagPage.Next()
 	}