MuranoCLI 3.2.0.beta.9 → 3.2.1.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d280f1504ef238178a4baea98ead2816f1e5e4e171b833c1905f2f9829e5f664
-  data.tar.gz: 57a8ba23b80836607343f7dad576c730747d7ca672b9b2c55318b69a0eb956cf
+  metadata.gz: da25ca3b8f76c8441e11b57712ef6d7a536cf9c70a92e03822131e29dbaf4019
+  data.tar.gz: 68dfdbefe7259168d61e30009e305a79d505cc503ae94b86b982947724d0c588
 SHA512:
-  metadata.gz: 81a67f95d05900d181d9ffd87eea654d0ccf44cb0e9d9dc83d76b8999d203595a8015e4f8a1a9aae83b028c5dd8b343450795bab7e05bf7c194c31a15112c7d3
-  data.tar.gz: 7a27339a72cd15419af5961680e178fb723919082f9a47cf7a9d8fbfd07db9936c3931b16ab665efae073ab58ee719d1f6689123d8babe878c7225d50d9e73dc
+  metadata.gz: ccdbdbfa174682349eaef3f788d031fdc6f785ac4369cf798132dc6efdd0361c0dc61f5d3bf531d6775f2589630704c799bed9ecd9e38119e4f5ddd0fa7ed0db
+  data.tar.gz: 83e03633309260f8e50eb35b6641a48474f89f4aac27d5229b5ac1b549bf3f1a1fa0795d799c89cb38f0f1c5431162bb21828d21f64235fd69d5a72367602925

data/.rubocop.yml

@@ -285,4 +285,7 @@ AllCops:
     #
     # The spec_helper is a generated file; don't care.
     - 'spec/spec_helper.rb'
+    # The unit test for syncdown has a ton of copy-paste curl output,
+    # which would be super duper tedious to clean up for the linter.
+    - 'spec/cmd_syncdown_unit_spec.rb'
 

data/Rakefile

@@ -88,6 +88,11 @@ task :rubocop do
 end
 task lint: :rubocop
 
+desc 'Run Rubocop linter through `less`'
+task 'lint-less' do
+  system %(rubocop --color -D -c .rubocop.yml | less -r)
+end
+
 desc 'Clean out junk from prior hot tests'
 task :test_clean_up do
   unless ENV['MURANO_CONFIGFILE'].nil?

data/dockers/README.rst

@@ -305,18 +305,25 @@ Jenkins project configuration: Murano CLI Gem Release
     - Notifications
 
       - Notification Type: ``Build started``
+        Color: ``purple``
 
       - Notification Type: ``Build aborted``
+        Color: ``red``
 
       - Notification Type: ``Build successful``
+        Color: ``green``
 
       - Notification Type: ``Build failed``
+        Color: ``red``
 
       - Notification Type: ``Module not built``
+        Color: ``red``
 
       - Notification Type: ``Build is back to normal``
+        Color: ``yellow``
 
       - Notification Type: ``Build is unstable``
+        Color: ``yellow``
 
     Job started::
 

data/dockers/RELEASE.rst

@@ -58,8 +58,8 @@ Trigger the Gem release build
 Set the variables above, and then tag the appropriate branch::
 
   cd ${MURCLI_BASE}/exosite+MuranoCLI
-  git checkout ${MURCLI_REL}
-  git pull
+  git checkout ${MURCLI_REF}
+  git pull --ff-only
 
   git tag -a "${MURCLI_REL}" -m "Release tag: ${MURCLI_REL}" ${MURCLI_REF}
   git push origin "${MURCLI_REL}"
@@ -101,6 +101,7 @@ Download the built Gem from GitHub::
        --location \
          https://api.github.com/repos/${OWNER}/${REPO}/releases/tags/v${MURCLI_VER}
   cat v${MURCLI_VER}
+  #
   ASSET_ID=$(cat v${MURCLI_VER} | jq '.assets[0].id')
   echo ${ASSET_ID}
   #
@@ -110,13 +111,15 @@ Download the built Gem from GitHub::
     --header='Accept:application/octet-stream' \
     https://${GITHUB_TOKEN}:@api.github.com/repos/${OWNER}/${REPO}/releases/assets/${ASSET_ID} \
     -O MuranoCLI-${MURCLI_VER}.gem
