Skip to content

Commit 2ba8dc3

Browse files
author
Sander van Harmelen
committed
Switch to go-multierror
It seems there are 4 locations left that use the `helper/multierror` package, where the rest is TF settled on the `hashicorp/go-multierror` package. Functionally this doesn’t change anything, so I suggest to delete the builtin version as it can only cause confusion (both packages have the same name, but are still different types according to Go’s type system.
1 parent 6bd40a7 commit 2ba8dc3

6 files changed

Lines changed: 4 additions & 114 deletions

File tree

builtin/providers/aws/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"strings"
77

8-
"github.com/hashicorp/terraform/helper/multierror"
8+
"github.com/hashicorp/go-multierror"
99

1010
"github.com/aws/aws-sdk-go/aws"
1111
"github.com/aws/aws-sdk-go/aws/awserr"

builtin/providers/aws/resource_aws_db_security_group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/aws/aws-sdk-go/aws"
1010
"github.com/aws/aws-sdk-go/aws/awserr"
1111
"github.com/aws/aws-sdk-go/service/rds"
12+
"github.com/hashicorp/go-multierror"
1213
"github.com/hashicorp/terraform/helper/hashcode"
13-
"github.com/hashicorp/terraform/helper/multierror"
1414
"github.com/hashicorp/terraform/helper/resource"
1515
"github.com/hashicorp/terraform/helper/schema"
1616
)

builtin/providers/heroku/resource_heroku_app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66

77
"github.com/cyberdelia/heroku-go/v3"
8-
"github.com/hashicorp/terraform/helper/multierror"
8+
"github.com/hashicorp/go-multierror"
99
"github.com/hashicorp/terraform/helper/schema"
1010
)
1111

config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"strconv"
99
"strings"
1010

11+
"github.com/hashicorp/go-multierror"
1112
"github.com/hashicorp/terraform/config/lang"
1213
"github.com/hashicorp/terraform/config/lang/ast"
1314
"github.com/hashicorp/terraform/flatmap"
14-
"github.com/hashicorp/terraform/helper/multierror"
1515
"github.com/mitchellh/mapstructure"
1616
"github.com/mitchellh/reflectwalk"
1717
)

helper/multierror/error.go

Lines changed: 0 additions & 54 deletions
This file was deleted.

helper/multierror/error_test.go

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)