Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds domain and domain_iam_role_name parameters to resource aws_db_instance #1363

Closed
wants to merge 491 commits into from
Closed
Changes from all commits
Commits
Show all changes
491 commits
Select commit Hold shift + click to select a range
ec48de6
Typo in the word install
Jan 21, 2016
d70a80c
Added a bit of formatting for readability
Jan 21, 2016
5cfa50f
examples: Add examples for CloudWatch Events
Feb 5, 2016
5d367f8
examples: ECS and ALB example
radeksimko Aug 23, 2016
8795855
Fmt all the config files
Sep 22, 2016
dda9e38
examples: creating VPCs and subnets across two regions
apparentlymart Jul 17, 2016
ef6526c
update aws elb example to work in vpc
catsby Jan 13, 2017
15b6d47
examples: Fix formatting issues in the ASG example README
cuongnv23 Feb 20, 2017
3681aba
`roles` deprecated in ECS ALB example
msysyamamoto Apr 19, 2017
26c492d
Fix typo in two-tier example
dj80hd Apr 20, 2017
7d92665
examples: Allow metrics collection in ECS/ALB example policy
wuan Jun 21, 2017
7e47a83
examples: Ensure that subnets are created in the desired AZ in networ…
tomfitzherbert Jun 30, 2017
0035874
Migrate examples from the core Terraform repository
apparentlymart Jul 7, 2017
2efbacd
Merge migrated examples
apparentlymart Jul 7, 2017
d03f09f
Add support for Api Gateway method request validators.
betabandido Jul 5, 2017
84031c7
Fix formatting string
betabandido Jul 5, 2017
1165c50
Fix issue in resourceAwsApiGatewayRequestValidatorDelete
betabandido Jul 6, 2017
871a1fc
Update CHANGELOG.md
catsby Jul 7, 2017
dbed725
r/kms_alias: Retry lookups after creation (#1040)
radeksimko Jul 8, 2017
a9b7d25
Update CHANGELOG.md
radeksimko Jul 8, 2017
869bc76
r/internet_gateway: Retry properly on DependencyViolation (#1021)
radeksimko Jul 8, 2017
d16ee16
Update CHANGELOG.md
radeksimko Jul 8, 2017
cbba13c
r/aws_elb: Cleanup ENIs after deleting ELB (#1036)
radeksimko Jul 8, 2017
f282fcd
Update CHANGELOG.md
radeksimko Jul 8, 2017
e9a56cd
r/kms_key: Retry lookups after creation (#1039)
radeksimko Jul 8, 2017
3007c7f
Update CHANGELOG.md
radeksimko Jul 8, 2017
32df9ef
r/ami: Retry on InvalidAMIID.NotFound (#1035)
radeksimko Jul 8, 2017
e23c213
Update CHANGELOG.md
radeksimko Jul 8, 2017
5d40e56
Update CHANGELOG.md
radeksimko Jul 8, 2017
240b262
Append the info about IAM Server Certificate import (#1090)
cazorla19 Jul 10, 2017
1485470
dependencies: Bump AWS SDK to 1.10.8 (#1095)
stack72 Jul 10, 2017
0faffdb
resource/aws_lambda_function: Add support for lambda_function vpc_con…
stack72 Jul 11, 2017
8f4e53e
Update CHANGELOG.md
stack72 Jul 11, 2017
cbd7b0e
resource/aws_route53_health_check: add support for health_check regio…
stack72 Jul 11, 2017
0ae21b0
Update CHANGELOG.md
stack72 Jul 11, 2017
0b3fde3
docs: add ECR repository to aws.erb (#1115)
stack72 Jul 11, 2017
4ebaeb1
resource/aws_dms_replication_instance: Add modifying as a pending cre…
stack72 Jul 11, 2017
013c01b
Update CHANGELOG.md
stack72 Jul 11, 2017
8afe536
docs/aws_redshift_cluster: Fix default value of skip_final_snapshot (…
minamijoyo Jul 11, 2017
08384e9
r/aws_redshift_cluster: Trigger ForceNew aws_redshift_cluster on encr…
minamijoyo Jul 11, 2017
437d569
Update CHANGELOG.md
stack72 Jul 11, 2017
dddced6
docs/ebs_volume: Add a note about the Elastic Volumes considerations …
stack72 Jul 11, 2017
7ccd3d0
resource/default_network_acl: Add support for ipv6_cidr_block (#1113)
stack72 Jul 11, 2017
7e3934b
Update CHANGELOG.md
stack72 Jul 11, 2017
941b934
added launch_group option to aws_spot_instance_request. (#1097)
Harrison-Miller Jul 12, 2017
0826ebd
Update CHANGELOG.md
stack72 Jul 12, 2017
e44f18e
Updating documentation (#1136)
thomasbiddle Jul 13, 2017
b902539
data/aws_db_instance: Fix the output of subnet_group_name (#1141)
stack72 Jul 14, 2017
86dfe37
Update CHANGELOG.md
stack72 Jul 14, 2017
9b54531
data/aws_iam_group: Add a data source for AWS IAM Group (#1140)
stack72 Jul 14, 2017
4f6985e
Update CHANGELOG.md
stack72 Jul 14, 2017
b8692bf
resource/rds_cluster_instance: Export the RDI Resource ID for the ins…
stack72 Jul 14, 2017
a3906c6
Update CHANGELOG.md
stack72 Jul 14, 2017
d9cac70
docs/ecs_task_definition: clarify that multiple volume blocks may be …
Jul 14, 2017
a8e80b5
dependencies: Bump AWS SDK to 1.10.10 (#1157)
stack72 Jul 15, 2017
9c8a713
Add note about EMR-Managed security group pitfalls.
david-resnick Jul 16, 2017
a40f50e
Add support for aws_cloudwatch_dashboard resource
ttacon Jul 18, 2017
3104157
Turn internal vars to lowercase
radeksimko Jul 18, 2017
7e0ed24
Rephrased and added anchors for better UX
Ninir Jul 18, 2017
637f62f
Merge pull request #1158 from azban/ecs-task-definition-volumes-clari…
Ninir Jul 18, 2017
58eaeeb
r/route_53_delegation_set: Randomize test configs (#1173)
radeksimko Jul 18, 2017
a5534b1
PR cleanup and more explicit checking for ResourceNotFoundException
ttacon Jul 18, 2017
284400a
r/resource_aws_eip: implement retry reading EIPs
Jun 29, 2017
fda4fdb
Merge pull request #1053 from s-urbaniak/fix-1246
radeksimko Jul 18, 2017
380cda0
Update CHANGELOG.md
radeksimko Jul 18, 2017
2d980fc
r/vpc: Ignore ClassicLink DNS support in unsupported regions
radeksimko Jul 18, 2017
c28520b
Merge pull request #1176 from terraform-providers/b-r-vpc-classic-link
radeksimko Jul 18, 2017
7d52647
Update CHANGELOG.md
radeksimko Jul 18, 2017
8b9cd26
Added API Gateway Gateway response resource
Ninir Jul 17, 2017
a81fcc6
Merge pull request #1168 from Ninir/f-apigw-gateway-responses
Ninir Jul 18, 2017
1b965d0
Update CHANGELOG.md
Ninir Jul 18, 2017
7b8bb7f
Merge pull request #1163 from david-resnick/clarify-docs-about-emr-ma…
Ninir Jul 19, 2017
c3bdb7d
Issues #143 - Add aws_iot_policy resource based on work from @jhedev
Jul 19, 2017
fe9ce38
SNS: Fixed the password-protected HTTPS endpoints autoconfirm
Ninir Jun 14, 2017
6e94773
Change schema type from list to set
Jul 15, 2017
1c21e98
Merge pull request #986 from AlexMabry/f-aws-iot-policy
radeksimko Jul 19, 2017
df4fb13
Update CHANGELOG.md
radeksimko Jul 19, 2017
a1d3f41
Fix handling of `vpc_zone_identifier` for autoscaling groups in EC2 c…
Jul 20, 2017
0064216
Merge pull request #1191 from joshuaspence/classic-vpczoneidentifier
radeksimko Jul 20, 2017
f00b25f
Update CHANGELOG.md
radeksimko Jul 20, 2017
1b8d7b2
Added acceptance test for HTTPS password-protected endpoints
Ninir Jul 20, 2017
48d6b74
Suppress diffs when an empty set is specified for `aws_autoscaling_gr…
Jul 20, 2017
97f5f8a
Add acc test to exercise JSON normalization
radeksimko Jul 19, 2017
d78b3be
Merge pull request #901 from artburkart/closes-150
radeksimko Jul 20, 2017
5936dd6
Update CHANGELOG.md
radeksimko Jul 20, 2017
1c91caa
Fix resourceAwsIamPolicyDelete error message
Jul 20, 2017
fcfeeca
Append the info about IAM role policy import
cazorla19 Jul 21, 2017
caa583a
Merge pull request #1199 from reallistic/master
Ninir Jul 21, 2017
68ac75e
Fix the import info confusion
cazorla19 Jul 21, 2017
c51acb9
Merge pull request #1201 from cazorla19/docs-r-iam-role-policy
Ninir Jul 21, 2017
1b0a7e1
Use correct error function and ensure we ignore whitespace changes wh…
ttacon Jul 21, 2017
e3c5ffb
Fixing link in README
grubernaut Jul 21, 2017
f88854e
#1196: added data source aws_internet_gateway
trung Jul 21, 2017
42b9be2
Add test for updating the body of a CloudWatch dashboard
ttacon Jul 21, 2017
7d883a0
Add import test
ttacon Jul 21, 2017
794f9d6
Configure SDK to log extra debug details on request errors
kmosher Jul 22, 2017
fa25cbe
fix: Invalid repo policy due to IAM eventual consistency
frncmx Jul 16, 2017
86497be
Fix spelling in error message for aws_db_snapshot data source
zxjinn Jul 22, 2017
12c8deb
Fix restriction on length of `name_prefix` for `aws_iam_server_certif…
Jul 24, 2017
704fcaf
Merge pull request #1212 from zxjinn/zxjinn/snapshot_spelling
radeksimko Jul 24, 2017
122f52a
Merge pull request #1190 from joshuaspence/asg-az
radeksimko Jul 24, 2017
b35bcb5
Update CHANGELOG.md
radeksimko Jul 24, 2017
8bfcac5
Prefered usage of invoke_arn attribute
Ninir Jul 24, 2017
99b1232
Merge pull request #1217 from joshuaspence/iam-np
radeksimko Jul 24, 2017
8769f12
Update CHANGELOG.md
radeksimko Jul 24, 2017
60e767e
r/asg: Fix TestAccAWSAutoScalingGroup_VpcUpdates
radeksimko Jul 24, 2017
e70a8d7
Merge pull request #1165 from frncmx/fix/ecr-cannot-use-new-iam-role-…
radeksimko Jul 24, 2017
2cde2c9
Update CHANGELOG.md
radeksimko Jul 24, 2017
a98b35b
Merge pull request #861 from Ninir/f-sns-protected-endpoint
radeksimko Jul 24, 2017
28a98fa
Update CHANGELOG.md
radeksimko Jul 24, 2017
53f5863
Merge pull request #1218 from terraform-providers/b-asg-vpc-zone-id-fix
radeksimko Jul 24, 2017
1b2d9bf
support more than 20 parameters in elasticacheGroupParameterGroup
Jul 24, 2017
0d3244c
resource/elastic_beanstalk_configuration_template: Handle missing pla…
stack72 Jul 24, 2017
9674588
Merge pull request #1222 from stack72/b-aws-beanstalk-missing-platform
grubernaut Jul 24, 2017
6531d6e
Update CHANGELOG.md
grubernaut Jul 24, 2017
80b8b4d
Minor cleanup and refactoring regarding put function
ttacon Jul 24, 2017
fb5803e
r/api_gateway_account: Randomize IAM role name in test
radeksimko Jul 24, 2017
42a27ec
Merge pull request #1221 from commarla/master
grubernaut Jul 24, 2017
52fa9d4
Update CHANGELOG.md
grubernaut Jul 24, 2017
61e2948
Add aws_iot_certificate resource based on work from @jhedev
Jul 24, 2017
1e70224
format changes
Jul 24, 2017
fec7dfe
Merge pull request #1224 from terraform-providers/b-apig-acc-randomize
radeksimko Jul 24, 2017
50c2a07
changes based on @grubernaut feedback
Jul 24, 2017
f73e480
Merge pull request #1225 from AlexMabry/f-aws-iot-certificate
grubernaut Jul 24, 2017
775b4eb
Update CHANGELOG.md
grubernaut Jul 24, 2017
53d359d
provider: Remove assumeRoleHash
grubernaut Jul 24, 2017
0702ed6
Make aws_iam_policy_attachment warning less opaque
mcwqy9 Jul 25, 2017
543f643
Merge pull request #1234 from mcwqy9/aws_iam_policy_attachment_warning
grubernaut Jul 25, 2017
b896a0b
dependencies: Bump AWS SDK to 1.10.15
stack72 Jul 25, 2017
50eda85
r/ecr_repository: Randomize names in tests
radeksimko Jul 25, 2017
4b3f7f2
run go fmt
trung Jul 25, 2017
5689334
Merge pull request #1235 from stack72/bump-aws-sdk-1.10.15
radeksimko Jul 25, 2017
e77af1a
fixed broken logo link
trung Jul 25, 2017
6864de0
add test
grubernaut Jul 25, 2017
84dd6bf
Merge pull request #1227 from terraform-providers/f-empty-assume-role
grubernaut Jul 25, 2017
83d43de
Update CHANGELOG.md
grubernaut Jul 25, 2017
79dfd51
v0.1.3
Jul 25, 2017
28f83c2
Cleanup after v0.1.3 release
Jul 25, 2017
6c7da4a
Added missing attribute in the API Gateway Resource documentation
Ninir Jul 26, 2017
79c9c95
Merge pull request #1236 from terraform-providers/b-ecr-randomization
radeksimko Jul 26, 2017
eb9ea04
Make sure we validate the names provided for CloudWatch dashboards
ttacon Jul 26, 2017
80bc919
Merge pull request #1237 from trung/b-logo-link-fix
grubernaut Jul 26, 2017
30a6940
Set AWS Config Configuration recorder & Delivery channel names as For…
Ninir Jul 26, 2017
7a23a6b
fix typo
trung Jul 27, 2017
b281899
Merge pull request #1247 from Ninir/f-config-immutable-names-1244
Ninir Jul 27, 2017
88e8dff
Update CHANGELOG.md
Ninir Jul 27, 2017
7139069
Update CHANGELOG.md
Ninir Jul 27, 2017
2ebeaef
Update api_gateway_resource.html.markdown
Ninir Jul 27, 2017
6253e28
resource/aws_ssm_association: Add support for OutputLocation and Sche…
stack72 Jul 27, 2017
9d4bed1
Merge pull request #1245 from Ninir/f-apigateway-resource-documentati…
Ninir Jul 27, 2017
5c54c36
New Data Source: aws_efs_mount_target
stack72 Jul 27, 2017
5a644c5
resource/aws_rds_cluster: Add support for iam_roles to rds_cluster
stack72 Jul 27, 2017
00029a3
resource/aws_ssm_patch_baseline: Update support for Operating System
stack72 Jul 27, 2017
c1dc181
Add retries for Kinesis throttling exceptions
Jul 7, 2017
c718349
Update CHANGELOG.md
catsby Jul 27, 2017
b84a40d
dependencies: Bumpd SDK to 1.10.17
stack72 Jul 27, 2017
f5e6b31
r/aws_autoscaling_schedule: Allow empty value
grubernaut Jul 27, 2017
2a22795
Adding support for Kinesis Firehose ExtendedS3DestinationConfiguration
Jun 29, 2017
a3679b9
Updated documentation for Kinesis Firehose Extended S3 Configuration …
Jun 30, 2017
c1742b2
Acceptance tests to accompany Kinesis Firehose ExtendedS3DestinationC…
Jun 30, 2017
4991931
Changes based on PR feedback
Jul 26, 2017
e09dfc0
Update CHANGELOG.md
catsby Jul 27, 2017
a7a0001
Merge pull request #1266 from stack72/bump-aws-sdk-1.10.17
Ninir Jul 28, 2017
1d97f8e
add wait_for_fulfillment to spot_fleet_request
svenwltr Jul 24, 2017
6c6d64f
Update validators_test.go
Ninir Jul 28, 2017
ae4db88
fix remarks for spot_fleet_request
svenwltr Jul 28, 2017
eaf53d2
Merge pull request #1241 from rebuy-de/wait-for-fulfillment
radeksimko Jul 28, 2017
a9d06f4
Update CHANGELOG.md
radeksimko Jul 28, 2017
973a8d0
Fixed validation test for Cloudwatch Dashboard names
Ninir Jul 28, 2017
320a72a
fix empty key_name on aws_spot_fleet_request
svenwltr Jul 28, 2017
78f41c6
Merge pull request #1172 from ttacon/master
Ninir Jul 28, 2017
bb5c094
Merge pull request #1268 from terraform-providers/b-empty-value-asg-p…
grubernaut Jul 28, 2017
1a84d88
Update CHANGELOG.md
grubernaut Jul 28, 2017
a570a2a
Update CHANGELOG.md
Ninir Jul 28, 2017
c9786d7
Merge pull request #1203 from rebuy-de/fix-spot-fleet-key-name
radeksimko Jul 28, 2017
0b91160
Update CHANGELOG.md
radeksimko Jul 28, 2017
c64de1b
Merge pull request #1253 from stack72/f-aws-ssm-association-1246
grubernaut Jul 28, 2017
06e2357
Update CHANGELOG.md
grubernaut Jul 28, 2017
46b7237
Merge pull request #1233 from trung/f-aws-internet-gateway
grubernaut Jul 28, 2017
d175b9c
Update CHANGELOG.md
grubernaut Jul 28, 2017
9a17d0f
Merge pull request #1260 from stack72/f-aws-ssm-patch-baseline-1257
grubernaut Jul 28, 2017
863760b
Update CHANGELOG.md
grubernaut Jul 28, 2017
d9715e3
Merge pull request #1210 from kmosher/extra-debug-logging
radeksimko Jul 28, 2017
7bc5495
Update CHANGELOG.md
radeksimko Jul 28, 2017
c7d6025
Merge pull request #1255 from stack72/f-aws-data-source-efs-mount-1207
grubernaut Jul 28, 2017
f55bb8a
Update CHANGELOG.md
grubernaut Jul 28, 2017
6e85498
The field is Required but docs say it's optional
Jul 29, 2017
e33c3fc
Merge pull request #1282 from artburkart/asg-hook-docs-update
radeksimko Jul 31, 2017
6b36a87
resource/aws_db_instance: Expose db_instance ca_cert_identifier
stack72 Jul 27, 2017
95f7201
resource/aws_instance: Guard check for aws_instance UserData to preve…
stack72 Jul 31, 2017
905266b
Merge pull request #1288 from stack72/b-aws-instance-userdata-guard-581
grubernaut Jul 31, 2017
132ae46
Update CHANGELOG.md
grubernaut Jul 31, 2017
b502553
emr_cluster/instance: force emr connection argument for refresh func
catsby Jul 31, 2017
a26ce59
Update CHANGELOG.md
catsby Jul 31, 2017
a0a5da2
Issue #459 - EBS information required during cluster config change (#…
Jul 31, 2017
623502e
Merge pull request #1256 from stack72/b-aws-db-instance-cacert-1166
Ninir Jul 31, 2017
7ba4d73
Update CHANGELOG.md
Ninir Jul 31, 2017
a0ddc87
Update CHANGELOG.md
radeksimko Jul 31, 2017
26ccd27
dependencies: Bump AWS SDK to 1.10.18
stack72 Jul 31, 2017
b6e0421
Updated IAM Role & IAM Role Policy documentation
Ninir Jul 31, 2017
ed488bb
Merge pull request #1292 from Ninir/f-iam-role-documentation
Ninir Aug 1, 2017
e0ec85c
Added CloudWatch Dashboard documentation
Ninir Jul 31, 2017
fdce4e9
Merge pull request #1291 from Ninir/b-cloudwatch-dashboards-docs
Ninir Aug 1, 2017
fe91fa2
Support > 20 parameters in rds cluster parameter groups
samber Aug 1, 2017
c5642a9
update code sample for aws_alb data source (#1299)
hakamadare Aug 2, 2017
0f0a630
Update cloudwatch_event_target.html.markdown
Ninir Aug 2, 2017
3a1443b
r/elasticache_parameter_group: Allow removing parameters
radeksimko Aug 2, 2017
a775b59
Merge pull request #1258 from stack72/f-aws-rds-cluster-iam_roles-382
grubernaut Aug 2, 2017
57ecd47
Update CHANGELOG.md
grubernaut Aug 2, 2017
1249acc
Fix a panic
Aug 3, 2017
af06cc7
Merge pull request #1316 from joshuaspence/s3panic
radeksimko Aug 3, 2017
0c8fe18
Update CHANGELOG.md
radeksimko Aug 3, 2017
dd2de30
Merge pull request #1305 from terraform-providers/d-event-target-argu…
Ninir Aug 3, 2017
360d1a0
Rule number is multiple of 100
sublimino Aug 3, 2017
bfaecf6
Merge pull request #1321 from sublimino/patch-1
radeksimko Aug 3, 2017
cd2dc12
:lipstick: Support > 20 parameters in rds cluster parameter groups
samber Aug 3, 2017
930276a
Merge pull request #1298 from samber/rds-cluster-parameter-group-more…
grubernaut Aug 3, 2017
5226702
Update CHANGELOG.md
grubernaut Aug 3, 2017
54432db
elastic_transcoder_preset: Fix provider validation
grubernaut Aug 3, 2017
c3acc63
Merge pull request #1338 from terraform-providers/b-fix-elastic-trans…
grubernaut Aug 3, 2017
3b0d57a
Update CHANGELOG.md
grubernaut Aug 3, 2017
ec3a057
r/aws_eip_association: Avoid crash in EC2 Classic
radeksimko Aug 4, 2017
ac82569
increasing timeout for delete and update
Aug 4, 2017
5a828cb
fixing how timeout is passed
Aug 4, 2017
de120ad
fix for 1316 where s3 lifecycle rule prefix key value is not set corr…
Preston4tw Aug 4, 2017
fc9a8f9
r/cloudtrail: Add acc test for changing CW settings
radeksimko Aug 5, 2017
589afe0
r/cloudtrail: Fix CloudWatch role ARN/group updates
radeksimko Aug 5, 2017
1468bf9
Normalized the IAM role data source
Ninir Aug 3, 2017
b3df924
Merge pull request #1330 from Ninir/f-iam-role-attributes
Ninir Aug 7, 2017
35b293c
r/cloudtrail: Retry if IAM role isn't propagated yet
radeksimko Aug 2, 2017
2a312a5
Merge pull request #1312 from terraform-providers/b-cloudtrail-retry
radeksimko Aug 7, 2017
5c32bba
Update CHANGELOG.md
radeksimko Aug 7, 2017
aae6542
Merge pull request #1357 from terraform-providers/b-cloudtrail-cw-update
radeksimko Aug 7, 2017
50cd36c
Update CHANGELOG.md
radeksimko Aug 7, 2017
254f76c
Merge pull request #1344 from terraform-providers/b-eip-assoc-ec2classic
radeksimko Aug 7, 2017
43d3933
Update CHANGELOG.md
radeksimko Aug 7, 2017
c0ead1f
Merge pull request #1309 from terraform-providers/b-elasticache-param…
radeksimko Aug 7, 2017
5036c92
Update CHANGELOG.md
radeksimko Aug 7, 2017
4f58b34
Update CHANGELOG.md
Ninir Aug 7, 2017
dddc0d4
Merge pull request #1345 from nevins-b/kinesis_timeout
grubernaut Aug 7, 2017
c03cebb
Update CHANGELOG.md
grubernaut Aug 7, 2017
f2a5c2b
Add docs for timeouts added to Kinesis Stream
grubernaut Aug 7, 2017
525f4a9
Merge pull request #1360 from terraform-providers/d-add-timeout-block…
grubernaut Aug 7, 2017
6b938a9
Merge pull request #1350 from Preston4tw/master
grubernaut Aug 7, 2017
0846d8b
Update CHANGELOG.md
grubernaut Aug 7, 2017
87dd884
Adds domain and domain_iam_role_name parameters to resource aws_db_in…
Aug 7, 2017
677073c
fixing code formatting to comply
Aug 7, 2017
eefa117
Adds domain and domain_iam_role_name parameters to resource aws_db_in…
Aug 7, 2017
4551c48
fixing code formatting to comply
Aug 7, 2017
c993884
Merge branch 'rds-add-domain' of github.com:nckslvrmn/terraform-provi…
Aug 8, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions aws/resource_aws_db_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,18 @@ func resourceAwsDbInstance() *schema.Resource {
Computed: true,
},

"domain": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},

"domain_iam_role_name": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},

"tags": tagsSchema(),
},
}
Expand Down Expand Up @@ -660,6 +672,14 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
opts.EnableIAMDatabaseAuthentication = aws.Bool(attr.(bool))
}

if attr, ok := d.GetOk("domain"); ok {
opts.Domain = aws.String(attr.(string))
}

if attr, ok := d.GetOk("domain_iam_role_name"); ok {
opts.DomainIAMRoleName = aws.String(attr.(string))
}

log.Printf("[DEBUG] DB Instance create configuration: %#v", opts)
var err error
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
Expand Down Expand Up @@ -776,6 +796,11 @@ func resourceAwsDbInstanceRead(d *schema.ResourceData, meta interface{}) error {
d.Set("monitoring_role_arn", v.MonitoringRoleArn)
}

if v.DomainMemberships != nil {
d.Set("domain", v.DomainMemberships[0].Domain)
d.Set("domain-iam-role-name", v.DomainMemberships[0].IAMRoleName)
}

// list tags for resource
// set tags
conn := meta.(*AWSClient).rdsconn
Expand Down Expand Up @@ -1028,6 +1053,18 @@ func resourceAwsDbInstanceUpdate(d *schema.ResourceData, meta interface{}) error
requestUpdate = true
}

if d.HasChange("domain") && !d.IsNewResource() {
d.SetPartial("domain")
req.Domain = aws.String(d.Get("domain").(string))
requestUpdate = true
}

if d.HasChange("domain_iam_role_name") && !d.IsNewResource() {
d.SetPartial("domain_iam_role_name")
req.DomainIAMRoleName = aws.String(d.Get("domain_iam_role_name").(string))
requestUpdate = true
}

log.Printf("[DEBUG] Send DB Instance Modification request: %t", requestUpdate)
if requestUpdate {
log.Printf("[DEBUG] DB Instance Modification request: %s", req)
Expand Down