Resolve merge conflicts with upstream main

Signed-off-by: huy pham <huyp@amazon.com>

Author: huypham612

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/buffer/Buffer.java

@@ -6,6 +6,7 @@
 package org.opensearch.dataprepper.model.buffer;
 
 import org.opensearch.dataprepper.model.CheckpointState;
+import org.opensearch.dataprepper.model.plugin.PluginComponentType;
 import org.opensearch.dataprepper.model.record.Record;
 
 import java.time.Duration;
@@ -18,6 +19,7 @@
  * Buffer queues the records between TI components and acts as a layer between source and processor/sink. Buffer can
  * be in-memory, disk based or other a standalone implementation.
  */
+@PluginComponentType("buffer")
 public interface Buffer<T extends Record<?>> {
     /**
      * writes the record to the buffer

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/encryption/EncryptionEngine.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.encryption;
+
+public interface EncryptionEngine {
+    /**
+     * Encrypts raw data into {@link EncryptionEnvelope}.
+     *
+     * @param data the raw data in bytes
+     * @return returns the encryption envelope
+     */
+    EncryptionEnvelope encrypt(byte[] data);
+
+    /**
+     * Decrypts the encryption envelope into raw data.
+     *
+     * @param encryptionEnvelope the encryption envelope
+     * @return returns the raw data in bytes
+     */
+    byte[] decrypt(EncryptionEnvelope encryptionEnvelope);
+}

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/encryption/EncryptionEnvelope.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.encryption;
+
+public interface EncryptionEnvelope {
+    /**
+     * The encrypted data.
+     */
+    byte[] getEncryptedData();
+
+    /**
+     * The encrypted data key.
+     */
+    String getEncryptedDataKey();
+}

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/encryption/KeyProvider.java

@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.dataprepper.model.encryption;
+
+@FunctionalInterface
+public interface KeyProvider {
+    byte[] decryptKey(byte[] encryptedKey);
+}

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/plugin/PluginComponentType.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.dataprepper.model.plugin;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for Data Prepper plugin type components.
+ * Intended for processor, sink, source, buffer.
+ *
+ * @since 2.12
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface PluginComponentType {
+    /**
+     * Gets the name of the plugin component type.
+     *
+     * @return The name of the plugin component type.
+     */
+    String value();
+}

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/processor/Processor.java

@@ -5,6 +5,7 @@
 
 package org.opensearch.dataprepper.model.processor;
 
+import org.opensearch.dataprepper.model.plugin.PluginComponentType;
 import org.opensearch.dataprepper.model.record.Record;
 
 import java.util.Collection;
@@ -14,6 +15,7 @@
  * Processor interface. These are intermediary processing units using which users can filter,
  * transform and enrich the records into desired format before publishing to the sink.
  */
+@PluginComponentType("processor")
 public interface Processor<InputRecord extends Record<?>, OutputRecord extends Record<?>> {
 
     /**

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/sink/Sink.java

@@ -5,6 +5,7 @@
 
 package org.opensearch.dataprepper.model.sink;
 
+import org.opensearch.dataprepper.model.plugin.PluginComponentType;
 import org.opensearch.dataprepper.model.record.Record;
 
 import java.util.Collection;
@@ -13,6 +14,7 @@
  * Data Prepper sink interface. Sink may publish records to a disk, a file,
  * to OpenSearch, other pipelines, or other external systems.
  */
+@PluginComponentType("sink")
 public interface Sink<T extends Record<?>> {
 
     /**

data-prepper-api/src/main/java/org/opensearch/dataprepper/model/source/Source.java

@@ -6,13 +6,15 @@
 package org.opensearch.dataprepper.model.source;
 
 import org.opensearch.dataprepper.model.buffer.Buffer;
+import org.opensearch.dataprepper.model.plugin.PluginComponentType;
 import org.opensearch.dataprepper.model.record.Record;
 import org.opensearch.dataprepper.model.codec.HasByteDecoder;
 
 /**
  * Data Prepper source interface. Source acts as receiver of the events that flow
  * through the transformation pipeline.
  */
+@PluginComponentType("source")
 public interface Source<T extends Record<?>> extends HasByteDecoder {
 
     /**

data-prepper-core/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     implementation project(':data-prepper-event')
     implementation project(':data-prepper-plugins:blocking-buffer')
     implementation project(':data-prepper-plugins:common')
+    implementation project(':data-prepper-plugins:encryption-plugin')
     implementation project(':data-prepper-logstash-configuration')
     implementation project(':data-prepper-pipeline-parser')
     implementation project(':data-prepper-plugin-framework')