#2087 add consul_node and consul_service resources
This commit is contained in:
parent
bdf2bbff2e
commit
296f8be10a
|
@ -0,0 +1,156 @@
|
|||
package consul
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
consulapi "github.com/hashicorp/consul/api"
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
|
||||
func resourceConsulNode() *schema.Resource {
|
||||
return &schema.Resource{
|
||||
Create: resourceConsulNodeCreate,
|
||||
Update: resourceConsulNodeCreate,
|
||||
Read: resourceConsulNodeRead,
|
||||
Delete: resourceConsulNodeDelete,
|
||||
|
||||
Schema: map[string]*schema.Schema{
|
||||
"address": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
ForceNew: true,
|
||||
},
|
||||
|
||||
"datacenter": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
ForceNew: true,
|
||||
},
|
||||
|
||||
"name": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
ForceNew: true,
|
||||
},
|
||||
|
||||
"token": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func resourceConsulNodeCreate(d *schema.ResourceData, meta interface{}) error {
|
||||
client := meta.(*consulapi.Client)
|
||||
catalog := client.Catalog()
|
||||
|
||||
var dc string
|
||||
if v, ok := d.GetOk("datacenter"); ok {
|
||||
dc = v.(string)
|
||||
} else {
|
||||
var err error
|
||||
if dc, err = getDC(d, client); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
var token string
|
||||
if v, ok := d.GetOk("token"); ok {
|
||||
token = v.(string)
|
||||
}
|
||||
|
||||
// Setup the operations using the datacenter
|
||||
wOpts := consulapi.WriteOptions{Datacenter: dc, Token: token}
|
||||
|
||||
address := d.Get("address").(string)
|
||||
name := d.Get("name").(string)
|
||||
|
||||
registration := &consulapi.CatalogRegistration{
|
||||
Address: address,
|
||||
Datacenter: dc,
|
||||
Node: name,
|
||||
}
|
||||
|
||||
if _, err := catalog.Register(registration, &wOpts); err != nil {
|
||||
return fmt.Errorf("Failed to register Consul catalog node with name '%s' at address '%s' in %s: %v",
|
||||
name, address, dc, err)
|
||||
}
|
||||
|
||||
// Update the resource
|
||||
qOpts := consulapi.QueryOptions{Datacenter: dc}
|
||||
if _, _, err := catalog.Node(name, &qOpts); err != nil {
|
||||
return fmt.Errorf("Failed to read Consul catalog node with name '%s' at address '%s' in %s: %v",
|
||||
name, address, dc, err)
|
||||
} else {
|
||||
d.Set("datacenter", dc)
|
||||
}
|
||||
|
||||
d.SetId(fmt.Sprintf("%s-%s", name, address))
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func resourceConsulNodeRead(d *schema.ResourceData, meta interface{}) error {
|
||||
client := meta.(*consulapi.Client)
|
||||
catalog := client.Catalog()
|
||||
|
||||
// Get the DC, error if not available.
|
||||
var dc string
|
||||
if v, ok := d.GetOk("datacenter"); ok {
|
||||
dc = v.(string)
|
||||
}
|
||||
|
||||
name := d.Get("name").(string)
|
||||
|
||||
// Setup the operations using the datacenter
|
||||
qOpts := consulapi.QueryOptions{Datacenter: dc}
|
||||
|
||||
if _, _, err := catalog.Node(name, &qOpts); err != nil {
|
||||
return fmt.Errorf("Failed to get name '%s' from Consul catalog: %v", name, err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func resourceConsulNodeDelete(d *schema.ResourceData, meta interface{}) error {
|
||||
client := meta.(*consulapi.Client)
|
||||
catalog := client.Catalog()
|
||||
|
||||
var dc string
|
||||
if v, ok := d.GetOk("datacenter"); ok {
|
||||
dc = v.(string)
|
||||
} else {
|
||||
var err error
|
||||
if dc, err = getDC(d, client); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
var token string
|
||||
if v, ok := d.GetOk("token"); ok {
|
||||
token = v.(string)
|
||||
}
|
||||
|
||||
// Setup the operations using the datacenter
|
||||
wOpts := consulapi.WriteOptions{Datacenter: dc, Token: token}
|
||||
|
||||
address := d.Get("address").(string)
|
||||
name := d.Get("name").(string)
|
||||
|
||||
deregistration := consulapi.CatalogDeregistration{
|
||||
Address: address,
|
||||
Datacenter: dc,
|
||||
Node: name,
|
||||
}
|
||||
|
||||
if _, err := catalog.Deregister(&deregistration, &wOpts); err != nil {
|
||||
return fmt.Errorf("Failed to deregister Consul catalog node with name '%s' at address '%s' in %s: %v",
|
||||
name, address, dc, err)
|
||||
}
|
||||
|
||||
// Clear the ID
|
||||
d.SetId("")
|
||||
return nil
|
||||
}
|
|
@ -0,0 +1,87 @@
|
|||
package consul
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
consulapi "github.com/hashicorp/consul/api"
|
||||
"github.com/hashicorp/terraform/helper/resource"
|
||||
"github.com/hashicorp/terraform/terraform"
|
||||
)
|
||||
|
||||
func TestAccConsulNode_basic(t *testing.T) {
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() {},
|
||||
Providers: testAccProviders,
|
||||
CheckDestroy: testAccCheckConsulNodeDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccConsulNodeConfig,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckConsulNodeExists(),
|
||||
testAccCheckConsulNodeValue("consul_catalog_entry.app", "address", "127.0.0.1"),
|
||||
testAccCheckConsulNodeValue("consul_catalog_entry.app", "name", "foo"),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func testAccCheckConsulNodeDestroy(s *terraform.State) error {
|
||||
catalog := testAccProvider.Meta().(*consulapi.Client).Catalog()
|
||||
qOpts := consulapi.QueryOptions{}
|
||||
nodes, _, err := catalog.Nodes(&qOpts)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Could not retrieve services: %#v", err)
|
||||
}
|
||||
for i := range nodes {
|
||||
if nodes[i].Node == "foo" {
|
||||
return fmt.Errorf("Node still exists: %#v", "foo")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func testAccCheckConsulNodeExists() resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
catalog := testAccProvider.Meta().(*consulapi.Client).Catalog()
|
||||
qOpts := consulapi.QueryOptions{}
|
||||
nodes, _, err := catalog.Nodes(&qOpts)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for i := range nodes {
|
||||
if nodes[i].Node == "foo" {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return fmt.Errorf("Service does not exist: %#v", "google")
|
||||
}
|
||||
}
|
||||
|
||||
func testAccCheckConsulNodeValue(n, attr, val string) resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
rn, ok := s.RootModule().Resources[n]
|
||||
if !ok {
|
||||
return fmt.Errorf("Resource not found")
|
||||
}
|
||||
out, ok := rn.Primary.Attributes[attr]
|
||||
if !ok {
|
||||
return fmt.Errorf("Attribute '%s' not found: %#v", attr, rn.Primary.Attributes)
|
||||
}
|
||||
if val != "<any>" && out != val {
|
||||
return fmt.Errorf("Attribute '%s' value '%s' != '%s'", attr, out, val)
|
||||
}
|
||||
if val == "<any>" && out == "" {
|
||||
return fmt.Errorf("Attribute '%s' value '%s'", attr, out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
const testAccConsulNodeConfig = `
|
||||
resource "consul_catalog_entry" "foo" {
|
||||
address = "127.0.0.1"
|
||||
name = "foo"
|
||||
}
|
||||
`
|
|
@ -0,0 +1,139 @@
|
|||
package consul
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
consulapi "github.com/hashicorp/consul/api"
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
|
||||
func resourceConsulService() *schema.Resource {
|
||||
return &schema.Resource{
|
||||
Create: resourceConsulServiceCreate,
|
||||
Update: resourceConsulServiceCreate,
|
||||
Read: resourceConsulServiceRead,
|
||||
Delete: resourceConsulServiceDelete,
|
||||
|
||||
Schema: map[string]*schema.Schema{
|
||||
"address": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
Computed: true,
|
||||
ForceNew: true,
|
||||
},
|
||||
|
||||
"id": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Computed: true,
|
||||
},
|
||||
|
||||
"name": &schema.Schema{
|
||||
Type: schema.TypeString,
|
||||
Required: true,
|
||||
},
|
||||
|
||||
"port": &schema.Schema{
|
||||
Type: schema.TypeInt,
|
||||
Optional: true,
|
||||
ForceNew: true,
|
||||
},
|
||||
|
||||
"tags": &schema.Schema{
|
||||
Type: schema.TypeList,
|
||||
Optional: true,
|
||||
Elem: &schema.Schema{Type: schema.TypeString},
|
||||
ForceNew: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func resourceConsulServiceCreate(d *schema.ResourceData, meta interface{}) error {
|
||||
client := meta.(*consulapi.Client)
|
||||
agent := client.Agent()
|
||||
|
||||
name := d.Get("name").(string)
|
||||
registration := consulapi.AgentServiceRegistration{Name: name}
|
||||
|
||||
if address, ok := d.GetOk("address"); ok {
|
||||
registration.Address = address.(string)
|
||||
}
|
||||
|
||||
if port, ok := d.GetOk("port"); ok {
|
||||
registration.Port = port.(int)
|
||||
}
|
||||
|
||||
if v, ok := d.GetOk("tags"); ok {
|
||||
vs := v.([]interface{})
|
||||
s := make([]string, len(vs))
|
||||
for i, raw := range vs {
|
||||
s[i] = raw.(string)
|
||||
}
|
||||
registration.Tags = s
|
||||
}
|
||||
|
||||
if err := agent.ServiceRegister(®istration); err != nil {
|
||||
return fmt.Errorf("Failed to register service '%s' with Consul agent: %v", name, err)
|
||||
}
|
||||
|
||||
// Update the resource
|
||||
if serviceMap, err := agent.Services(); err != nil {
|
||||
return fmt.Errorf("Failed to read services from Consul agent: %v", err)
|
||||
} else if service, ok := serviceMap[name]; !ok {
|
||||
return fmt.Errorf("Failed to read service '%s' from Consul agent: %v", name, err)
|
||||
} else {
|
||||
d.Set("address", service.Address)
|
||||
d.Set("id", service.ID)
|
||||
d.SetId(service.ID)
|
||||
d.Set("name", service.Service)
|
||||
d.Set("port", service.Port)
|
||||
tags := make([]string, 0, len(service.Tags))
|
||||
for _, tag := range service.Tags {
|
||||
tags = append(tags, tag)
|
||||
}
|
||||
d.Set("tags", tags)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func resourceConsulServiceRead(d *schema.ResourceData, meta interface{}) error {
|
||||
client := meta.(*consulapi.Client)
|
||||
agent := client.Agent()
|
||||
|
||||
name := d.Get("name").(string)
|
||||
|
||||
if services, err := agent.Services(); err != nil {
|
||||
return fmt.Errorf("Failed to get services from Consul agent: %v", err)
|
||||
} else if service, ok := services[name]; !ok {
|
||||
return fmt.Errorf("Failed to get service '%s' from Consul agent", name)
|
||||
} else {
|
||||
d.Set("address", service.Address)
|
||||
d.Set("id", service.ID)
|
||||
d.SetId(service.ID)
|
||||
d.Set("name", service.Service)
|
||||
d.Set("port", service.Port)
|
||||
tags := make([]string, 0, len(service.Tags))
|
||||
for _, tag := range service.Tags {
|
||||
tags = append(tags, tag)
|
||||
}
|
||||
d.Set("tags", tags)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func resourceConsulServiceDelete(d *schema.ResourceData, meta interface{}) error {
|
||||
client := meta.(*consulapi.Client)
|
||||
catalog := client.Agent()
|
||||
|
||||
id := d.Get("id").(string)
|
||||
|
||||
if err := catalog.ServiceDeregister(id); err != nil {
|
||||
return fmt.Errorf("Failed to deregister service '%s' from Consul agent: %v", id, err)
|
||||
}
|
||||
|
||||
// Clear the ID
|
||||
d.SetId("")
|
||||
return nil
|
||||
}
|
|
@ -0,0 +1,90 @@
|
|||
package consul
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
consulapi "github.com/hashicorp/consul/api"
|
||||
"github.com/hashicorp/terraform/helper/resource"
|
||||
"github.com/hashicorp/terraform/terraform"
|
||||
)
|
||||
|
||||
func TestAccConsulService_basic(t *testing.T) {
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() {},
|
||||
Providers: testAccProviders,
|
||||
CheckDestroy: testAccCheckConsulServiceDestroy,
|
||||
Steps: []resource.TestStep{
|
||||
resource.TestStep{
|
||||
Config: testAccConsulServiceConfig,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
testAccCheckConsulServiceExists(),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "address", "www.google.com"),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "id", "google"),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "name", "google"),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "port", "80"),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "tags.#", "2"),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "tags.0", "tag0"),
|
||||
testAccCheckConsulServiceValue("consul_service.app", "tags.1", "tag1"),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func testAccCheckConsulServiceDestroy(s *terraform.State) error {
|
||||
agent := testAccProvider.Meta().(*consulapi.Client).Agent()
|
||||
services, err := agent.Services()
|
||||
if err != nil {
|
||||
return fmt.Errorf("Could not retrieve services: %#v", err)
|
||||
}
|
||||
_, ok := services["google"]
|
||||
if ok {
|
||||
return fmt.Errorf("Service still exists: %#v", "google")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func testAccCheckConsulServiceExists() resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
agent := testAccProvider.Meta().(*consulapi.Client).Agent()
|
||||
services, err := agent.Services()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, ok := services["google"]
|
||||
if !ok {
|
||||
return fmt.Errorf("Service does not exist: %#v", "google")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func testAccCheckConsulServiceValue(n, attr, val string) resource.TestCheckFunc {
|
||||
return func(s *terraform.State) error {
|
||||
rn, ok := s.RootModule().Resources[n]
|
||||
if !ok {
|
||||
return fmt.Errorf("Resource not found")
|
||||
}
|
||||
out, ok := rn.Primary.Attributes[attr]
|
||||
if !ok {
|
||||
return fmt.Errorf("Attribute '%s' not found: %#v", attr, rn.Primary.Attributes)
|
||||
}
|
||||
if val != "<any>" && out != val {
|
||||
return fmt.Errorf("Attribute '%s' value '%s' != '%s'", attr, out, val)
|
||||
}
|
||||
if val == "<any>" && out == "" {
|
||||
return fmt.Errorf("Attribute '%s' value '%s'", attr, out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
const testAccConsulServiceConfig = `
|
||||
resource "consul_service" "app" {
|
||||
address = "www.google.com"
|
||||
name = "google"
|
||||
port = 80
|
||||
tags = ["tag0", "tag1"]
|
||||
}
|
||||
`
|
|
@ -37,6 +37,8 @@ func Provider() terraform.ResourceProvider {
|
|||
"consul_agent_service": resourceConsulAgentService(),
|
||||
"consul_catalog_entry": resourceConsulCatalogEntry(),
|
||||
"consul_keys": resourceConsulKeys(),
|
||||
"consul_node": resourceConsulNode(),
|
||||
"consul_service": resourceConsulService(),
|
||||
},
|
||||
|
||||
ConfigureFunc: providerConfigure,
|
||||
|
|
Loading…
Reference in New Issue