Merge pull request #40 from oracle-quickstart/develop

Develop - Complete Solution

Author: junior

.dockerignore

@@ -0,0 +1,8 @@
+.DS_Store
+.env
+assets
+*.tgz
+**/build
+**/coverage
+**/node_modules
+**/Makefile

.gitignore

@@ -69,4 +69,8 @@ pkg/
 override.tf
 override.tf.json
 *_override.tf
-*_override.tf.json
+*_override.tf.json
+
+tnsnames.ora
+keystore.jks
+truststore.jks

ci/README.md

@@ -0,0 +1,52 @@
+# MuShop CI
+
+## Wercker Setup
+
+When setting up a new Wercker workflow, keep in mind the following environment variables and pipelines that need to be configured beforehand.
+
+The following global variables need to be set on the Wercker application (the Environment tab):
+
+| Environment variable name | Description | Example |
+| --- | --- | --- |
+| DOCKER_REPOSITORY | Docker repository name | `phx.ocir.io/{tenancyName}/mushop` |
+
+### Build (`build`)
+
+Build pipeline uses the `internal/docker-build` step to build Docker images for all services.
+
+### Push to Registry (`push-to-registry`)
+
+This pipeline pushes the build Docker images to the registry. The following environment variables need to be set on the pipeline.
+
+| Environment variable name | Description | Example |
+| --- | --- | --- |
+| DOCKER_USERNAME | Docker registry username | `{tenancyName}/{myUserName}` |
+| DOCKER_PASSWORD | Docker registry password | `{myUserPassword}` |
+
+### Testing
+
+Because we have services in multiple languages, we had to separate the pipelines per-language (each pipeline uses a language specific box (e.g. `node`, `golang`)). Another reason we had to do this is because Wercker isn't really set up for a multi-repo - it would work better if we had a separate repo for each component.
+
+We have the following pipelines to run tests - these could be run in parallel after build pipeline completes.
+
+- `test-node-services` - runs unit tests for all NodeJS services
+- `test-go-services` - runs unit tests for all Go services
+- `test-java-services` - runs unit tests for all Java services
+
+The test pipelines don't require any additional environment variables.
+
+### Deployments
+
+There are two deployment (upgrade) pipelines defined in Wercker
+
+- Test Deployment (`upgrade-test-deployment`)
+- Production Deployment (`upgrade-production-deployment`)
+
+Both deployment pipelines are equivalent, the difference is in the environment variables that are set on the pipelines. The variables define which cluster is used for deployment as well as the Helm release name.
+
+| Environment variable name | Description | Example |
+| --- | --- | --- |
+| HELM_RELEASE_NAME | Helm release name to be upgraded | `mymushop` |
+| HELM_TIMEOUT | Helm timeout value | `600` |
+| KUBERNETES_SERVER | URL of the Kubernetes server | `https://mykubernetescluster.com:6443` |
+| KUBERNETES_TOKEN | User token for the Kubernetes cluster (from `.kube/config`) | `eyJoZWFkZXIiOnsiQXV0a...` |

ci/build.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# The Universal Permissive License (UPL), Version 1.0
+#
+
+# set -ev
+
+PROJECT="mushop"
+SRC_DIR=$1
+CODE_DIR=$(cd $SRC_DIR; pwd)
+REPO=${PROJECT}/$(basename $CODE_DIR);
+echo $REPO
+
+TAG=$2
+if [[ -n "$CI" ]]; then
+  TAG=$WERCKER_GIT_COMMIT
+fi
+
+if [[ -z "$TAG" ]] ; then
+  TAG=latest
+fi
+
+if [[ "$(uname)" == "Darwin" ]]; then
+  DOCKER_CMD=docker
+else
+  DOCKER_CMD="sudo docker"
+fi
+
+cd $CODE_DIR
+echo "Building $REPO:$TAG ..."
+$DOCKER_CMD build -t ${REPO}:${TAG} .

ci/push.sh

