Skip to content

Resolve S3 labels one after another #3383

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

Open
sharanggupta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve S3 labels one after another #3383

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
5 changes: 2 additions & 3 deletions .../java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ public Environment findOne(String specifiedApplication, String specifiedProfiles
private void addPropertySources(Environment environment, List<String> apps, String[] profiles,
List<String> labels) {
String[] profilesByPrecedence = profilesByPrecedence(profiles);
// Each label is resolved completely before the next one, so the last label wins
for (String label : labels) {
for (String profile : profilesByPrecedence) {
addPropertySourcesForApps(apps,
Expand All @@ -173,9 +174,7 @@ private void addPropertySources(Environment environment, List<String> apps, Stri
addPropertySourcesForApps(apps,
app -> addProfileSpecificPropertySource(environment, app, null, profiles, label));
}
}
if (this.searchPaths.isEmpty()) {
for (String label : labels) {
if (this.searchPaths.isEmpty()) {
addPropertySourcesForApps(apps,
app -> addNonProfileSpecificPropertySource(environment, app, profiles, label));
}
Expand Down
16 changes: 0 additions & 16 deletions ...cloud/config/server/environment/compliance/AwsS3EnvironmentRepositoryComplianceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
import java.util.Set;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.localstack.LocalStackContainer.Service;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.services.s3.S3Client;
Expand Down Expand Up @@ -58,20 +56,6 @@ protected EnvironmentRepositoryFixture fixture() {
return this.fixture;
}

@Override
@Test
@Disabled("TODO-issue: Documents activated by a profile expression get the lowest precedence")
public void profileExpressionsActivateDocuments() throws Exception {
super.profileExpressionsActivateDocuments();
}

@Override
@Test
@Disabled("TODO-issue: Labels are interleaved by profile rather than resolved one after another")
public void lastLabelTakesPrecedence() throws Exception {
super.lastLabelTakesPrecedence();
}

static class Fixture implements EnvironmentRepositoryFixture {

@Override
Expand Down
Loading