Make policy names unique in integration tests #4421
Merged
+9
−6
Conversation
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
Otherwise we have name collisions and errors from the Fleet server.
rdner
added
Team:Elastic-Agent
|
Pinging @elastic/elastic-agent (Team:Elastic-Agent) |
cmacknz
reviewed
Mar 18, 2024
| dsNamespace := cleanString(fmt.Sprintf("%snamespace%d", t.Name(), rand.Uint64())) | ||
| dsDataset := cleanString(fmt.Sprintf("%s-dataset", t.Name())) | ||
| id := uuid.New().String() | ||
| dsNamespace := cleanString(fmt.Sprintf("namespace-%s", id)) |
There was a problem hiding this comment.
We should be able to just use info.Namespace for this, but id is unique so it doesn't matter too much.
elastic-agent/pkg/testing/define/define.go
Lines 53 to 57 in a7034ef
cmacknz
reviewed
Mar 18, 2024
| @@ -41,7 +42,7 @@ func TestContainerCMD(t *testing.T) { | |||
| require.NoError(t, err) | |||
|
|
|||
| createPolicyReq := kibana.AgentPolicy{ | |||
| Name: fmt.Sprintf("test-policy-enroll-%d", time.Now().Unix()), | |||
| Name: fmt.Sprintf("test-policy-enroll-%s", uuid.New().String()), | |||
There was a problem hiding this comment.
Might be worth creating a helper for this like UniquePolicyName() to help people do this properly.
cmacknz
approved these changes
Mar 18, 2024
|
0.0% Duplication on New Code
mergify bot
pushed a commit
that referenced
this pull request
Mar 18, 2024
Otherwise we have name collisions and errors from the Fleet server. (cherry picked from commit 8e6593f)
rdner
added a commit
that referenced
this pull request
Mar 18, 2024
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Otherwise we have name collisions and errors from the Fleet server.
Related issues