Commit a3403f2
committed
terraform: Ugly huge change to weave in new State and Plan types
Due to how often the state and plan types are referenced throughout
Terraform, there isn't a great way to switch them out gradually. As a
consequence, this huge commit gets us from the old world to a _compilable_
new world, but still has a large number of known test failures due to
key functionality being stubbed out.
The stubs here are for anything that interacts with providers, since we
now need to do the follow-up work to similarly replace the old
terraform.ResourceProvider interface with its replacement in the new
"providers" package. That work, along with work to fix the remaining
failing tests, will follow in subsequent commits.
The aim here was to replace all references to terraform.State and its
downstream types with states.State, terraform.Plan with plans.Plan,
state.State with statemgr.State, and switch to the new implementations of
the state and plan file formats. However, due to the number of times those
types are used, this also ended up affecting numerous other parts of core
such as terraform.Hook, the backend.Backend interface, and most of the CLI
commands.
Just as with 5861dbf before, I apologize
in advance to the person who inevitably just found this huge commit while
spelunking through the commit history.1 parent cf68922 commit a3403f2
File tree
206 files changed
+7763
-10445
lines changed- addrs
- backend
- atlas
- local
- remote-state
- artifactory
- azure
- consul
- etcdv2
- etcdv3
- gcs
- http
- inmem
- manta
- s3
- swift
- builtin/providers/terraform
- command
- clistate
- format
- configs/configload
- helper/resource
- plans
- planfile
- providers
- states
- statefile
- statemgr
- state
- remote
- terraform
- test-fixtures/apply-resource-scale-in
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
206 files changed
+7763
-10445
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
32 | 31 | | |
33 | 32 | | |
34 | 33 | | |
| |||
80 | 79 | | |
81 | 80 | | |
82 | 81 | | |
83 | | - | |
84 | 82 | | |
85 | 83 | | |
86 | 84 | | |
| |||
152 | 150 | | |
153 | 151 | | |
154 | 152 | | |
155 | | - | |
156 | 153 | | |
157 | 154 | | |
158 | 155 | | |
| |||
178 | 175 | | |
179 | 176 | | |
180 | 177 | | |
181 | | - | |
182 | 178 | | |
183 | 179 | | |
184 | 180 | | |
| |||
250 | 246 | | |
251 | 247 | | |
252 | 248 | | |
253 | | - | |
254 | 249 | | |
255 | 250 | | |
256 | 251 | | |
| |||
269 | 264 | | |
270 | 265 | | |
271 | 266 | | |
272 | | - | |
273 | 267 | | |
274 | 268 | | |
275 | 269 | | |
| |||
313 | 307 | | |
314 | 308 | | |
315 | 309 | | |
316 | | - | |
317 | 310 | | |
318 | 311 | | |
319 | 312 | | |
| |||
333 | 326 | | |
334 | 327 | | |
335 | 328 | | |
336 | | - | |
337 | 329 | | |
338 | 330 | | |
339 | 331 | | |
| |||
387 | 379 | | |
388 | 380 | | |
389 | 381 | | |
390 | | - | |
391 | 382 | | |
392 | 383 | | |
393 | 384 | | |
| |||
433 | 424 | | |
434 | 425 | | |
435 | 426 | | |
436 | | - | |
437 | 427 | | |
438 | 428 | | |
439 | 429 | | |
| |||
469 | 459 | | |
470 | 460 | | |
471 | 461 | | |
472 | | - | |
473 | 462 | | |
474 | 463 | | |
475 | 464 | | |
| |||
517 | 506 | | |
518 | 507 | | |
519 | 508 | | |
520 | | - | |
521 | 509 | | |
522 | 510 | | |
523 | 511 | | |
| |||
569 | 557 | | |
570 | 558 | | |
571 | 559 | | |
572 | | - | |
573 | 560 | | |
574 | 561 | | |
575 | 562 | | |
| |||
641 | 628 | | |
642 | 629 | | |
643 | 630 | | |
644 | | - | |
645 | 631 | | |
646 | 632 | | |
647 | 633 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
| 54 | + | |
53 | 55 | | |
54 | 56 | | |
55 | 57 | | |
| |||
160 | 162 | | |
161 | 163 | | |
162 | 164 | | |
163 | | - | |
| 165 | + | |
164 | 166 | | |
165 | 167 | | |
166 | 168 | | |
167 | | - | |
| 169 | + | |
168 | 170 | | |
169 | 171 | | |
170 | 172 | | |
171 | | - | |
| 173 | + | |
172 | 174 | | |
173 | 175 | | |
174 | 176 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | 16 | | |
18 | 17 | | |
19 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
20 | 23 | | |
21 | 24 | | |
22 | 25 | | |
| |||
25 | 28 | | |
26 | 29 | | |
27 | 30 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
44 | 38 | | |
45 | | - | |
46 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
47 | 43 | | |
48 | 44 | | |
49 | 45 | | |
| |||
87 | 83 | | |
88 | 84 | | |
89 | 85 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
| 86 | + | |
94 | 87 | | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
| 88 | + | |
| 89 | + | |
101 | 90 | | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
106 | 95 | | |
107 | | - | |
108 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
109 | 106 | | |
110 | 107 | | |
111 | 108 | | |
| |||
136 | 133 | | |
137 | 134 | | |
138 | 135 | | |
139 | | - | |
| 136 | + | |
140 | 137 | | |
141 | 138 | | |
142 | 139 | | |
| |||
166 | 163 | | |
167 | 164 | | |
168 | 165 | | |
169 | | - | |
| 166 | + | |
170 | 167 | | |
171 | 168 | | |
172 | 169 | | |
| |||
178 | 175 | | |
179 | 176 | | |
180 | 177 | | |
181 | | - | |
| 178 | + | |
182 | 179 | | |
183 | 180 | | |
184 | 181 | | |
185 | | - | |
186 | 182 | | |
187 | 183 | | |
188 | 184 | | |
| |||
259 | 255 | | |
260 | 256 | | |
261 | 257 | | |
262 | | - | |
| 258 | + | |
263 | 259 | | |
264 | 260 | | |
265 | 261 | | |
| |||
0 commit comments