Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use rwmutex instead of mutex #5732

Merged
merged 2 commits into from
Feb 23, 2022
Merged

use rwmutex instead of mutex #5732

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36b57a
use rwmutex instead of mutex
shuyama1 Feb 22, 2022
9757097
changed the variable name to camelCase style
shuyama1 Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions mmv1/third_party/terraform/utils/provider_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ var masterBillingAccountEnvVars = []string{
"GOOGLE_MASTER_BILLING_ACCOUNT",
}

var mutex = &sync.Mutex{}
var configsLock = sync.RWMutex{}
var sourcesLock = sync.RWMutex{}

func init() {
configs = make(map[string]*Config)
Expand Down Expand Up @@ -156,7 +157,10 @@ func init() {
// VCR requires a single HTTP client to handle all interactions so it can record and replay responses so
// this caches HTTP clients per test by replacing ConfigureFunc
func getCachedConfig(ctx context.Context, d *schema.ResourceData, configureFunc schema.ConfigureContextFunc, testName string) (*Config, diag.Diagnostics) {
if v, ok := configs[testName]; ok {
configsLock.RLock()
v, ok := configs[testName]
configsLock.RUnlock()
if ok {
return v, nil
}
c, diags := configureFunc(ctx, d)
Expand Down Expand Up @@ -231,15 +235,18 @@ func getCachedConfig(ctx context.Context, d *schema.ResourceData, configureFunc
return false
})
config.client.Transport = rec
mutex.Lock()
configsLock.Lock()
configs[testName] = config
mutex.Unlock()
configsLock.Unlock()
return config, nil
}

// We need to explicitly close the VCR recorder to save the cassette
func closeRecorder(t *testing.T) {
if config, ok := configs[t.Name()]; ok {
configsLock.RLock()
config, ok := configs[t.Name()]
configsLock.RUnlock()
if ok {
// We did not cache the config if it does not use VCR
if !t.Failed() && isVcrEnabled() {
// If a test succeeds, write new seed/yaml to files
Expand All @@ -248,23 +255,32 @@ func closeRecorder(t *testing.T) {
t.Error(err)
}
envPath := os.Getenv("VCR_PATH")
if vcrSource, ok := sources[t.Name()]; ok {

sourcesLock.RLock()
vcrSource, ok := sources[t.Name()]
sourcesLock.RUnlock()
if ok {
err = writeSeedToFile(vcrSource.seed, vcrSeedFile(envPath, t.Name()))
if err != nil {
t.Error(err)
}
}
}
// Clean up test config
mutex.Lock()
configsLock.Lock()
delete(configs, t.Name())
configsLock.Unlock()

sourcesLock.Lock()
delete(sources, t.Name())
mutex.Unlock()
sourcesLock.Unlock()
}
}

func googleProviderConfig(t *testing.T) *Config {
configsLock.RLock()
config, ok := configs[t.Name()]
configsLock.RUnlock()
if ok {
return config
}
Expand Down Expand Up @@ -321,17 +337,20 @@ func vcrFileName(name string) string {
// In RECORDING mode, generates a new seed and saves it to a file, using the seed for the source
// In REPLAYING mode, reads a seed from a file and creates a source from it
func vcrSource(t *testing.T, path, mode string) (*VcrSource, error) {
if s, ok := sources[t.Name()]; ok {
sourcesLock.RLock()
s, ok := sources[t.Name()]
sourcesLock.RUnlock()
if ok {
return &s, nil
}
switch mode {
case "RECORDING":
seed := rand.Int63()
s := rand.NewSource(seed)
vcrSource := VcrSource{seed: seed, source: s}
mutex.Lock()
sourcesLock.Lock()
sources[t.Name()] = vcrSource
mutex.Unlock()
sourcesLock.Unlock()
return &vcrSource, nil
case "REPLAYING":
seed, err := readSeedFromFile(vcrSeedFile(path, t.Name()))
Expand All @@ -340,9 +359,9 @@ func vcrSource(t *testing.T, path, mode string) (*VcrSource, error) {
}
s := rand.NewSource(seed)
vcrSource := VcrSource{seed: seed, source: s}
mutex.Lock()
sourcesLock.Lock()
sources[t.Name()] = vcrSource
mutex.Unlock()
sourcesLock.Unlock()
return &vcrSource, nil
default:
log.Printf("[DEBUG] No valid environment var set for VCR_MODE, expected RECORDING or REPLAYING, skipping VCR. VCR_MODE: %s", mode)
Expand Down