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

provider/aws: Fix issue with IAM Server Certificates and Chains

This commit is contained in:
Clint Shryock 2015-07-28 14:02:26 -05:00
parent 476197f2cf
commit 8527174c6e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/providers/aws/resource_aws_iam_server_certificate.go
View File

@ -4,6 +4,7 @@ import (
"crypto/sha1" "crypto/sha1"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"log"
"strings" "strings"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
@ -34,8 +35,9 @@ func resourceAwsIAMServerCertificate() *schema.Resource {
}, },
"path": &schema.Schema{ "path": &schema.Schema{
Type: schema.TypeBool, Type: schema.TypeString,
Optional: true, Optional: true,
Default: "/",
ForceNew: true, ForceNew: true,
}, },
@ -74,10 +76,11 @@ func resourceAwsIAMServerCertificateCreate(d *schema.ResourceData, meta interfac
createOpts.CertificateChain = aws.String(v.(string)) createOpts.CertificateChain = aws.String(v.(string))
} }
if v, ok := d.GetOk("Path"); ok { if v, ok := d.GetOk("path"); ok {
createOpts.Path = aws.String(v.(string)) createOpts.Path = aws.String(v.(string))
} }
log.Printf("[DEBUG] Creating IAM Server Certificate with opts: %s", createOpts)
resp, err := conn.UploadServerCertificate(createOpts) resp, err := conn.UploadServerCertificate(createOpts)
if err != nil { if err != nil {
if awsErr, ok := err.(awserr.Error); ok { if awsErr, ok := err.(awserr.Error); ok {
@ -107,7 +110,12 @@ func resourceAwsIAMServerCertificateRead(d *schema.ResourceData, meta interface{
// these values should always be present, and have a default if not set in // these values should always be present, and have a default if not set in
// configuration, and so safe to reference with nil checks // configuration, and so safe to reference with nil checks
d.Set("certificate_body", normalizeCert(resp.ServerCertificate.CertificateBody)) d.Set("certificate_body", normalizeCert(resp.ServerCertificate.CertificateBody))
d.Set("certificate_chain", normalizeCert(resp.ServerCertificate.CertificateChain))
c := normalizeCert(resp.ServerCertificate.CertificateChain)
if c != "" {
d.Set("certificate_chain", c)
}
d.Set("path", resp.ServerCertificate.ServerCertificateMetadata.Path) d.Set("path", resp.ServerCertificate.ServerCertificateMetadata.Path)
d.Set("arn", resp.ServerCertificate.ServerCertificateMetadata.ARN) d.Set("arn", resp.ServerCertificate.ServerCertificateMetadata.ARN)
@ -132,9 +140,10 @@ func resourceAwsIAMServerCertificateDelete(d *schema.ResourceData, meta interfac
} }
func normalizeCert(cert interface{}) string { func normalizeCert(cert interface{}) string {
if cert == nil { if cert == nil || cert == (*string)(nil) {
return "" return ""
} }
switch cert.(type) { switch cert.(type) {
case string: case string:
hash := sha1.Sum([]byte(strings.TrimSpace(cert.(string)))) hash := sha1.Sum([]byte(strings.TrimSpace(cert.(string))))