+  ls -la MuranoCLI-${MURCLI_VER}.gem
 
 Publish the gem::
 
   gem push MuranoCLI-${MURCLI_VER}.gem
   popd
   rm /tmp/gem_push/MuranoCLI-${MURCLI_VER}.gem
-  rm /tmp/gem_push/${ASSET_ID}
+  rm /tmp/gem_push/v${MURCLI_VER}
+  rm /tmp/gem_push/releases
   rmdir /tmp/gem_push
 
 Test!::

data/dockers/docker-test.sh

@@ -48,6 +48,11 @@ must_verify_environs () {
   [[ -z ${MURANO_USERNAME} ]] && echo "ERROR: Please set MURANO_USERNAME" && exit 1
   [[ -z ${MURANO_PASSWORD} ]] && echo "ERROR: Please set MURANO_PASSWORD" && exit 1
   [[ -z ${MURANO_BUSINESS} ]] && echo "ERROR: Please set MURANO_BUSINESS" && exit 1
+
+  # TEST_ME: (lb): I bet WORKSPACE is set to /app on Docker.
+  if [[ -d /app && "${WORKSPACE}" != "/app" ]]; then
+    echo "WARNING: WORKSPACE not /app?: ${WORKSPACE}"
+  fi
 }
 
 # Create a basic Murano CLI config indicating the Murano account credentials.
