style updates to documentation and nil checks
This commit is contained in:
parent
bcd5904eea
commit
88de250615
|
@ -510,8 +510,19 @@ func resourceAwsOpsworksInstanceRead(d *schema.ResourceData, meta interface{}) e
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If nothing was found, then return no state
|
||||||
|
if len(resp.Instances) == 0 {
|
||||||
|
d.SetId("")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
instance := resp.Instances[0]
|
instance := resp.Instances[0]
|
||||||
|
|
||||||
|
if instance.InstanceId == nil {
|
||||||
|
d.SetId("")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
instanceId := *instance.InstanceId
|
instanceId := *instance.InstanceId
|
||||||
|
|
||||||
d.SetId(instanceId)
|
d.SetId(instanceId)
|
||||||
d.Set("agent_version", instance.AgentVersion)
|
d.Set("agent_version", instance.AgentVersion)
|
||||||
d.Set("ami_id", instance.AmiId)
|
d.Set("ami_id", instance.AmiId)
|
||||||
|
@ -726,6 +737,10 @@ func resourceAwsOpsworksInstanceCreate(d *schema.ResourceData, meta interface{})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if resp.InstanceId == nil {
|
||||||
|
return fmt.Errorf("Error launching instance: no instance returned in response")
|
||||||
|
}
|
||||||
|
|
||||||
instanceId := *resp.InstanceId
|
instanceId := *resp.InstanceId
|
||||||
d.SetId(instanceId)
|
d.SetId(instanceId)
|
||||||
d.Set("id", instanceId)
|
d.Set("id", instanceId)
|
||||||
|
|
|
@ -13,14 +13,17 @@ Provides an OpsWorks instance resource.
|
||||||
## Example Usage
|
## Example Usage
|
||||||
|
|
||||||
```
|
```
|
||||||
resource "aws_opsworks_instance" "my-instance" {
|
aws_opsworks_instance" "my-instance" {
|
||||||
stack_id = "${aws_opsworks_stack.my-stack.id}"
|
stack_id = "${aws_opsworks_stack.my-stack.id}"
|
||||||
|
|
||||||
layer_ids = [
|
layer_ids = [
|
||||||
"${aws_opsworks_custom_layer.my-layer.id}",
|
"${aws_opsworks_custom_layer.my-layer.id}",
|
||||||
]
|
]
|
||||||
|
|
||||||
instance_type = "t2.micro"
|
instance_type = "t2.micro"
|
||||||
os = "Amazon Linux 2015.09"
|
os = "Amazon Linux 2015.09"
|
||||||
state = "stopped"
|
state = "stopped"
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
## Argument Reference
|
## Argument Reference
|
||||||
|
|
Loading…
Reference in New Issue