update from fork

.github/workflows/end-to-end-test.yml

@@ -64,5 +64,8 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
+      - name: Build Nginx Docker Container
+        working-directory: ./src/endtoend-test/context/docker
+        run: docker build -t nginx-test .
       - name: Run Docker Context Tests
         run: java -jar vexrun.jar -d ./src/endtoend-test/context/docker

src/endtoend-test/context/docker/DockerTests.yml

@@ -2,8 +2,6 @@ tests:
   - "can install titan":
       command: titan install
       wait: 10
-  - "can build nginx-test":
-      command: cd src/endtoend-test/context/docker && docker build -t nginx-test -f ./src/endtoend-test/context/docker/Dockerfile .
   - "can run nginx-test":
       command: titan run nginx-test
   - "can remove nginx-test":

src/endtoend-test/getting-started/GettingStartedTests.yml

@@ -4,7 +4,7 @@ tests:
       wait: 10
       stdout:
         contains: Titan cli successfully installed, happy data versioning :)
-  - "can clone hello-world/posrgres":
+  - "can clone hello-world/postgres":
       command: titan clone -n hello-world s3web://demo.titan-data.io/hello-world/postgres
       stdout:
         contains:
@@ -85,4 +85,4 @@ tests:
       stdout:
         contains: Uninstalled titan infrastructure
 after:
-  clearVars: true
+  clearVars: true

src/endtoend-test/remotes/s3/s3WorkflowTests.yml

@@ -19,7 +19,7 @@ tests:
       wait: 30
       stdout:
         contains: Titan cli successfully installed, happy data versioning :)
-  - "can clone hello-world/posrgres":
+  - "can clone hello-world/postgres":
       command: titan clone -n hello-world s3web://demo.titan-data.io/hello-world/postgres
       stdout:
         contains:
@@ -37,4 +37,4 @@ files:
         URI: s3://titan-data-testdata/e2etest
         REPO: hello-world
 after:
-  clearVars: true
+  clearVars: true

src/main/kotlin/io/titandata/titan/Cli.kt

