Skip to content

feat: move resource element up in plugin description #136

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

Merged
vpa1977 merged 1 commit into from
Mar 27, 2026
Merged

feat: move resource element up in plugin description #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions src/main/java/com/canonical/devpackspring/build/PluginDescriptorContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ public PluginDescriptorContainer(Reader source) {
try {
for (String key : yamlData.keySet()) {
Map<String, Object> root = yamlData.get(key);
addPlugin(key, root, BuildSystem.gradle);
addPlugin(key, root, BuildSystem.maven);
PluginResource[] resources = readResources((ArrayList<Map<String, String>>) root.get("resources"));
addPlugin(key, root, BuildSystem.gradle, resources);
addPlugin(key, root, BuildSystem.maven, resources);
}
}
catch (Exception ex) {
Expand All @@ -51,10 +52,10 @@ public PluginDescriptorContainer(Reader source) {
}
}

private void addPlugin(String key, Map<String, Object> root, BuildSystem buildSystem) {
private void addPlugin(String key, Map<String, Object> root, BuildSystem buildSystem, PluginResource[] resources) {
Map<String, Object> description = (Map<String, Object>) root.get(buildSystem.name());
if (description != null) {
PluginConfiguration config = readPluginConfiguration(
PluginConfiguration config = readPluginConfiguration(resources,
(Map<String, Object>) description.get("configuration"));
PluginTasks pluginTasks = readTasks((Map<String, Object>) description.get("tasks"));
pluginMap.put(getKey(key, buildSystem),
Expand Down Expand Up @@ -85,12 +86,13 @@ else if (v instanceof List<?> list) {
return new PluginTasks(result);
}

private @NonNull PluginConfiguration readPluginConfiguration(Map<String, Object> configuration) {
private @NonNull PluginConfiguration readPluginConfiguration(PluginResource[] resources,
Map<String, Object> configuration) {
if (configuration == null) {
return new PluginConfiguration(new PluginResource[0], new MavenConfiguration(null, null, null), null, null);
}
Map<String, String> maven = (Map<String, String>) configuration.get("maven");
return new PluginConfiguration(readResources((ArrayList<Map<String, String>>) configuration.get("resources")),
return new PluginConfiguration(resources,
new MavenConfiguration(maven.get("configuration"), maven.get("dependencies"), maven.get("executions")),
(String) configuration.get("gradleKotlin"), (String) configuration.get("gradleGroovy"));
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/com/canonical/devpackspring/plugin-configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ format:
tasks:
apply: :apply
rockcraft:
resources:
- path: .config/config.xml
content: |
<resource/>
gradle:
id: io.github.rockcrafters.rockcraft
version: 1.2.3
Expand All @@ -31,10 +35,6 @@ rockcraft:
push-rock: push-rock
push-build-rock: push-build-rock
configuration:
resources:
- path: .config/config.xml
content: |
<resource/>
maven:
configuration: |
<maven-element-config/>
Expand Down
2 changes: 0 additions & 2 deletions src/test/resources/com/canonical/devpackspring/build/test-custom-plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ format-me:
gradle:
id: io.spring.javaformat
version: 0.0.41
class-name: io.spring.javaformat.gradle.SpringJavaFormatPlugin
default-task: format
description: Formats source code
tasks:
format: format
repository: gradlePluginPortal()
classpath: "io.spring.javaformat:io.spring.javaformat.gradle.plugin:0.0.43"

22 changes: 11 additions & 11 deletions src/test/resources/com/canonical/devpackspring/build/test-plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
checkStyle:
resources:
- path: checkstyle.xml
content: |
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">
</module>
gradle:
id: checkstyle
version: 1.0.0
Expand All @@ -16,13 +23,6 @@ checkStyle:
- install
- checkstyle:check
configuration:
resources:
- path: checkstyle.xml
content: |
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">
</module>
maven:
configuration: |
<configuration>
Expand All @@ -47,6 +47,10 @@ checkStyle:
</execution>
</executions>
rockcraft:
resources:
- path: .config/config.xml
content: |
<resource/>
gradle:
id: io.github.rockcrafters.rockcraft
version: 1.0.0
Expand All @@ -65,10 +69,6 @@ rockcraft:
description: |
This is a plugin description
configuration:
resources:
- path: .config/config.xml
content: |
<resource/>
maven:
configuration: |
<maven-element-config/>
Expand Down