Add support to import multiple resources into tf plugin (#681)

Signed-off-by: Steven Kaufer <[email protected]>

Author: kaufers

pkg/provider/terraform/instance/README.md

@@ -116,7 +116,7 @@ The supported fields are:
 
 The plugin also supports importing an existing resource into terraform; this can be used to import the initial manager into terraform. Once the resource is imported into terraform, a corresponding `.tf.json` file is also created. The following optional fields are used for this purpose:
 * `import-group-spec-url`: The group specification URL that contains a nested instance specification; the `.tf.json` file for the imported resource contains the properties in the instance specification
-* `import-instance-id`: The ID of the instance to import
+* `import-resource`: The terraform resource type, optional resource name, and resource ID to import into in the form of `<type>:[<name>:]<id>`. The `<type>` and `<name>` must match a resource in the instance specification; the `<name>` is required if there is more then one resource of the given type in the specification. This value may be specified multiple times.
 * `import-group-id`: Optional group ID that the imported resource should be tagged with
 
 The plugin also checks to make sure it can call `terraform`. Install Terraform [here](https://www.terraform.io/downloads.html) if you haven't done so.

pkg/provider/terraform/instance/cmd/main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"strings"
 	"time"
 
 	log "github.com/Sirupsen/logrus"
@@ -49,21 +50,48 @@ func main() {
 	standalone := cmd.Flags().Bool("standalone", false, "Set if running standalone, disables manager leadership verification")
 	// Import options
 	importGrpSpecURL := cmd.Flags().String("import-group-spec-url", "", "Defines the group spec that the instance is imported into")
-	importInstID := cmd.Flags().String("import-instance-id", "", "Defines the instance ID to import ")
+	importResources := cmd.Flags().StringArray("import-resource", []string{}, "Defines the resource to import in the format <type>:[<name>:]<id>")
 	importGrpID := cmd.Flags().String("import-group-id", "", "Defines the group ID to import the resource into (optional)")
 
 	cmd.Run = func(c *cobra.Command, args []string) {
 		mustHaveTerraform()
 		importInstSpec, err := parseInstanceSpecFromGroup(*importGrpSpecURL, *importGrpID)
 		if err != nil {
-			// If we cannot prase the group spec then we cannot import the resource, the plugin should
+			// If we cannot parse the group spec then we cannot import the resource, the plugin should
 			// not start since terraform is not managing the resource
 			log.Error(err)
 			panic(err)
 		}
+		resources := []*terraform.ImportResource{}
+		for _, resourceString := range *importResources {
+			split := strings.Split(resourceString, ":")
+			if len(split) < 2 || len(split) > 3 {
+				err := fmt.Errorf("Imported resource value is not valid: %v", resourceString)
+				log.Error(err)
+				panic(err)
+			}
+			resType := terraform.TResourceType(split[0])
+			var resName string
+			var resID string
+			if len(split) == 3 {
+				resName = split[1]
+				resID = split[2]
+			} else {
+				resID = split[1]
+			}
+			res := terraform.ImportResource{
+				ResourceID:   &resID,
+				ResourceType: &resType,
+			}
+			if resName != "" {
+				tResName := terraform.TResourceName(resName)
+				res.ResourceName = &tResName
+			}
+			resources = append(resources, &res)
+		}
 		importOpts := terraform.ImportOptions{
 			InstanceSpec: importInstSpec,
-			InstanceID:   importInstID,
+			Resources:    resources,
 		}
 		cli.SetLogLevel(*logLevel)
 		run.Plugin(plugin_base.DefaultTransport(*name), instance_plugin.PluginServer(
@@ -118,6 +146,10 @@ func parseInstanceSpecFromGroup(groupSpecURL, groupID string) (*instance.Spec, e
 		}
 		tags["infrakit.group"] = groupID
 	}
+	// Use the first logical ID if set
+	if len(groupProps.Allocation.LogicalIDs) > 0 {
+		tags["LogicalID"] = string(groupProps.Allocation.LogicalIDs[0])
+	}
 
 	spec := instance.Spec{
 		Properties: groupProps.Instance.Properties,

pkg/provider/terraform/instance/cmd/main_test.go

@@ -48,6 +48,34 @@ func TestParseInstanceSpecFromGroup(t *testing.T) {
 		*instSpec)
 }
 
+func TestParseInstanceSpecFromGroupLogicalID(t *testing.T) {
+	groupSpecURL := `str://
+{
+  "ID": "managers",
+  "Properties": {
+    "Allocation": {
+      "LogicalIDs": ["mgr1", "mgr2", "mgr3"]
+    },
+    "instance": {
+      "Properties": {"resource": {"aws_instance": {}}}
+    }
+  }
+}`
+	groupID := "managers"
+	instSpec, err := parseInstanceSpecFromGroup(groupSpecURL, groupID)
+	require.NoError(t, err)
+	require.Equal(t,
+		instance.Spec{
+			Properties: types.AnyString(`{"resource": {"aws_instance": {}}}`),
+			Tags: map[string]string{
+				"infrakit.config_sha": "bootstrap",
+				"infrakit.group":      groupID,
+				"LogicalID":           "mgr1",
+			},
+		},
+		*instSpec)
+}
+
 func TestParseInstanceSpecFromGroupNoGroupIDSpecified(t *testing.T) {
 	groupSpecURL := `str://
 {