Skip to content
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.

Sign up for GitHub

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

Jump to bottom

CID-3159: Use yaml as manifest extension #34

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

CID-3159: Use yaml as manifest extension #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
828949a
fix: Use yaml as manifest extension
kostas-petrakis Nov 4, 2024
8fd84c5
chore: move unsupported yaml extension to const
kostas-petrakis Nov 5, 2024
5735520
chore: extend tests for unsupported yml
kostas-petrakis Nov 5, 2024
507f204
chore: refactor test for unsupported yaml extension
kostas-petrakis Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/net/leanix/githubagent/shared/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package net.leanix.githubagent.shared
const val TOPIC_PREFIX = "/app/ghe/"
const val APP_NAME_TOPIC = "appName"
const val LOGS_TOPIC = "logs"
const val MANIFEST_FILE_NAME = "leanix.yml"
const val MANIFEST_FILE_NAME = "leanix.yaml"

val SUPPORTED_EVENT_TYPES = listOf(
"REPOSITORY",
Expand Down
47 changes: 47 additions & 0 deletions src/test/kotlin/net/leanix/githubagent/services/WebhookEventServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.ActiveProfiles

const val UNSUPPORTED_MANIFEST_EXTENSION = "leanix.yml"

@SpringBootTest
@ActiveProfiles("test")
class WebhookEventServiceTest {
Expand Down Expand Up @@ -266,4 +268,49 @@ class WebhookEventServiceTest {
)
}
}

@Test
fun `should handle push event only with supported YAML extension`() {
val payload = """{
"repository": {
"name": "repo",
"full_name": "owner/repo",
"owner": {"name": "owner"},
"default_branch": "main"
},
"head_commit": {
"added": ["custom/path/added1/$UNSUPPORTED_MANIFEST_EXTENSION", "custom/path/added2/$MANIFEST_FILE_NAME"],
"modified": [],
"removed": []
},
"installation": {"id": 1},
"ref": "refs/heads/main"
}"""

webhookEventService.consumeWebhookEvent("PUSH", payload)

verify(exactly = 1) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Small note, I think if we really want to test that it won't process files with UNSUPPORTED_MANIFEST_EXTENSION, then we need to verify(exactly=0) for a message with the path for the file with UNSUPPORTED_MANIFEST_EXTENSION.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good one, I will extend the tests :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated, @mohamedlajmileanix let me know if it looks ok or if there is a better way for the test.

webSocketService.sendMessage(
"/events/manifestFile",
ManifestFileUpdateDto(
"owner/repo",
ManifestFileAction.ADDED,
"content",
"custom/path/added2/$MANIFEST_FILE_NAME"
)
)
}

verify(exactly = 0) {
webSocketService.sendMessage(
"/events/manifestFile",
ManifestFileUpdateDto(
"owner/repo",
ManifestFileAction.ADDED,
"content",
"custom/path/added1/$UNSUPPORTED_MANIFEST_EXTENSION"
)
)
}
}
}
Loading