ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/aws: Added conflictsWith for API GW Domain Name certificate_arn (#12649)

This commit is contained in:
Gauthier Wallet 2017-03-13 18:50:44 +01:00 committed by Paul Stack
parent dc842caee0
commit cdc3fa8337
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/providers/aws/resource_aws_api_gateway_domain_name.go
View File

@ -28,23 +28,27 @@ func resourceAwsApiGatewayDomainName() *schema.Resource {
Type: schema.TypeString, Type: schema.TypeString,
ForceNew: true, ForceNew: true,
Optional: true, Optional: true,
ConflictsWith: []string{"certificate_arn"},
}, },
"certificate_chain": { "certificate_chain": {
Type: schema.TypeString, Type: schema.TypeString,
ForceNew: true, ForceNew: true,
Optional: true, Optional: true,
ConflictsWith: []string{"certificate_arn"},
}, },
"certificate_name": { "certificate_name": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ConflictsWith: []string{"certificate_arn"},
}, },
"certificate_private_key": { "certificate_private_key": {
Type: schema.TypeString, Type: schema.TypeString,
ForceNew: true, ForceNew: true,
Optional: true, Optional: true,
ConflictsWith: []string{"certificate_arn"},
}, },
"domain_name": { "domain_name": {
@ -56,6 +60,7 @@ func resourceAwsApiGatewayDomainName() *schema.Resource {
"certificate_arn": { "certificate_arn": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ConflictsWith: []string{"certificate_body", "certificate_chain", "certificate_name", "certificate_private_key"},
}, },
"cloudfront_domain_name": { "cloudfront_domain_name": {

10
website/source/docs/providers/aws/r/api_gateway_domain_name.html.markdown
View File

@ -56,15 +56,15 @@ The following arguments are supported:
* `domain_name` - (Required) The fully-qualified domain name to register * `domain_name` - (Required) The fully-qualified domain name to register
* `certificate_name` - (Optional) The unique name to use when registering this * `certificate_name` - (Optional) The unique name to use when registering this
cert as an IAM server certificate cert as an IAM server certificate. Conflicts with `certificate_arn`.
* `certificate_body` - (Optional) The certificate issued for the domain name * `certificate_body` - (Optional) The certificate issued for the domain name
being registered, in PEM format being registered, in PEM format. Conflicts with `certificate_arn`.
* `certificate_chain` - (Optional) The certificate for the CA that issued the * `certificate_chain` - (Optional) The certificate for the CA that issued the
certificate, along with any intermediate CA certificates required to certificate, along with any intermediate CA certificates required to
create an unbroken chain to a certificate trusted by the intended API clients. create an unbroken chain to a certificate trusted by the intended API clients. Conflicts with `certificate_arn`.
* `certificate_private_key` - (Optional) The private key associated with the * `certificate_private_key` - (Optional) The private key associated with the
domain certificate given in `certificate_body`. domain certificate given in `certificate_body`. Conflicts with `certificate_arn`.
* `certificate_arn` - (Optional) The ARN for an AWS-managed certificate. * `certificate_arn` - (Optional) The ARN for an AWS-managed certificate. Conflicts with `certificate_name`, `certificate_body`, `certificate_chain` and `certificate_private_key`.
## Attributes Reference ## Attributes Reference