Skip to content

Commit 5d6a97c

Browse files
authored
Merge pull request #2 from qrkourier/zitify
add CA cert verification and Ziti authentication and default search keys
2 parents b0ef96f + 392be50 commit 5d6a97c

18 files changed

+826
-106
lines changed

.goreleaser.yml

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ builds:
1111
# they are unable to install libraries.
1212
- CGO_ENABLED=0
1313
mod_timestamp: '{{ .CommitTimestamp }}'
14+
tags:
15+
- no_pkcs11
1416
flags:
1517
- -trimpath
1618
ldflags:

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ Have a look at the [examples directory](./examples/) for some use cases.
3737

3838
This provider has only a few moving components, but LOTS of configurable parameters:
3939

40-
* [provider documentation](https://registry.terraform.io/providers/Mastercard/restapi/latest/docs)
41-
* [restapi_object resource documentation](https://registry.terraform.io/providers/Mastercard/restapi/latest/docs/resources/object)
42-
* [restapi_object datasource documentation](https://registry.terraform.io/providers/Mastercard/restapi/latest/docs/data-sources/object)
40+
* [provider documentation](https://registry.terraform.io/providers/qrkourier/restapi/latest/docs)
41+
* [restapi_object resource documentation](https://registry.terraform.io/providers/qrkourier/restapi/latest/docs/resources/object)
42+
* [restapi_object datasource documentation](https://registry.terraform.io/providers/qrkourier/restapi/latest/docs/data-sources/object)
4343

4444
## Usage
4545

@@ -99,7 +99,7 @@ To make development easy, you can use the Docker image [druggeri/tdk](https://hu
9999

100100
```bash
101101
docker run -it --name tdk --rm -v "$HOME/go":/root/go druggeri/tdk
102-
go get github.com/Mastercard/terraform-provider-restapi
103-
cd ~/go/src/github.com/Mastercard/terraform-provider-restapi
102+
go get github.com/qrkourier/terraform-provider-restapi
103+
cd ~/go/src/github.com/qrkourier/terraform-provider-restapi
104104
#Hack hack hack
105105
```

examples/dummy_users_with_fakeserver.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# In this example, we are using the fakeserver available with this provider
22
# to create and manage imaginary users in our imaginary API server
3-
# https://github.com/Mastercard/terraform-provider-restapi/tree/master/fakeserver
3+
# https://github.com/qrkourier/terraform-provider-restapi/tree/master/fakeserver
44

55
# To use this example fully, start up fakeserver and run this command
66
# curl 127.0.0.1:8080/api/objects -X POST -d '{ "id": "8877", "first": "John", "last": "Doe" }'

fakeservercli/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"os"
77

8-
fakeserver "github.com/Mastercard/terraform-provider-restapi/fakeserver"
8+
fakeserver "github.com/qrkourier/terraform-provider-restapi/fakeserver"
99
)
1010

1111
func main() {

go.mod

+86-28
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,129 @@
1-
module github.com/Mastercard/terraform-provider-restapi
1+
module github.com/qrkourier/terraform-provider-restapi
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/davecgh/go-spew v1.1.1
77
github.com/hashicorp/terraform-json v0.13.0 // indirect; forced so test cases pass
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
9-
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
9+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
1010
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
1111
)
1212

1313
require (
14-
cloud.google.com/go v0.65.0 // indirect
14+
github.com/Jeffail/gabs v1.4.0
15+
github.com/openziti/ziti v0.27.5
16+
)
17+
18+
// replace github.com/openziti/ziti => ../ziti
19+
20+
require (
21+
cloud.google.com/go v0.99.0 // indirect
1522
cloud.google.com/go/storage v1.10.0 // indirect
1623
github.com/agext/levenshtein v1.2.2 // indirect
1724
github.com/apparentlymart/go-textseg v1.0.0 // indirect
1825
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
26+
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
1927
github.com/aws/aws-sdk-go v1.25.3 // indirect
2028
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
21-
github.com/fatih/color v1.7.0 // indirect
22-
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
23-
github.com/golang/protobuf v1.4.2 // indirect
24-
github.com/google/go-cmp v0.5.6 // indirect
25-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
29+
github.com/blang/semver v3.5.1+incompatible // indirect
30+
github.com/fatih/color v1.14.1 // indirect
31+
github.com/fsnotify/fsnotify v1.6.0 // indirect
32+
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
33+
github.com/go-logr/logr v1.2.3 // indirect
34+
github.com/go-logr/stdr v1.2.2 // indirect
35+
github.com/go-openapi/analysis v0.21.4 // indirect
36+
github.com/go-openapi/errors v0.20.3 // indirect
37+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
38+
github.com/go-openapi/jsonreference v0.20.2 // indirect
39+
github.com/go-openapi/loads v0.21.2 // indirect
40+
github.com/go-openapi/runtime v0.25.0 // indirect
41+
github.com/go-openapi/spec v0.20.8 // indirect
42+
github.com/go-openapi/strfmt v0.21.3 // indirect
43+
github.com/go-openapi/swag v0.22.3 // indirect
44+
github.com/go-openapi/validate v0.22.1 // indirect
45+
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
46+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
47+
github.com/golang/protobuf v1.5.2 // indirect
48+
github.com/google/go-cmp v0.5.9 // indirect
49+
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
2650
github.com/hashicorp/errwrap v1.0.0 // indirect
2751
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
2852
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
2953
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
3054
github.com/hashicorp/go-getter v1.6.2 // indirect
31-
github.com/hashicorp/go-hclog v0.15.0 // indirect
55+
github.com/hashicorp/go-hclog v1.4.0 // indirect
3256
github.com/hashicorp/go-multierror v1.0.0 // indirect
3357
github.com/hashicorp/go-plugin v1.4.0 // indirect
3458
github.com/hashicorp/go-safetemp v1.0.0 // indirect
3559
github.com/hashicorp/go-uuid v1.0.1 // indirect
3660
github.com/hashicorp/go-version v1.3.0 // indirect
61+
github.com/hashicorp/hcl v1.0.0 // indirect
3762
github.com/hashicorp/hcl/v2 v2.3.0 // indirect
3863
github.com/hashicorp/logutils v1.0.0 // indirect
3964
github.com/hashicorp/terraform-exec v0.13.0 // indirect
4065
github.com/hashicorp/terraform-plugin-go v0.2.1 // indirect
4166
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
67+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
4268
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
43-
github.com/jstemmer/go-junit-report v0.9.1 // indirect
44-
github.com/klauspost/compress v1.11.2 // indirect
45-
github.com/mattn/go-colorable v0.1.4 // indirect
46-
github.com/mattn/go-isatty v0.0.10 // indirect
69+
github.com/josharian/intern v1.0.0 // indirect
70+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
71+
github.com/klauspost/compress v1.13.6 // indirect
72+
github.com/magiconair/properties v1.8.5 // indirect
73+
github.com/mailru/easyjson v0.7.7 // indirect
74+
github.com/mattn/go-colorable v0.1.13 // indirect
75+
github.com/mattn/go-isatty v0.0.17 // indirect
76+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
77+
github.com/michaelquigley/pfxlog v0.6.9 // indirect
78+
github.com/miekg/pkcs11 v1.1.1 // indirect
4779
github.com/mitchellh/copystructure v1.2.0 // indirect
4880
github.com/mitchellh/go-homedir v1.1.0 // indirect
4981
github.com/mitchellh/go-testing-interface v1.0.4 // indirect
5082
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
51-
github.com/mitchellh/mapstructure v1.1.2 // indirect
83+
github.com/mitchellh/mapstructure v1.5.0 // indirect
5284
github.com/mitchellh/reflectwalk v1.0.2 // indirect
85+
github.com/nxadm/tail v1.4.8 // indirect
5386
github.com/oklog/run v1.0.0 // indirect
87+
github.com/oklog/ulid v1.3.1 // indirect
88+
github.com/opentracing/opentracing-go v1.2.0 // indirect
89+
github.com/openziti/edge v0.24.135 // indirect
90+
github.com/openziti/edge-api v0.25.6 // indirect
91+
github.com/openziti/fabric v0.22.32 // indirect
92+
github.com/openziti/foundation/v2 v2.0.17 // indirect
93+
github.com/openziti/identity v1.0.39 // indirect
94+
github.com/openziti/sdk-golang v0.18.30 // indirect
95+
github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect
96+
github.com/pelletier/go-toml v1.9.4 // indirect
97+
github.com/pkg/errors v0.9.1 // indirect
98+
github.com/sirupsen/logrus v1.9.0 // indirect
99+
github.com/spf13/afero v1.6.0 // indirect
100+
github.com/spf13/cast v1.4.1 // indirect
101+
github.com/spf13/cobra v1.6.1 // indirect
102+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
103+
github.com/spf13/pflag v1.0.5 // indirect
104+
github.com/spf13/viper v1.10.0 // indirect
105+
github.com/subosito/gotenv v1.2.0 // indirect
54106
github.com/ulikunitz/xz v0.5.8 // indirect
55107
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
56108
github.com/zclconf/go-cty v1.9.1 // indirect
57-
go.opencensus.io v0.22.4 // indirect
58-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
59-
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
60-
golang.org/x/mod v0.3.0 // indirect
61-
golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
62-
golang.org/x/sys v0.0.0-20220517195934-5e4e11fc645e // indirect
63-
golang.org/x/text v0.3.5 // indirect
64-
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d // indirect
109+
go.mongodb.org/mongo-driver v1.11.1 // indirect
110+
go.opencensus.io v0.23.0 // indirect
111+
go.opentelemetry.io/otel v1.11.2 // indirect
112+
go.opentelemetry.io/otel/trace v1.11.2 // indirect
113+
golang.org/x/crypto v0.7.0 // indirect
114+
golang.org/x/net v0.8.0 // indirect
115+
golang.org/x/sys v0.6.0 // indirect
116+
golang.org/x/term v0.6.0 // indirect
117+
golang.org/x/text v0.8.0 // indirect
65118
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
66-
google.golang.org/api v0.30.0 // indirect
67-
google.golang.org/appengine v1.6.6 // indirect
68-
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
69-
google.golang.org/grpc v1.32.0 // indirect
70-
google.golang.org/protobuf v1.25.0 // indirect
119+
google.golang.org/api v0.62.0 // indirect
120+
google.golang.org/appengine v1.6.7 // indirect
121+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
122+
google.golang.org/grpc v1.42.0 // indirect
123+
google.golang.org/protobuf v1.28.1 // indirect
124+
gopkg.in/AlecAivazis/survey.v1 v1.8.7 // indirect
125+
gopkg.in/ini.v1 v1.66.2 // indirect
126+
gopkg.in/resty.v1 v1.12.0 // indirect
127+
gopkg.in/yaml.v2 v2.4.0 // indirect
128+
gopkg.in/yaml.v3 v3.0.1 // indirect
71129
)

0 commit comments

Comments
 (0)