remove local config file code

Signed-off-by: Yaliang Wu <[email protected]>
opensearch-project · Jul 12, 2023 · 15d5553 · 15d5553
1 parent f854e23
commit 15d5553
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 47 deletions.
diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
@@ -64,7 +64,6 @@ dependencies {
     implementation 'com.amazonaws:aws-encryption-sdk-java:2.4.0'
     implementation 'com.jayway.jsonpath:json-path:2.8.0'
     implementation group: 'org.json', name: 'json', version: '20230227'
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.0'
 }
 
 configurations.all {

diff --git a/ml-algorithms/src/main/java/org/opensearch/ml/engine/MLEngine.java b/ml-algorithms/src/main/java/org/opensearch/ml/engine/MLEngine.java
@@ -5,43 +5,24 @@
 
 package org.opensearch.ml.engine;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.stream.JsonReader;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import org.opensearch.ml.common.FunctionName;
 import org.opensearch.ml.common.MLModel;
 import org.opensearch.ml.common.dataframe.DataFrame;
 import org.opensearch.ml.common.dataset.DataFrameInputDataset;
 import org.opensearch.ml.common.dataset.MLInputDataset;
-import org.opensearch.ml.common.exception.MLException;
 import org.opensearch.ml.common.input.Input;
 import org.opensearch.ml.common.input.parameter.MLAlgoParams;
 import org.opensearch.ml.common.input.MLInput;
 import org.opensearch.ml.common.model.MLModelFormat;
 import org.opensearch.ml.common.output.MLOutput;
 import org.opensearch.ml.common.output.Output;
 import org.opensearch.ml.engine.encryptor.Encryptor;
-import org.opensearch.ml.engine.encryptor.EncryptorImpl;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.security.SecureRandom;
-import java.util.Base64;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import static org.opensearch.ml.common.CommonValue.MASTER_KEY;
-
 /**
  * This is the interface to all ml algorithms.
  */
@@ -68,33 +49,6 @@ public MLEngine(Path opensearchDataFolder, Path opensearchConfigFolder, Encrypto
         this.mlUserConfigPath = opensearchConfigFolder.resolve("opensearch-ml");
         this.mlConfigPath = mlCachePath.resolve("config");
         this.encryptor = encryptor;
-        initMasterKey();
-    }
-
-    private synchronized void initMasterKey() {
-        try {
-            AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                Path userConfigFilePath = mlUserConfigPath.resolve("security_config.json");
-                Map<String, String> config = null;
-                if (Files.exists(userConfigFilePath)) {
-                    try (FileInputStream fis = new FileInputStream(userConfigFilePath.toFile());) {
-                        Yaml yaml = new Yaml();
-                        config = yaml.load(fis);
-                    }
-                }
-                if (config == null) {
-                    config = new HashMap<>();
-                }
-
-                if (config.containsKey(MASTER_KEY)) {
-                    encryptor.setMasterKey(config.get(MASTER_KEY));
-                }
-                return null;
-            });
-        } catch (Exception e) {
-            log.error("Failed to save master key", e);
-            throw new MLException(e);
-        }
     }
 
     public String getPrebuiltModelMetaListPath() {