Added yamllint and shellchecked scripts (#22)

Author: AnthonyAmanse

.bluemix/pipeline.yml

@@ -1,59 +1,60 @@
 ---
 stages:
-- name: BUILD
-  inputs:
-  - type: git
-    branch: master
-    service: ${SAMPLE_REPO}
-  triggers:
-  - type: commit
-  jobs:
-  - name: Build
-    type: builder
-    artifact_dir: ''
-    build_type: shell
-    script: |-
-      #!/bin/bash
-      bash -n *.sh
-- name: DEPLOY
-  inputs:
-  - type: job
-    stage: BUILD
-    job: Build
-    dir_name: null
-  triggers:
-  - type: stage
-  properties:
-  - name: BLUEMIX_USER
-    type: text
-    value: ${BLUEMIX_USER}
-  - name: BLUEMIX_PASSWORD
-    type: secure
-    value: ${BLUEMIX_PASSWORD}
-  - name: BLUEMIX_ACCOUNT
-    type: secure
-    value: ${BLUEMIX_ACCOUNT}
-  - name: CLUSTER_NAME
-    type: text
-    value: ${CLUSTER_NAME}
-  - name: API_KEY
-    type: secure
-    value: ${API_KEY}
-  jobs:
-  - name: Deploy
-    type: deployer
-    target:
-      region_id: ${PROD_REGION_ID}
-      organization: ${PROD_ORG_NAME}
-      space: ${PROD_SPACE_NAME}
-      application: Pipeline
-    script: |
-      #!/bin/bash
-      . ./scripts/install_bx.sh
-      ./scripts/bx_login.sh
-      ./scripts/deploy.sh
+  - name: BUILD
+    inputs:
+      - type: git
+        branch: master
+        service: ${SAMPLE_REPO}
+    triggers:
+      - type: commit
+    jobs:
+      - name: Build
+        type: builder
+        artifact_dir: ''
+        build_type: shell
+        script: |-
+          #!/bin/bash
+          bash -n *.sh
+  - name: DEPLOY
+    inputs:
+      - type: job
+        stage: BUILD
+        job: Build
+        dir_name: null
+    triggers:
+      - type: stage
+    properties:
+      - name: BLUEMIX_USER
+        type: text
+        value: ${BLUEMIX_USER}
+      - name: BLUEMIX_PASSWORD
+        type: secure
+        value: ${BLUEMIX_PASSWORD}
+      - name: BLUEMIX_ACCOUNT
+        type: secure
+        value: ${BLUEMIX_ACCOUNT}
+      - name: CLUSTER_NAME
+        type: text
+        value: ${CLUSTER_NAME}
+      - name: API_KEY
+        type: secure
+        value: ${API_KEY}
+    jobs:
+      - name: Deploy
+        type: deployer
+        target:
+          region_id: ${PROD_REGION_ID}
+          organization: ${PROD_ORG_NAME}
+          space: ${PROD_SPACE_NAME}
+          application: Pipeline
+        script: |
+          #!/bin/bash
+          . ./scripts/deploy-to-bluemix/install_bx.sh
+          ./scripts/deploy-to-bluemix/bx_login.sh
+          ./scripts/deploy-to-bluemix/deploy.sh
 hooks:
-- enabled: true
-  label: null
-  ssl_enabled: false
-  url: https://devops-api-integration.stage1.ng.bluemix.net/v1/messaging/webhook/publish
+  - enabled: true
+    label: null
+    ssl_enabled: false
+    url: >-
+      https://devops-api-integration.stage1.ng.bluemix.net/v1/messaging/webhook/publish

.bluemix/toolchain.yml

@@ -5,8 +5,8 @@ version: 0.1
 image: data:image/svg+xml;base64,$file(toolchain.svg,base64)
 icon: data:image/svg+xml;base64,$file(icon.svg,base64)
 required:
- - deploy
- - sample-repo
+  - deploy
+  - sample-repo
 
 # Github repos
 sample-repo:
@@ -24,23 +24,23 @@ sample-build:
     name: "{{name}}"
     ui-pipeline: true
     configuration:
-     content: $file(pipeline.yml)
-     env:
-      SAMPLE_REPO: "sample-repo"
-      CF_APP_NAME: "{{deploy.parameters.prod-app-name}}"
-      PROD_SPACE_NAME: "{{deploy.parameters.prod-space}}"
-      PROD_ORG_NAME: "{{deploy.parameters.prod-organization}}"
-      PROD_REGION_ID: "{{deploy.parameters.prod-region}}"
-      BLUEMIX_USER: "{{deploy.parameters.bluemix-user}}"
-      BLUEMIX_PASSWORD: "{{deploy.parameters.bluemix-password}}"
-      API_KEY: "{{deploy.parameters.bluemix-api-key}}"
-      BLUEMIX_ACCOUNT: "{{deploy.parameters.bluemix-cluster-account}}"
-      CLUSTER_NAME: "{{deploy.parameters.bluemix-cluster-name}}"
-     execute: true
+      content: $file(pipeline.yml)
+      env:
+        SAMPLE_REPO: "sample-repo"
+        CF_APP_NAME: "{{deploy.parameters.prod-app-name}}"
+        PROD_SPACE_NAME: "{{deploy.parameters.prod-space}}"
+        PROD_ORG_NAME: "{{deploy.parameters.prod-organization}}"
+        PROD_REGION_ID: "{{deploy.parameters.prod-region}}"
+        BLUEMIX_USER: "{{deploy.parameters.bluemix-user}}"
+        BLUEMIX_PASSWORD: "{{deploy.parameters.bluemix-password}}"
+        API_KEY: "{{deploy.parameters.bluemix-api-key}}"
+        BLUEMIX_ACCOUNT: "{{deploy.parameters.bluemix-cluster-account}}"
+        CLUSTER_NAME: "{{deploy.parameters.bluemix-cluster-name}}"
+      execute: true
     services: ["sample-repo"]
   hidden: [form, description]
 
-#Deployment
+# Deployment
 deploy:
   schema:
     $ref: deploy.json

.travis.yml

@@ -1,8 +1,8 @@
+---
 language: bash
 sudo: required
 script:
-- bash scripts/install.sh
+  - bash scripts/install.sh
 group: stable
 dist: trusty
-sudo: required
 os: linux

.yamllint.yml

@@ -0,0 +1,47 @@
+---
+rules:
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 0
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+  colons:
+    max-spaces-before: 0
+    max-spaces-after: 1
+  commas:
+    max-spaces-before: 0
+    min-spaces-after: 1
+    max-spaces-after: 1
+  comments:
+    require-starting-space: true
+    min-spaces-from-content: 2
+  comments-indentation: enable
+  document-end: disable
+  document-start:
+    present: true
+  empty-lines:
+    max: 2
+    max-start: 0
+    max-end: 0
+  hyphens:
+    max-spaces-after: 1
+  indentation:
+    spaces: consistent
+    indent-sequences: true
+    check-multi-line-strings: false
+  key-duplicates: enable
+  line-length:
+    max: 80
+    allow-non-breakable-words: true
+    allow-non-breakable-inline-mappings: true
+    level: warning
+  new-line-at-end-of-file: enable
+  new-lines:
+    type: unix
+  trailing-spaces: enable
+  truthy: enable

local-volumes.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: PersistentVolume
 metadata:

mysql-deployment.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -41,21 +42,21 @@ spec:
         tier: mysql
     spec:
       containers:
-      - image: mysql:5.6
-        name: mysql
-        env:
-        - name: MYSQL_ROOT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: mysql-pass
-              key: password.txt
-        ports:
-        - containerPort: 3306
+        - image: mysql:5.6
           name: mysql
-        volumeMounts:
-        - name: mysql-local-storage
-          mountPath: /var/lib/mysql
+          env:
+            - name: MYSQL_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: mysql-pass
+                  key: password.txt
+          ports:
+            - containerPort: 3306
+              name: mysql
+          volumeMounts:
+            - name: mysql-local-storage
+              mountPath: /var/lib/mysql
       volumes:
-      - name: mysql-local-storage
-        persistentVolumeClaim:
-          claimName: mysql-lv-claim
+        - name: mysql-local-storage
+          persistentVolumeClaim:
+            claimName: mysql-lv-claim

scripts/bx_login.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+if [ -z "$CF_ORG" ]; then
+  CF_ORG="$BLUEMIX_ORG"
+fi
+if [ -z "$CF_SPACE" ]; then
+  CF_SPACE="$BLUEMIX_SPACE"
+fi
+
+
+if ([ -z "$BLUEMIX_USER" ] || [ -z "$BLUEMIX_PASSWORD" ] || [ -z "$BLUEMIX_ACCOUNT" ]) && ([ -z "$API_KEY" ]); then
+  echo "Define all required environment variables and rerun the stage."
+  exit 1
+fi
+
+echo "Deploy pods"
+
+echo "bx login -a $CF_TARGET_URL"
+
+if [ -z "$API_KEY" ]; then
+  if ! bx login -a "$CF_TARGET_URL" -u "$BLUEMIX_USER" -p "$BLUEMIX_PASSWORD" -c "$BLUEMIX_ACCOUNT" -o "$CF_ORG" -s "$CF_SPACE"; then
+    echo "Failed to authenticate to Bluemix"
+    exit 1
+  fi
+else
+  if ! bx login -a "$CF_TARGET_URL" --apikey "$API_KEY" -o "$CF_ORG" -s "$CF_SPACE"; then
+    echo "Failed to authenticate to Bluemix"
+    exit 1
+  fi
+fi
+
+# Init container clusters
+echo "bx cs init"
+if ! bx cs init; then
+  echo "Failed to initialize to Bluemix Container Service"
+  exit 1
+fi

scripts/deploy-to-bluemix/bx_login.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 echo "Create WordPress"
-IP_ADDR=$(bx cs workers $CLUSTER_NAME | grep Ready | awk '{ print $2 }')
-if [ -z $IP_ADDR ]; then
+IP_ADDR=$(bx cs workers "$CLUSTER_NAME" | grep Ready | awk '{ print $2 }')
+if [ -z "$IP_ADDR" ]; then
   echo "$CLUSTER_NAME not created or workers not ready"
   exit 1
 fi
 
 echo -e "Configuring vars"
-exp=$(bx cs cluster-config $CLUSTER_NAME | grep export)
-if [ $? -ne 0 ]; then
+exp=$(bx cs cluster-config "$CLUSTER_NAME" | grep export)
+if ! bx cs cluster-config "$CLUSTER_NAME" | grep export; then
   echo "Cluster $CLUSTER_NAME not created or not ready."
   exit 1
 fi

scripts/deploy.sh scripts/deploy-to-bluemix/deploy.sh

@@ -16,7 +16,7 @@ echo "Install the Bluemix container-service plugin"
 bx plugin install container-service -r Bluemix
 
 echo "Install kubectl"
-wget --quiet --output-document=/tmp/Bluemix_CLI/bin/kubectl  https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+wget --quiet --output-document=/tmp/Bluemix_CLI/bin/kubectl  https://storage.googleapis.com/kubernetes-release/release/"$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)"/bin/linux/amd64/kubectl
 chmod +x /tmp/Bluemix_CLI/bin/kubectl
 
 if [ -n "$DEBUG" ]; then