Create Doc PR on main

outscale · Dec 12, 2022 · c28aff7 · c28aff7
1 parent 9d322da
commit c28aff7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/scripts/git_command.sh b/.github/scripts/git_command.sh
@@ -44,7 +44,7 @@ function github_pr {
      echo "Pr Already exist"
    else
      git checkout "$GIT_USE_BRANCH"
-     result=$(curl -s -X POST -H "Authorization: token $SECRET_GITHUB_TOKEN" -d "{\"head\":\"$GIT_BRANCH\",\"base\":\"main\",\"title\":\"$GIT_TITLE\",\"body\":\"$GIT_CONTENT_BODY\"}" "https://api.github.com/repos/$GH_ORG_NAME/$GH_REPO_NAME/pulls")
+     result=$(curl -s -X POST -H "Authorization: token $SECRET_GITHUB_TOKEN" -d "{\"head\":\"$GH_ORG_NAME:$GIT_BRANCH\",\"base\":\"main\",\"title\":\"$GIT_TITLE\",\"body\":\"$GIT_CONTENT_BODY\"}" "https://api.github.com/repos/$GH_ORG_NAME/$GH_REPO_NAME/pulls")
      errors=$(echo "$result" | jq .errors)
      if [ "$errors" != "null" ]; then
        echo "$errors"
@@ -158,7 +158,7 @@ function check_gh {
 }
 
 
-optstring=":g:o:r:n:e:t:p:m:b:c:u:"
+optstring=":g:o:r:n:e:t:p:m:b:c:u:f:"
 while getopts ${optstring} arg; do
   case ${arg} in
     g)
@@ -170,6 +170,9 @@ while getopts ${optstring} arg; do
     r)
       GH_REPO_NAME=${OPTARG}
       ;;
+    f)
+      GH_ORG_USERNAME=${OPTARG}
+      ;;
     n)
       GIT_USERNAME=${OPTARG}
       ;;

diff --git a/.github/scripts/launch.sh b/.github/scripts/launch.sh
@@ -45,6 +45,7 @@ function check_gh {
     else
         echo "GH_ORG_NAME is set to '$GH_ORG_NAME'"
     fi
+
     if [ -z "${GH_REPO_NAME}" ]; then
         echo "GH_REPO_NAME is unset":
 	echo "Set default Values";
@@ -117,8 +118,7 @@ function get_name {
       fi
     done
   done
-  echo "-o ${GH_ORG_NAME} -r ${GH_REPO_NAME} -u ${GIT_CURRENT_BRANCH} -n ${GIT_USERNAME} -e ${GIT_USEREMAIL}  -t add_${k8s_version} -b add-k8s-${k8s_version} -m add_${k8s_version} -c add_${k8s_version} -p $GIT_FILE_PATH -g $root/bin/gh"
-  "$root"/.github/scripts/git_command.sh -o "${GH_ORG_NAME}" -r "${GH_REPO_NAME}" -u "${GIT_CURRENT_BRANCH}" -n "${GIT_USERNAME}" -e "${GIT_USEREMAIL}" -t add_"${k8s_version}" -b add-k8s-"${k8s_version}" -m Update_kubernetes_OMI_""${k8s_version}" -c add_"${k8s_version}" -p "$GIT_FILE_PATH" -g "$root"/bin/gh
+  "$root"/.github/scripts/git_command.sh -o "${GH_ORG_NAME}" -r "${GH_REPO_NAME}" -u "${GIT_CURRENT_BRANCH}" -n "${GIT_USERNAME}" -e "${GIT_USEREMAIL}" -t add_"${k8s_version}" -b add-k8s-"${k8s_version}" -m Update_kubernetes_OMI_"${k8s_version}" -c add_"${k8s_version}" -p "$GIT_FILE_PATH" -g "$root"/bin/gh
 }
 
 

diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ OSC_ACCESS_KEY ?= access
 OSC_SECRET_KEY ?= secret
 OSC_CLUSTER ?= cluster-api
 CLUSTER ?= cluster-api
-GH_ORG_NAME ?= outscale-dev 
+GH_ORG_NAME ?= outscale-dev
 GH_REPO_NAME ?= cluster-api-provider-outscale
 GIT_USERNAME ?= Outscale Bot
 GIT_USEREMAIL ?= opensource+bot@outscale.com
@@ -121,7 +121,7 @@ mock-generate: mockgen ## Generate mock
 
 .PHONY: generate-image-docs
 generate-image-docs:
-	./.github/scripts/launch.sh -c ${GIT_BRANCH} -o ${GH_ORG_NAME} -r ${GH_REPO_NAME} -n ${GIT_USERNAME} -e ${GIT_USEREMAIL}
+	./.github/scripts/launch.sh -c "${GIT_BRANCH}" -o "${GH_ORG_NAME}" -r "${GH_REPO_NAME}" -n "${GIT_USERNAME}" -e "${GIT_USEREMAIL}"
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.