IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-01-11 08:32:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix root cause of race condition in testing framework tests

Browse Source
This commit is contained in:
Liam Cervante 2023-08-09 15:21:31 +02:00
parent f1ca74f09f
commit 3cce200d0e
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/command/testdata/test/no_providers_in_main/main.tf vendored
View File

@ -16,8 +16,4 @@ resource "test_resource" "primary" {
resource "test_resource" "secondary" {
provider = test.secondary
value = "bar"
depends_on = [
test_resource.primary,
]
}

34
internal/command/testing/test_provider.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"path"
"strings"
"sync"
"time"
"github.com/hashicorp/go-uuid"
@ -139,6 +140,9 @@ func (provider *TestProvider) DataSourceCount() int {
}
func (provider *TestProvider) count(prefix string) int {
provider.Store.mutex.RLock()
defer provider.Store.mutex.RUnlock()
if len(prefix) == 0 {
return len(provider.Store.Data)
}
@ -153,6 +157,9 @@ func (provider *TestProvider) count(prefix string) int {
}
func (provider *TestProvider) string(prefix string) string {
provider.Store.mutex.RLock()
defer provider.Store.mutex.RUnlock()
var keys []string
for key := range provider.Store.Data {
if strings.HasPrefix(key, prefix) {
@ -264,10 +271,15 @@ func (provider *TestProvider) ReadDataSource(request providers.ReadDataSourceReq
// ResourceStore manages a set of cty.Value resources that can be shared between
// TestProvider providers.
type ResourceStore struct {
mutex sync.RWMutex
Data map[string]cty.Value
}
func (store *ResourceStore) Delete(key string) cty.Value {
store.mutex.Lock()
defer store.mutex.Unlock()
if resource, ok := store.Data[key]; ok {
delete(store.Data, key)
return resource
@ -276,14 +288,24 @@ func (store *ResourceStore) Delete(key string) cty.Value {
}
func (store *ResourceStore) Get(key string) cty.Value {
store.mutex.RLock()
defer store.mutex.RUnlock()
return store.get(key)
}
func (store *ResourceStore) Put(key string, resource cty.Value) cty.Value {
store.mutex.Lock()
defer store.mutex.Unlock()
old := store.get(key)
store.Data[key] = resource
return old
}
func (store *ResourceStore) get(key string) cty.Value {
if resource, ok := store.Data[key]; ok {
return resource
}
return cty.NilVal
}
func (store *ResourceStore) Put(key string, resource cty.Value) cty.Value {
old := store.Get(key)
store.Data[key] = resource
return old
}