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

Check if the fragment doesnot already have a name #2825

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −6
Open

Check if the fragment doesnot already have a name #2825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b082aab
Check if the fragment doesnot already have a name
pmf-test Mar 15, 2024
fdec19c
Adapt tests to the new NameEnricher behaviour
pmf-test Mar 15, 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
10 changes: 6 additions & 4 deletions ...e-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/NameEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ public void create(PlatformMode platformMode, KubernetesListBuilder builder) {
builder.accept(new TypedVisitor<ObjectMetaBuilder>() {
@Override
public void visit(ObjectMetaBuilder resource) {
if (StringUtils.isNotBlank(configuredName)) {
resource.withName(configuredName);
} else if (StringUtils.isBlank(resource.getName())) {
resource.withName(defaultName);
if(StringUtils.isBlank(resource.getName())) {
if (StringUtils.isNotBlank(configuredName)) {
resource.withName(configuredName);
} else {
resource.withName(defaultName);
}
}
}
});
Expand Down
18 changes: 16 additions & 2 deletions ...t/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/NameEnricherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void create_withAlreadyExistingName_shouldKeepExistingName() {
}

@Test
void create_withCustomNameAndAlreadyExistingName_shouldOverrideExistingName() {
void create_withCustomNameAndAlreadyExistingName_shouldKeepExistingName() {
// Given
klb = new KubernetesListBuilder();
properties.put("jkube.enricher.jkube-name.name", "custom-name");
Expand All @@ -128,6 +128,20 @@ void create_withCustomNameAndAlreadyExistingName_shouldOverrideExistingName() {
// Then
assertThat(klb.build().getItems())
.singleElement()
.hasFieldOrPropertyWithValue("metadata.name", "custom-name");
.hasFieldOrPropertyWithValue("metadata.name", "existing-name");
}

@Test
void create_withoutName_shouldSetGivenCustomName() {
// Given
klb = new KubernetesListBuilder();
properties.put("jkube.enricher.jkube-name.name", "custom-name");
// When
klb.addToItems(new ServiceBuilder().withNewMetadata().endMetadata().build());
new NameEnricher(context).create(PlatformMode.kubernetes, klb);
// Then
assertThat(klb.build().getItems())
.singleElement()
.hasFieldOrPropertyWithValue("metadata.name", "custom-name");
}
}