@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# The Universal Permissive License (UPL), Version 1.0
+#
+
+# set -ev
+
+if [[ -z "$OCIR" ]] ; then
+    echo "Cannot find OCIR env var"
+    exit 1
+fi
+
+PROJECT="mushop"
+SRC_DIR=$1
+CONTAINER=$(basename $SRC_DIR);
+
+push() {
+    DOCKER_PUSH=1;
+    while [ $DOCKER_PUSH -gt 0 ] ; do
+        echo "Pushing $1";
+        docker push $1;
+        DOCKER_PUSH=$(echo $?);
+        if [[ "$DOCKER_PUSH" -gt 0 ]] ; then
+            echo "Docker push failed with exit code $DOCKER_PUSH";
+        fi;
+    done;
+}
+
+tag_and_push() {
+    SEMREG='[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)'
+    if [[ -z "$1" ]] ; then
+        echo "Please pass the tag"
+        exit 1
+    else
+        SEM=`echo $1 | sed -e "s#^v##"`
+        TAGS=$SEM
+        MAJOR=`echo $SEM | sed -e "s#$SEMREG#\1#"`
+        MINOR=`echo $SEM | sed -e "s#$SEMREG#\2#"`
+        PATCH=`echo $SEM | sed -e "s#$SEMREG#\3#"`
+        SPECIAL=`echo $SEM | sed -e "s#$SEMREG#\4#"`
+        # add semantic tags
+        if [ "$MAJOR" != "$SEM" ] && [ -z "$SPECIAL" ]; then
+            TAGS="$SEM $MAJOR.$MINOR $MAJOR latest"
+            if [ -n "$SPECIAL" ]; then
+                TAGS="$MAJOR.$MINOR.$PATCH $TAGS"
+            fi
+        fi
+    fi
+
+    DOCKER_REPO=${PROJECT}/${CONTAINER}
+    OCIR_REPO=${OCIR}/ateam/${PROJECT}-${CONTAINER}
+
+    # determine src tag
+    SRC="${DOCKER_REPO}:latest"
+    if [[ -n "$CI" ]]; then
+        SRC="${DOCKER_REPO}:${WERCKER_GIT_COMMIT}"
+    fi
+
+    for tag in $TAGS; do
+        echo "Tagging ${OCIR_REPO}:$tag"
+        docker tag $SRC ${OCIR_REPO}:$tag
+        push "$OCIR_REPO:$tag";
+    done
+}
+
+# when running in Wercker CI
+if [ -n "$CI" ]; then 
+    # Push snapshot when in master
+    if [ "$WERCKER_GIT_BRANCH" == "master" ] && [ -z "$WERCKER_PULL_REQUEST" ]; then
+        tag_and_push master-${WERCKER_GIT_COMMIT:0:8}
+    fi;
+
+    # Push tag and latest when tagged
+    if [ -n "$GIT_TAG" ]; then
+        tag_and_push ${GIT_TAG}
+    fi;
+# Running manually
+elif [ -n "$2" ]; then
+    echo "Pushing tag $2"
+    tag_and_push $2
+else
+    echo "Error: Unknown tag for push"
+    exit 1
+fi;

ci/tag_and_push.sh

