IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race condition due to shared slice (#1144) (#1182)

Browse Source 
Signed-off-by: Philippe Desmarais <philippe.desmarais0trash@gmail.com>
This commit is contained in:
Philippe Desmarais 2024-02-01 11:00:22 -05:00 committed by GitHub
parent d9e023353f
commit 64f419e335
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/tofu/provider_mock.go
View File

@ -395,9 +395,9 @@ func (p *MockProvider) PlanResourceChange(r providers.PlanResourceChangeRequest)
func (p *MockProvider) ApplyResourceChange(r providers.ApplyResourceChangeRequest) (resp providers.ApplyResourceChangeResponse) {
p.Lock()
defer p.Unlock()
p.ApplyResourceChangeCalled = true
p.ApplyResourceChangeRequest = r
p.Unlock()
if !p.ConfigureProviderCalled {
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("Configure not called before ApplyResourceChange %q", r.TypeName))
@ -464,9 +464,13 @@ func (p *MockProvider) ImportResourceState(r providers.ImportResourceStateReques
}
if p.ImportResourceStateResponse != nil {
resp = *p.ImportResourceStateResponse
// There's no guarantee that the imported resources slice isn't being read somewhere else
// As such, any changes we make on it (including through pointers) would lead to data races.
// To avoid that, copy and make changes on the copy
resp.ImportedResources = make([]providers.ImportedResource, len(p.ImportResourceStateResponse.ImportedResources))
// fixup the cty value to match the schema
for i, res := range resp.ImportedResources {
for i, res := range p.ImportResourceStateResponse.ImportedResources {
schema, ok := p.getProviderSchema().ResourceTypes[res.TypeName]
if !ok {
resp.Diagnostics = resp.Diagnostics.Append(fmt.Errorf("no schema found for %q", res.TypeName))