Skip to content

[apache_tomcat] Quote keys with dots in test config files#8174

Merged
jsoriano merged 1 commit intoelastic:mainfrom
jsoriano:tomcat-fix-v3
Oct 12, 2023
Merged

[apache_tomcat] Quote keys with dots in test config files#8174
jsoriano merged 1 commit intoelastic:mainfrom
jsoriano:tomcat-fix-v3

Conversation

@jsoriano
Copy link
Copy Markdown
Member

@jsoriano jsoriano commented Oct 12, 2023

Proposed commit message

Fix tests of apache_tomcat package by quoting the keys with dots in the
test configuration files.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Screenshots

@jsoriano jsoriano requested a review from a team as a code owner October 12, 2023 09:34
@jsoriano jsoriano self-assigned this Oct 12, 2023
@ishleenk17
Copy link
Copy Markdown
Member

ishleenk17 commented Oct 12, 2023

@jsoriano : So, in the yaml files, we are removing the dot whereas in config we are keeping them?
The CI had passed for apache tomcat. How did you catch this issue?

@jsoriano
Copy link
Copy Markdown
Member Author

jsoriano commented Oct 12, 2023

So, in the yaml files, we are removing the dot whereas in config we are keeping them?

In these cases they are field names, and we need to keep the dots. This can be done now by quoting them.

elastic-package build and elastic-package format automatically formats unquoted keys with dots as objects since elastic/elastic-package#1485, what has the side effect of breaking these unquoted keys in test files.

The CI had passed for apache tomcat.

Yes, this has been an unfortunate "race condition" between #8159 and #8115, that have been merged around the same time and in combination they break CI.

How did you catch this issue?

I have seen these tests fail in other builds.

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Oct 12, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-10-12T09:35:05.821+0000

  • Duration: 24 min 14 sec

Test stats 🧪

Test Results
Failed 0
Passed 54
Skipped 0
Total 54

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@elasticmachine
Copy link
Copy Markdown

elasticmachine commented Oct 12, 2023

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 100.0% (9/9) 💚
Files 100.0% (9/9) 💚
Classes 100.0% (9/9) 💚
Methods 95.062% (77/81) 👎 -0.176
Lines 79.897% (934/1169) 👍 2.765
Conditionals 100.0% (0/0) 💚

ishleenk17
ishleenk17 approved these changes Oct 12, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@ishleenk17 ishleenk17 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@jsoriano jsoriano merged commit 5e23a62 into elastic:main Oct 12, 2023
@jsoriano jsoriano deleted the tomcat-fix-v3 branch October 12, 2023 10:18
This was referenced Oct 16, 2023
Closed
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ishleenk17 ishleenk17 ishleenk17 approved these changes

Assignees

@jsoriano jsoriano

Labels

Integration:apache_tomcat Apache Tomcat

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jsoriano @ishleenk17 @elasticmachine @andrewkroh