@@ -0,0 +1,87 @@
+# Script generates a space-delimited list of Docker image tags, based on the 
+# provided version, pulls the temporary image (tagged with WERCKER_GIT_COMMIT)
+# and pushes all images with different tags.
+
+# For example:
+# $ ./tag_and_push.sh 1.2.3
+# Pushes images with tags: 1.2.3 1.2 1 latest
+
+# If run on a master branch:
+# $ ./tag_and_push.sh 1.2.3
+# Pushes images with tags: 1.2.3 1.2 1 latest master-SHA
+
+OCIR=phx.ocir.io
+TEMP_IMAGE=$DOCKER_REPOSITORY/$SERVICE_NAME:$WERCKER_GIT_COMMIT
+
+VERSION=$1
+if [[ -z "$VERSION" ]] ; then
+    echo "Provide the version (e.g. 1.2.3)"
+    exit 1
+fi
+
+login() {
+    echo -e "\nLogin ${DOCKER_USERNAME} to ${OCIR}"
+    EXIT_CODE=$(docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD $OCIR)
+    if [[ "$EXIT_CODE" -gt 0 ]] ; then
+        echo "Failed to login to Docker"
+        exit 1
+    fi
+}
+
+pull_temp_image() {
+    echo -e "\nPulling base image: ${TEMP_IMAGE}"
+    EXIT_CODE=$(docker pull $TEMP_IMAGE)
+    if [[ "$EXIT_CODE" -gt 0 ]] ; then
+        echo "Failed to pull temp image"
+        exit 1
+    fi
+}
+
+create_tags() {
+    SEMREG='[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)'
+    SEM=`echo $1 | sed -e "s#^v##"`
+    TAGS=$SEM
+    MAJOR=`echo $SEM | sed -e "s#$SEMREG#\1#"`
+    MINOR=`echo $SEM | sed -e "s#$SEMREG#\2#"`
+    PATCH=`echo $SEM | sed -e "s#$SEMREG#\3#"`
+    SPECIAL=`echo $SEM | sed -e "s#$SEMREG#\4#"`
+    # add semantic tags
+    if [ "$MAJOR" != "$SEM" ] && [ -z "$SPECIAL" ]; then
+        TAGS="$SEM $MAJOR.$MINOR $MAJOR latest"
+        if [ -n "$SPECIAL" ]; then
+            TAGS="$MAJOR.$MINOR.$PATCH $TAGS"
+        fi
+    fi
+
+    login
+    pull_temp_image
+
+    echo -e "\nPushing tags: ${TAGS}"
+    for tag in $TAGS; do
+        echo -e "\nTagging: ${DOCKER_REPOSITORY}/${SERVICE_NAME}:${tag}"
+        EXIT_CODE=$(docker tag $TEMP_IMAGE $DOCKER_REPOSITORY/$SERVICE_NAME:$tag)
+        if [[ "$EXIT_CODE" -gt 0 ]] ; then
+            echo "Failed to tag image"
+            exit 1
+        fi
+
+        echo -e "\nPushing: ${DOCKER_REPOSITORY}/${SERVICE_NAME}:${tag}"
+        EXIT_CODE=$(docker push $DOCKER_REPOSITORY/$SERVICE_NAME:$tag)
+        if [[ "$EXIT_CODE" -gt 0 ]] ; then
+            echo "Failed to push image"
+            exit 1
+        fi
+    done
+}
+
+BRANCH_TAGS=""
+VERSION_TAGS=$(create_tags $VERSION)
+
+# If we are running on a master branch, we also need the
+# branch tag (e.g. 'master-SHA').
+if [ "$WERCKER_GIT_BRANCH" == "master" ] ; then
+    BRANCH_TAGS=$(create_tags ${WERCKER_GIT_BRANCH}-${WERCKER_GIT_COMMIT:0:8})
+    echo $VERSION_TAGS $BRANCH_TAGS
+else
+    echo $VERSION_TAGS
+fi

deploy/basic/terraform/atp.tf

