add checkout argument

Author: valdislav

etc/helm/requirements.yaml

@@ -6,7 +6,7 @@ dependencies:
 - name: redis
   repository: "@stable"
   version: "5.0"
-#- name: checkout
-#  repository: http://localhost:10191
-#  version: 0.1.0
-#  condition: global.checkout.enabled
+- name: checkout
+  repository: http://localhost:10191
+  version: 0.1.0
+  condition: global.checkout.enabled

etc/helm/values.yaml

@@ -45,8 +45,6 @@ global:
     nfs:
       enabled: true
 
-checkout:
-  enabled: false
 resources: {}
   # Uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.

init_project.sh

@@ -28,6 +28,7 @@ magento_ee_sample_data_dir="${magento_ce_dir}/magento2ee-sample-data"
 host_os="$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")"
 use_nfs="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs")"
 repository_url_ce="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_ce")"
+#repository_url_checkout="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_checkout")"
 repository_url_ee="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_ee")"
 composer_project_name="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "composer_project_name")"
 composer_project_url="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "composer_project_url")"
@@ -151,12 +152,14 @@ force_project_cleaning=0
 force_codebase_cleaning=0
 force_phpstorm_config_cleaning=0
 disable_nfs=0
-while getopts 'fcpd' flag; do
+enable_checkout=0
+while getopts 'fcpde' flag; do
   case "${flag}" in
     f) force_project_cleaning=1 ;;
     c) force_codebase_cleaning=1 ;;
     p) force_phpstorm_config_cleaning=1 ;;
     d) disable_nfs=1 ;;
+    e) enable_checkout=1 ;;
     *) error "Unexpected option" && exit 1;;
   esac
 done
@@ -245,9 +248,17 @@ waitForKubernetesPodToRun 'tiller-deploy'
 
 # TODO: change k-rebuild-environment to comply with formatting requirements
 if [[ "${disable_nfs}" == 1 ]]; then
-    bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh" -d
+    if [[ "${enable_checkout}" == 1 ]]; then
+        bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh" -d -e
+    else
+        bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh" -d
+    fi
 else
-    bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh"
+    if [[ "${enable_checkout}" == 1 ]]; then
+        bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh" -e
+    else
+        bash "${vagrant_dir}/scripts/host/k_rebuild_environment.sh"
+    fi
 fi
 
 minikube_ip="$(minikube service magento2-monolith --url | grep -oE '[0-9][^:]+' | head -1)"

scripts/functions.sh

@@ -194,6 +194,12 @@ function getMagento2PodId()
     echo "$(kubectl get pods | grep -ohE 'magento2-monolith-[a-z0-9\-]+')"
 }
 
+function getMagento2CheckoutPodId()
+{
+    # TODO: Calculate based on current helm release
+    echo "$(kubectl get pods | grep -ohE 'magento2-checkout-[a-z0-9\-]+')"
+}
+
 function getRedisMasterPodId()
 {
     echo "$(kubectl get pods | grep -ohE 'magento2-redis-master-[a-z0-9\-]+')"
@@ -210,6 +216,12 @@ function executeInMagento2Container()
     kubectl exec "${magento2_pod_id}" --container monolith "$@" 2> >(logError)
 }
 
+function executeInMagento2CheckoutContainer()
+{
+    magento2_pod_id="$(getMagento2CheckoutPodId)"
+    kubectl exec "${magento2_pod_id}" --container checkout "$@" 2> >(logError)
+}
+
 function isMinikubeRunning() {
     minikube_status="$(minikube status | grep minikube: 2> >(log))"
     if [[ ${minikube_status} == "minikube: Running" ]]; then

scripts/host/k_rebuild_environment.sh

@@ -21,9 +21,11 @@ set -e
 # TODO: Need to make sure all resources have been successfully deleted before the attempt of recreating them
 sleep 7
 enable_nfs="true"
-while getopts 'd' flag; do
+enable_checkout="false"
+while getopts 'de' flag; do
   case "${flag}" in
     d) enable_nfs="false" ;;
+    e) enable_checkout="true" ;;
     *) error "Unexpected option" && exit 1;;
   esac
 done
@@ -32,6 +34,7 @@ cd "${vagrant_dir}/etc/helm" && helm install \
     --values values.yaml \
     --set global.monolith.volumeHostPath="${vagrant_dir}" \
     --set global.persistence.nfs.enabled="${enable_nfs}" \
+    --set global.checkout.enabled="${enable_checkout}" \
     --set global.checkout.volumeHostPath="${vagrant_dir}" .
 
 # TODO: Waiting for containers to initialize before proceeding