MuranoCLI 3.2.0.beta.5 → 3.2.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee0c62e2b43c3677482ff5962c744efeb602e2a889aec33f4c25318e14b24d7
-  data.tar.gz: 626bc2a19f7a9d5dccc4943b3710ec75f4b7dcaf75aedb2e8d216f300bc42129
+  metadata.gz: 8940564247a955849c5a89835b1915f57b3766f28b0fc52cd83e282ec9aef599
+  data.tar.gz: dda30a89bf0f573fd124902dba05fe8c7f21b0b803dd951a6573ccd400a6293f
 SHA512:
-  metadata.gz: 6cc99cff39c92cbcce0b368bc5cf665eee0d1a296fb62ebed9002fe52b64e5aaa919dfa0696893be838b292f9d275cfa5c387db9befd8327123fa3980b8d4d18
-  data.tar.gz: 8b7234f489e517edc073ce7386426f19f376d04fe8e5694fb60396903a2c2c0f4cecd1452f36835d668e72fd3bfd1355beadb76b22f6132fd60ac906b21161d1
+  metadata.gz: e221c40000b55e2c6b18aa2738541ed3c8edbc4bdb61377a2e62342a0ca2f6e261731e455a846eff2a77b18893e1d90fc6c2bd74b9dee4d41ee23bdd8868a4ee
+  data.tar.gz: 6d9076522f2a45cd76a95ffc2f362952e6f2d3978699571efcc93663906b062051e8e883edc58400758112ad7093632f14d087d3218ec87179d9f121473fd01c

data/.ignore

@@ -1,19 +1,30 @@
 .git/
-coverage/
-pkg/
-report/
 
-.byebug_history
-.rspec_examples.txt
+# Build/install cruft.
+pkg/
 Gemfile.lock
 .bundle/
-tags
-
-# 2017-05-12: Testing!
-*.out
-.trustme.log
-curldebug.out
+.rake_build.out
 
+# Testing cruft.
+coverage/
+report/
 rspec-*.html
 *.rspec.html
+.rspec_examples.txt
+
+# Debugging/developing cruft.
+curldebug.out
+tags
+.byebug_history
+.trustme.log
+active-project
+projects
+
+# Symlinks!
+projects
+active-project
+
+# Generated files.
+docs/completions/murano_completion-bash
 

data/dockers/Dockerfile.2.2.9

@@ -16,7 +16,7 @@ RUN \
   && apt-get -qq update \
   && apt-get install -y sudo
 
-RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -26,7 +26,7 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  sudo gem install bundler && \
+  gem install bundler && \
   gem install rspec && \
   bundle install --with test && \
   rake build

data/dockers/Dockerfile.2.3.6

@@ -16,7 +16,7 @@ RUN \
   && apt-get -qq update \
   && apt-get install -y sudo
 
-RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -26,7 +26,7 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  sudo gem install bundler && \
+  gem install bundler && \
   gem install rspec && \
   bundle install --with test && \
   rake build

data/dockers/Dockerfile.2.4.3

@@ -16,7 +16,7 @@ RUN \
   && apt-get -qq update \
   && apt-get install -y sudo
 
-RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -26,7 +26,7 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  sudo gem install bundler && \
+  gem install bundler && \
   gem install rspec && \
   bundle install --with test && \
   rake build

data/dockers/Dockerfile.2.5.0

@@ -16,7 +16,7 @@ RUN \
   && apt-get -qq update \
   && apt-get install -y sudo
 
-RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
 
 WORKDIR /app
 COPY . /app
@@ -26,7 +26,7 @@ RUN /bin/chown -R jenkins /app
 USER jenkins
 
 RUN cd /app && \
-  sudo gem install bundler && \
+  gem install bundler && \
   gem install rspec && \
   bundle install --with test && \
   rake build

data/dockers/Dockerfile.GemRelease

@@ -26,11 +26,11 @@ RUN /bin/chown -R jenkins /app
 
 USER jenkins
 
