Skip to content

Commit d80d1a6

Browse files
sl1pm4tsl1pm4t
committed
Update TFPK dependency to 1.12.0
1 parent c050e81 commit d80d1a6

File tree

4 files changed

+126
-339
lines changed

4 files changed

+126
-339
lines changed

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ test:
99
go test -v ./...
1010

1111
dockerbuild:
12-
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.13 go build -v
12+
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.14 go build -v
1313

1414
dockertest:
15-
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.13 go test -v ./...
15+
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.14 go test -v ./...
1616

1717
release:
18-
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.13 /workspace/scripts/release.sh
18+
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.14 /workspace/scripts/release.sh
1919

2020
snapshot:
21-
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.13 /workspace/scripts/release.sh --snapshot
21+
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.14 /workspace/scripts/release.sh --snapshot
2222

2323
.PHONY: build test changelog targets $(TARGETS)

‎go.mod

+16-44
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,32 @@
11
module github.com/sl1pm4t/k2tf
22

3-
go 1.13
3+
go 1.14
44

55
require (
6-
cloud.google.com/go v0.49.0 // indirect
7-
cloud.google.com/go/bigquery v1.3.0 // indirect
8-
cloud.google.com/go/pubsub v1.1.0 // indirect
9-
cloud.google.com/go/storage v1.4.0 // indirect
10-
github.com/Azure/go-autorest v12.2.0+incompatible
11-
github.com/aws/aws-sdk-go v1.26.1 // indirect
12-
github.com/go-test/deep v1.0.4 // indirect
13-
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
14-
github.com/hashicorp/go-hclog v0.10.0 // indirect
156
github.com/hashicorp/go-multierror v1.0.0
167
github.com/hashicorp/hcl v1.0.0
17-
github.com/hashicorp/hcl/v2 v2.2.0 // indirect
188
github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6
19-
github.com/hashicorp/terraform v0.12.18
20-
github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect
219
github.com/hashicorp/terraform-plugin-sdk v1.7.0
22-
github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136 // indirect
23-
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
24-
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
25-
github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a
26-
github.com/jstemmer/go-junit-report v0.9.1 // indirect
27-
github.com/keybase/go-crypto v0.0.0-20190828182435-a05457805304 // indirect
28-
github.com/marstr/guid v1.1.0 // indirect
29-
github.com/mattn/go-isatty v0.0.11 // indirect
10+
github.com/hashicorp/terraform-provider-kubernetes v1.12.0
11+
github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
12+
github.com/jinzhu/inflection v1.0.0
3013
github.com/mitchellh/reflectwalk v1.0.1
31-
github.com/posener/complete v1.2.3 // indirect
32-
github.com/rs/zerolog v1.11.0
14+
github.com/rs/zerolog v1.19.0
3315
github.com/sirupsen/logrus v1.4.2
3416
github.com/spf13/pflag v1.0.5
3517
github.com/stretchr/testify v1.4.0
36-
github.com/terraform-providers/terraform-provider-kubernetes v1.11.1
3718
github.com/zclconf/go-cty v1.2.1
38-
go.opencensus.io v0.22.2 // indirect
39-
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
40-
golang.org/x/exp v0.0.0-20191129062945-2f5052295587 // indirect
41-
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
42-
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
43-
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
44-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
45-
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
46-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
47-
golang.org/x/tools v0.0.0-20191213183929-27b81bef4ab3 // indirect
48-
google.golang.org/appengine v1.6.5 // indirect
49-
google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f // indirect
50-
google.golang.org/grpc v1.25.1 // indirect
51-
gopkg.in/yaml.v2 v2.2.7 // indirect
52-
k8s.io/api v0.0.0-20191025225708-5524a3672fbb
53-
k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
54-
k8s.io/client-go v12.0.0+incompatible
19+
k8s.io/api v0.16.12
20+
k8s.io/apimachinery v0.16.12
21+
k8s.io/client-go v11.0.0+incompatible
5522
k8s.io/kube-aggregator v0.0.0-20191025230902-aa872b06629d
5623
)
5724

58-
replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
59-
60-
replace github.com/Unknwon/com => github.com/unknwon/com v1.0.1
25+
// Override invalid go-autorest pseudo-version. This can be removed once
26+
// all transitive dependencies on go-autorest use correct pseudo-versions.
27+
// See https://tip.golang.org/doc/go1.13#version-validation
28+
// and https://github.com/Azure/go-autorest/issues/481
29+
replace (
30+
github.com/Azure/go-autorest v11.1.2+incompatible => github.com/Azure/go-autorest v12.1.0+incompatible
31+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
32+
)

0 commit comments

Comments
 (0)