Skip to content

Commit

Permalink
upgrade dependencies (#33)
Browse files Browse the repository at this point in the history
  • Loading branch information
@markhowardform3
markhowardform3 authored Feb 9, 2022
1 parent f784c92 commit 0ff4e8a
Show file tree
Hide file tree
Showing 1,412 changed files with 110,410 additions and 141,656 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.16.x
- 1.17.x
env:
global:
- GO111MODULE=on
Expand Down
4 changes: 2 additions & 2 deletions codeowners/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package codeowners
import (
"context"

"github.com/google/go-github/v28/github"
"github.com/hashicorp/terraform/helper/schema"
"github.com/google/go-github/v42/github"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"golang.org/x/oauth2"
)

Expand Down
4 changes: 2 additions & 2 deletions codeowners/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"testing"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

var testAccProviders map[string]terraform.ResourceProvider
Expand Down
8 changes: 4 additions & 4 deletions codeowners/resource_file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

githubcommitutils "github.com/form3tech-oss/go-github-utils/pkg/commit"
githubfileutils "github.com/form3tech-oss/go-github-utils/pkg/file"
"github.com/google/go-github/v28/github"
"github.com/hashicorp/terraform/helper/schema"
"github.com/google/go-github/v42/github"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

const codeownersPath = ".github/CODEOWNERS"
Expand Down Expand Up @@ -133,7 +133,7 @@ func resourceFileCreateOrUpdate(s string, d *schema.ResourceData, m interface{})
file.Branch = *rep.DefaultBranch
}

entries := []github.TreeEntry{
entries := []*github.TreeEntry{
{
Path: github.String(codeownersPath),
Content: github.String(string(file.Ruleset.Compile())),
Expand Down Expand Up @@ -193,7 +193,7 @@ func resourceFileDelete(d *schema.ResourceData, m interface{}) error {

// Remove the target file from the list of entries for the new tree.
// NOTE: Entries of type "tree" must be removed as well, otherwise deletion won't take place.
newTree := make([]github.TreeEntry, 0, len(oldTree.Entries))
newTree := make([]*github.TreeEntry, 0, len(oldTree.Entries))
for _, entry := range oldTree.Entries {
if *entry.Type != "tree" && *entry.Path != codeownersPath {
newTree = append(newTree, entry)
Expand Down
6 changes: 3 additions & 3 deletions codeowners/resource_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"testing"

"github.com/google/go-github/v28/github"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
"github.com/google/go-github/v42/github"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

const testAccFileConfig = `
Expand Down
77 changes: 72 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,79 @@
module github.com/form3tech-oss/terraform-provider-codeowners

go 1.16
go 1.17

require (
github.com/form3tech-oss/go-github-utils v0.0.0-20190905153528-7219c2e250b4
github.com/google/go-github/v28 v28.1.1
github.com/hashicorp/terraform v0.12.8
github.com/form3tech-oss/go-github-utils v0.0.0-20220202160928-550ce279ed0c
github.com/google/go-github/v42 v42.0.0
github.com/stretchr/testify v1.4.0
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
)

require (
github.com/hashicorp/hcl/v2 v2.0.0 // indirect
github.com/hashicorp/terraform-json v0.4.0 // indirect
github.com/hashicorp/terraform-plugin-test v1.2.0 // indirect
github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 // indirect
)

require (
cloud.google.com/go v0.45.1 // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/apparentlymart/go-cidr v1.0.1 // indirect
github.com/apparentlymart/go-textseg v1.0.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.25.3 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.7.0 // indirect
github.com/golang/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.1.1 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-getter v1.4.0 // indirect
github.com/hashicorp/go-hclog v0.9.2 // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/hashicorp/go-plugin v1.0.1 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-uuid v1.0.1 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 // indirect
github.com/hashicorp/terraform-plugin-sdk v1.7.0
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
github.com/mattn/go-colorable v0.1.1 // indirect
github.com/mattn/go-isatty v0.0.5 // indirect
github.com/mitchellh/cli v1.0.0 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.2.1 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/ulikunitz/xz v0.5.5 // indirect
github.com/vmihailenco/msgpack v4.0.1+incompatible // indirect
github.com/zclconf/go-cty v1.2.1 // indirect
github.com/zclconf/go-cty-yaml v1.0.1 // indirect
go.opencensus.io v0.22.0 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
golang.org/x/text v0.3.3 // indirect
google.golang.org/api v0.9.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
google.golang.org/grpc v1.23.0 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
)
Loading

0 comments on commit 0ff4e8a

Please sign in to comment.