-RUN cd /app
-RUN gem install bundler
-RUN gem install rspec
-RUN bundle install
-RUN rake build
+RUN cd /app && \
+  gem install bundler && \
+  gem install rspec && \
+  bundle install && \
+  rake build
 
 RUN gem install \
   pkg/MuranoCLI-$(ruby -e \
@@ -41,7 +41,7 @@ RUN gem install \
 
 RUN mkdir -p /home/jenkins/Downloads && \
   cd /home/jenkins/Downloads && \
-  curl -L https://github.com/aktau/github-release/releases/download/v0.6.2/linux-amd64-github-release.tar.bz2 | bzcat | tar xf - && \
+  curl -L https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 | bzcat | tar xf - && \
   mkdir -p /home/jenkins/bin && \
   cp bin/linux/amd64/github-release /home/jenkins/bin/github-release
 

data/dockers/Dockerfile.m4

@@ -77,10 +77,10 @@ RUN \
   && apt-get -qq update \
   && apt-get install -y sudo
 
-dnl # NOTE: It's just easier to give the jenkins user full sudo...
-dnl #   RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
+dnl # (lb) It may be easier to give the jenkins user full sudo...
+RUN echo "jenkins ALL= NOPASSWD: /bin/chmod" >> /etc/sudoers
 dnl #   RUN echo "jenkins ALL= NOPASSWD: /usr/local/bundle/bin/gem" >> /etc/sudoers
-RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
+dnl #   RUN echo "jenkins ALL= NOPASSWD: ALL" >> /etc/sudoers
 dnl # If you have complainst about sudoers, try:
 dnl #   RUN visudo -c
 
@@ -106,7 +106,7 @@ dnl #
 USER jenkins
 
 RUN cd /app && \
-  sudo gem install bundler && \
+  gem install bundler && \
   gem install rspec && \
   bundle install --with test && \
   rake build

data/dockers/README.rst

@@ -196,7 +196,7 @@ Jenkins project configuration: Murano CLI Gem Release
 
   - NEW:
 
-    *TBD*
+    https://jenkins.exosite.com/job/MuranoCLI/job/Murano_CLI_Gem_Release/configure
 
   - OLD:
 
@@ -204,7 +204,13 @@ Jenkins project configuration: Murano CLI Gem Release
 
 - General configuration
 
-  - Project name: ``Murano CLI Gem Release``
+  - Project name: ``Murano_CLI_Gem_Release``
+
+    - NOTE: Do not use spaces in the project name -- e.g., this is bad:
+      ``Murano CLI Gem Release`` -- or the `Jenkins Docker Plugin
+     <https://github.com/jenkinsci/docker-custom-build-environment-plugin>`__
+       will complain, e.g., ``docker: Error response from daemon: Invalid container
+       name (Murano CLI Gem Release-69), only [a-zA-Z0-9][a-zA-Z0-9_.-] are allowed``.
 
   - Discard old builds ``✓``
 
@@ -226,7 +232,7 @@ Jenkins project configuration: Murano CLI Gem Release
 
       - Repository URL: https://github.com/exosite/MuranoCLI.git
 
-      - Credentials: (SSH key. Set Deploy Key in GitHub; Credentials in Jenkins.)
+      - Credentials [dropdown]: ``git``
 
     - Branches to build
 
@@ -242,33 +248,31 @@ Jenkins project configuration: Murano CLI Gem Release
 
 - Build Environment
 
-  - Build inside a Docker container ``✓``
+  - Use secret text(s) or file(s) ``✓``
 
-    - Docker image to use
+    - Bindings
 
-      - Build from Dockerfile ``✓``
+      - Secret text
 
-        - path to docker context: ``.``
+        - Variable: ``GITHUB_TOKEN``
 
-        - Dockerfile: ``./dockers/Dockerfile.GemRelease``
+        - Credentials: "Specific credentials"
 
-  - Inject environment variables to the build process ``✓``
+          Dropdown: "Exosite Github API Token"
 
-    - Properties Content::
+  - Build inside a Docker container ``✓``
 
-      GITHUB_REPO=MuranoCLI
-      GITHUB_USER=exosite
-      PATH=$HOME/bin:$PATH
+    - Docker image to use
 
-  - Inject passwords to the build as environment variables ``✓``
+      - Build from Dockerfile ``✓``
 
-    - Job passwords
+        - path to docker context: ``.``
 
-      - Name: ``GITHUB_TOKEN``
+        - Dockerfile: ``./dockers/Dockerfile.GemRelease``
 
-      - Password: (App token generated on GitHub.)
+  - Color ANSI Console Output ``✓``
 
-    - Mask password parameters ``✓``
+    - ANSI color map [dropdown]: ``xterm``
 
 - Build
 
@@ -277,11 +281,75 @@ Jenkins project configuration: Murano CLI Gem Release
     - Command::
 
       #!/bin/bash
+      export GITHUB_REPO=MuranoCLI
+      export GITHUB_USER=exosite
+      export PATH=$HOME/bin:$PATH
       /app/dockers/gem-release.sh
 
 - Post-build Actions
 
   - Files to archive: ``pkg/MuranoCLI-*.gem``
 
-FIXME: Missing GitHub & other notifications. See old job.
+  - E-mail Notification
+
+    - Recipients: ``user`@exosite.com user2@exosite.com``
+
+    - Send e-mail for every unstable build ``✓``
+
+  - HipChat Notifications
+
+    - Credentials [dropdown]: ``HipChat token for Jenkins``
+
+    - Project Room: ``4403216`` [MurCLI:CI]
+    
+    - Notifications
+
+      - Notification Type: ``Build started``
+
+      - Notification Type: ``Build aborted``
+
+      - Notification Type: ``Build successful``
+
+      - Notification Type: ``Build failed``
+
+      - Notification Type: ``Module not built``
+
+      - Notification Type: ``Build is back to normal``
+
+      - Notification Type: ``Build is unstable``
+
+    Job started::
+
+      Jenkins is starting up <a href="$URL">$JOB_NAME #$BUILD_NUMBER</a> using <a href="$GIT_URL">$GIT_BRANCH</a> ($CHANGES_OR_CAUSE).
+
+    Job Completed::
+
+      Jenkins completed <a href="$URL">$JOB_NAME #$BUILD_NUMBER</a> on <a href="$GIT_URL">$GIT_BRANCH</a> (Lap Time: $DURATION).
+
+Legacy Jenkins Settings:
+
+- (lb): This is how it looked on the old build server, which is still
+  alive if we need it:
+
+    https://build.exosite.com/view/MuranoCLI/job/MrMurano%20Gem%20Release/
+
+  - Build Environment
+
+    - Inject environment variables to the build process ``✓``
+
+      - Properties Content::
+
+        GITHUB_REPO=MuranoCLI
+        GITHUB_USER=exosite
+        PATH=$HOME/bin:$PATH
+
+    - Inject passwords to the build as environment variables ``✓``
+
+      - Job passwords
+
+        - Name: ``GITHUB_TOKEN``
+
+        - Password: (App token generated on GitHub.)
+
+      - Mask password parameters ``✓``
 

data/dockers/RELEASE.rst

@@ -38,7 +38,7 @@ Set that latest version
 
 Set the release version, e.g.,::
 
-  MURCLI_VER="3.1.0.beta.8"
+  MURCLI_VER="3.2.0.beta.8"
   MURCLI_REL="v${MURCLI_VER}"
 
 Choose a release: pre or official

data/dockers/docker-test.sh

@@ -52,6 +52,9 @@ must_verify_environs () {
 
 # Create a basic Murano CLI config indicating the Murano account credentials.
 
+# Default to host "bizapi-staging.hosted.exosite.io".
+export MURANO_BIZAPIIO=${MURANO_BIZAPIIO:-bizapi-staging.hosted.exosite.io}
+
 create_basic_config () {
   cat > "${WORKSPACE}/test.run.muranocfg" <<-EOCFB
 [user]
@@ -59,7 +62,7 @@ create_basic_config () {
 [business]
   id = ${MURANO_BUSINESS}
 [net]
-  host = bizapi-staging.hosted.exosite.io
+  host = ${MURANO_BIZAPIIO}
 EOCFB
   export MURANO_CONFIGFILE="${WORKSPACE}/test.run.muranocfg"
 }

data/{.trustme.plugin → docs/ci/.trustme.plugin}

@@ -43,6 +43,8 @@ build_it() {
       ).gem \
     &>> ${OUT_FILE} 2>&1 &
   wait_maybe_fail
+  #alert_success_toast 'Murano CLI says, "Woot woot!!"' 'Wheeee!' 666
+  alert_success_flash
 
   say '' true
 }
@@ -57,8 +59,9 @@ lint_it() {
 
 test_it() {
   test_it_
-# MEH/2017-12-06: The tests take a number of seconds to run, so skipping.
-return
+  # 2017-10-02: (lb): Testing takes too long (20 minutes!), and saving often
+  # just means constant churn, so skip tests.
+  return
 
   rake rspec &>> ${OUT_FILE}
 

data/{.trustme.sh → docs/ci/.trustme.sh}

@@ -66,7 +66,8 @@ source_plugin() {
   PROJECT_DIR=$(dirname -- "${BASH_SOURCE[0]}")
   DOTFILENAME=${TRUSTME_BASENAME:-.trustme}
 
-  source_color
+  source_home_fries_util 'color_util.sh'
+  source_home_fries_util 'logger.sh'
 
   PROJ_PLUGIN="${PROJECT_DIR}/${DOTFILENAME}.plugin"
   if [[ ! -f "${PROJ_PLUGIN}" ]]; then
@@ -76,22 +77,24 @@ source_plugin() {
   source "${PROJ_PLUGIN}"
 }
 
-source_color() {
-  local color_util='color_util.sh'
-  local color_path="${color_util}"
+source_home_fries_util() {
+  local home_fries_util="$1"
+  local source_path="${home_fries_util}"
   # If the /user/home/.fries/lib path is on $PATH, you can just source it.
-  if ! source "${color_path}" &> /dev/null; then
-    # But if it's not on $PATH, see if this script is a symlink, in which
-    # case color_util.sh is also part of this file's owning repo.
+  if ! source "${source_path}" &> /dev/null; then
+    # But if it's not on $PATH, see if this script is a symlink, and if so,
+    # see if the util file is part of this file's owning repo.
     if [[ -h "${BASH_SOURCE[0]}" ]]; then
-      color_path="$(dirname $(readlink -f ${BASH_SOURCE[0]}))/${color_util}"
+      source_path="$(dirname $(readlink -f ${BASH_SOURCE[0]}))/${home_fries_util}"
     fi
-    if ! source "${color_path}" &> /dev/null; then
-      >&2 echo "Unable to find and source ${color_util}. You're missing out!"
+    if ! source "${source_path}" &> /dev/null; then
+      >&2 echo "Unable to find and source ${home_fries_util}. You're missing out!"
     fi
   fi
 }
 
+# ***
+
 assign_globals_() {
   OUT_FILE="${PROJECT_DIR}/${DOTFILENAME}.log"
 
@@ -113,6 +116,8 @@ assign_globals() {
   assign_globals_
 }
 
+# ***
+
 say() {
   FORCE_ECHO=${2:-false}
   # Restrict newlines to no more than 2 in a row.
@@ -161,6 +166,8 @@ repeat_char() {
   printf "$1"'%.s' $(eval "echo {1.."$(($2))"}")
 }
 
+# ***
+
 death() {
   if [[ -n ${WAIT_PID} ]]; then
     say "Sub-killing ‘${WAIT_PID}’"
@@ -263,7 +270,7 @@ lock_kill_or_die() {
   lock_kill_die true
 }
 
-# ===
+# ***
 
 wait_maybe_fail_pre_exit() {
   : # no-op
@@ -286,9 +293,51 @@ wait_maybe_fail() {
   WAIT_PID=
 }
 
+# ***
+
+alert_success_toast() {
+  local message
+  local title
+  local timeout
+  message="${1:-Yay!}"
+  title="${2:-Build Success!}"
+  timeout=${3:-2123}
+  if ``command -v notify-send >/dev/null 2>&1``; then
+    #notify-send -i face-wink -t 1234 \
+    #  'Build Success!' 'Murano CLI says, "Woot woot!!"'
+    # 2018-03-19: 1234 msec. is a tad too long. Something quicker,
+    # so I can train myself to ignore if it's a blip in the corner of my eye.
+    # Just make sure your mouse into over popup, or it won't go away!
+    # Hahaha, at 333 msec. it's basically a flash on the screen...
+    #   in that case, there's probably a better way to implement this!
+    notify-send \
+      -t ${timeout} \
+      -u normal \
+      -i '/home/landonb/.waffle/home/Pictures/Landonb-Bitmoji-Thumbs.Up.png' \
+      "${title}" \
+      "${message}"
+  fi
+}
+
+alert_success_flash() {
+  local duration
+  duration=${1:-0.075}
+  # 2018-03-19 18:04: This just gets better!
+  # sudo apt-get install xcalib
+  ##xcalib -invert -alter
+  #xcalib -alter -invert
+  # xcalib, because of X, only works on the first monitor!
+  # 2018-04-12: But I found a solution that works on all!!
+  /srv/opt/bin/xrandr-invert-colors.bin
+  sleep ${duration}
+  ##xcalib -invert -alter
+  #xcalib -alter -invert
+  /srv/opt/bin/xrandr-invert-colors.bin
+}
+
+# ***
+
 prepare_to_build() {
-  #/bin/rm "${DONE_FILE}"
-  #/bin/rm "${OUT_FILE}"
   rmdir "${KILL_DIR}"
   say
   say "See you on the other side!"
@@ -360,10 +409,11 @@ remove_pid_files() {
   /bin/rm "${KILL_BIN}"
 }
 
+# ***
+
 main() {
   source_plugin
 
-  # MAYBE: This call is redundant. Do we need to call it again here? Or should we delete first call?
   assign_globals
 
   # We're called on both save, and on simple buffer enter.
@@ -448,8 +498,6 @@ main() {
 
   lint_it
 
-  # 2017-10-02: I think testing takes too long, and saving often just means constant churn.
-
   # Unit tests.
   test_it
 

data/lib/MrMurano/Business.rb

@@ -357,6 +357,79 @@ module MrMurano
     def delete_application(sid)
       delete_solution(sid)
     end
+
+    # ---------------------------------------------------------------------
+
+    def get_business_network(bid)
+      return nil unless check_if_biz_network_capable(bid) == true
+      get('business/' + bid + '/network') do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+    # ---------------------------------------------------------------------
+
+    # ---------------------------------------------------------------------
+
+    def configure_business_network(bid, name)
+      return nil unless check_if_biz_network_capable(bid) == true
+      patch('business/' + bid + '/network', name: name) do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+    # ---------------------------------------------------------------------
+
+    def check_if_biz_network_capable(bid)
+      get('business/' + bid + '/tier') do |request, http|
+        tier_response = http.request(request)
+        case tier_response
+        when Net::HTTPSuccess
+          parsed_response = workit_response(tier_response)
+          if parsed_response[:network] != true
+            MrMurano::Verbose.error(
+              'Your business does not have access to business network features. Please upgrade your business.'
+            )
+            nil
+          else
+            true
+          end
+        else
+          showHttpError(request, tier_response)
+          nil
+        end
+      end
+    end
+
+    def self.must_not_be_managed!
+      # Check that the solution(s) are not managed.
+      # NOTE: BizAPI only tells us 'managed' via the business/<bizid>/solutions
+      # endpoint. I.e., we have to fetch all solutions, and cannot just check
+      # them individually. (lb): Probably not a big deal for most people, but
+      # I know some Support and QA biznesses have loads and loads o' solutions.
+      MrMurano::Verbose.whirly_msg 'Verifying solutions can be managed...'
+      biz = MrMurano::Business.new
+      solz = biz.solutions
+      solz.each do |sol|
+        # FIXME/2018-05-16: (lb): Fix this when Multi-solution support.
+        if [$cfg['application.id'], $cfg['product.id']].include? sol.sid
+          sol.must_not_be_managed!
+        end
+      end
+      MrMurano::Verbose.whirly_stop
+    end
   end
 end
 

data/lib/MrMurano/Config.rb

@@ -195,6 +195,7 @@ module MrMurano
       set('tool.no-page', false, :defaults)
       set('tool.no-progress', false, :defaults)
       set('tool.show-password', false, :defaults)
+      set('tool.skip-managed', false, :defaults)
     end
 
     def set_defaults_net
@@ -222,12 +223,12 @@ module MrMurano
       set('location.resources', 'specs/resources.yaml', :defaults)
       set('location.cors', 'cors.yaml', :defaults)
       # MUR-6562/MUR-6329: Changing defaults: files => assets; routes => endpoints.
-      set_defaults_location_MUR_6562('location.files', 'files', 'assets')
-      set_defaults_location_MUR_6562('location.endpoints', 'routes', 'endpoints')
+      set_defaults_location_newstyle('location.files', 'files', 'assets')
+      set_defaults_location_newstyle('location.endpoints', 'routes', 'endpoints')
     end
 
     # rubocop:disable Style/MethodName: Use snake_case for method names.
-    def set_defaults_location_MUR_6562(key, formerly, currently)
+    def set_defaults_location_newstyle(key, formerly, currently)
       if @project_dir && !@project_dir.join(formerly).exist?
         set(key, currently, :defaults)
       elsif @project_dir.join(currently).exist?

data/lib/MrMurano/Keystore.rb

@@ -26,15 +26,19 @@ module MrMurano
     end
 
     def getkey(key)
+      key = URI.encode_www_form_component(key)
       ret = call(:get, :post, key: key)
       ret[:value]
     end
 
     def setkey(key, value)
+      key = URI.encode_www_form_component(key)
+      value = URI.encode_www_form_component(value)
       call(:set, :post, key: key, value: value)
     end
 
     def delkey(key)
+      key = URI.encode_www_form_component(key)
       call(:delete, :post, key: key)
     end