diff --git a/dsl/config/AppConfig.dhall b/dsl/config/AppConfig.dhall deleted file mode 100644 index 67646d2..0000000 --- a/dsl/config/AppConfig.dhall +++ /dev/null @@ -1,40 +0,0 @@ -{- - Sample unipipe service broker configuration - using ssh-key method to access the git repo - - Application configuration - basic-auth-username : - The service broker API itself is secured via HTTP Basic Auth. - The basic auth username for requests against the API. - basic-auth-password : - The basic auth password for requests against the API. - - Git access configuration - - SSH configuration : - local : - The path where the local Git Repo shall be created/used. Defaults to tmp/git - remote : - The remote Git repository to push the repo to - ssh-key : - This is the SSH key to be used for accessing the remote repo. Linebreaks must be replaced with spaces as sample shown below - -----BEGIN RSA PRIVATE KEY----- Hgiud8z89ijiojdobdikdosaa+hnjk789hdsanlklmladlsagasHOHAo7869+bcG x9tD2aI3...ysKQfmAnDBdG4= -----END RSA PRIVATE KEY----- - - Server configuration - port : port to used by the application - --} -let Config = ./AppSchema.dhall - -let GitAccess = ./GitAccess.dhall - -let ExampleSsh - : Config - = { app = { basic-auth-username = "user", basic-auth-password = "password" } - , git = - GitAccess.SSH - { local = "local path", remote = "remote path", ssh-key = "-----BEGIN RSA PRIVATE KEY----- Hgiud8z89ijiojdobdikdosaa+hnjk789hdsanlklmladlsagasHOHAo7869+bcG x9tD2aI3...ysKQfmAnDBdG4= -----END RSA PRIVATE KEY-----" } - , server.port = 8075 - } - -in ExampleSsh diff --git a/dsl/config/AppSchema.dhall b/dsl/config/AppSchema.dhall deleted file mode 100644 index 961d066..0000000 --- a/dsl/config/AppSchema.dhall +++ /dev/null @@ -1,42 +0,0 @@ -{- - Base schema for Unipipe service broker configuration - - Application configuration - basic-auth-username : - The service broker API itself is secured via HTTP Basic Auth. - The basic auth username for requests against the API. - basic-auth-password : - The basic auth password for requests against the API - - Git access configuration - Union of git configurations,to give a choice to user to use HTTPS config or SSH config - - SSH configuration : - local : - The path where the local Git Repo shall be created/used. Defaults to tmp/git - remote : - The remote Git repository to push the repo to - ssh-key : - This is the SSH key to be used for accessing the remote repo. Linebreaks must be replaced with spaces - - HTTPS configuration : - local : - The path where the local Git Repo shall be created/used. Defaults to tmp/git - remote : - The remote Git repository to push the repo to - username : - To access the git repo HTTPS username - password : - To access the git repo HTTPS password - - Server configuration - port : port to used by the application - --} -let GitAccess = ./GitAccess.dhall - -let AppConfig = { basic-auth-password : Text, basic-auth-username : Text } - -let ServerCofig = { port : Natural } - -in { app : AppConfig, git : GitAccess, server : ServerCofig } diff --git a/dsl/config/GitAccess.dhall b/dsl/config/GitAccess.dhall deleted file mode 100644 index a55ac55..0000000 --- a/dsl/config/GitAccess.dhall +++ /dev/null @@ -1,5 +0,0 @@ -{- - Union of git configurations, - to give a choice to user to use HTTPS config or SSH config --} -< HTTPS : ./GitHttps.dhall | SSH : ./GitSsh.dhall > diff --git a/dsl/config/GitHttps.dhall b/dsl/config/GitHttps.dhall deleted file mode 100644 index 60a0293..0000000 --- a/dsl/config/GitHttps.dhall +++ /dev/null @@ -1,9 +0,0 @@ --- Git configuration schema to access the git repo via https -{- - HTTPS configuration to access git repository - local : The path where the local Git Repo shall be created/used. Defaults to tmp/git - remote : The remote Git repository to push the repo to - username : To access the git repo HTTPS username - password : To access the git repo HTTPS password --} -{ local : Text, remote : Text, username : Text, password : Text } diff --git a/dsl/config/GitSsh.dhall b/dsl/config/GitSsh.dhall deleted file mode 100644 index 2bf637b..0000000 --- a/dsl/config/GitSsh.dhall +++ /dev/null @@ -1,8 +0,0 @@ --- Git configuration schema to access the git repo via ssh -{- - SSH configuration to access git repository - local : The path where the local Git Repo shall be created/used. Defaults to tmp/git - remote : The remote Git repository to push the repo to - ssh-key : This is the SSH key to be used for accessing the remote repo. Linebreaks must be replaced with spaces --} -{ local : Text, remote : Text, ssh-key : Text } diff --git a/dsl/config/run.sh b/dsl/config/run.sh deleted file mode 100755 index ee7597c..0000000 --- a/dsl/config/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# Exit on all errors and undefined vars -set -o errexit -set -o errtrace -set -o pipefail -set -o nounset - -main() { - # Generate application.yml configuration for unipipe service broker - dhall-to-yaml < ./AppConfig.dhall | tee ../../src/main/resources/application-default.yml - -} - - -main \ No newline at end of file