Export servers using image name instead of Id (to make it easier to deploy in another data centre).

Author: tintoy

CHANGES.md

@@ -0,0 +1,7 @@
+# Changelog for dd-tf-export
+
+## v0.2-alpha2
+
+Changes:
+
+* ddcloud_server is now exported using source image name instead of ID where possible. This makes it easier when retargeting configurations to other data centres.

Makefile

@@ -32,4 +32,4 @@ test: fmt
 	go test -v github.com/DimensionDataResearch/dd-tf-export
 
 version:
-	echo "package main\n\n// ProgramVersion is the current version of the DD Cloud Compute terraform exporter.\nconst ProgramVersion = \"v0.2-alpha1 (`git rev-parse HEAD`)\"" > ./version-info.go
+	echo "package main\n\n// ProgramVersion is the current version of the DD Cloud Compute terraform exporter.\nconst ProgramVersion = \"v0.2-alpha2 (`git rev-parse HEAD`)\"" > ./version-info.go

export_networkdomain.go

@@ -108,7 +108,11 @@ func (exporter *Exporter) ExportNetworkDomain(id string, uniquenessKey int, recu
 			serverUniquenessKey := uniquenessKey + index
 			serverResourceName := makeServerResourceName(serverUniquenessKey)
 			serverResourceNamesByPrivateIPv4[serverPrivateIPv4] = serverResourceName
-			exporter.exportServer(server, networkDomainID, vlanID, serverUniquenessKey)
+
+			err = exporter.exportServer(server, networkDomainID, vlanID, serverUniquenessKey)
+			if err != nil {
+				return err
+			}
 		}
 
 		page.Next()

export_server.go

@@ -25,7 +25,7 @@ resource "ddcloud_server" "%s" {
 	dns_primary             = "8.8.8.8"
 	dns_secondary           = "8.8.4.4"
 
-	osimage_id              = "%s"%s%s
+	osimage_name            = "%s"%s%s
 }
 `
 
@@ -40,6 +40,14 @@ func (exporter *Exporter) exportServer(server compute.Server, networkDomainID st
 		return err
 	}
 
+	osImage, err := exporter.APIClient.GetOSImage(server.SourceImageID)
+	if err != nil {
+		return err
+	}
+	if osImage == nil {
+		return fmt.Errorf("Cannot find OS image '%s'.", server.SourceImageID)
+	}
+
 	configuration := fmt.Sprintf(configurationTemplateServer,
 		makeServerResourceName(uniquenessKey),
 		server.Name,
@@ -49,7 +57,7 @@ func (exporter *Exporter) exportServer(server compute.Server, networkDomainID st
 		networkDomainID,
 		primaryVLANResourceName,
 		*server.Network.PrimaryAdapter.PrivateIPv4Address,
-		server.SourceImageID,
+		osImage.Name,
 		diskConfiguration,
 		tagConfiguration,
 	)