Skip to content

Commit 1328a43

Browse files
KagashinoKagashino
authored
Merge pull request #21 from tencentcloudstack/feat/tf-sdk-forward
feat: tf provider dep update
2 parents d0a581f + f98e54a commit 1328a43

File tree

12 files changed

+260
-2
lines changed

12 files changed

+260
-2
lines changed

‎Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ TESTPARALLELISM := 4
1717

1818
WORKING_DIR := $(shell pwd)
1919

20+
REQ_CLIENT_LDFLAG := github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity.ReqClient=pulumi-${VERSION}
21+
2022
OS := $(shell uname)
2123
EMPTY_TO_AVOID_SED := ""
2224

@@ -53,7 +55,7 @@ tfgen:: install_plugins
5355
(cd provider && VERSION=$(VERSION) go generate cmd/${PROVIDER}/main.go)
5456

5557
provider:: tfgen install_plugins # build the provider binary
56-
(cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/${PROVIDER})
58+
(cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION} -X ${REQ_CLIENT_LDFLAG}" ${PROJECT}/${PROVIDER_PATH}/cmd/${PROVIDER})
5759

5860
build_sdks:: install_plugins provider build_nodejs build_python build_go build_dotnet # build all the sdks
5961

‎provider/cmd/pulumi-resource-tencentcloud/schema.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7706,6 +7706,15 @@
77067706
}
77077707
}
77087708
},
7709+
"mountIp": {
7710+
"type": "string",
7711+
"description": "IP of the file system.\n",
7712+
"language": {
7713+
"python": {
7714+
"mapCase": false
7715+
}
7716+
}
7717+
},
77097718
"name": {
77107719
"type": "string",
77117720
"description": "A file system name used to query.\n",
@@ -7767,6 +7776,7 @@
77677776
"availabilityZone",
77687777
"createTime",
77697778
"fileSystemId",
7779+
"mountIp",
77707780
"name",
77717781
"protocol",
77727782
"sizeLimit",
@@ -68702,6 +68712,10 @@
6870268712
"type": "string",
6870368713
"description": "ID of the SQL Server instance which publish.\n"
6870468714
},
68715+
"publishSubscribeId": {
68716+
"type": "integer",
68717+
"description": "ID of PubSub.\n"
68718+
},
6870568719
"publishSubscribeName": {
6870668720
"type": "string",
6870768721
"description": "The name of the Publish and Subscribe. Default is `default_name`.\n"
@@ -68714,6 +68728,7 @@
6871468728
"required": [
6871568729
"databaseTuples",
6871668730
"publishInstanceId",
68731+
"publishSubscribeId",
6871768732
"subscribeInstanceId"
6871868733
],
6871968734
"inputProperties": {
@@ -68767,6 +68782,10 @@
6876768782
"description": "ID of the SQL Server instance which publish.\n",
6876868783
"willReplaceOnChanges": true
6876968784
},
68785+
"publishSubscribeId": {
68786+
"type": "integer",
68787+
"description": "ID of PubSub.\n"
68788+
},
6877068789
"publishSubscribeName": {
6877168790
"type": "string",
6877268791
"description": "The name of the Publish and Subscribe. Default is `default_name`.\n"

‎provider/go.mod

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/hashicorp/terraform-plugin-sdk/v2 v2.19.0
1212
github.com/pulumi/pulumi-terraform-bridge/v3 v3.24.1
1313
github.com/pulumi/pulumi/sdk/v3 v3.33.1
14-
github.com/tencentcloudstack/terraform-provider-tencentcloud v1.76.4-0.20220725102315-0a6431f8da60
14+
github.com/tencentcloudstack/terraform-provider-tencentcloud v1.76.4-0.20221031093100-399e0d3c5866
1515
)
1616

1717
require (
@@ -35,12 +35,17 @@ require (
3535
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
3636
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3737
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
38+
github.com/BurntSushi/toml v0.3.1 // indirect
39+
github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157 // indirect
3840
github.com/Masterminds/goutils v1.1.0 // indirect
3941
github.com/Masterminds/semver v1.5.0 // indirect
4042
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
4143
github.com/Microsoft/go-winio v0.5.1 // indirect
44+
github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
4245
github.com/agext/levenshtein v1.2.3 // indirect
46+
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 // indirect
4347
github.com/apparentlymart/go-cidr v1.1.0 // indirect
48+
github.com/apparentlymart/go-textseg v1.0.0 // indirect
4449
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
4550
github.com/armon/go-radix v1.0.0 // indirect
4651
github.com/aws/aws-sdk-go v1.40.34 // indirect
@@ -54,34 +59,67 @@ require (
5459
github.com/aws/aws-sdk-go-v2/service/sso v1.4.0 // indirect
5560
github.com/aws/aws-sdk-go-v2/service/sts v1.7.0 // indirect
5661
github.com/aws/smithy-go v1.8.0 // indirect
62+
github.com/bflad/gopaniccheck v0.1.0 // indirect
63+
github.com/bflad/tfproviderlint v0.14.0 // indirect
5764
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
5865
github.com/bgentry/speakeasy v0.1.0 // indirect
5966
github.com/blang/semver v3.5.1+incompatible // indirect
67+
github.com/bombsimon/wsl/v3 v3.0.0 // indirect
6068
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
6169
github.com/cheggaaa/pb v1.0.29 // indirect
70+
github.com/client9/misspell v0.3.4 // indirect
6271
github.com/davecgh/go-spew v1.1.1 // indirect
6372
github.com/dimchansky/utfbom v1.1.1 // indirect
6473
github.com/djherbis/times v1.5.0 // indirect
6574
github.com/dustin/go-humanize v1.0.0 // indirect
6675
github.com/emirpasic/gods v1.12.0 // indirect
6776
github.com/ettle/strcase v0.1.1 // indirect
6877
github.com/fatih/color v1.9.0 // indirect
78+
github.com/fsnotify/fsnotify v1.5.1 // indirect
6979
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
80+
github.com/go-critic/go-critic v0.4.1 // indirect
81+
github.com/go-lintpack/lintpack v0.5.2 // indirect
82+
github.com/go-toolsmith/astcast v1.0.0 // indirect
83+
github.com/go-toolsmith/astcopy v1.0.0 // indirect
84+
github.com/go-toolsmith/astequal v1.0.0 // indirect
85+
github.com/go-toolsmith/astfmt v1.0.0 // indirect
86+
github.com/go-toolsmith/astp v1.0.0 // indirect
87+
github.com/go-toolsmith/strparse v1.0.0 // indirect
88+
github.com/go-toolsmith/typep v1.0.0 // indirect
89+
github.com/gobwas/glob v0.2.3 // indirect
90+
github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b // indirect
7091
github.com/gofrs/uuid v4.2.0+incompatible // indirect
7192
github.com/gogo/protobuf v1.3.2 // indirect
7293
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
7394
github.com/golang/glog v1.0.0 // indirect
7495
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7596
github.com/golang/protobuf v1.5.2 // indirect
7697
github.com/golang/snappy v0.0.4 // indirect
98+
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
99+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
100+
github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 // indirect
101+
github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 // indirect
102+
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3 // indirect
103+
github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee // indirect
104+
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
105+
github.com/golangci/golangci-lint v1.27.0 // indirect
106+
github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc // indirect
107+
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
108+
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
109+
github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770 // indirect
110+
github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 // indirect
111+
github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0 // indirect
112+
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
77113
github.com/google/go-cmp v0.5.8 // indirect
78114
github.com/google/go-querystring v1.1.0 // indirect
79115
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
80116
github.com/google/uuid v1.3.0 // indirect
81117
github.com/google/wire v0.5.0 // indirect
82118
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
83119
github.com/googleapis/go-type-adapters v1.0.0 // indirect
120+
github.com/gookit/color v1.2.4 // indirect
84121
github.com/gorilla/mux v1.7.4 // indirect
122+
github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3 // indirect
85123
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
86124
github.com/hashicorp/errwrap v1.1.0 // indirect
87125
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -100,13 +138,16 @@ require (
100138
github.com/hashicorp/hc-install v0.3.1 // indirect
101139
github.com/hashicorp/hcl v1.0.0 // indirect
102140
github.com/hashicorp/hcl/v2 v2.11.1 // indirect
141+
github.com/hashicorp/hcl2 v0.0.0-20191002203319-fb75b3253c80 // indirect
103142
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
104143
github.com/hashicorp/logutils v1.0.0 // indirect
144+
github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 // indirect
105145
github.com/hashicorp/terraform-exec v0.16.0 // indirect
106146
github.com/hashicorp/terraform-json v0.14.0 // indirect
107147
github.com/hashicorp/terraform-plugin-go v0.8.0 // indirect
108148
github.com/hashicorp/terraform-plugin-log v0.3.0 // indirect
109149
github.com/hashicorp/terraform-plugin-sdk v1.7.0 // indirect
150+
github.com/hashicorp/terraform-plugin-test v1.2.0 // indirect
110151
github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect
111152
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
112153
github.com/hashicorp/vault/api v1.1.1 // indirect
@@ -118,17 +159,25 @@ require (
118159
github.com/imdario/mergo v0.3.12 // indirect
119160
github.com/inconshreveable/mousetrap v1.0.0 // indirect
120161
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
162+
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a // indirect
163+
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 // indirect
121164
github.com/jmespath/go-jmespath v0.4.0 // indirect
122165
github.com/json-iterator/go v1.1.12 // indirect
166+
github.com/katbyte/terrafmt v0.2.0 // indirect
123167
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
124168
github.com/kevinburke/ssh_config v1.1.0 // indirect
169+
github.com/kisielk/gotool v1.0.0 // indirect
125170
github.com/klauspost/compress v1.13.5 // indirect
171+
github.com/magiconair/properties v1.8.1 // indirect
172+
github.com/maratori/testpackage v1.0.1 // indirect
173+
github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb // indirect
126174
github.com/mattn/go-colorable v0.1.12 // indirect
127175
github.com/mattn/go-ieproxy v0.0.1 // indirect
128176
github.com/mattn/go-isatty v0.0.14 // indirect
129177
github.com/mattn/go-runewidth v0.0.13 // indirect
130178
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
131179
github.com/mitchellh/cli v1.1.2 // indirect
180+
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
132181
github.com/mitchellh/copystructure v1.2.0 // indirect
133182
github.com/mitchellh/go-homedir v1.1.0 // indirect
134183
github.com/mitchellh/go-ps v1.0.0 // indirect
@@ -141,9 +190,12 @@ require (
141190
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
142191
github.com/modern-go/reflect2 v1.0.2 // indirect
143192
github.com/mozillazg/go-httpheader v0.3.0 // indirect
193+
github.com/nakabonne/nestif v0.3.0 // indirect
194+
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
144195
github.com/oklog/run v1.0.0 // indirect
145196
github.com/opentracing/basictracer-go v1.1.0 // indirect
146197
github.com/opentracing/opentracing-go v1.2.0 // indirect
198+
github.com/pelletier/go-toml v1.2.0 // indirect
147199
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
148200
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
149201
github.com/pkg/errors v0.9.1 // indirect
@@ -158,16 +210,25 @@ require (
158210
github.com/rjeczalik/notify v0.9.2 // indirect
159211
github.com/rogpeppe/go-internal v1.8.1 // indirect
160212
github.com/russross/blackfriday/v2 v2.1.0 // indirect
213+
github.com/ryancurrah/gomodguard v1.0.4 // indirect
161214
github.com/ryanuber/go-glob v1.0.0 // indirect
162215
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
163216
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
217+
github.com/securego/gosec/v2 v2.3.0 // indirect
164218
github.com/sergi/go-diff v1.2.0 // indirect
219+
github.com/sirupsen/logrus v1.7.0 // indirect
220+
github.com/sourcegraph/go-diff v0.5.1 // indirect
165221
github.com/spf13/afero v1.6.0 // indirect
166222
github.com/spf13/cast v1.4.1 // indirect
167223
github.com/spf13/cobra v1.4.0 // indirect
224+
github.com/spf13/jwalterweatherman v1.0.0 // indirect
168225
github.com/spf13/pflag v1.0.5 // indirect
226+
github.com/spf13/viper v1.6.1 // indirect
169227
github.com/src-d/gcfg v1.4.0 // indirect
228+
github.com/stretchr/objx v0.2.0 // indirect
170229
github.com/stretchr/testify v1.7.1 // indirect
230+
github.com/subosito/gotenv v1.2.0 // indirect
231+
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 // indirect
171232
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/antiddos v1.0.358 // indirect
172233
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285 // indirect
173234
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.199 // indirect
@@ -214,11 +275,17 @@ require (
214275
github.com/tencentyun/cos-go-sdk-v5 v0.7.33 // indirect
215276
github.com/terraform-providers/terraform-provider-archive v1.3.0 // indirect
216277
github.com/terraform-providers/terraform-provider-http v1.2.0 // indirect
278+
github.com/tetafro/godot v0.3.7 // indirect
217279
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
280+
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e // indirect
281+
github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa // indirect
218282
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
219283
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
220284
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
221285
github.com/ulikunitz/xz v0.5.8 // indirect
286+
github.com/ultraware/funlen v0.0.2 // indirect
287+
github.com/ultraware/whitespace v0.0.4 // indirect
288+
github.com/uudashr/gocognit v1.0.1 // indirect
222289
github.com/valyala/bytebufferpool v1.0.0 // indirect
223290
github.com/valyala/quicktemplate v1.7.0 // indirect
224291
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
@@ -244,18 +311,25 @@ require (
244311
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
245312
golang.org/x/text v0.3.7 // indirect
246313
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
314+
golang.org/x/tools v0.1.5 // indirect
247315
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
248316
google.golang.org/api v0.74.0 // indirect
249317
google.golang.org/appengine v1.6.7 // indirect
250318
google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect
251319
google.golang.org/grpc v1.45.0 // indirect
252320
google.golang.org/protobuf v1.28.0 // indirect
253321
gopkg.in/AlecAivazis/survey.v1 v1.8.9-0.20200217094205-6773bdf39b7f // indirect
322+
gopkg.in/ini.v1 v1.51.0 // indirect
254323
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
255324
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
256325
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
257326
gopkg.in/warnings.v0 v0.1.2 // indirect
258327
gopkg.in/yaml.v2 v2.4.0 // indirect
259328
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
329+
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
330+
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
331+
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
332+
mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f // indirect
260333
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
334+
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 // indirect
261335
)

0 commit comments

Comments
 (0)