Merge pull request #18 from mercari/redesigned_package_structure

Redesigned package structure
mercari · Mar 13, 2023 · 9186e05 · 9186e05
2 parents b4a5876 + 96eb8f3
commit 9186e05
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 19 deletions.
diff --git a/...cp/src/main/java/com/github/hpgrahsl/kafka/connect/transforms/kryptonite/CipherField.java b/...cp/src/main/java/com/github/hpgrahsl/kafka/connect/transforms/kryptonite/CipherField.java
@@ -33,10 +33,10 @@
 import com.github.hpgrahsl.kafka.connect.transforms.kryptonite.validators.KeySourceValidator;
 import com.github.hpgrahsl.kafka.connect.transforms.kryptonite.validators.TimeUnitValidator;
 import com.github.hpgrahsl.kryptonite.CipherMode;
-import com.github.hpgrahsl.kryptonite.ConfigDataKeyVault;
-import com.github.hpgrahsl.kryptonite.GcpSecretManagerKeyVault;
 import com.github.hpgrahsl.kryptonite.Kryptonite;
-import com.github.hpgrahsl.kryptonite.NoOpKeyStrategy;
+import com.github.hpgrahsl.kryptonite.key.ConfigDataKeyVault;
+import com.github.hpgrahsl.kryptonite.key.NoOpKeyStrategy;
+import com.github.hpgrahsl.kryptonite.key.gcp.GcpSecretManagerKeyVault;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;

diff --git a/kryptonite/src/main/java/com/github/hpgrahsl/kryptonite/Kryptonite.java b/kryptonite/src/main/java/com/github/hpgrahsl/kryptonite/Kryptonite.java
@@ -16,6 +16,9 @@
 
 package com.github.hpgrahsl.kryptonite;
 
+import com.github.hpgrahsl.kryptonite.crypto.AesGcmNoPadding;
+import com.github.hpgrahsl.kryptonite.crypto.CryptoAlgorithm;
+import com.github.hpgrahsl.kryptonite.key.KeyVault;
 import java.util.Base64;
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/.../hpgrahsl/kryptonite/AesGcmNoPadding.java → ...sl/kryptonite/crypto/AesGcmNoPadding.java b/.../hpgrahsl/kryptonite/AesGcmNoPadding.java → ...sl/kryptonite/crypto/AesGcmNoPadding.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.crypto;
 
 import java.nio.ByteBuffer;
 import java.security.SecureRandom;

