Only read the new AWS credentials file
@@ -13,24 +13,19 @@ import com.yahoo.slime.SlimeUtils;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.concurrent.atomic.AtomicReference;
public class VespaAwsCredentialsProvider implements AWSCredentialsProvider {
private static final String DEFAULT_CREDENTIALS_PATH = "/opt/vespa/var/vespa/aws/credentials.json";
- // TODO (freva): Remove when host-admin writes to the new path above
- private static final String DEFAULT_CREDENTIALS_PATH_OLD = "/opt/vespa/var/container-data/opt/vespa/conf/vespa/credentials.json";
private final AtomicReference<AWSCredentials> credentials = new AtomicReference<>();
private final Path credentialsPath;
- private final Path credentialsPathOld;
public VespaAwsCredentialsProvider() {
this.credentialsPath = Path.of(DEFAULT_CREDENTIALS_PATH);
- this.credentialsPathOld = Path.of(DEFAULT_CREDENTIALS_PATH_OLD);
refresh();
}
@@ -50,12 +45,7 @@ public class VespaAwsCredentialsProvider implements AWSCredentialsProvider {
private AWSSessionCredentials readCredentials() {
try {
- Slime slime;
- try {
- slime = SlimeUtils.jsonToSlime(Files.readAllBytes(credentialsPath));
- } catch (NoSuchFileException ignored) {
- slime = SlimeUtils.jsonToSlime(Files.readAllBytes(credentialsPathOld));
- }
+ Slime slime = SlimeUtils.jsonToSlime(Files.readAllBytes(credentialsPath));
Cursor cursor = slime.get();
String accessKey = cursor.field("awsAccessKey").asString();
String secretKey = cursor.field("awsSecretKey").asString();
