Replace all instances of 'enterprise' with 'cloud' (#807)

## Usage and product changes

We replace the term 'enterprise' with 'cloud', to reflect the new
consistent terminology used throughout Vaticle.

Author: dmitrii-ubskii

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -12,7 +12,7 @@ assignees: ''
 
 ## Environment
 
-1. TypeDB distribution: Core/Enterprise/Cloud
+1. TypeDB distribution: Core/Cloud
 2. TypeDB version: 
 3. Environment: Linux/Mac/Windows/TypeDB Cloud/Google Cloud/AWS/Azure
 4. Studio version: 

RELEASE_NOTES_LATEST.md

@@ -21,9 +21,9 @@ which versions of Studio are compatible with which versions of TypeDB server.
 
 
 ## Bugs Fixed
-- **Update Enterprise error code prefix**
+- **Update Cloud error code prefix**
 
-  * We've updated the enterprise error prefix in places where we detect certain errors.
+  * We've updated the cloud error prefix in places where we detect certain errors.
 
 
 

dependencies/vaticle/repositories.bzl

@@ -28,7 +28,7 @@ def vaticle_dependencies():
     git_repository(
         name = "vaticle_dependencies",
         remote = "https://github.com/vaticle/dependencies",
-        commit = "a9faffcbe1a0f4a45a07e010e575b7d305ac380e", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
+        commit = "1200b4aef118e75ca070c4944e9459b2aab7982a",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
     )
 
 def vaticle_force_graph():
@@ -42,12 +42,12 @@ def vaticle_typedb_common():
     git_repository(
         name = "vaticle_typedb_common",
         remote = "https://github.com/vaticle/typedb-common",
-        tag = "2.25.0",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
+        commit = "4d2adde1cb75a40ca1629eed258d2a7dcda9f5e3",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
     )
 
 def vaticle_typedb_driver():
     git_repository(
         name = "vaticle_typedb_driver",
         remote = "https://github.com/vaticle/typedb-driver",
-        tag = "2.25.8",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_client_java
+        commit = "927343bbb09ad12ba74d88c94d443f3f81cc2e09",  # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
     )

module/connection/ServerDialog.kt

@@ -59,7 +59,7 @@ import com.vaticle.typedb.studio.service.Service
 import com.vaticle.typedb.studio.service.common.util.Label
 import com.vaticle.typedb.studio.service.common.util.Property
 import com.vaticle.typedb.studio.service.common.util.Property.Server.TYPEDB_CORE
-import com.vaticle.typedb.studio.service.common.util.Property.Server.TYPEDB_ENTERPRISE
+import com.vaticle.typedb.studio.service.common.util.Property.Server.TYPEDB_CLOUD
 import com.vaticle.typedb.studio.service.common.util.Sentence
 import com.vaticle.typedb.studio.service.connection.DriverState.Status.CONNECTED
 import com.vaticle.typedb.studio.service.connection.DriverState.Status.CONNECTING
@@ -78,8 +78,8 @@ object ServerDialog {
     private class ConnectServerForm : Form.State() {
         var server: Property.Server by mutableStateOf(appData.server ?: Property.Server.TYPEDB_CORE)
         var coreAddress: String by mutableStateOf(appData.coreAddress ?: "")
-        var enterpriseAddresses: MutableList<String> = mutableStateListOf<String>().also {
-            appData.enterpriseAddresses?.let { saved -> it.addAll(saved) }
+        var cloudAddresses: MutableList<String> = mutableStateListOf<String>().also {
+            appData.cloudAddresses?.let { saved -> it.addAll(saved) }
         }
         var username: String by mutableStateOf(appData.username ?: "")
         var password: String by mutableStateOf("")
@@ -89,22 +89,22 @@ object ServerDialog {
         override fun cancel() = Service.driver.connectServerDialog.close()
         override fun isValid(): Boolean = when (server) {
             TYPEDB_CORE -> coreAddress.isNotBlank() && addressFormatIsValid(coreAddress)
-            TYPEDB_ENTERPRISE -> !(enterpriseAddresses.isEmpty() || username.isBlank() || password.isBlank())
+            TYPEDB_CLOUD -> !(cloudAddresses.isEmpty() || username.isBlank() || password.isBlank())
         }
 
         override fun submit() {
             when (server) {
                 TYPEDB_CORE -> Service.driver.tryConnectToTypeDBCoreAsync(coreAddress) {
                     Service.driver.connectServerDialog.close()
                 }
-                TYPEDB_ENTERPRISE -> Service.driver.tryConnectToTypeDBEnterpriseAsync(
-                    enterpriseAddresses.toSet(), username, password, tlsEnabled, caCertificate
+                TYPEDB_CLOUD -> Service.driver.tryConnectToTypeDBCloudAsync(
+                    cloudAddresses.toSet(), username, password, tlsEnabled, caCertificate
                 ) { Service.driver.connectServerDialog.close() }
             }
             password = ""
             appData.server = server
             appData.coreAddress = coreAddress
-            appData.enterpriseAddresses = enterpriseAddresses
+            appData.cloudAddresses = cloudAddresses
             appData.username = username
             appData.tlsEnabled = tlsEnabled
             appData.caCertificate = caCertificate
@@ -114,11 +114,11 @@ object ServerDialog {
     private object AddAddressForm : Form.State() {
         var value: String by mutableStateOf("")
         override fun cancel() = Service.driver.manageAddressesDialog.close()
-        override fun isValid() = value.isNotBlank() && addressFormatIsValid(value) && !state.enterpriseAddresses.contains(value)
+        override fun isValid() = value.isNotBlank() && addressFormatIsValid(value) && !state.cloudAddresses.contains(value)
 
         override fun submit() {
             assert(isValid())
-            state.enterpriseAddresses.add(value)
+            state.cloudAddresses.add(value)
             value = ""
         }
     }
@@ -131,7 +131,7 @@ object ServerDialog {
     @Composable
     fun MayShowDialogs() {
         if (Service.driver.connectServerDialog.isOpen) ConnectServer()
-        if (Service.driver.manageAddressesDialog.isOpen) ManageEnterpriseAddresses()
+        if (Service.driver.manageAddressesDialog.isOpen) ManageCloudAddresses()
     }
 
     @Composable
@@ -143,8 +143,8 @@ object ServerDialog {
     ) {
         Submission(state = state, modifier = Modifier.fillMaxSize(), showButtons = false) {
             ServerFormField(state)
-            if (state.server == TYPEDB_ENTERPRISE) {
-                ManageEnterpriseAddressesButton(state = state, shouldFocus = Service.driver.isDisconnected)
+            if (state.server == TYPEDB_CLOUD) {
+                ManageCloudAddressesButton(state = state, shouldFocus = Service.driver.isDisconnected)
                 UsernameFormField(state)
                 PasswordFormField(state)
                 TLSEnabledFormField(state)
@@ -196,11 +196,11 @@ object ServerDialog {
     }
 
     @Composable
-    private fun ManageEnterpriseAddressesButton(state: ConnectServerForm, shouldFocus: Boolean) {
+    private fun ManageCloudAddressesButton(state: ConnectServerForm, shouldFocus: Boolean) {
         val focusReq = if (shouldFocus) remember { FocusRequester() } else null
         Field(label = Label.ADDRESSES) {
             TextButton(
-                text = Label.MANAGE_ENTERPRISE_ADDRESSES + " (${state.enterpriseAddresses.size})",
+                text = Label.MANAGE_CLOUD_ADDRESSES + " (${state.cloudAddresses.size})",
                 focusReq = focusReq, leadingIcon = Form.IconArg(Icon.CONNECT_TO_TYPEDB),
                 enabled = Service.driver.isDisconnected
             ) {
@@ -211,15 +211,15 @@ object ServerDialog {
     }
 
     @Composable
-    private fun ManageEnterpriseAddresses() {
+    private fun ManageCloudAddresses() {
         val dialogState = Service.driver.manageAddressesDialog
-        Dialog.Layout(dialogState, Label.MANAGE_ENTERPRISE_ADDRESSES, ADDRESS_MANAGER_WIDTH, ADDRESS_MANAGER_HEIGHT) {
+        Dialog.Layout(dialogState, Label.MANAGE_CLOUD_ADDRESSES, ADDRESS_MANAGER_WIDTH, ADDRESS_MANAGER_HEIGHT) {
             Column(Modifier.fillMaxSize()) {
                 Text(value = Sentence.MANAGE_ADDRESSES_MESSAGE, softWrap = true)
                 Spacer(Modifier.height(Dialog.DIALOG_SPACING))
-                EnterpriseAddressList(Modifier.fillMaxWidth().weight(1f))
+                CloudAddressList(Modifier.fillMaxWidth().weight(1f))
                 Spacer(Modifier.height(Dialog.DIALOG_SPACING))
-                AddEnterpriseAddressForm()
+                AddCloudAddressForm()
                 Spacer(Modifier.height(Dialog.DIALOG_SPACING * 2))
                 Row(verticalAlignment = Alignment.Bottom) {
                     Spacer(modifier = Modifier.weight(1f))
@@ -231,7 +231,7 @@ object ServerDialog {
     }
 
     @Composable
-    private fun AddEnterpriseAddressForm() {
+    private fun AddCloudAddressForm() {
         val focusReq = remember { FocusRequester() }
         Submission(AddAddressForm, modifier = Modifier.height(Form.FIELD_HEIGHT), showButtons = false) {
             Row {
@@ -251,15 +251,15 @@ object ServerDialog {
     }
 
     @Composable
-    private fun EnterpriseAddressList(modifier: Modifier) = ActionableList.SingleButtonLayout(
-        items = state.enterpriseAddresses.toMutableList(),
+    private fun CloudAddressList(modifier: Modifier) = ActionableList.SingleButtonLayout(
+        items = state.cloudAddresses.toMutableList(),
         modifier = modifier.border(1.dp, Theme.studio.border),
         buttonSide = ActionableList.Side.RIGHT,
         buttonFn = { address ->
             Form.IconButtonArg(
                 icon = Icon.REMOVE,
                 color = { Theme.studio.errorStroke },
-                onClick = { state.enterpriseAddresses.remove(address) }
+                onClick = { state.cloudAddresses.remove(address) }
             )
         }
     )

service/common/DataService.kt

@@ -72,7 +72,7 @@ class DataService {
 
         private val CONNECTION_SERVER = "connection.server"
         private val CONNECTION_CORE_ADDRESS = "connection.core_address"
-        private val CONNECTION_ENTERPRISE_ADDRESSES = "connection.enterprise_addresses"
+        private val CONNECTION_CLOUD_ADDRESSES = "connection.cloud_addresses"
         private val CONNECTION_USERNAME = "connection.username"
         private val CONNECTION_TLS_ENABLED = "connection.tls_enabled"
         private val CONNECTION_CA_CERTIFICATE = "connection.ca_certificate"
@@ -83,10 +83,10 @@ class DataService {
         var coreAddress: String?
             get() = properties?.getProperty(CONNECTION_CORE_ADDRESS)
             set(value) = value?.let { setProperty(CONNECTION_CORE_ADDRESS, it) } ?: Unit
-        var enterpriseAddresses: MutableList<String>?
-            get() = properties?.getProperty(CONNECTION_ENTERPRISE_ADDRESSES)
+        var cloudAddresses: MutableList<String>?
+            get() = properties?.getProperty(CONNECTION_CLOUD_ADDRESSES)
                 ?.split(",")?.filter { it.isNotBlank() }?.toMutableList()
-            set(value) = value?.let { setProperty(CONNECTION_ENTERPRISE_ADDRESSES, it.joinToString(",")) } ?: Unit
+            set(value) = value?.let { setProperty(CONNECTION_CLOUD_ADDRESSES, it.joinToString(",")) } ?: Unit
         var username: String?
             get() = properties?.getProperty(CONNECTION_USERNAME)
             set(value) = value?.let { setProperty(CONNECTION_USERNAME, it) } ?: Unit

service/common/util/Label.kt

@@ -127,7 +127,7 @@ object Label {
     const val LABEL = "Label"
     const val LEARN_MORE = "Learn More"
     const val LOG = "Log"
-    const val MANAGE_ENTERPRISE_ADDRESSES = "Manage Enterprise Addresses"
+    const val MANAGE_CLOUD_ADDRESSES = "Manage Cloud Addresses"
     const val MANAGE_DATABASES = "Manage Databases"
     const val MANAGE_PREFERENCES = "Manage Preferences"
     const val MOVE = "Move"

service/common/util/Property.kt

@@ -45,13 +45,13 @@ object Property {
 
     enum class Server(val displayName: String) {
         TYPEDB_CORE("TypeDB Core"),
-        TYPEDB_ENTERPRISE("TypeDB Enterprise");
+        TYPEDB_CLOUD("TypeDB Cloud");
 
         companion object {
             fun of(name: String): Server? {
                 return when (name) {
                     TYPEDB_CORE.displayName -> TYPEDB_CORE
-                    TYPEDB_ENTERPRISE.displayName -> TYPEDB_ENTERPRISE
+                    TYPEDB_CLOUD.displayName -> TYPEDB_CLOUD
                     else -> null
                 }
             }
@@ -87,7 +87,7 @@ object Property {
     fun serverOf(displayName: String): Server {
         return when (displayName) {
             Server.TYPEDB_CORE.displayName -> Server.TYPEDB_CORE
-            Server.TYPEDB_ENTERPRISE.displayName -> Server.TYPEDB_ENTERPRISE
+            Server.TYPEDB_CLOUD.displayName -> Server.TYPEDB_CLOUD
             else -> throw IllegalStateException("Unrecognised TypeDB server type")
         }
     }

service/common/util/Sentence.kt

@@ -85,8 +85,8 @@ object Sentence {
         "Create a new %s type."
     const val CREATE_TYPE_AS_SUBTYPE_OF =
         "Create a new %s type as a subtype of '%s'."
-    const val CREATE_AN_ADDRESS_FOR_ENTERPRISE =
-        "Create a new address for connecting to your TypeDB Enterprise."
+    const val CREATE_AN_ADDRESS_FOR_CLOUD =
+        "Create a new address for connecting to your TypeDB Cloud."
     const val EDITING_TYPES_REQUIREMENT_DESCRIPTION =
         "To add/delete/edit type definitions in the database schema, you must be on a 'schema' session and 'write' transaction."
 
@@ -113,7 +113,7 @@ object Sentence {
                 "can set on these parameters in the toolbar, and perform queries against the TypeDB server with configured " +
                 "parameters interactively. " + BUTTON_ENABLED_WHEN_CONNECTED
     const val MANAGE_ADDRESSES_MESSAGE =
-        "Below is the list of server addresses of your TypeDB Enterprise. You can remove them from the list below and/or " +
+        "Below is the list of server addresses of your TypeDB Cloud. You can remove them from the list below and/or " +
                 "add new ones."
     const val MANAGE_DATABASES_DESCRIPTION =
         "You can manage your databases by adding or deleting databases from the TypeDB Server you are connected to. " +

service/connection/DriverState.kt

@@ -117,15 +117,15 @@ class DriverState(
     private var _driver: TypeDBDriver? by mutableStateOf(null)
     private var hasRunningCommandAtomic = AtomicBooleanState(false)
     private var databaseListRefreshedTime = System.currentTimeMillis()
-    internal var isEnterprise: Boolean = false
+    internal var isCloud: Boolean = false
 
     private val coroutines = CoroutineScope(Dispatchers.Default)
 
     fun tryConnectToTypeDBCoreAsync(
         address: String, onSuccess: () -> Unit
     ) = tryConnectAsync(newConnectionName = address, onSuccess = onSuccess) { TypeDB.coreDriver(address) }
 
-    fun tryConnectToTypeDBEnterpriseAsync(
+    fun tryConnectToTypeDBCloudAsync(
         addresses: Set<String>, username: String, password: String,
         tlsEnabled: Boolean, caPath: String, onSuccess: (() -> Unit)? = null
     ) {
@@ -137,7 +137,7 @@ class DriverState(
             else mayWarnPasswordExpiry()
         }
         tryConnectAsync(newConnectionName = "$username@${addresses.first()}", postLoginFn) {
-            TypeDB.enterpriseDriver(addresses, credentials)
+            TypeDB.cloudDriver(addresses, credentials)
         }
     }
 
@@ -150,8 +150,8 @@ class DriverState(
         tryUpdateUserPassword(old, new) {
             updateDefaultPasswordDialog.close()
             close()
-            tryConnectToTypeDBEnterpriseAsync(
-                addresses = dataSrv.connection.enterpriseAddresses!!.toSet(),
+            tryConnectToTypeDBCloudAsync(
+                addresses = dataSrv.connection.cloudAddresses!!.toSet(),
                 username = dataSrv.connection.username!!,
                 password = new,
                 tlsEnabled = dataSrv.connection.tlsEnabled!!,
@@ -190,7 +190,7 @@ class DriverState(
     }
 
     private fun mayWarnPasswordExpiry() {
-        if (!this.isEnterprise) return
+        if (!this.isCloud) return
         val passwordExpiryDurationOptional: Optional<Duration>? =
             _driver?.user()?.passwordExpirySeconds()?.map { Duration.ofSeconds(it) }
         if (passwordExpiryDurationOptional?.isPresent != true) return

test/integration/common/TypeDBRunners.kt

@@ -19,18 +19,18 @@
 package com.vaticle.typedb.studio.test.integration.common
 
 import com.vaticle.typedb.common.test.TypeDBRunner
-import com.vaticle.typedb.common.test.enterprise.TypeDBEnterpriseRunner
+import com.vaticle.typedb.common.test.cloud.TypeDBCloudRunner
 import com.vaticle.typedb.common.test.core.TypeDBCoreRunner
 import kotlin.io.path.Path
 
 object TypeDBRunners {
-    val ENTERPRISE_RUNNER_SERVER_COUNT = 3
-    val ENTERPRISE_RUNNER_DATA_PATH = Path("enterprise-runner-data-path")
+    val CLOUD_RUNNER_SERVER_COUNT = 3
+    val CLOUD_RUNNER_DATA_PATH = Path("cloud-runner-data-path")
 
     fun withTypeDB(runnerType: RunnerType = RunnerType.CORE, testFunction: (TypeDBRunner) -> Unit) {
         val typeDB = when (runnerType) {
             RunnerType.CORE -> TypeDBCoreRunner()
-            RunnerType.ENTERPRISE -> TypeDBEnterpriseRunner.create(ENTERPRISE_RUNNER_DATA_PATH, ENTERPRISE_RUNNER_SERVER_COUNT)
+            RunnerType.CLOUD -> TypeDBCloudRunner.create(CLOUD_RUNNER_DATA_PATH, CLOUD_RUNNER_SERVER_COUNT)
         }
         typeDB.start()
         testFunction(typeDB)
@@ -39,6 +39,6 @@ object TypeDBRunners {
 
     enum class RunnerType {
         CORE,
-        ENTERPRISE
+        CLOUD
     }
 }