cloudapi: Move Services to an actual struct

This removes the need to make anonymous structs in the middle of the
Customizations request.

internal/cloudapi/v2/compose_test.go

@@ -38,15 +38,6 @@ func TestGetBlueprintWithCustomizations(t *testing.T) {
 	// interface{} is a terrible idea. Work around it...
 	var rootStr interface{} = "root"
 
-	// anonymous structs buried in a data type are almost as bad.
-	services := struct {
-		Disabled *[]string `json:"disabled,omitempty"`
-		Enabled  *[]string `json:"enabled,omitempty"`
-	}{
-		Disabled: &[]string{"cleanup"},
-		Enabled:  &[]string{"sshd"},
-	}
-
 	// Construct the compose request with customizations
 	cr = ComposeRequest{Customizations: &Customizations{
 		Users: &[]User{
@@ -87,7 +78,10 @@ func TestGetBlueprintWithCustomizations(t *testing.T) {
 				MinSize:    1099511627776,
 			},
 		},
-		Services: &services,
+		Services: &Services{
+			Disabled: &[]string{"cleanup"},
+			Enabled:  &[]string{"sshd"},
+		},
 		Openscap: &OpenSCAP{ProfileId: "B 263-59"},
 		CustomRepositories: &[]CustomRepository{
 			CustomRepository{