diff --git a/.../hpgrahsl/kryptonite/CryptoAlgorithm.java → ...sl/kryptonite/crypto/CryptoAlgorithm.java b/.../hpgrahsl/kryptonite/CryptoAlgorithm.java → ...sl/kryptonite/crypto/CryptoAlgorithm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.crypto;
 
 public interface CryptoAlgorithm {
 

diff --git a/...grahsl/kryptonite/ConfigDataKeyVault.java → ...sl/kryptonite/key/ConfigDataKeyVault.java b/...grahsl/kryptonite/ConfigDataKeyVault.java → ...sl/kryptonite/key/ConfigDataKeyVault.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 import java.util.Map;
 

diff --git a/...hub/hpgrahsl/kryptonite/KeyException.java → ...hpgrahsl/kryptonite/key/KeyException.java b/...hub/hpgrahsl/kryptonite/KeyException.java → ...hpgrahsl/kryptonite/key/KeyException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 @SuppressWarnings("serial")
 public class KeyException extends RuntimeException {

diff --git a/...rahsl/kryptonite/KeyInvalidException.java → ...l/kryptonite/key/KeyInvalidException.java b/...rahsl/kryptonite/KeyInvalidException.java → ...l/kryptonite/key/KeyInvalidException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 @SuppressWarnings("serial")
 public class KeyInvalidException extends KeyException {

diff --git a/...ahsl/kryptonite/KeyNotFoundException.java → .../kryptonite/key/KeyNotFoundException.java b/...ahsl/kryptonite/KeyNotFoundException.java → .../kryptonite/key/KeyNotFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 @SuppressWarnings("serial")
 public class KeyNotFoundException extends KeyException {

diff --git a/...thub/hpgrahsl/kryptonite/KeyStrategy.java → .../hpgrahsl/kryptonite/key/KeyStrategy.java b/...thub/hpgrahsl/kryptonite/KeyStrategy.java → .../hpgrahsl/kryptonite/key/KeyStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,5 +27,5 @@ public Map<String, byte[]> getKeyCache() {
     return keyCache;
   }
 
-  abstract byte[] processKey(byte[] origKeyBytes, String identifier);
+  public abstract byte[] processKey(byte[] origKeyBytes, String identifier);
 }
diff --git a/.../github/hpgrahsl/kryptonite/KeyVault.java → ...hub/hpgrahsl/kryptonite/key/KeyVault.java b/.../github/hpgrahsl/kryptonite/KeyVault.java → ...hub/hpgrahsl/kryptonite/key/KeyVault.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 public abstract class KeyVault {
 
-  KeyStrategy keyStrategy;
+  protected KeyStrategy keyStrategy;
 
   public KeyVault(KeyStrategy keyStrategy) {
     this.keyStrategy = keyStrategy;
   }
 
-  abstract byte[] readKey(String identifier);
+  public abstract byte[] readKey(String identifier);
 }
diff --git a/.../hpgrahsl/kryptonite/NoOpKeyStrategy.java → ...rahsl/kryptonite/key/NoOpKeyStrategy.java b/.../hpgrahsl/kryptonite/NoOpKeyStrategy.java → ...rahsl/kryptonite/key/NoOpKeyStrategy.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key;
 
 public class NoOpKeyStrategy extends KeyStrategy {
 

diff --git a/...pgrahsl/kryptonite/GcpKmsKeyStrategy.java → ...kryptonite/key/gcp/GcpKmsKeyStrategy.java b/...pgrahsl/kryptonite/GcpKmsKeyStrategy.java → ...kryptonite/key/gcp/GcpKmsKeyStrategy.java
@@ -1,5 +1,6 @@
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key.gcp;
 
+import com.github.hpgrahsl.kryptonite.key.KeyStrategy;
 import com.google.cloud.kms.v1.CryptoKeyName;
 import com.google.cloud.kms.v1.DecryptResponse;
 import com.google.cloud.kms.v1.KeyManagementServiceClient;
@@ -21,7 +22,7 @@ public GcpKmsKeyStrategy(String keyName) throws IOException {
   }
 
   @Override
-  byte[] processKey(byte[] origKeyBytes, String identifier) {
+  public byte[] processKey(byte[] origKeyBytes, String identifier) {
     LOGGER.info("Process key: " + identifier);
     LOGGER.info("KEK name: " + keyName);
     DecryptResponse resp = client.decrypt(keyName, ByteString.copyFrom(origKeyBytes));

diff --git a/.../kryptonite/GcpSecretManagerKeyVault.java → ...ite/key/gcp/GcpSecretManagerKeyVault.java b/.../kryptonite/GcpSecretManagerKeyVault.java → ...ite/key/gcp/GcpSecretManagerKeyVault.java
@@ -1,9 +1,11 @@
-package com.github.hpgrahsl.kryptonite;
+package com.github.hpgrahsl.kryptonite.key.gcp;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.RemovalCause;
 import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.github.hpgrahsl.kryptonite.key.KeyStrategy;
+import com.github.hpgrahsl.kryptonite.key.KeyVault;
 import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import com.google.cloud.secretmanager.v1.SecretManagerServiceClient.ListSecretVersionsPagedResponse;
@@ -79,7 +81,7 @@ private byte[] accessSecretVersion(String identifier) {
   }
 
   @Override
-  byte[] readKey(String identifier) {
+  public byte[] readKey(String identifier) {
     byte[] keyBytes = secretCache.get(identifier);
     if (keyBytes == null) {
       LOGGER.info("Read key: " + identifier);