Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit774b80c

Browse files
committed
Terraform provisioner
1 parentc1012d2 commit774b80c

File tree

10 files changed

+761
-229
lines changed

10 files changed

+761
-229
lines changed

‎go.mod

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,23 @@ require (
167167
tailscale.comv1.32.2
168168
)
169169

170-
requirecloud.google.com/go/longrunningv0.1.1// indirect
170+
require (
171+
cloud.google.com/go/longrunningv0.1.1// indirect
172+
github.com/coder/terraform-provider-coderv0.6.6// indirect
173+
github.com/hashicorp/go-ctyv1.4.1-0.20200414143053-d3edf31b6320// indirect
174+
github.com/hashicorp/go-hclogv1.2.1// indirect
175+
github.com/hashicorp/go-uuidv1.0.3// indirect
176+
github.com/hashicorp/logutilsv1.0.0// indirect
177+
github.com/hashicorp/terraform-plugin-gov0.12.0// indirect
178+
github.com/hashicorp/terraform-plugin-logv0.7.0// indirect
179+
github.com/hashicorp/terraform-plugin-sdk/v2v2.20.0// indirect
180+
github.com/mitchellh/copystructurev1.2.0// indirect
181+
github.com/mitchellh/go-testing-interfacev1.14.1// indirect
182+
github.com/mitchellh/reflectwalkv1.0.2// indirect
183+
github.com/vmihailenco/msgpackv4.0.4+incompatible// indirect
184+
github.com/vmihailenco/msgpack/v4v4.3.12// indirect
185+
github.com/vmihailenco/tagparserv0.1.1// indirect
186+
)
171187

