feat(sql): Flipped over to the mariadb driver and jdbc urls

- Enabled SSL - Support for a writeOnly-mode (`spinnaker.migration.writeOnly: false`)
spinnaker · Jul 8, 2019 · 63cb1f2 · 63cb1f2
1 parent 1ed13dd
commit 63cb1f2
Show file tree

Hide file tree

Showing 5 changed files with 457 additions and 5 deletions.
diff --git a/front50-sql/front50-sql.gradle b/front50-sql/front50-sql.gradle
@@ -10,11 +10,13 @@ dependencies {
   implementation "io.strikt:strikt-core"
   implementation "com.netflix.hystrix:hystrix-core"
   implementation "io.github.resilience4j:resilience4j-retry"
+
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.2.1"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.1"
 
-  runtimeOnly "mysql:mysql-connector-java"
+  implementation "org.mariadb.jdbc:mariadb-java-client:2.2.3"
+//  runtimeOnly "mysql:mysql-connector-java"
 
   testImplementation "dev.minutest:minutest"
   testImplementation "org.testcontainers:mysql"

diff --git a/...-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt b/...-sql/src/main/kotlin/com/netflix/spinnaker/config/CompositeStorageServiceConfiguration.kt
@@ -37,7 +37,8 @@ class CompositeStorageServiceConfiguration() {
                               storageServices: List<StorageService>) =
     CompositeStorageService(
       storageServices.first { it.javaClass.canonicalName.equals(properties.primaryClass) },
-      storageServices.first { it.javaClass.canonicalName.equals(properties.previousClass) }
+      storageServices.first { it.javaClass.canonicalName.equals(properties.previousClass) },
+      properties.writeOnly
     )
 
   @Bean
@@ -55,5 +56,6 @@ class CompositeStorageServiceConfiguration() {
 @ConfigurationProperties("spinnaker.migration")
 data class StorageServiceMigratorConfigurationProperties(
   var primaryClass: String? = null,
-  var previousClass: String? = null
+  var previousClass: String? = null,
+  var writeOnly: Boolean = false
 )
diff --git a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageService.kt b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/CompositeStorageService.kt
@@ -20,7 +20,8 @@ import org.slf4j.LoggerFactory
 
 class CompositeStorageService(
   private val primary: StorageService,
-  private val previous: StorageService
+  private val previous: StorageService,
+  private val writeOnly: Boolean
 ) : StorageService {
 
   companion object {
@@ -37,7 +38,7 @@ class CompositeStorageService(
   }
 
   override fun <T : Timestamped?> loadObject(objectType: ObjectType?, objectKey: String?): T {
-    if (objectType == ObjectType.ENTITY_TAGS) {
+    if (writeOnly || objectType == ObjectType.ENTITY_TAGS) {
       return previous.loadObject<T>(objectType, objectKey)
     }
 
@@ -89,6 +90,10 @@ class CompositeStorageService(
   }
 
   override fun listObjectKeys(objectType: ObjectType?): Map<String, Long> {
+    if (writeOnly) {
+      return previous.listObjectKeys(objectType)
+    }
+
     val primaryObjectKeys = primary.listObjectKeys(objectType)
     val previousObjectKeys = previous.listObjectKeys(objectType)
 
@@ -98,6 +103,10 @@ class CompositeStorageService(
   override fun <T : Timestamped?> listObjectVersions(objectType: ObjectType?,
                                                      objectKey: String?,
                                                      maxResults: Int): MutableCollection<T> {
+    if (writeOnly) {
+      return previous.listObjectVersions(objectType, objectKey, maxResults)
+    }
+
     try {
       return primary.listObjectVersions(objectType, objectKey, maxResults)
     } catch (e: Exception) {
@@ -113,6 +122,10 @@ class CompositeStorageService(
   }
 
   override fun getLastModified(objectType: ObjectType?): Long {
+    if (writeOnly) {
+      return previous.getLastModified(objectType)
+    }
+
     try {
       return primary.getLastModified(objectType)
     } catch (e: Exception) {

diff --git a/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt b/front50-sql/src/main/kotlin/com/netflix/spinnaker/front50/model/SqlStorageService.kt
@@ -97,6 +97,9 @@ class SqlStorageService(
   override fun <T : Timestamped> storeObject(objectType: ObjectType, objectKey: String, item: T) {
     item.lastModifiedBy = AuthenticatedRequest.getSpinnakerUser().orElse("anonymous")
 
+    // TODO-AJ handle overriding the `lastModified` during a migration so that not everything is `now()`
+    item.lastModified = clock.millis()
+
     try {
       jooq.transactional(sqlRetryProperties.transactions) { ctx ->
         val insert = ctx.insertInto(