Skip to content

Commit

Permalink
Merge pull request #24 from TimDurward/feature/zero-point-twelve
Browse files Browse the repository at this point in the history
Terraform 0.12.20 Compatibility and Updated Slack API Client
  • Loading branch information
TimDurward authored May 7, 2020
2 parents 71f3f9c + 66bd760 commit fcde7e5
Show file tree
Hide file tree
Showing 951 changed files with 64,658 additions and 29,888 deletions.
63 changes: 0 additions & 63 deletions GNUmakefile

This file was deleted.

5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ fmtcheck:
errcheck:
@sh -c "'$(CURDIR)/scripts/errcheck.sh'"

vendor-status:
@govendor status

test-compile:
@if [ "$(TEST)" = "./..." ]; then \
echo "ERROR: Set TEST to a specific package. For example,"; \
Expand All @@ -43,4 +40,4 @@ test-compile:
fi
go test -c $(TEST) $(TESTARGS)

.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile
.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile
2 changes: 1 addition & 1 deletion datasource_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"

"github.com/hashicorp/terraform/helper/schema"
"github.com/timdurward/slack"
"github.com/slack-go/slack"
)

func dataSourceSlackUser() *schema.Resource {
Expand Down
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module github.com/TimDurward/terraform-provider-slack
go 1.12

require (
github.com/hashicorp/terraform v0.12.0
github.com/timdurward/slack v0.1.1-0.20180526230822-e450e1c3c16a
github.com/hashicorp/terraform v0.12.20
github.com/slack-go/slack v0.6.4
)

replace github.com/slack-go/slack => github.com/timdurward/slack v0.6.5
417 changes: 264 additions & 153 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resource_channel.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/timdurward/slack"
"github.com/slack-go/slack"
)

func resourceChannel() *schema.Resource {
Expand Down
31 changes: 0 additions & 31 deletions scripts/changelog-links.sh

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/errcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ echo "==> Checking for unchecked errors..."

if ! which errcheck > /dev/null; then
echo "==> Installing errcheck..."
go get -u github.com/kisielk/errcheck
go install github.com/kisielk/errcheck
fi

err_files=$(errcheck -ignoretests \
Expand Down
10 changes: 0 additions & 10 deletions scripts/gogetcookie.sh

This file was deleted.

15 changes: 0 additions & 15 deletions vendor/cloud.google.com/go/AUTHORS

This file was deleted.

40 changes: 0 additions & 40 deletions vendor/cloud.google.com/go/CONTRIBUTORS

This file was deleted.

13 changes: 13 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/metadata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 27 additions & 2 deletions vendor/cloud.google.com/go/internal/trace/trace.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions vendor/cloud.google.com/go/internal/version/update_version.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/cloud.google.com/go/internal/version/version.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/cloud.google.com/go/storage/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/cloud.google.com/go/storage/bucket.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fcde7e5

Please sign in to comment.