Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix: Lock to write MockKubectlCmd.LastValidate to fix the race condition (#52)

Browse source 
* fix: lock to write MockKubectlCmd.LastValidate to fix the race condition
This commit is contained in:
Shunsuke Suzuki 2020-06-06 00:58:42 +09:00 committed by GitHub
parent c3b39b3a7e
commit 93cf3c532b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/sync/sync_context_test.go
View file

@ -73,7 +73,7 @@ func TestSyncValidate(t *testing.T) {
syncCtx.Sync()
kubectl := syncCtx.kubectl.(*kubetest.MockKubectlCmd)
assert.False(t, kubectl.LastValidate)
assert.False(t, kubectl.GetLastValidate())
}
func TestSyncNotPermittedNamespace(t *testing.T) {
@ -393,7 +393,7 @@ func TestSyncOptionValidate(t *testing.T) {
syncCtx.Sync()
kubectl, _ := syncCtx.kubectl.(*kubetest.MockKubectlCmd)
assert.Equal(t, tt.want, kubectl.LastValidate)
assert.Equal(t, tt.want, kubectl.GetLastValidate())
})
}
}

32
pkg/utils/kube/kubetest/mock.go
View file

@ -1,6 +1,8 @@
package kubetest
import (
"sync"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -19,13 +21,27 @@ type KubectlOutput struct {
}
type MockKubectlCmd struct {
APIResources []kube.APIResourceInfo
Commands map[string]KubectlOutput
Events chan watch.Event
LastValidate bool
Version string
DynamicClient dynamic.Interface
APIGroups []metav1.APIGroup
APIResources []kube.APIResourceInfo
Commands map[string]KubectlOutput
Events chan watch.Event
lastValidate bool
Version string
DynamicClient dynamic.Interface
APIGroups []metav1.APIGroup
lastValidateLock sync.RWMutex
}
func (k *MockKubectlCmd) SetLastValidate(validate bool) {
k.lastValidateLock.Lock()
k.lastValidate = validate
k.lastValidateLock.Unlock()
}
func (k *MockKubectlCmd) GetLastValidate() bool {
k.lastValidateLock.RLock()
validate := k.lastValidate
k.lastValidateLock.RUnlock()
return validate
}
func (k *MockKubectlCmd) NewDynamicClient(config *rest.Config) (dynamic.Interface, error) {
@ -53,7 +69,7 @@ func (k *MockKubectlCmd) DeleteResource(config *rest.Config, gvk schema.GroupVer
}
func (k *MockKubectlCmd) ApplyResource(config *rest.Config, obj *unstructured.Unstructured, namespace string, dryRun, force, validate bool) (string, error) {
k.LastValidate = validate
k.SetLastValidate(validate)
command, ok := k.Commands[obj.GetName()]
if !ok {
return "", nil