diff --git a/gradle.properties b/gradle.properties index 9c6e9da63..f9d25567c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ # limitations under the License. # -version=3.32.0 +version=3.32.1 groupId=com.nike.cerberus artifactId=cms diff --git a/src/main/java/com/nike/cerberus/server/config/guice/CmsGuiceModule.java b/src/main/java/com/nike/cerberus/server/config/guice/CmsGuiceModule.java index f409384db..a10bb1f33 100644 --- a/src/main/java/com/nike/cerberus/server/config/guice/CmsGuiceModule.java +++ b/src/main/java/com/nike/cerberus/server/config/guice/CmsGuiceModule.java @@ -304,7 +304,7 @@ public StaticAssetManager dashboardStaticAssetManager() { @Singleton @Named("encryptCryptoMaterialsManager") public CryptoMaterialsManager encryptCryptoMaterialsManager(@Named("cms.encryption.cmk.arns") String cmkArns, - @Named("cms.cache.enabled") boolean cacheEnabled, + @Named("cms.encryption.cache.enabled") boolean cacheEnabled, KmsDataKeyCachingOptionalPropertyHolder kmsDataKeyCachingOptionalPropertyHolder, Region currentRegion) { MasterKeyProvider keyProvider = initializeKeyProvider(cmkArns, currentRegion); @@ -332,7 +332,7 @@ public CryptoMaterialsManager encryptCryptoMaterialsManager(@Named("cms.encrypti @Singleton @Named("decryptCryptoMaterialsManager") public CryptoMaterialsManager decryptCryptoMaterialsManager(@Named("cms.encryption.cmk.arns") String cmkArns, - @Named("cms.cache.enabled") boolean cacheEnabled, + @Named("cms.encryption.cache.enabled") boolean cacheEnabled, KmsDataKeyCachingOptionalPropertyHolder kmsDataKeyCachingOptionalPropertyHolder, Region currentRegion) { MasterKeyProvider keyProvider = initializeKeyProvider(cmkArns, currentRegion); @@ -377,23 +377,23 @@ public Region currentRegion() { */ static class KmsDataKeyCachingOptionalPropertyHolder { @Inject(optional=true) - @com.google.inject.name.Named("cms.cache.encryption.encrypt.maxSize") + @com.google.inject.name.Named("cms.encryption.cache.encrypt.maxSize") int encryptMaxSize = 0; @Inject(optional=true) - @com.google.inject.name.Named("cms.cache.encryption.encrypt.maxAge") + @com.google.inject.name.Named("cms.encryption.cache.encrypt.maxAge") int encryptMaxAge = 0; @Inject(optional=true) - @com.google.inject.name.Named("cms.cache.encryption.encrypt.messageUseLimit") + @com.google.inject.name.Named("cms.encryption.cache.encrypt.messageUseLimit") int encryptMessageUseLimit = 0; @Inject(optional=true) - @com.google.inject.name.Named("cms.cache.encryption.decrypt.maxSize") + @com.google.inject.name.Named("cms.encryption.cache.decrypt.maxSize") int decryptMaxSize = 0; @Inject(optional=true) - @com.google.inject.name.Named("cms.cache.encryption.decrypt.maxAge") + @com.google.inject.name.Named("cms.encryption.cache.decrypt.maxAge") int decryptMaxAge = 0; } } diff --git a/src/main/resources/cms.conf b/src/main/resources/cms.conf index e9f47d5bd..f0d7fd758 100644 --- a/src/main/resources/cms.conf +++ b/src/main/resources/cms.conf @@ -197,4 +197,4 @@ cms.iam.token.ttl=1h # When false, if an SDB grants access to AD group 'Lst-foo', then users in group 'Lst-Foo' will have access cms.user.groups.caseSensitive=true -cms.cache.enabled=false +cms.encryption.cache.enabled=false