172188
require (
173189
cloud.google.com/go/computev1.12.1// indirect

‎go.sum

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ github.com/apache/arrow/go/arrow v0.0.0-20210818145353-234c94e4ce64/go.mod h1:2q
204204
github.com/apache/arrow/go/arrowv0.0.0-20211013220434-5962184e7a30/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
205205
github.com/apparentlymart/go-dumpv0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
206206
github.com/apparentlymart/go-textsegv1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
207+
github.com/apparentlymart/go-textseg/v12v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
207208
github.com/apparentlymart/go-textseg/v13v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
208209
github.com/apparentlymart/go-textseg/v13v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
209210
github.com/arbovm/levenshteinv0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
@@ -361,6 +362,8 @@ github.com/coder/ssh v0.0.0-20220811105153-fcea99919338 h1:tN5GKFT68YLVzJoA8AHui
361362
github.com/coder/sshv0.0.0-20220811105153-fcea99919338/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
362363
github.com/coder/tailscalev1.1.1-0.20221117204504-2d6503f027c3 h1:lq8GmpE5bn8A36uxq1h+TWnaQKPugtRkxKrYZA78O9c=
363364
github.com/coder/tailscalev1.1.1-0.20221117204504-2d6503f027c3/go.mod h1:lkCb74eSJwxeNq8YwyILoHD5vtHktiZnTOxBxo3tbNc=
365+
github.com/coder/terraform-provider-coderv0.6.6 h1:ZAYvERlgjQPHyDdemXEuVcwdCFGfk9v5zQARegWL6nQ=
366+
github.com/coder/terraform-provider-coderv0.6.6/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
364367
github.com/containerd/aufsv0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
365368
github.com/containerd/aufsv0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
366369
github.com/containerd/aufsv0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -984,7 +987,11 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng
984987
github.com/hashicorp/go-cleanhttpv0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
985988
github.com/hashicorp/go-cleanhttpv0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
986989
github.com/hashicorp/go-cleanhttpv0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
990+
github.com/hashicorp/go-ctyv1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI=
991+
github.com/hashicorp/go-ctyv1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs=
987992
github.com/hashicorp/go-hclogv0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
993+
github.com/hashicorp/go-hclogv1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw=
994+
github.com/hashicorp/go-hclogv1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
988995
github.com/hashicorp/go-immutable-radixv1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
989996
github.com/hashicorp/go-msgpackv0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
990997
github.com/hashicorp/go-multierrorv0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
@@ -1000,6 +1007,8 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX
10001007
github.com/hashicorp/go-syslogv1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
10011008
github.com/hashicorp/go-uuidv1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
10021009
github.com/hashicorp/go-uuidv1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
1010+
github.com/hashicorp/go-uuidv1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
1011+
github.com/hashicorp/go-uuidv1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
10031012
github.com/hashicorp/go-versionv1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
10041013
github.com/hashicorp/go-versionv1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
10051014
github.com/hashicorp/go-versionv1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
@@ -1016,6 +1025,7 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
10161025
github.com/hashicorp/hcl/v2v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90=
10171026
github.com/hashicorp/hcl/v2v2.14.0 h1:jX6+Q38Ly9zaAJlAjnFVyeNSNCKKW8D0wvyg7vij5Wc=
10181027
github.com/hashicorp/hcl/v2v2.14.0/go.mod h1:e4z5nxYlWNPdDSNYX+ph14EvWYMFm3eP0zIUqPc2jr0=
1028+
github.com/hashicorp/logutilsv1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
10191029
github.com/hashicorp/logutilsv1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
10201030
github.com/hashicorp/mdnsv1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
10211031
github.com/hashicorp/mdnsv1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
@@ -1025,6 +1035,12 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J
10251035
github.com/hashicorp/serfv0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
10261036
github.com/hashicorp/terraform-jsonv0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e17dKDpqV7s=
10271037
github.com/hashicorp/terraform-jsonv0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM=
1038+
github.com/hashicorp/terraform-plugin-gov0.12.0 h1:6wW9mT1dSs0Xq4LR6HXj1heQ5ovr5GxXNJwkErZzpJw=
1039+
github.com/hashicorp/terraform-plugin-gov0.12.0/go.mod h1:kwhmaWHNDvT1B3QiSJdAtrB/D4RaKSY/v3r2BuoWK4M=
1040+
github.com/hashicorp/terraform-plugin-logv0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R+Y2BQ0sRZftGKQs=
1041+
github.com/hashicorp/terraform-plugin-logv0.7.0/go.mod h1:p4R1jWBXRTvL4odmEkFfDdhUjHf9zcs/BCoNHAc7IK4=
1042+
github.com/hashicorp/terraform-plugin-sdk/v2v2.20.0 h1:+KxZULPsbjpAVoP0WNj/8aVW6EqpcX5JcUcQ5wl7Da4=
1043+
github.com/hashicorp/terraform-plugin-sdk/v2v2.20.0/go.mod h1:DwGJG3KNxIPluVk6hexvDfYR/MS/eKGpiztJoT3Bbbw=
10281044
github.com/hashicorp/yamuxv0.0.0-20220718163420-dd80a7ee44ce h1:7FO+LmZwiG/eDsBWo50ZeqV5PoH0gwiM1mxFajXAkas=
10291045
github.com/hashicorp/yamuxv0.0.0-20220718163420-dd80a7ee44ce/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
10301046
github.com/hdevalence/ed25519consensusv0.0.0-20220222234857-c00d1f31bab3 h1:aSVUgRRRtOrZOC1fYmY9gV0e9z/Iu+xNVSASWjsuyGU=
@@ -1342,12 +1358,15 @@ github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceT
13421358
github.com/mitchellh/cliv1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
13431359
github.com/mitchellh/cliv1.1.4/go.mod h1:vTLESy5mRhKOs9KDp0/RATawxP1UqBmdrpVRMnpcvKQ=
13441360
github.com/mitchellh/copystructurev1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
1361+
github.com/mitchellh/copystructurev1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
13451362
github.com/mitchellh/copystructurev1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
13461363
github.com/mitchellh/go-homedirv1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
13471364
github.com/mitchellh/go-homedirv1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
13481365
github.com/mitchellh/go-psv1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
13491366
github.com/mitchellh/go-psv1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
13501367
github.com/mitchellh/go-testing-interfacev1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
1368+
github.com/mitchellh/go-testing-interfacev1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
1369+
github.com/mitchellh/go-testing-interfacev1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
13511370
github.com/mitchellh/go-wordwrapv0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
13521371
github.com/mitchellh/go-wordwrapv1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
13531372
github.com/mitchellh/go-wordwrapv1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
@@ -1364,6 +1383,7 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
13641383
github.com/mitchellh/osextv0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
13651384
github.com/mitchellh/reflectwalkv1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
13661385
github.com/mitchellh/reflectwalkv1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
1386+
github.com/mitchellh/reflectwalkv1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
13671387
github.com/mitchellh/reflectwalkv1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
13681388
github.com/moby/lockerv1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
13691389
github.com/moby/mobyv20.10.21+incompatible h1:LfdCNzNpDYtOTtlO5wxLcUEk0nyM3KqPyeIyXVdvl/U=
@@ -1723,6 +1743,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
17231743
github.com/stretchr/testifyv1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
17241744
github.com/stretchr/testifyv1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
17251745
github.com/stretchr/testifyv1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1746+
github.com/stretchr/testifyv1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
17261747
github.com/stretchr/testifyv1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
17271748
github.com/stretchr/testifyv1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
17281749
github.com/stretchr/testifyv1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
@@ -1817,7 +1838,11 @@ github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1
18171838
github.com/vishvananda/netnsv0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
18181839
github.com/vishvananda/netnsv0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
18191840
github.com/vmihailenco/msgpackv3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
1841+
github.com/vmihailenco/msgpackv4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
1842+
github.com/vmihailenco/msgpackv4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
1843+
github.com/vmihailenco/msgpack/v4v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U=
18201844
github.com/vmihailenco/msgpack/v4v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
1845+
github.com/vmihailenco/tagparserv0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
18211846
github.com/vmihailenco/tagparserv0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
18221847
github.com/willf/bitsetv1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
18231848
github.com/willf/bitsetv1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=

‎provisioner/terraform/executor.go

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
223223
iferr!=nil {
224224
returnnil,xerrors.Errorf("terraform plan: %w",err)
225225
}
226-
resources,err:=e.planResources(ctx,killCtx,planfilePath)
226+
resources,parameters,err:=e.planResources(ctx,killCtx,planfilePath)
227227
iferr!=nil {
228228
returnnil,err
229229
}
@@ -234,25 +234,31 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
234234
return&proto.Provision_Response{
235235
Type:&proto.Provision_Response_Complete{
236236
Complete:&proto.Provision_Complete{
237-
Resources:resources,
238-
Plan:planFileByt,
237+
Parameters:parameters,
238+
Resources:resources,
239+
Plan:planFileByt,
239240
},
240241
},
241242
},nil
242243
}
243244

