## Version 1.0.19

- Improved branch handling

Author: aho-dips

CHANGELOG.md

@@ -1,4 +1,7 @@
-## Version 1.0.17
+## Version 1.0.19
+- Improved branch handling
+
+## Version 1.0.18
 - Args refactor
 
 ## Version 1.0.16

smud-cli/functions-init.sh

@@ -55,7 +55,7 @@ set_upstream()
 
 set_origin()
 {
-
+    # echo "***** set_origin"
     if [ "$skip_init_feature" ] || [ "$installed" ];then
         return
     fi    
@@ -75,8 +75,29 @@ set_origin()
     else
         println_not_silent "Remote origin '$remote_origin' already set." $gray
     fi
+
+    set_branch_origin
 }
+set_branch_origin()
+{
+    git_config_command="git config --get branch.$current_branch.remote"
+    run_command --command-in-var=git_config_command --return-var=branch_remote_origin --debug-title="Checking if branch.$current_branch.remote exist in git config"
+    if [ ! "$branch_remote_origin" ]; then
+        branch_remote_origin="origin"
+        println_not_silent "Setting branch remote origin to '$branch_remote_origin'" $gray
+        git_config_command="git config --add branch.$current_branch.remote $branch_remote_origin"
+        run_command --command-in-var=git_config_command --force-debug-title='Setting branch remote origin'
+    fi
 
+    git_config_command="git config --get branch.$current_branch.merge"
+    run_command --command-in-var=git_config_command --return-var=branch_remote_merge --debug-title="Checking if branch.$current_branch.merge exist in git config"
+    if [ ! "$branch_remote_merge" ]; then
+        branch_remote_merge="refs/heads/$current_branch"
+        println_not_silent "Setting branch remote merge to '$branch_remote_merge'" $gray
+        git_config_command="git config --add branch.$current_branch.merge $branch_remote_merge"
+        run_command --command-in-var=git_config_command --force-debug-title='Setting branch remote merge'
+    fi
+}
 merge_upstream()
 {
     if [ "$skip_init_feature" ] && [ ! "$merge" ];then
@@ -186,7 +207,7 @@ init()
         fi
         printf "${bold}smud $func${normal}: Initializes local repository and sets ${yellow}upstream, origin remotes, source-branch${normal} and ${yellow}default-branch${normal}\n"
         printf "${yellow}upstream${normal}: \n"
-        printf "  With Only ${green}$func${normal}, ${yellow}upstream${normal} '${bold}$default_upstream${normal}' will be configured if not configured yet. When configured the upstream will be fetched. \n"
+        printf "  With Only ${green}$func${normal}, ${yellow}upstream-url${normal} '${bold}$default_upstream${normal}' AND ${yellow}upstream${normal} ${bold}'upstream/main'${normal} will be configured if not configured yet. When configured the upstream will be fetched. \n"
         printf "  With ${green}$func ${bold}<value>${normal}, ${yellow}upstream${normal} '${bold}<value>${normal}' will be configured before upstream is fetched. \n"
         printf "  With ${green}$func ${bold}${yellow}${bold}--upstream-url <value>${normal}, ${yellow}upstream${normal} '${bold}<value>${normal}' will be configured before upstream is fetched. \n"
         printf "  With ${green}$func ${yellow}${bold}-${normal}, ${yellow}upstream${normal} will be removed. \n"
@@ -208,8 +229,15 @@ init()
     fi
     if [ "$skip_init_feature" ];then
         return
-    fi    
+    fi
 
+    get_arg list_branches '--list-branches,--list'
+    if [ "$list_branches" ]; then
+        echo "Existing git-brances:"
+        git branch 
+        return 
+    fi
+    
     if [ ! "$upstream_url" ]; then
         upstream_url="$1"
         if [ ! "$upstream_url" ]; then
@@ -248,6 +276,7 @@ init()
         fi
     fi
 
+    set_branch_origin
     git__setup_source_config
 
     if [ ! "$remote_origin" ]; then
@@ -261,9 +290,5 @@ init()
     if [ "$run_push" ]; then
         git_push
     fi
-
-    if [ "$configs" ]; then
-        git_config_command="git config -l"
-        run_command --command-in-var git_config_command  --skip-error
-    fi
+    show_configs
 }

smud-cli/functions-list.sh

@@ -106,15 +106,15 @@ list()
     } || {
         return
     }
-
+    # echo "¤¤¤¤¤ installed: $installed"
     if [ "$installed" ]; then
         product_infos__find_latest_products_with_version "installed"
         product_infos__find_latest_products_with_version "skip-add-new-product"
     else
         product_infos__find_latest_products_with_version 
     fi
 
-    product_infos__find_latest_products_with_files
+    # product_infos__find_latest_products_with_files
 
     product_infos__print
 }
@@ -335,6 +335,11 @@ product_infos__find_latest_products_with_files()
         stage_product_name="$product_name_files/$product_stage"
         product_info="${product_infos[${stage_product_name}]}"
         if [ ! "$product_info" ]; then
+            echo "******* Not found product_info: $stage_product_name"
+            # create_product_info product_info
+            # product_infos[$stage_product_name]="$product_info"
+            # product_info="${product_infos[${stage_product_name}]}"
+
             # echo "** find-files : $i: file='$file', stage_product_name='$stage_product_name', NO PRODUCT_INFO -- product_name_files=$product_name_files"     
             continue
         fi
@@ -482,7 +487,9 @@ resolve_team_array()
         fi
         teams_resolved="true"
     fi
-
+    # for t in $responsibles; do
+    #     echo "===== TEAM: $t"
+    # done 
 
 }
 
@@ -657,6 +664,7 @@ product_infos__print()
                 # fi
 
                 if [ "$show_files" ]; then
