Merge pull request #4 from jullianoacqio/master

Support passing parameters to the Databricks cli in the run phase
acqio · Aug 4, 2020 · fd9f8ce · fd9f8ce
2 parents 76347bc + f9bd679
commit fd9f8ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/internal/utility/fs.bzl b/internal/utility/fs.bzl
@@ -67,7 +67,7 @@ def _impl(ctx):
         'READER_CONFIG_FILE="%s"' % reader_config_file,
     ]
 
-    cmd_template = "$CLI $CMD $DEFAULT_OPTIONS {OPTIONS} {ARGS}"
+    cmd_template = "exe $CLI $CMD $DEFAULT_OPTIONS {OPTIONS} {ARGS}"
 
     fsinfo_stampfile = ""
     if ctx.attr.stamp:

diff --git a/internal/utility/helpers.bzl b/internal/utility/helpers.bzl
@@ -6,6 +6,7 @@ DBFS_PROPERTIES = {
 CHECK_CONFIG_FILE = """
 $READER_CONFIG_FILE $DEFAULT_OPTIONS --config_file $DATABRICKS_CONFIG_FILE
 """
+
 CMD_CLUSTER_INFO = """
 CLUSTER_ID=$($CLI clusters list $DEFAULT_OPTIONS --output JSON | \
 $JQ_TOOL -r \'(.clusters[] | select (.cluster_name=="\'$CLUSTER_NAME\'")).cluster_id\')

diff --git a/internal/utility/libraries.bzl b/internal/utility/libraries.bzl
@@ -53,7 +53,7 @@ def _impl(ctx):
         'READER_CONFIG_FILE="%s"' % reader_config_file,
     ]
 
-    cmd_template = "$CLI $CMD $DEFAULT_OPTIONS {OPTIONS}"
+    cmd_template = "exe $CLI $CMD $DEFAULT_OPTIONS {OPTIONS}"
 
     if api_cmd in ["install", "uninstall"]:
         if ctx.attr.dbfs:
@@ -66,7 +66,7 @@ def _impl(ctx):
             variables += ["STAMP=$(cat %s)" % dbfs[FsInfo].stamp_file.short_path]
 
         if api_cmd == "install":
-            cmd += ["exe '%s'" % dbfs[DefaultInfo].files_to_run.executable.short_path]
+            cmd += ["'%s' $@" % dbfs[DefaultInfo].files_to_run.executable.short_path]
 
         cmd += [cmd_template.format(OPTIONS = "--jar %s" % f) for f in dbfs[FsInfo].dbfs_files_path]
 
@@ -83,7 +83,7 @@ def _impl(ctx):
                     ]
 
     if api_cmd == "cluster-status":
-        cmd += ["%s | $JQ_TOOL ." % cmd_template.format(OPTIONS = "")]
+        cmd += ["%s" % cmd_template.format(OPTIONS = "")]
 
     ctx.actions.expand_template(
         is_executable = True,

diff --git a/internal/utility/script.sh.tpl b/internal/utility/script.sh.tpl
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 set -euo pipefail
-echo $0
 
 function exe() { echo "\$ ${@/eval/}" ; "$@" ; }