Skip to content

Commit

Permalink
fix(secret-service): fix default encrypt key (#7074)
Browse files Browse the repository at this point in the history
  • Loading branch information
david-leifker committed Jan 19, 2023
1 parent 5951379 commit f14676f
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ telemetry:
enabledServer: ${DATAHUB_TELEMETRY_ENABLED:true}

secretService:
encryptionKey: "#{systemEnvironment['SECRET_SERVICE_ENCRYPTION_KEY']}:ENCRYPTION_KEY"
encryptionKey: "#{systemEnvironment['SECRET_SERVICE_ENCRYPTION_KEY'] ?: 'ENCRYPTION_KEY'}"

datahub:
serverType: ${DATAHUB_SERVER_TYPE:prod}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.linkedin.gms.factory.secret;

import com.linkedin.metadata.secret.SecretService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
import org.testng.annotations.Test;

import java.io.IOException;
import java.nio.charset.StandardCharsets;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;

@TestPropertySource(locations = "classpath:/application.yml")
@SpringBootTest(classes = {SecretServiceFactory.class})
public class SecretServiceFactoryTest extends AbstractTestNGSpringContextTests {

@Value("${secretService.encryptionKey}")
private String encryptionKey;

@Autowired
SecretService test;

@Test
void testInjection() throws IOException {
assertEquals(encryptionKey, "ENCRYPTION_KEY");
assertNotNull(test);
assertEquals(test.getHashedPassword("".getBytes(StandardCharsets.UTF_8), "password"),
"XohImNooBHFR0OVvjcYpJ3NgPQ1qq73WKhHvch0VQtg=");
}
}

0 comments on commit f14676f

Please sign in to comment.