@@ -43,13 +43,7 @@ object Cli {
     class Titan : CliktCommand(help = "Titan CLI") {
 
         override fun run() {
-            val providerFactory = ProviderFactory()
-            val type = System.getenv("TITAN_CONTEXT") ?: "local"
-            val provider = providerFactory.getFactory(type)
-            context.obj = Dependencies(provider)
-            if (context.invokedSubcommand?.commandName != "install") {
-                provider.checkInstall()
-            }
+            context.obj = Dependencies(ProviderFactory())
         }
     }
 

src/main/kotlin/io/titandata/titan/Dependencies.kt

@@ -1,5 +1,5 @@
 package io.titandata.titan
 
-import io.titandata.titan.providers.Provider
+import io.titandata.titan.providers.ProviderFactory
 
-data class Dependencies(val provider: Provider)
+data class Dependencies(val providers: ProviderFactory)

src/main/kotlin/io/titandata/titan/commands/Abort.kt

@@ -17,7 +17,7 @@ class Abort : CliktCommand(help = "Abort current push or pull operation") {
     private val dependencies: Dependencies by requireObject()
     private val repository: String by argument()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.abort(repository)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Checkout.kt

@@ -21,7 +21,7 @@ class Checkout : CliktCommand(help = "Checkout a specific commit") {
     private val commit by option("-c", "--commit", help = "Commit to checkout")
     private val tags by option("-t", "--tag", help = "Tag to filter latest commit, if commit is not specified").multiple()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.checkout(repository, commit, tags)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Clone.kt

@@ -28,7 +28,7 @@ class Clone : CliktCommand(help = "Clone a remote repository to local repository
     private val arguments by argument().multiple()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepositoryName(repository)
         val params = mutableMapOf<String, String>()
         for (param in parameters) {
             val split = param.split("=")

src/main/kotlin/io/titandata/titan/commands/Commit.kt

@@ -22,7 +22,7 @@ class Commit : CliktCommand(help = "Commit current data state") {
     private val message by option("-m", "--message", help = "Commit message").default("")
     private val tags by option("-t", "--tag", help = "Tag to set").multiple()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.commit(repository, message, tags)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Cp.kt

@@ -25,7 +25,7 @@ class Cp : CliktCommand(
     private val source by option("-s", "--source", help = "Required. Source location of the files on the local machine").required()
     private val destination by option("-d", "--destination", help = "Destination of the files inside of the container").default("")
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.cp(repository, "local", source, destination)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Delete.kt

@@ -23,7 +23,7 @@ class Delete : CliktCommand(
     private val commit by option("-c", "--commit", help = "Commit GUID to delete")
     private val tags by option("-t", "--tag", help = "Tags to remove from a commit").multiple()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.delete(repository, commit, tags)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Install.kt

@@ -19,7 +19,7 @@ class Install : CliktCommand(help = "Install titan infrastructure") {
     private val registry by option("-r", "--registry", help = "Registry URL for titan docker image, defaults to titandata")
     private val verbose by option("-V", "--verbose", help = "Verbose output of Titan Server installation steps.").flag(default = false)
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.default(false)
         provider.install(registry, verbose)
     }
 }

src/main/kotlin/io/titandata/titan/commands/List.kt

@@ -14,9 +14,15 @@ import org.kodein.di.generic.provider
 
 class List : CliktCommand(help = "List repositories", name = "ls") {
     private val dependencies: Dependencies by requireObject()
+    private val n = System.lineSeparator()
+
     override fun run() {
-        val provider = dependencies.provider
-        provider.list()
+        // Check that we have at least one context installed
+        dependencies.providers.default()
+        System.out.printf("%-20s  %s$n", "REPOSITORY", "STATUS")
+        for (provider in dependencies.providers.list()) {
+            provider.list()
+        }
     }
 }
 

src/main/kotlin/io/titandata/titan/commands/Log.kt

@@ -20,7 +20,7 @@ class Log : CliktCommand(help = "List commits for a repository") {
     private val repository by argument()
     private val tags by option("-t", "--tag", help = "Tag to set").multiple()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.log(repository, tags)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Migrate.kt

@@ -25,7 +25,7 @@ class Migrate : CliktCommand(
     private val repository by argument()
     private val source by option("-s", "--source", help = "Required. Source docker database container").required()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.default()
         provider.migrate(source, repository)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Pull.kt

@@ -25,7 +25,7 @@ class Pull : CliktCommand(help = "Pull a new data state from remote") {
     private val repository by argument()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.pull(repository, commit, remote, tags, metadataOnly)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Push.kt

@@ -25,7 +25,7 @@ class Push : CliktCommand(help = "Push data state to remote") {
     private val repository: String by argument()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.push(repository, commit, remote, tags, metadataOnly)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Remote.kt

@@ -29,7 +29,7 @@ class RemoteAdd : CliktCommand(help = "Set remote destination for a repository",
     private val repository: String by argument()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         val params = mutableMapOf<String, String>()
         for (param in parameters) {
             val split = param.split("=")
@@ -49,7 +49,7 @@ class RemoteLog : CliktCommand(help = "Display log on remote", name = "log") {
     private val tags by option("-t", "--tag", help = "Tag to set").multiple()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.remoteLog(repository, remote, tags)
     }
 }
@@ -59,7 +59,7 @@ class RemoteList : CliktCommand(help = "List remotes for a repository", name = "
     private val repository: String by argument()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.remoteList(repository)
     }
 }
@@ -70,7 +70,7 @@ class RemoteRemove : CliktCommand(help = "Remove remote from a repository", name
     private val remote: String by argument()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.remoteRemove(repository, remote)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Remove.kt

@@ -20,7 +20,7 @@ class Remove : CliktCommand(help = "Remove a repository", name = "rm") {
     private val dependencies: Dependencies by requireObject()
     private val repository by argument()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.remove(repository, force)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Run.kt

@@ -30,7 +30,7 @@ class Run : CliktCommand(
     private val repository by option("-n", "--name", help = "Optional new name for repository.")
     private val arguments by argument().multiple()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepositoryName(repository)
         provider.run(image, repository, environments, arguments, disablePortMapping)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Start.kt

@@ -17,7 +17,7 @@ class Start : CliktCommand(help = "Start a container for a repository") {
     private val dependencies: Dependencies by requireObject()
     private val repository by argument()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.start(repository)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Status.kt

@@ -18,7 +18,7 @@ class Status : CliktCommand(help = "Display current status for a repository") {
     private val repository: String by argument()
 
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.status(repository)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Stop.kt

@@ -17,7 +17,7 @@ class Stop : CliktCommand(help = "Stop a running container for a repository") {
     private val dependencies: Dependencies by requireObject()
     private val repository by argument()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.stop(repository)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Tag.kt

@@ -24,7 +24,7 @@ class Tag : CliktCommand(
     private val commit by option("-c", "--commit", help = "Commit GUID to tag").required()
     private val tags by option("-t", "--tag", help = "Tags to add").multiple()
     override fun run() {
-        val provider = dependencies.provider
+        val provider = dependencies.providers.byRepository(repository)
         provider.tag(repository, commit, tags)
     }
 }

src/main/kotlin/io/titandata/titan/commands/Uninstall.kt

@@ -18,8 +18,9 @@ class Uninstall : CliktCommand(help = "Uninstall titan infrastructure") {
     private val force by option("-f", "--force", help = "Destroy all repositories").flag(default = false)
     private val dependencies: Dependencies by requireObject()
     override fun run() {
-        val provider = dependencies.provider
-        provider.uninstall(force)
+        for (provider in dependencies.providers.list()) {
+            provider.uninstall(force)
+        }
     }
 }
 

src/main/kotlin/io/titandata/titan/commands/Upgrade.kt

@@ -22,7 +22,8 @@ class Upgrade : CliktCommand(help = "Upgrade titan CLI and infrastructure") {
     private val finalize by option("--finalize").flag(default = false)
     private val path by option("-p", "--path", help = "Full installation path of Titan").default("")
     override fun run() {
-        val provider = dependencies.provider
+        // TODO This command is not really provider-specific
+        val provider = dependencies.providers.default()
 
         provider.upgrade(force, version, finalize, path)
     }

src/main/kotlin/io/titandata/titan/providers/Kubernetes.kt

@@ -195,7 +195,6 @@ class Kubernetes : Provider {
     }
 
     override fun list() {
-        System.out.printf("%-20s  %s$n", "REPOSITORY", "STATUS")
         for (container in getRuntimeStatus()) {
             System.out.printf("%-20s  %s$n", container.name, container.status)
         }

src/main/kotlin/io/titandata/titan/providers/Local.kt

@@ -163,7 +163,6 @@ class Local : Provider {
     }
 
     override fun list() {
-        System.out.printf("%-20s  %s$n", "REPOSITORY", "STATUS")
         for (container in getContainersStatus()) {
             System.out.printf("%-20s  %s$n", container.name, container.status)
         }

src/main/kotlin/io/titandata/titan/providers/ProviderFactory.kt

@@ -1,11 +1,38 @@
 package io.titandata.titan.providers
 
 class ProviderFactory {
-    fun getFactory(name: String): Provider {
-        return when (name) {
+
+    private val provider: Provider
+
+    init {
+        val type = System.getenv("TITAN_CONTEXT") ?: "local"
+        provider = when (type) {
             "local" -> Local()
             "kubernetes" -> Kubernetes()
             else -> Mock()
         }
     }
+
+    fun list(): List<Provider> {
+        return listOf(provider)
+    }
+
+    fun byRepositoryName(repoName: String?): Provider {
+        if (repoName == null) {
+            return default()
+        } else {
+            return provider
+        }
+    }
+
+    fun byRepository(repoName: String): Provider {
+        return provider
+    }
+
+    fun default(checkInstall: Boolean = true): Provider {
+        if (checkInstall) {
+            provider.checkInstall()
+        }
+        return provider
+    }
 }