+                    # echo "product_info: $product_info"
                     product_info__get_latest_files product_info files
                 fi
 
@@ -947,7 +955,7 @@ create_product_info()
     fi
 
     createproductinfo__local_product_info="$product_latest_date|$current_version|$product_latest_version|$product_latest_commit|$product_info_files|$product_info_dependencies|$product_responsible"
-    # echo "create_product_info()...[$product_info_dependencies]"
+    # echo "create_product_info()...[$createproductinfo__local_product_info]"
 }
 
 
@@ -1244,30 +1252,47 @@ append_product_depenencies()
 
 append_product()
 {
+    file_to_append="$1"
+    if [ "$file_to_append" ] && [ $(grep "chartVersion:" -c  <<< $file_to_append) -gt 0 ]; then
+        return
+    fi
+
     if [ "$4" ];then
         local -n appendproduct__return_value="$4"
     fi
 
     appendproduct__return_value="false"
     local product_info_created=0
+    
     if [ ! "$product_info" ] && [ "$stage_product_name" ]; then
-        product_info="${product_infos[${stage_product_name}]}"
+        product_info="${product_infos[${stage_product_name}]}"    
         if [ ! "$product_info" ];then
             if [ "$3" = "false" ];then
                 return 
             fi    
+            # product_info_files=""
+            # product_responsible=""
+            # product_info_dependencies=""
+            # product_latest_version=""
             product_info_created=1
             create_product_info product_info
             product_infos[$stage_product_name]="$product_info"
             appendproduct__return_value="true"
         fi
     fi
+
     if [ $product_info_created -eq 0 ]; then
         product_info__get_latest_version product_info product_latest_version
         product_info__get_dependencies product_info product_info_dependencies
     fi
 
-    file_to_append="$1"
+    if [ ! "${product_infos[${stage_product_name}]}" ]; then
+        old_product_info=$product_info
+        product_info="||||||"
+        product_infos[$stage_product_name]=$product_info
+        # echo "@@@@@ product: $stage_product_name -- MISSING --- product_info: $product_info"    
+        # echo "@@@@@ product: $stage_product_name -- MISSING --- old_product_info: $old_product_info"    
+    fi
 
     if [ ! "$file_to_append" ]; then
         return 
@@ -1281,6 +1306,8 @@ append_product()
     if [ ! "$file_state_to_append" ]; then
         file_state_to_append="A"
     fi
+
+
     regex_stage_product_name=$(echo "$stage_product_name" | sed -e 's/\//\\\//g')
     file_to_append=$(echo "$file_to_append"|sed -e "s/products\\/${regex_stage_product_name}\\///g" )
 
@@ -1292,6 +1319,10 @@ append_product()
     if [ "$appendproduct__return_value" = "false" ]; then
         appendproduct__return_value="$append_product_appendproductfiles__return_value"
     fi
+
+    # echo "@@@@@ product: $stage_product_name -- file_to_append: $file_to_append --- appendproduct__return_value: $appendproduct__return_value"
+    # echo "@@@@@ product: $stage_product_name -- product_info: ${product_infos[${stage_product_name}]}"
+
 }
 
 

smud-cli/functions-resources.sh

@@ -20,15 +20,19 @@ resources()
     pods_command="kubectl get pods ${namespace_filter} ${exclude_ns} --sort-by=.spec.containers[].resources.requests.cpu -o custom-columns=NAME:.metadata.name,${ns_col}REQ-CPU:.spec.containers[].resources.requests.cpu,REQ-MEM:.spec.containers[].resources.requests.memory,INIT-REQ-CPU:.spec.initContainers[].resources.requests.cpu,INIT-REQ-MEM:.spec.initContainers[].resources.requests.memory,OWNER-KIND:.metadata.ownerReferences[].kind,OWNER-NAME:.metadata.ownerReferences[].name |sed -e 's/<none>/      /g'"
     cronjobs_command="kubectl get cj ${namespace_filter} --sort-by=.spec.jobTemplate.spec.template.spec.containers[].resources.requests.cpu -o custom-columns=NAME:.metadata.name,${ns_col}REQ-CPU:.spec.jobTemplate.spec.template.spec.containers[].resources.requests.cpu,REQ-MEM:.spec.jobTemplate.spec.template.spec.containers[].resources.requests.memory |sed -e 's/<none>/      /g'"
 
-    run_command --command-var=pods_command --return-var=lines_array --array --force-debug-title 'Pod resources'
+    run_command --command-var=pods_command --return-var=lines_str --skip-shell --force-debug-title 'Pod resources'
+
     old_SEP=$IFS
 
-    IFS=$'\n'
-    if [ ${#lines_array[@]} -gt 1 ]; then
+    # IFS=$'\n'
+    read -rd '' -a lines <<< "$lines_str"
+    # echo ${#lines[@]}:${lines_array[@]}
+    if [ ${#lines[@]} -gt 1 ]; then
         echo "Pods:"
-        header="${lines_array[0]}"
+        header="${lines[0]}"
         printf "${white}$header${normal}\n"
-        echo "${lines[@]}" | tail +2|tac
+        echo "${lines[@]}"
+        # echo "${lines[@]}" | tail +2|tac
     fi
 
     run_command --command-var=cronjobs_command --return-var=cron_lines_array --array --force-debug-title 'Cronjob resources'

smud-cli/functions.sh

@@ -9,6 +9,7 @@ show_valid_commands()
     echo "  version       Show the version-log of smud CLI" 
     echo "  list          List products ready for installation or current products installed."
     echo "  conflict(s)   Scan and list conflicts in yaml-files. (Under construction)"
+    echo "  resource(s)   Report rescource in use in current kubernetes-cluster"
 
     if [ ! "$is_smud_dev_repo" ]; then
         echo "  upgrade       Upgrade one or more productst to the repository."