-
Notifications
You must be signed in to change notification settings - Fork 11
HYPERFLEET-630 - fix: consolidate duplicate resource operation logs #84
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
Open
xueli181114
wants to merge
1
commit into
openshift-hyperfleet:main
Choose a base branch
from
xueli181114:HYPERFLEET-630
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 hidden or 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 hidden or 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,100 @@ | ||
| package k8sclient | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/internal/manifest" | ||
| "github.com/openshift-hyperfleet/hyperfleet-adapter/pkg/logger" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
| ) | ||
|
|
||
| func newTestClient() *Client { | ||
| scheme := runtime.NewScheme() | ||
| builder := fake.NewClientBuilder().WithScheme(scheme) | ||
| log, _ := logger.NewLogger(logger.Config{Level: "error", Output: "stdout", Format: "json"}) | ||
| return &Client{ | ||
| client: builder.Build(), | ||
| log: log, | ||
| } | ||
| } | ||
|
|
||
| func newConfigMap(name, namespace string, generation int64) *unstructured.Unstructured { | ||
| obj := &unstructured.Unstructured{} | ||
| obj.SetGroupVersionKind(CommonResourceKinds.ConfigMap) | ||
| obj.SetName(name) | ||
| obj.SetNamespace(namespace) | ||
| obj.SetAnnotations(map[string]string{ | ||
| "hyperfleet.io/generation": fmt.Sprintf("%d", generation), | ||
| }) | ||
| obj.Object["data"] = map[string]any{ | ||
| "key": "value", | ||
| } | ||
| return obj | ||
| } | ||
|
|
||
| func TestApplyManifest_CreateAlreadyExists(t *testing.T) { | ||
| ctx := context.Background() | ||
| c := newTestClient() | ||
|
|
||
| cm := newConfigMap("test-cm", "default", 1) | ||
|
|
||
| // First create should succeed | ||
| result1, err := c.ApplyManifest(ctx, cm, nil, nil) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, manifest.OperationCreate, result1.Operation) | ||
|
|
||
| // Second create with nil existing (simulates concurrent create race) | ||
| // ApplyManifest sees existing=nil so decides to create, but resource already exists | ||
| cm2 := newConfigMap("test-cm", "default", 1) | ||
| result2, err := c.ApplyManifest(ctx, cm2, nil, nil) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, manifest.OperationSkip, result2.Operation) | ||
| assert.Equal(t, "already exists (concurrent create)", result2.Reason) | ||
| } | ||
|
|
||
| func TestApplyManifest_CreateSuccess(t *testing.T) { | ||
| ctx := context.Background() | ||
| c := newTestClient() | ||
|
|
||
| cm := newConfigMap("new-cm", "default", 1) | ||
| result, err := c.ApplyManifest(ctx, cm, nil, nil) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, manifest.OperationCreate, result.Operation) | ||
| } | ||
|
|
||
| func TestApplyManifest_SkipSameGeneration(t *testing.T) { | ||
| ctx := context.Background() | ||
| c := newTestClient() | ||
|
|
||
| cm := newConfigMap("existing-cm", "default", 1) | ||
|
|
||
| // Create the resource first | ||
| _, err := c.CreateResource(ctx, cm) | ||
| require.NoError(t, err) | ||
|
|
||
| // Get existing to pass to ApplyManifest | ||
| existing, err := c.GetResource(ctx, CommonResourceKinds.ConfigMap, "default", "existing-cm", nil) | ||
| require.NoError(t, err) | ||
|
|
||
| // Apply with same generation should skip | ||
| newCm := newConfigMap("existing-cm", "default", 1) | ||
| result, err := c.ApplyManifest(ctx, newCm, existing, nil) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, manifest.OperationSkip, result.Operation) | ||
| } | ||
|
|
||
| func TestApplyManifest_NilManifest(t *testing.T) { | ||
| ctx := context.Background() | ||
| c := newTestClient() | ||
|
|
||
| result, err := c.ApplyManifest(ctx, nil, nil, nil) | ||
| assert.Error(t, err) | ||
| assert.Nil(t, result) | ||
| assert.Contains(t, err.Error(), "new manifest cannot be nil") | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
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.
Missing test coverage for this change
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.
Added test coverage in
apply_test.go.TestApplyManifest_CreateAlreadyExistsverifies the concurrent create race condition: first ApplyManifest creates the resource, second ApplyManifest withexisting=nilhits AlreadyExists and returns OperationSkip with reason "already exists (concurrent create)". Also added tests for create success, same-generation skip, and nil manifest validation.