Merge pull request #51 from cloud-ca/development

v1.2.0

Author: pdube

README.md

@@ -2,7 +2,7 @@
 
 Terraform provider for cloud.ca
 
-Tested with Terraform version : 0.11.1
+Tested with Terraform version : 0.11.5
 
 # Installation
 

cloudca/README.md

@@ -73,8 +73,8 @@ resource "cloudca_network" "my_network" {
 	name = "test-network"
 	description = "This is a test network"
 	vpc_id = "8b46e2d1-bbc4-4fad-b3bd-1b25fcba4cec"
-	network_offering = "Standard Network"
-	network_acl_id = "7d428416-263d-47cd-9270-2cdbdf222f57"
+	network_offering = "Standard Tier"
+	network_acl = "7d428416-263d-47cd-9270-2cdbdf222f57"
 }
 ```
 ### Argument Reference
@@ -84,7 +84,7 @@ The following arguments are supported:
 - description - (Required) Description of the network
 - vpc_id - (Required) The ID of the vpc where the network should be created
 - network_offering - (Required) The name of the network offering to use for the network
-- network_acl_id - (Required) The id of the network ACL to use for the network
+- network_acl - (Required) The id or name of the network ACL to use for the network
 
 ### Attribute Reference
 - id - ID of network.
@@ -157,7 +157,7 @@ resource "cloudca_instance" "my_instance" {
 	environment_id = "4cad744d-bf1f-423d-887b-bbb34f4d1b5b"
 	name = "test-instance"
 	network_id = "672016ef-05ee-4e88-b68f-ac9cc462300b"
-	template = "CentOS 6.7 base (64bit)"
+	template = "Ubuntu 16.04.03 HVM"
 	compute_offering = "1vCPU.512MB"
 	ssh_key_name = "my_ssh_key"
 	root_volume_size_in_gb = 100
@@ -320,4 +320,24 @@ resource "cloudca_load_balancer_rule" "lbr" {
 - stickiness_params - (Optional) The additional parameters required for each stickiness method. See (TODO ADD LINK here) for more information
 
 ### Attribute reference
+
 - id - the load balancer rule ID
+
+## cloudca_ssh_key
+
+Adds an SSH key to the environment so that it can be associated with instances.
+
+### Example usage
+
+```hcl
+resource "cloudca_ssh_key" "dev_ssh_key" {
+	environment_id = "4cad744d-bf1f-423d-887b-bbb34f4d1b5b"
+	name     = "my-ssh-key"
+	public_key    = "my_public_key_data"
+}
+```
+
+### Argument reference
+- environment_id - (Required) ID of environment
+- name - (Required) The name of the SSH key to add
+- public_key - (Required) The public key data

cloudca/resource_cloudca.go

@@ -24,6 +24,7 @@ func GetCloudCAResourceMap() map[string]*schema.Resource {
 		"cloudca_network_acl":          resourceCloudcaNetworkAcl(),
 		"cloudca_network_acl_rule":     resourceCloudcaNetworkAclRule(),
 		"cloudca_static_nat":           resourceCloudcaStaticNat(),
+		"cloudca_ssh_key":              resourceCloudcaSSHKey(),
 	}
 }
 

cloudca/resource_cloudca_network.go

@@ -53,10 +53,10 @@ func resourceCloudcaNetwork() *schema.Resource {
 				ForceNew:    true,
 				Description: `The network offering name or id (e.g. "Standard Network" or "Load Balanced Network")`,
 			},
-			"network_acl_id": {
+			"network_acl": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "Id of the network ACL",
+				Description: "Name or id of the network ACL",
 			},
 			"cidr": {
 				Type:     schema.TypeString,
@@ -77,16 +77,21 @@ func resourceCloudcaNetworkCreate(d *schema.ResourceData, meta interface{}) erro
 		return nerr
 	}
 
+	aclID, nerr := retrieveNetworkAclID(&ccaResources, d.Get("network_acl").(string), d.Get("vpc_id").(string))
+	if nerr != nil {
+		return nerr
+	}
+
 	networkToCreate := cloudca.Network{
 		Name:              d.Get("name").(string),
 		Description:       d.Get("description").(string),
 		VpcId:             d.Get("vpc_id").(string),
 		NetworkOfferingId: networkOfferingId,
-		NetworkAclId:      d.Get("network_acl_id").(string),
+		NetworkAclId:      aclID,
 	}
 	options := map[string]string{}
-	if orgId, ok := d.GetOk("organization_code"); ok {
-		options["org_id"] = orgId.(string)
+	if orgID, ok := d.GetOk("organization_code"); ok {
+		options["org_id"] = orgID.(string)
 	}
 	newNetwork, err := ccaResources.Networks.Create(networkToCreate, options)
 	if err != nil {
@@ -131,7 +136,7 @@ func resourceCloudcaNetworkRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("description", network.Description)
 	setValueOrID(d, "network_offering", offering.Name, network.NetworkOfferingId)
 	d.Set("vpc_id", network.VpcId)
-	d.Set("network_acl_id", network.NetworkAclId)
+	setValueOrID(d, "network_acl", network.NetworkAclName, network.NetworkAclId)
 	d.Set("cidr", network.Cidr)
 	return nil
 }
@@ -153,8 +158,12 @@ func resourceCloudcaNetworkUpdate(d *schema.ResourceData, meta interface{}) erro
 		}
 	}
 
-	if d.HasChange("network_acl_id") {
-		_, aclErr := ccaResources.Networks.ChangeAcl(d.Id(), d.Get("network_acl_id").(string))
+	if d.HasChange("network_acl") {
+		aclID, err := retrieveNetworkAclID(&ccaResources, d.Get("network_acl").(string), d.Get("vpc_id").(string))
+		if err != nil {
+			return err
+		}
+		_, aclErr := ccaResources.Networks.ChangeAcl(d.Id(), aclID)
 		if aclErr != nil {
 			return aclErr
 		}
@@ -201,3 +210,19 @@ func retrieveNetworkOfferingId(ccaRes *cloudca.Resources, name string) (id strin
 	}
 	return "", fmt.Errorf("Network offering with name %s not found", name)
 }
+
+func retrieveNetworkAclID(ccaRes *cloudca.Resources, name, vpcID string) (id string, err error) {
+	if isID(name) {
+		return name, nil
+	}
+	acls, err := ccaRes.NetworkAcls.ListByVpcId(vpcID)
+	if err != nil {
+		return "", err
+	}
+	for _, acl := range acls {
+		if strings.EqualFold(acl.Name, name) {
+			return acl.Id, nil
+		}
+	}
+	return "", fmt.Errorf("Network ACL with name %s not found", name)
+}

cloudca/resource_cloudca_ssh_key.go

@@ -0,0 +1,102 @@
+package cloudca
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/cloud-ca/go-cloudca"
+	"github.com/cloud-ca/go-cloudca/api"
+	"github.com/cloud-ca/go-cloudca/services/cloudca"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceCloudcaSSHKey() *schema.Resource {
+	return &schema.Resource{
+		Create: createSSHKey,
+		Read:   readSSHKey,
+		Delete: deleteSSHKey,
+
+		Schema: map[string]*schema.Schema{
+			"environment_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "ID of environment where the SSH key should be created",
+			},
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Name of the SSH Key",
+			},
+			"public_key": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+		},
+	}
+}
+
+func createSSHKey(d *schema.ResourceData, meta interface{}) error {
+	ccaResources, rerr := getResourcesForEnvironmentId(meta.(*cca.CcaClient), d.Get("environment_id").(string))
+
+	if rerr != nil {
+		return rerr
+	}
+	name := d.Get("name").(string)
+	publicKey := d.Get("public_key").(string)
+
+	sk := cloudca.SSHKey{
+		Name:      name,
+		PublicKey: publicKey,
+	}
+	newSk, err := ccaResources.SSHKeys.Create(sk)
+	if err != nil {
+		return fmt.Errorf("Error creating new SSH key %s", err)
+	}
+	d.SetId(newSk.ID)
+	return readSSHKey(d, meta)
+}
+
+func readSSHKey(d *schema.ResourceData, meta interface{}) error {
+	ccaResources, rerr := getResourcesForEnvironmentId(meta.(*cca.CcaClient), d.Get("environment_id").(string))
+
+	if rerr != nil {
+		return rerr
+	}
+	sk, err := ccaResources.SSHKeys.Get(d.Id())
+	if err != nil {
+		if ccaError, ok := err.(api.CcaErrorResponse); ok {
+			if ccaError.StatusCode == 404 {
+				log.Printf("SSH key with id='%s' was not found", d.Id())
+				d.SetId("")
+				return nil
+			}
+		}
+		return err
+	}
+	d.Set("name", sk.Name)
+	return nil
+}
+
+func deleteSSHKey(d *schema.ResourceData, meta interface{}) error {
+	ccaResources, rerr := getResourcesForEnvironmentId(meta.(*cca.CcaClient), d.Get("environment_id").(string))
+
+	if rerr != nil {
+		return rerr
+	}
+
+	if _, err := ccaResources.SSHKeys.Delete(d.Id()); err != nil {
+		if ccaError, ok := err.(api.CcaErrorResponse); ok {
+			if ccaError.StatusCode == 404 {
+				fmt.Printf("SSH key %s not found", d.Id())
+				d.SetId("")
+				return nil
+			}
+		}
+		return err
+	}
+
+	return nil
+}