@@ -5,12 +5,12 @@
 # creates an ATP database
 resource "oci_database_autonomous_database" "mushop_autonomous_database" {
   #Required
-  admin_password           = "${random_string.autonomous_database_wallet_password.result}"
-  compartment_id           = "${var.compartment_ocid}"
+  admin_password           = random_string.autonomous_database_wallet_password.result
+  compartment_id           = var.compartment_ocid
   cpu_core_count           = 1
   data_storage_size_in_tbs = 1
   db_name                  = "${var.database_name}${random_id.mushop_id.dec}"
-  freeform_tags            = "${local.common_tags}"
+  freeform_tags            = local.common_tags
   is_free_tier             = true
 
   #Optional

deploy/basic/terraform/datasources.tf

@@ -5,14 +5,14 @@
 # Gets a list of Availability Domains
 data "oci_identity_availability_domains" "ADs" {
 
-  compartment_id = "${var.tenancy_ocid}"
+  compartment_id = var.tenancy_ocid
 
 }
 
 
 data "oci_objectstorage_namespace" "user_namespace" {
 
-  compartment_id = "${var.compartment_ocid}"
+  compartment_id = var.compartment_ocid
 
 }
 
@@ -35,8 +35,28 @@ resource "random_id" "mushop_id" {
 
 data "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
 
-  autonomous_database_id = "${oci_database_autonomous_database.mushop_autonomous_database.id}"
-  password               = "${random_string.autonomous_database_wallet_password.result}"
-  base64_encode_content  = "false"
+  autonomous_database_id = oci_database_autonomous_database.mushop_autonomous_database.id
+  password               = random_string.autonomous_database_wallet_password.result
+  base64_encode_content  = "true"
 
 }
+
+data "oci_limits_services" "test_services" {
+  #Required
+  compartment_id = var.tenancy_ocid
+
+  filter {
+    name   = "name"
+    values = ["compute"]
+  }
+}
+
+data "oci_limits_limit_values" "test_limit_values" {
+  count          = length(data.oci_identity_availability_domains.ADs.availability_domains)
+  compartment_id = var.tenancy_ocid
+  service_name   = data.oci_limits_services.test_services.services.0.name
+
+  availability_domain = data.oci_identity_availability_domains.ADs.availability_domains[count.index].name
+  name                = "vm-standard-e2-1-micro-count"
+  scope_type          = "AD"
+}

deploy/basic/terraform/loadbalancer.tf

@@ -1,17 +1,17 @@
 resource "oci_load_balancer_load_balancer" "mushop_lb" {
 
-  compartment_id = "${var.compartment_ocid}"
+  compartment_id = var.compartment_ocid
   display_name   = "mushop-${random_id.mushop_id.dec}"
-  shape          = "${local.lb_shape}"
-  subnet_ids     = ["${oci_core_subnet.mushopLBSubnet.id}"]
+  shape          = local.lb_shape
+  subnet_ids     = [oci_core_subnet.mushopLBSubnet.id]
   is_private     = "false"
-  freeform_tags  = "${local.common_tags}"
+  freeform_tags  = local.common_tags
 
 }
 
 resource "oci_load_balancer_backend_set" "mushop-bes" {
   name             = "mushop-${random_id.mushop_id.dec}"
-  load_balancer_id = "${oci_load_balancer_load_balancer.mushop_lb.id}"
+  load_balancer_id = oci_load_balancer_load_balancer.mushop_lb.id
   policy           = "IP_HASH"
 
   health_checker {
@@ -27,10 +27,10 @@ resource "oci_load_balancer_backend_set" "mushop-bes" {
 }
 
 resource "oci_load_balancer_backend" "mushop-be" {
-  count            = "${var.num_nodes}"
-  load_balancer_id = "${oci_load_balancer_load_balancer.mushop_lb.id}"
-  backendset_name  = "${oci_load_balancer_backend_set.mushop-bes.name}"
-  ip_address       = "${element(oci_core_instance.app-instance.*.private_ip, count.index)}"
+  count            = var.num_nodes
+  load_balancer_id = oci_load_balancer_load_balancer.mushop_lb.id
+  backendset_name  = oci_load_balancer_backend_set.mushop-bes.name
+  ip_address       = element(oci_core_instance.app-instance.*.private_ip, count.index)
   port             = 80
   backup           = false
   drain            = false
@@ -41,8 +41,8 @@ resource "oci_load_balancer_backend" "mushop-be" {
 resource "oci_load_balancer_listener" "mushop_listener" {
   #Required
 
-  load_balancer_id         = "${oci_load_balancer_load_balancer.mushop_lb.id}"
-  default_backend_set_name = "${oci_load_balancer_backend_set.mushop-bes.name}"
+  load_balancer_id         = oci_load_balancer_load_balancer.mushop_lb.id
+  default_backend_set_name = oci_load_balancer_backend_set.mushop-bes.name
   name                     = "mushop-${random_id.mushop_id.dec}"
   port                     = 80
   protocol                 = "HTTP"