-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
add coverage for phase2 synchronizer #81
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package core | ||
|
|
||
| import ( | ||
| "context" | ||
| "net" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/kubescape/go-logger" | ||
| "github.com/kubescape/go-logger/helpers" | ||
| "github.com/kubescape/synchronizer/adapters" | ||
| "github.com/kubescape/synchronizer/domain" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| var ( | ||
| kindDeployment = domain.KindName{ | ||
| Kind: domain.KindFromString(context.TODO(), "apps/v1/Deployment"), | ||
| Name: "name", | ||
| Namespace: "namespace", | ||
| } | ||
| kindKnownServers = domain.KindName{ | ||
| Kind: domain.KindFromString(context.TODO(), "spdx.softwarecomposition.kubescape.io/v1beta1/KnownServers"), | ||
| Name: "name", | ||
| Namespace: "namespace", | ||
| } | ||
| object = []byte(`{"kind":"kind","metadata":{"name":"name","resourceVersion":"1"}}`) | ||
| objectClientV2 = []byte(`{"kind":"kind","metadata":{"name":"client","resourceVersion":"2"}}`) | ||
| objectServerV2 = []byte(`{"kind":"kind","metadata":{"name":"server","resourceVersion":"2"}}`) | ||
| ) | ||
|
|
||
| func initTest(t *testing.T) (context.Context, *adapters.MockAdapter, *adapters.MockAdapter) { | ||
| ctx := context.WithValue(context.TODO(), domain.ContextKeyClientIdentifier, domain.ClientIdentifier{ | ||
| Account: "11111111-2222-3333-4444-555555555555", | ||
| Cluster: "cluster", | ||
| }) | ||
| err := logger.L().SetLevel(helpers.DebugLevel.String()) | ||
| assert.NoError(t, err) | ||
| clientAdapter := adapters.NewMockAdapter(true) | ||
| serverAdapter := adapters.NewMockAdapter(false) | ||
| clientConn, serverConn := net.Pipe() | ||
| newConn := func() (net.Conn, error) { | ||
| return clientConn, nil | ||
| } | ||
| client, err := NewSynchronizerClient(ctx, []adapters.Adapter{clientAdapter}, clientConn, newConn) | ||
| assert.NoError(t, err) | ||
| server, err := NewSynchronizerServer(ctx, []adapters.Adapter{serverAdapter}, serverConn) | ||
| assert.NoError(t, err) | ||
| go func() { | ||
| _ = client.Start(ctx) | ||
| }() | ||
| go func() { | ||
| _ = server.Start(ctx) | ||
| }() | ||
| return ctx, clientAdapter, serverAdapter | ||
| } | ||
|
|
||
| func TestSynchronizer_ObjectModifiedOnBothSides(t *testing.T) { | ||
| ctx, clientAdapter, serverAdapter := initTest(t) | ||
| // pre: add object | ||
| clientAdapter.Resources[kindKnownServers.String()] = object | ||
| serverAdapter.Resources[kindKnownServers.String()] = object | ||
| // manually modify object on server (PutObject message will be sent later) | ||
| serverAdapter.Resources[kindKnownServers.String()] = objectServerV2 | ||
| // we create a race condition here | ||
| // object is modified on client, but we don't know about server modification | ||
| err := clientAdapter.TestCallPutOrPatch(ctx, kindKnownServers, object, objectClientV2) | ||
| assert.NoError(t, err) | ||
| // server message arrives just now on client | ||
| err = clientAdapter.PutObject(ctx, kindKnownServers, objectServerV2) | ||
| assert.NoError(t, err) | ||
| time.Sleep(1 * time.Second) | ||
| // check both sides have the one from the server | ||
| clientObj, ok := clientAdapter.Resources[kindKnownServers.String()] | ||
| assert.True(t, ok) | ||
| assert.Equal(t, objectServerV2, clientObj) | ||
| serverObj, ok := clientAdapter.Resources[kindKnownServers.String()] | ||
| assert.True(t, ok) | ||
| assert.Equal(t, objectServerV2, serverObj) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@amirmalka I think I ran into the issue that we saw last month - do you think it's OK to force here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eventually we discovered that the problem was trying to apply a namespaced object for a non-namespaced resource definition.
Why do we need to force? What is the issue you are seeing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right... well in this case we really need it since it's an existing object, that was updated in both sides, but we want the backend to have the last word on it
I think mechanism 1 applies here: https://pkg.go.dev/k8s.io/client-go/applyconfigurations#hdr-Controller_Support