Skip to content

Commit

Permalink
AWS: codecommit set default_branch only if defined
Browse files Browse the repository at this point in the history
Do not try to update or reaad the AWS codecommit repository default branch if
the resource definition does not set it or is an empty string.

Fixes #5641
  • Loading branch information
keymon committed Mar 29, 2016
1 parent 2e415df commit 77f6a31
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builtin/providers/aws/resource_aws_codecommit_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func resourceAwsCodeCommitRepositoryCreate(d *schema.ResourceData, meta interfac
func resourceAwsCodeCommitRepositoryUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).codecommitconn

if d.HasChange("default_branch") {
if d.HasChange("default_branch") && len(d.Get("default_branch").(string)) > 0 {
if err := resourceAwsCodeCommitUpdateDefaultBranch(conn, d); err != nil {
return err
}
Expand Down Expand Up @@ -135,7 +135,7 @@ func resourceAwsCodeCommitRepositoryRead(d *schema.ResourceData, meta interface{
d.Set("arn", *out.RepositoryMetadata.Arn)
d.Set("clone_url_http", *out.RepositoryMetadata.CloneUrlHttp)
d.Set("clone_url_ssh", *out.RepositoryMetadata.CloneUrlSsh)
if out.RepositoryMetadata.DefaultBranch != nil {
if out.RepositoryMetadata.DefaultBranch != nil && len(d.Get("default_branch").(string)) > 0 {
d.Set("default_branch", *out.RepositoryMetadata.DefaultBranch)
}

Expand Down

0 comments on commit 77f6a31

Please sign in to comment.