244245
// planResources must only be called while the lock is held.
245-
func (e*executor)planResources(ctx,killCtx context.Context,planfilePathstring) ([]*proto.Resource,error) {
246+
func (e*executor)planResources(ctx,killCtx context.Context,planfilePathstring) ([]*proto.Resource,[]*proto.RichParameter,error) {
246247
plan,err:=e.showPlan(ctx,killCtx,planfilePath)
247248
iferr!=nil {
248-
returnnil,xerrors.Errorf("show terraform plan file: %w",err)
249+
returnnil,nil,xerrors.Errorf("show terraform plan file: %w",err)
249250
}
250251

251252
rawGraph,err:=e.graph(ctx,killCtx)
252253
iferr!=nil {
253-
returnnil,xerrors.Errorf("graph: %w",err)
254+
returnnil,nil,xerrors.Errorf("graph: %w",err)
254255
}
255-
returnConvertResources(plan.PlannedValues.RootModule,rawGraph)
256+
modules:= []*tfjson.StateModule{}
257+
ifplan.PriorState!=nil {
258+
modules=append(modules,plan.PriorState.Values.RootModule)
259+
}
260+
modules=append(modules,plan.PlannedValues.RootModule)
261+
returnConvertResourcesAndParameters(modules,rawGraph)
256262
}
257263

258264
// showPlan must only be called while the lock is held.
@@ -326,7 +332,7 @@ func (e *executor) apply(
326332
iferr!=nil {
327333
returnnil,xerrors.Errorf("terraform apply: %w",err)
328334
}
329-
resources,err:=e.stateResources(ctx,killCtx)
335+
resources,parameters,err:=e.stateResources(ctx,killCtx)
330336
iferr!=nil {
331337
returnnil,err
332338
}
@@ -338,31 +344,35 @@ func (e *executor) apply(
338344
return&proto.Provision_Response{
339345
Type:&proto.Provision_Response_Complete{
340346
Complete:&proto.Provision_Complete{
341-
Resources:resources,
342-
State:stateContent,
347+
Parameters:parameters,
348+
Resources:resources,
349+
State:stateContent,
343350
},
344351
},
345352
},nil
346353
}
347354

348355
// stateResources must only be called while the lock is held.
349-
func (e*executor)stateResources(ctx,killCtx context.Context) ([]*proto.Resource,error) {
356+
func (e*executor)stateResources(ctx,killCtx context.Context) ([]*proto.Resource,[]*proto.RichParameter,error) {
350357
state,err:=e.state(ctx,killCtx)
351358
iferr!=nil {
352-
returnnil,err
359+
returnnil,nil,err
353360
}
354361
rawGraph,err:=e.graph(ctx,killCtx)
355362
iferr!=nil {
356-
returnnil,xerrors.Errorf("get terraform graph: %w",err)
363+
returnnil,nil,xerrors.Errorf("get terraform graph: %w",err)
357364
}
358365
varresources []*proto.Resource
366+
varparameters []*proto.RichParameter
359367
ifstate.Values!=nil {
360-
resources,err=ConvertResources(state.Values.RootModule,rawGraph)
368+
resources,parameters,err=ConvertResourcesAndParameters([]*tfjson.StateModule{
369+
state.Values.RootModule,
370+
},rawGraph)
361371
iferr!=nil {
362-
returnnil,err
372+
returnnil,nil,err
363373
}
364374
}
365-
returnresources,nil
375+
returnresources,parameters,nil
366376
}
367377

368378
// state must only be called while the lock is held.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp