Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Service to generate a key pair from jks file in AWS Secrets Manager.
*/
@Service
@Profile("!local")
@Profile("aws")
@Lazy
public class AwsKeyPairLoadingService implements KeyPairLoadingService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* * Service to generate a key pair from a local jks file.
*/
@Service
@Profile("local")
@Profile("!aws")
@Lazy
public class LocalKeyPairLoadingService implements KeyPairLoadingService {

Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/application-aws.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ server.servlet.session.cookie.secure=true

# As we are proxying through nginx
server.tomcat.remoteip.remote-ip-header=x-forwarded-for
server.tomcat.remoteip.protocol-header=x-forwarded-proto
server.tomcat.remoteip.protocol-header=x-forwarded-proto

spring.cloud.aws.secretsmanager.enabled=true
3 changes: 3 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,6 @@ management.endpoint.health.show-components=always
# expose sentry endpoint, health is exposed by default, but as we override the include we need to add it back in
management.endpoints.web.exposure.include=health,sentry

# disable by default
spring.cloud.aws.secretsmanager.enabled=false

3 changes: 0 additions & 3 deletions src/test/resources/application-test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,4 @@ spring.security.oauth2.client.provider.canvas.token-uri=https://sso.canvaslms.co
spring.security.oauth2.client.provider.canvas.jwk-set-uri=https://sso.canvaslms.com/api/lti/security/jwks
spring.security.oauth2.client.provider.canvas.user-name-attribute=sub

# Disable the secrets manager as we don't have any secrets in AWS when testing.
spring.cloud.aws.secretsmanager.enabled=false

spring.profiles.active=local
Loading