screwdriver-api 8.0.28 → 8.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/bin/server
CHANGED
|
@@ -88,10 +88,16 @@ const DatastorePlugin = require(`screwdriver-datastore-${datastoreConfig.plugin}
|
|
|
88
88
|
const datastorePluginConfig = { ...datastoreConfig[datastoreConfig.plugin] };
|
|
89
89
|
|
|
90
90
|
// Readonly Datastore
|
|
91
|
-
const datastoreROConfig = datastorePluginConfig.readOnly;
|
|
91
|
+
const datastoreROConfig = { ...datastorePluginConfig.readOnly };
|
|
92
92
|
let datastoreRO;
|
|
93
93
|
|
|
94
94
|
if (datastoreROConfig && Object.keys(datastoreROConfig).length > 0) {
|
|
95
|
+
if (!datastoreROConfig.dialectOptions && datastorePluginConfig.dialectOptions) {
|
|
96
|
+
datastoreROConfig.dialectOptions = datastorePluginConfig.dialectOptions;
|
|
97
|
+
}
|
|
98
|
+
if (!datastoreROConfig.dialectOptions && datastorePluginConfig.caCert) {
|
|
99
|
+
datastoreROConfig.caCert = datastorePluginConfig.caCert;
|
|
100
|
+
}
|
|
95
101
|
datastoreRO = new DatastorePlugin(hoek.applyToDefaults({ ecosystem }, datastoreROConfig));
|
|
96
102
|
}
|
|
97
103
|
delete datastorePluginConfig.readOnly;
|
|
@@ -96,11 +96,13 @@ datastore:
|
|
|
96
96
|
__name: DATASTORE_SEQUELIZE_RETRY
|
|
97
97
|
__format: json
|
|
98
98
|
# An object of additional options, which are passed directly to the connection library
|
|
99
|
-
#
|
|
99
|
+
# In order to configure SSL/TLS connection settings, use this option and 'caCert' option
|
|
100
100
|
# https://sequelize.org/docs/v6/other-topics/dialect-specific-things/
|
|
101
101
|
dialectOptions:
|
|
102
102
|
__name: DATASTORE_DIALECT_OPTIONS
|
|
103
103
|
__format: json
|
|
104
|
+
# A file path of ca or a raw certificate string
|
|
105
|
+
caCert: DATASTORE_CA_CERT
|
|
104
106
|
buildMetricsEnabled: DATASTORE_SEQUELIZE_CAPTURE_METRICS_ENABLED
|
|
105
107
|
readOnly:
|
|
106
108
|
__name: DATASTORE_SEQUELIZE_RO
|