-
Notifications
You must be signed in to change notification settings - Fork 9.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #3228: aws_directory_service_directory resource
- Loading branch information
Showing
7 changed files
with
669 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
291 changes: 291 additions & 0 deletions
291
builtin/providers/aws/resource_aws_directory_service_directory.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,291 @@ | ||
package aws | ||
|
||
import ( | ||
"fmt" | ||
"log" | ||
"time" | ||
|
||
"github.com/hashicorp/terraform/helper/schema" | ||
|
||
"github.com/aws/aws-sdk-go/aws" | ||
"github.com/aws/aws-sdk-go/service/directoryservice" | ||
"github.com/hashicorp/terraform/helper/resource" | ||
) | ||
|
||
func resourceAwsDirectoryServiceDirectory() *schema.Resource { | ||
return &schema.Resource{ | ||
Create: resourceAwsDirectoryServiceDirectoryCreate, | ||
Read: resourceAwsDirectoryServiceDirectoryRead, | ||
Update: resourceAwsDirectoryServiceDirectoryUpdate, | ||
Delete: resourceAwsDirectoryServiceDirectoryDelete, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
"name": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
"password": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
"size": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
"alias": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Optional: true, | ||
Computed: true, | ||
ForceNew: true, | ||
}, | ||
"description": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Optional: true, | ||
ForceNew: true, | ||
}, | ||
"short_name": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Optional: true, | ||
Computed: true, | ||
ForceNew: true, | ||
}, | ||
"vpc_settings": &schema.Schema{ | ||
Type: schema.TypeList, | ||
Required: true, | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"subnet_ids": &schema.Schema{ | ||
Type: schema.TypeSet, | ||
Required: true, | ||
ForceNew: true, | ||
Elem: &schema.Schema{Type: schema.TypeString}, | ||
Set: schema.HashString, | ||
}, | ||
"vpc_id": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
"enable_sso": &schema.Schema{ | ||
Type: schema.TypeBool, | ||
Optional: true, | ||
Default: false, | ||
}, | ||
"access_url": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"dns_ip_addresses": &schema.Schema{ | ||
Type: schema.TypeSet, | ||
Elem: &schema.Schema{Type: schema.TypeString}, | ||
Set: schema.HashString, | ||
Computed: true, | ||
}, | ||
"type": &schema.Schema{ | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func resourceAwsDirectoryServiceDirectoryCreate(d *schema.ResourceData, meta interface{}) error { | ||
dsconn := meta.(*AWSClient).dsconn | ||
|
||
input := directoryservice.CreateDirectoryInput{ | ||
Name: aws.String(d.Get("name").(string)), | ||
Password: aws.String(d.Get("password").(string)), | ||
Size: aws.String(d.Get("size").(string)), | ||
} | ||
|
||
if v, ok := d.GetOk("description"); ok { | ||
input.Description = aws.String(v.(string)) | ||
} | ||
if v, ok := d.GetOk("short_name"); ok { | ||
input.ShortName = aws.String(v.(string)) | ||
} | ||
|
||
if v, ok := d.GetOk("vpc_settings"); ok { | ||
settings := v.([]interface{}) | ||
|
||
if len(settings) > 1 { | ||
return fmt.Errorf("Only a single vpc_settings block is expected") | ||
} else if len(settings) == 1 { | ||
s := settings[0].(map[string]interface{}) | ||
var subnetIds []*string | ||
for _, id := range s["subnet_ids"].(*schema.Set).List() { | ||
subnetIds = append(subnetIds, aws.String(id.(string))) | ||
} | ||
|
||
vpcSettings := directoryservice.DirectoryVpcSettings{ | ||
SubnetIds: subnetIds, | ||
VpcId: aws.String(s["vpc_id"].(string)), | ||
} | ||
input.VpcSettings = &vpcSettings | ||
} | ||
} | ||
|
||
log.Printf("[DEBUG] Creating Directory Service: %s", input) | ||
out, err := dsconn.CreateDirectory(&input) | ||
if err != nil { | ||
return err | ||
} | ||
log.Printf("[DEBUG] Directory Service created: %s", out) | ||
d.SetId(*out.DirectoryId) | ||
|
||
// Wait for creation | ||
log.Printf("[DEBUG] Waiting for DS (%q) to become available", d.Id()) | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{"Requested", "Creating", "Created"}, | ||
Target: "Active", | ||
Refresh: func() (interface{}, string, error) { | ||
resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ | ||
DirectoryIds: []*string{aws.String(d.Id())}, | ||
}) | ||
if err != nil { | ||
log.Printf("Error during creation of DS: %q", err.Error()) | ||
return nil, "", err | ||
} | ||
|
||
ds := resp.DirectoryDescriptions[0] | ||
log.Printf("[DEBUG] Creation of DS %q is in following stage: %q.", | ||
d.Id(), *ds.Stage) | ||
return ds, *ds.Stage, nil | ||
}, | ||
Timeout: 10 * time.Minute, | ||
} | ||
if _, err := stateConf.WaitForState(); err != nil { | ||
return fmt.Errorf( | ||
"Error waiting for Directory Service (%s) to become available: %#v", | ||
d.Id(), err) | ||
} | ||
|
||
if v, ok := d.GetOk("alias"); ok { | ||
d.SetPartial("alias") | ||
|
||
input := directoryservice.CreateAliasInput{ | ||
DirectoryId: aws.String(d.Id()), | ||
Alias: aws.String(v.(string)), | ||
} | ||
|
||
log.Printf("[DEBUG] Assigning alias %q to DS directory %q", | ||
v.(string), d.Id()) | ||
out, err := dsconn.CreateAlias(&input) | ||
if err != nil { | ||
return err | ||
} | ||
log.Printf("[DEBUG] Alias %q assigned to DS directory %q", | ||
*out.Alias, *out.DirectoryId) | ||
} | ||
|
||
return resourceAwsDirectoryServiceDirectoryUpdate(d, meta) | ||
} | ||
|
||
func resourceAwsDirectoryServiceDirectoryUpdate(d *schema.ResourceData, meta interface{}) error { | ||
dsconn := meta.(*AWSClient).dsconn | ||
|
||
if d.HasChange("enable_sso") { | ||
d.SetPartial("enable_sso") | ||
var err error | ||
|
||
if v, ok := d.GetOk("enable_sso"); ok && v.(bool) { | ||
log.Printf("[DEBUG] Enabling SSO for DS directory %q", d.Id()) | ||
_, err = dsconn.EnableSso(&directoryservice.EnableSsoInput{ | ||
DirectoryId: aws.String(d.Id()), | ||
}) | ||
} else { | ||
log.Printf("[DEBUG] Disabling SSO for DS directory %q", d.Id()) | ||
_, err = dsconn.DisableSso(&directoryservice.DisableSsoInput{ | ||
DirectoryId: aws.String(d.Id()), | ||
}) | ||
} | ||
|
||
if err != nil { | ||
return err | ||
} | ||
} | ||
|
||
return resourceAwsDirectoryServiceDirectoryRead(d, meta) | ||
} | ||
|
||
func resourceAwsDirectoryServiceDirectoryRead(d *schema.ResourceData, meta interface{}) error { | ||
dsconn := meta.(*AWSClient).dsconn | ||
|
||
input := directoryservice.DescribeDirectoriesInput{ | ||
DirectoryIds: []*string{aws.String(d.Id())}, | ||
} | ||
out, err := dsconn.DescribeDirectories(&input) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
dir := out.DirectoryDescriptions[0] | ||
log.Printf("[DEBUG] Received DS directory: %s", *dir) | ||
|
||
d.Set("access_url", *dir.AccessUrl) | ||
d.Set("alias", *dir.Alias) | ||
if dir.Description != nil { | ||
d.Set("description", *dir.Description) | ||
} | ||
d.Set("dns_ip_addresses", schema.NewSet(schema.HashString, flattenStringList(dir.DnsIpAddrs))) | ||
d.Set("name", *dir.Name) | ||
if dir.ShortName != nil { | ||
d.Set("short_name", *dir.ShortName) | ||
} | ||
d.Set("size", *dir.Size) | ||
d.Set("type", *dir.Type) | ||
d.Set("vpc_settings", flattenDSVpcSettings(dir.VpcSettings)) | ||
d.Set("enable_sso", *dir.SsoEnabled) | ||
|
||
return nil | ||
} | ||
|
||
func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta interface{}) error { | ||
dsconn := meta.(*AWSClient).dsconn | ||
|
||
input := directoryservice.DeleteDirectoryInput{ | ||
DirectoryId: aws.String(d.Id()), | ||
} | ||
_, err := dsconn.DeleteDirectory(&input) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
// Wait for deletion | ||
log.Printf("[DEBUG] Waiting for DS (%q) to be deleted", d.Id()) | ||
stateConf := &resource.StateChangeConf{ | ||
Pending: []string{"Deleting"}, | ||
Target: "", | ||
Refresh: func() (interface{}, string, error) { | ||
resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ | ||
DirectoryIds: []*string{aws.String(d.Id())}, | ||
}) | ||
if err != nil { | ||
return nil, "", err | ||
} | ||
|
||
if len(resp.DirectoryDescriptions) == 0 { | ||
return nil, "", nil | ||
} | ||
|
||
ds := resp.DirectoryDescriptions[0] | ||
log.Printf("[DEBUG] Deletion of DS %q is in following stage: %q.", | ||
d.Id(), *ds.Stage) | ||
return ds, *ds.Stage, nil | ||
}, | ||
Timeout: 10 * time.Minute, | ||
} | ||
if _, err := stateConf.WaitForState(); err != nil { | ||
return fmt.Errorf( | ||
"Error waiting for Directory Service (%s) to be deleted: %q", | ||
d.Id(), err.Error()) | ||
} | ||
|
||
return nil | ||
} |
Oops, something went wrong.