@@ -55,8 +60,10 @@ must_verify_environs () {
 # Default to host "bizapi-staging.hosted.exosite.io".
 export MURANO_BIZAPIIO=${MURANO_BIZAPIIO:-bizapi-staging.hosted.exosite.io}
 
+export MURANO_CONFIGFILE="${MURANO_CONFIGFILE:-${WORKSPACE}/test.run.muranocfg}"
+
 create_basic_config () {
-  cat > "${WORKSPACE}/test.run.muranocfg" <<-EOCFB
+  cat > "${MURANO_CONFIGFILE}" <<-EOCFB
 [user]
   name = ${MURANO_USERNAME}
 [business]
@@ -64,21 +71,28 @@ create_basic_config () {
 [net]
   host = ${MURANO_BIZAPIIO}
 EOCFB
-  export MURANO_CONFIGFILE="${WORKSPACE}/test.run.muranocfg"
+}
+
+remove_basic_config () {
+  rm "${MURANO_CONFIGFILE}"
 }
 
 # Switch to the project directory and run tests.
 
 prepare_to_test () {
-  cd /app
+  cd ${WORKSPACE}
 
   # Instead of `rake test_clean_up -t`, call CLI directly with --no-color.
 
   echo "Removing existing solutions from Murano account."
 
-  ruby -Ilib bin/murano solutions expunge -y --no-progress --no-color --ascii
+  # We're not installing Murano CLI using gem, so we have to tell ruby
+  # where the library is.
+  export murano="ruby -I${WORKSPACE}/lib ${WORKSPACE}/bin/murano"
 
-  # Fix the PATH to avoid the error:
+  ${murano} solutions expunge -y --no-progress --no-color --ascii
+
+  # Fix the PATH to avoid the error (on new Jenkins, dockerized test server):
   #
   #   /tmp/jenkins8459777890102160498.sh: line 81: rspec: command not found
   PATH=${PATH}:/usr/local/bundle/bin
@@ -86,15 +100,20 @@ prepare_to_test () {
   # (lb): Sometimes the host drive directories mount as root:root with 2755
   # permissions. But sometimes not. If it starts happening again, you'll see
   # Errno::EACCES: Permission denied. Uncomment the sudoers code in Dockerfile.
-  sudo chmod 2777 /app/report
-  sudo chmod 2777 /app/coverage
+  if [[ -d /app ]]; then
+    sudo chmod 2777 /app/report
+    sudo chmod 2777 /app/coverage
+  else
+    mkdir ${WORKSPACE}/report
+    mkdir ${WORKSPACE}/coverage
+  fi
 }
 
 execute_tests () {
-  cd /app
+  cd ${WORKSPACE}
 
   echo "############################################################################################"
-  echo "Testing \"$(murano -v)\" on \"$(ruby -v)\""
+  echo "Testing \"$(${murano} -v)\" on \"$(ruby -v)\""
   echo "############################################################################################"
 
   # Hint: Add `--example "<...>"` to limit the test suite.
@@ -105,30 +124,39 @@ execute_tests () {
 
   rspec \
     --format html \
-    --out /app/report/index-${RVERS}.html \
-    --format documentation
+    --out ${WORKSPACE}/report/index-${RVERS}.html \
+    --format documentation \
+    "${@}"
 
   rspec_rsp=$?
 
+  local retries=3
+
   # BizAPI oftentimes timesout on a few tests, so try again.
-  if [[ ${rspec_rsp} -ne 0 ]]; then
+  while [[ ${rspec_rsp} -ne 0 && ${retries} -gt 0 ]]; do
+    echo -e "\n\nRetrying! ${retries} remain!!\n\n"
+
     rspec \
       --format html \
-      --out /app/report/index-${RVERS}.html \
+      --out ${WORKSPACE}/report/index-${RVERS}.html \
       --format documentation \
-      --only-failures
+      --only-failures \
+      "${@}"
 
     rspec_rsp=$?
-  fi
+    retries=$((${retries} - 1))
+  done
 
-  exit ${rspec_rsp}
+  #exit ${rspec_rsp}
+  echo -e "Thanks for flying the Murano CLIs!\n"
 }
 
 main () {
   must_verify_environs
   create_basic_config
   prepare_to_test
-  execute_tests
+  execute_tests "${@}"
+  remove_basic_config
 }
 
 main "${@}"

data/docs/completions/murano_completion-bash

@@ -74,7 +74,6 @@ function _murano () {
     if [[ -z $cmd0 ]]; then
       local -a comp_list
       comp_list=(
-        _gb
         _s
         application
         applications
@@ -82,6 +81,7 @@ function _murano () {
         banner
         business
         businesses
+        child
         completion
         config
         content
@@ -92,9 +92,9 @@ function _murano () {
         devices
         diff
         domain
+        element
         exchange
         find
-        gwe
         help
         init
         keystore
@@ -105,6 +105,7 @@ function _murano () {
         logout
         logs
         mock
+        network
         password
         passwords
         plugin
@@ -139,9 +140,6 @@ function _murano () {
       COMPREPLY=($(compgen -W '${comp_list[@]}' -- "$last"))
     else
       case $cmd0 in
-        (_gb)
-          __murano-_gb "$cmd1" "$cmd2" "${used_switches[@]}"
-        ;;
         (_s)
           __murano-_s "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
@@ -163,6 +161,9 @@ function _murano () {
         (businesses)
           __murano-businesses "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
+        (child)
+          __murano-child "$cmd1" "$cmd2" "${used_switches[@]}"
+        ;;
         (completion)
           __murano-completion "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
@@ -193,15 +194,15 @@ function _murano () {
         (domain)
           __murano-domain "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
+        (element)
+          __murano-element "$cmd1" "$cmd2" "${used_switches[@]}"
+        ;;
         (exchange)
           __murano-exchange "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
         (find)
           __murano-find "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
-        (gwe)
-          __murano-gwe "$cmd1" "$cmd2" "${used_switches[@]}"
-        ;;
         (help)
           __murano-help "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
@@ -232,6 +233,9 @@ function _murano () {
         (mock)
           __murano-mock "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
+        (network)
+          __murano-network "$cmd1" "$cmd2" "${used_switches[@]}"
+        ;;
         (password)
           __murano-password "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
@@ -305,60 +309,6 @@ function _murano () {
     fi
 }
 
-# Completion for subcommand: "_gb".
-function __murano-_gb () {
-  local subcmd1="$1"
-  local subcmd2="$2"
-  #local subcmdn="$3"
-  local used_switches="${@:3}"
-  local last="${COMP_WORDS[COMP_CWORD]}"
-  local len=$(($COMP_CWORD - 1))
-
-  local -a more_switches
-
-  local -a comp_list
-
-  #>&2 echo -e "\nsubcmd1=$subcmd1 / subcmd2=$subcmd2 / last=$last / len=$len"
-  #>&2 echo "used_switches=$used_switches"
-  #>&2 echo "more_switches=$more_switches"
-
-  # NOTE: Not doing anything special for ${subcmd2}.
-  #       Are there sub-sub-commands we shoud list?
-
-  # Add unused application-wide flags.
-  local idx
-  for ((idx = 0; idx < ${#__app_switches[@]}; idx++)); do
-    local switch=${__app_switches[$idx]}
-    if ! contains_element "$switch" "${used_switches[@]}"; then
-      comp_list+=("$switch")
-    fi
-  done
-  # Add unused subcommand flags.
-  for ((idx = 0; idx < ${#more_switches[@]}; idx++)); do
-    local switch=${more_switches[$idx]}
-    comp_list+=("$switch")
-  done
-
-  # If there are only --flags, <TAB> will put the common prefix,
-  # "--", but maybe the user doesn't want to add a flag after all.
-  if [[ -z ${last} ]]; then
-    local flags_only=true
-    for ((idx = 0; idx < ${#comp_list[@]}; idx++)); do
-      local switch=${comp_list[$idx]}
-      if [[ ${switch} != --* ]]; then
-        flags_only=false
-        break
-      fi
-    done
-    if ${flags_only}; then
-      # Use two Unicode en spaces to prevent compgen from prefixing "--".
-      comp_list+=("	 ")
-    fi
-  fi
-
-  COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
-}
-
 # Completion for subcommand: "_s".
 function __murano-_s () {
   local subcmd1="$1"
@@ -896,6 +846,82 @@ function __murano-businesses () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
+# Completion for subcommand: "child".
+function __murano-child () {
+  local subcmd1="$1"
+  local subcmd2="$2"
+  #local subcmdn="$3"
+  local used_switches="${@:3}"
+  local last="${COMP_WORDS[COMP_CWORD]}"
+  local len=$(($COMP_CWORD - 1))
+
+  local -a more_switches
+
+  local -a comp_list
+
+  #>&2 echo -e "\nsubcmd1=$subcmd1 / subcmd2=$subcmd2 / last=$last / len=$len"
+  #>&2 echo "used_switches=$used_switches"
+  #>&2 echo "more_switches=$more_switches"
+
+  # NOTE: Not doing anything special for ${subcmd2}.
+  #       Are there sub-sub-commands we shoud list?
+  if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
+    comp_list=(
+      add
+      remove
+      show
+    )
+  else
+    case $subcmd1 in
+      (add)
+      more_switches=(
+      )
+      ;;
+      (remove)
+      more_switches=(
+      )
+      ;;
+      (show)
+      more_switches=(
+      )
+      ;;
+    esac
+  fi
+
+  # Add unused application-wide flags.
+  local idx
+  for ((idx = 0; idx < ${#__app_switches[@]}; idx++)); do
+    local switch=${__app_switches[$idx]}
+    if ! contains_element "$switch" "${used_switches[@]}"; then
+      comp_list+=("$switch")
+    fi
+  done
+  # Add unused subcommand flags.
+  for ((idx = 0; idx < ${#more_switches[@]}; idx++)); do
+    local switch=${more_switches[$idx]}
+    comp_list+=("$switch")
+  done
+
+  # If there are only --flags, <TAB> will put the common prefix,
+  # "--", but maybe the user doesn't want to add a flag after all.
+  if [[ -z ${last} ]]; then
+    local flags_only=true
+    for ((idx = 0; idx < ${#comp_list[@]}; idx++)); do
+      local switch=${comp_list[$idx]}
+      if [[ ${switch} != --* ]]; then
+        flags_only=false
+        break
+      fi
+    done
+    if ${flags_only}; then
+      # Use two Unicode en spaces to prevent compgen from prefixing "--".
+      comp_list+=("	 ")
+    fi
+  fi
+
+  COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
+}
+
 # Completion for subcommand: "completion".
 function __murano-completion () {
   local subcmd1="$1"
@@ -1633,8 +1659,8 @@ function __murano-domain () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
-# Completion for subcommand: "exchange".
-function __murano-exchange () {
+# Completion for subcommand: "element".
+function __murano-element () {
   local subcmd1="$1"
   local subcmd2="$2"
   #local subcmdn="$3"
@@ -1654,29 +1680,23 @@ function __murano-exchange () {
   #       Are there sub-sub-commands we shoud list?
   if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
     comp_list=(
-      add
-      buy
-      list
-      purchase
+      edit
+      show
+      update
     )
   else
     case $subcmd1 in
-      (add)
+      (edit)
       more_switches=(
         {--trace}
       )
       ;;
-      (buy)
-      more_switches=(
-        {--trace}
-      )
-      ;;
-      (list)
+      (show)
       more_switches=(
         {--trace}
       )
       ;;
-      (purchase)
+      (update)
       more_switches=(
         {--trace}
       )
@@ -1718,8 +1738,8 @@ function __murano-exchange () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
-# Completion for subcommand: "find".
-function __murano-find () {
+# Completion for subcommand: "exchange".
+function __murano-exchange () {
   local subcmd1="$1"
   local subcmd2="$2"
   #local subcmdn="$3"
@@ -1739,17 +1759,29 @@ function __murano-find () {
   #       Are there sub-sub-commands we shoud list?
   if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
     comp_list=(
-      application
-      product
+      add
+      buy
+      list
+      purchase
     )
   else
     case $subcmd1 in
-      (application)
+      (add)
       more_switches=(
         {--trace}
       )
       ;;
-      (product)
+      (buy)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+      (list)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+      (purchase)
       more_switches=(
         {--trace}
       )
@@ -1791,8 +1823,8 @@ function __murano-find () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
-# Completion for subcommand: "gwe".
-function __murano-gwe () {
+# Completion for subcommand: "find".
+function __murano-find () {
   local subcmd1="$1"
   local subcmd2="$2"
   #local subcmdn="$3"
@@ -1812,12 +1844,19 @@ function __murano-gwe () {
   #       Are there sub-sub-commands we shoud list?
   if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
     comp_list=(
-      app
+      application
+      product
     )
   else
     case $subcmd1 in
-      (app)
+      (application)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+      (product)
       more_switches=(
+        {--trace}
       )
       ;;
     esac
@@ -2646,6 +2685,92 @@ function __murano-mock () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
+# Completion for subcommand: "network".
+function __murano-network () {
+  local subcmd1="$1"
+  local subcmd2="$2"
+  #local subcmdn="$3"
+  local used_switches="${@:3}"
+  local last="${COMP_WORDS[COMP_CWORD]}"
+  local len=$(($COMP_CWORD - 1))
+
+  local -a more_switches
+
+  local -a comp_list
+
+  #>&2 echo -e "\nsubcmd1=$subcmd1 / subcmd2=$subcmd2 / last=$last / len=$len"
+  #>&2 echo "used_switches=$used_switches"
+  #>&2 echo "more_switches=$more_switches"
+
+  # NOTE: Not doing anything special for ${subcmd2}.
+  #       Are there sub-sub-commands we shoud list?
+  if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
+    comp_list=(
+      children
+      configure
+      delete
+      new
+      show
+    )
+  else
+    case $subcmd1 in
+      (children)
+      more_switches=(
+      )
+      ;;
+      (configure)
+      more_switches=(
+      )
+      ;;
+      (delete)
+      more_switches=(
+      )
+      ;;
+      (new)
+      more_switches=(
+      )
+      ;;
+      (show)
+      more_switches=(
+      )
+      ;;
+    esac
+  fi
+
+  # Add unused application-wide flags.
+  local idx
+  for ((idx = 0; idx < ${#__app_switches[@]}; idx++)); do
+    local switch=${__app_switches[$idx]}
+    if ! contains_element "$switch" "${used_switches[@]}"; then
+      comp_list+=("$switch")
+    fi
+  done
+  # Add unused subcommand flags.
+  for ((idx = 0; idx < ${#more_switches[@]}; idx++)); do
+    local switch=${more_switches[$idx]}
+    comp_list+=("$switch")
+  done
+
+  # If there are only --flags, <TAB> will put the common prefix,
+  # "--", but maybe the user doesn't want to add a flag after all.
+  if [[ -z ${last} ]]; then
+    local flags_only=true
+    for ((idx = 0; idx < ${#comp_list[@]}; idx++)); do
+      local switch=${comp_list[$idx]}
+      if [[ ${switch} != --* ]]; then
+        flags_only=false
+        break
+      fi
+    done
+    if ${flags_only}; then
+      # Use two Unicode en spaces to prevent compgen from prefixing "--".
+      comp_list+=("	 ")
+    fi
+  fi
+
+  COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
+}
+
 # Completion for subcommand: "password".
 function __murano-password () {
   local subcmd1="$1"