Backport to branch(3) : Revise feature names in error messages (#2335)

Co-authored-by: Josh Wong <[email protected]> Co-authored-by: brfrn169 <[email protected]>
scalar-labs · Nov 14, 2024 · a185244 · a185244
1 parent 4fe9471
commit a185244
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/core/src/main/java/com/scalar/db/api/Admin.java b/core/src/main/java/com/scalar/db/api/Admin.java
@@ -421,8 +421,7 @@ default void addNewColumnToTable(
       String namespace, String table, String columnName, DataType columnType, boolean encrypted)
       throws ExecutionException {
     if (encrypted) {
-      throw new UnsupportedOperationException(
-          CoreError.TRANSPARENT_DATA_ENCRYPTION_NOT_ENABLED.buildMessage());
+      throw new UnsupportedOperationException(CoreError.ENCRYPTION_NOT_ENABLED.buildMessage());
     } else {
       addNewColumnToTable(namespace, table, columnName, columnType);
     }

diff --git a/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java b/core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java
@@ -65,8 +65,7 @@ public void createTable(
     }
 
     if (!metadata.getEncryptedColumnNames().isEmpty()) {
-      throw new UnsupportedOperationException(
-          CoreError.TRANSPARENT_DATA_ENCRYPTION_NOT_ENABLED.buildMessage());
+      throw new UnsupportedOperationException(CoreError.ENCRYPTION_NOT_ENABLED.buildMessage());
     }
 
     try {
@@ -248,8 +247,7 @@ public void repairTable(
       String namespace, String table, TableMetadata metadata, Map<String, String> options)
       throws ExecutionException {
     if (!metadata.getEncryptedColumnNames().isEmpty()) {
-      throw new UnsupportedOperationException(
-          CoreError.TRANSPARENT_DATA_ENCRYPTION_NOT_ENABLED.buildMessage());
+      throw new UnsupportedOperationException(CoreError.ENCRYPTION_NOT_ENABLED.buildMessage());
     }
 
     try {

diff --git a/core/src/main/java/com/scalar/db/common/error/CoreError.java b/core/src/main/java/com/scalar/db/common/error/CoreError.java
@@ -118,7 +118,7 @@ public enum CoreError implements ScalarDbError {
   AUTH_NOT_ENABLED(
       Category.USER_ERROR,
       "0022",
-      "ScalarDB Auth is not enabled. To use ScalarDB Auth, you must enable it. Note that this feature is supported only in the ScalarDB Enterprise edition",
+      "The authentication and authorization feature is not enabled. To use this feature, you must enable it. Note that this feature is supported only in the ScalarDB Enterprise edition",
       "",
       ""),
   CONDITION_BUILD_ERROR_CONDITION_NOT_ALLOWED_FOR_PUT_IF(
@@ -647,10 +647,10 @@ public enum CoreError implements ScalarDbError {
           + "If you want to modify a condition, please use clearConditions() to remove all existing conditions first",
       "",
       ""),
-  TRANSPARENT_DATA_ENCRYPTION_NOT_ENABLED(
+  ENCRYPTION_NOT_ENABLED(
       Category.USER_ERROR,
       "0143",
-      "ScalarDB Transparent Data Encryption is not enabled. To use ScalarDB Transparent Data Encryption, you must enable it. Note that this feature is supported only in the ScalarDB Enterprise edition",
+      "The encryption feature is not enabled. To encrypt data at rest, you must enable this feature. Note that this feature is supported only in the ScalarDB Enterprise edition",
       "",
       ""),
   INVALID_VARIABLE_KEY_COLUMN_SIZE(