feat(be): boltdb deprecated label

Author: fiftin

cli/setup/setup.go

@@ -113,7 +113,7 @@ func InteractiveSetup(conf *util.ConfigType) {
 
 	dbPrompt := `What database to use:
    1 - MySQL
-   2 - BoltDB
+   2 - BoltDB (DEPRECATED!!!)
    3 - PostgreSQL
    4 - SQLite
 `

db/sql/migrations/v2.16.0.err.sql

@@ -1,3 +1,5 @@
+alter table `project__environment` drop `source_storage_id`;
+alter table `project__environment` drop `source_storage_key`;
 alter table `access_key` drop `storage_id`;
 alter table `access_key` drop `source_storage_id`;
 alter table `access_key` drop `source_storage_key`;

db/sql/migrations/v2.16.0.sql

@@ -18,4 +18,7 @@ create table project__secret_storage (
 alter table `access_key` add `storage_id` int null references `project__secret_storage`(`id`);
 
 alter table `access_key` add `source_storage_id` int null references `project__secret_storage`(`id`);
-alter table `access_key` add `source_storage_key` varchar(1000);
+alter table `access_key` add `source_storage_key` varchar(1000);
+
+alter table `project__environment` add `source_storage_id` int null references `project__secret_storage`(`id`);
+alter table `project__environment` add `source_storage_key` varchar(1000);

util/config.go

@@ -34,9 +34,8 @@ var Cookie *securecookie.SecureCookie
 var WebHostURL *url.URL
 
 const (
-	DbDriverMySQL = "mysql"
-	// Deprecated: replaced with sqlite
-	DbDriverBolt     = "bolt"
+	DbDriverMySQL    = "mysql"
+	DbDriverBolt     = "bolt" // Deprecated: replaced with sqlite
 	DbDriverPostgres = "postgres"
 	DbDriverSQLite   = "sqlite"
 )
@@ -203,7 +202,7 @@ type DebuggingConfig struct {
 // ConfigType mapping between Config and the json file that sets it
 type ConfigType struct {
 	MySQL    *DbConfig `json:"mysql,omitempty"`
-	BoltDb   *DbConfig `json:"bolt,omitempty"`
+	BoltDb   *DbConfig `json:"bolt,omitempty"` // Deprecated
 	Postgres *DbConfig `json:"postgres,omitempty"`
 	SQLite   *DbConfig `json:"sqlite,omitempty"`
 

web/src/components/EnvironmentForm.vue

@@ -53,11 +53,36 @@
       :rules="[v => !!v || $t('name_required')]"
       required
       :disabled="formSaving"
-      class="mb-2"
       outlined
       dense
     ></v-text-field>
 
+    <v-row>
+      <v-col>
+        <v-autocomplete
+          v-model="item.source_storage_id"
+          :label="$t('Secret Storage (optional)')"
+          :items="secretStorages"
+          :disabled="formSaving"
+          item-value="id"
+          item-text="name"
+          outlined
+          dense
+          clearable
+        />
+      </v-col>
+      <v-col>
+
+        <v-text-field
+          v-model="item.source_storage_key"
+          :label="$t('Source Key')"
+          :disabled="formSaving || !item.source_storage_id"
+          outlined
+          dense
+        />
+      </v-col>
+    </v-row>
+
     <v-tabs grow v-model="tab">
       <v-tab key="variables">Variables</v-tab>
       <v-tab key="secrets">Secrets</v-tab>

web/src/views/Runners.vue

@@ -403,7 +403,7 @@ export default {
 
   computed: {
     webHost() {
-      return this.systemInfo?.web_host || '';
+      return this.systemInfo?.web_host || window.location.origin;
     },
 
     premiumFeatures() {
@@ -420,7 +420,7 @@ export default {
 
     runnerConfigCommand() {
       return `{
-  "web_host": "${this.webHost}",
+  "web_host": "${this.webHost || window.location.origin}",
   "runner": {
     "token": "${(this.newRunner || {}).token}",
     "private_key_file": "/path/to/private/key"