Merge pull request #181 from alvarolop/feature/upgrade-gitlab-18

⚡️ Move from DC deployment for GitLab 12 to certified operator for GitLab 18 ⚡️

Author: eformat

codereadyworkspaces/stack/VERSION

@@ -1 +1 @@
-VERSION=3.0.19
+VERSION=3.0.20

codereadyworkspaces/stack/root/usr/local/bin/user-functions.sh

@@ -2,8 +2,42 @@
 
 export GITLAB_PAT=
 
-# Generate a new Gilab Personal Access Token
+# Generate a new GitLab Personal Access Token
 gitlab_pat() {
+    # checks
+    [ -z "$GIT_SERVER" ] && echo "Warning: must supply GIT_SERVER in env" && return
+    [ -z "$GITLAB_USER" ] && echo "Warning: must supply GITLAB_USER in env" && return
+    [ -z "$GITLAB_PASSWORD" ] && echo "Warning: must supply GITLAB_PASSWORD in env" && return
+    gitlabEncodedPassword=$(echo ${GITLAB_PASSWORD} | perl -MURI::Escape -ne 'chomp;print uri_escape($_)')
+    # get csrf from login page
+    gitlab_basic_auth_string="Basic $(echo -n ${GITLAB_USER}:${gitlabEncodedPassword} | base64)"
+    body_header=$(curl -k -L -s -H "Authorization: ${gitlab_basic_auth_string}" -c /tmp/cookies.txt -i "https://${GIT_SERVER}/users/sign_in")
+    csrf_token=$(echo $body_header | perl -ne 'print "$1\n" if /name="authenticity_token"[[:blank:]]value="(.+?)"/' | sed -n 1p)
+    # login
+    curl -k -s -H "Authorization: ${gitlab_basic_auth_string}" -b /tmp/cookies.txt -c /tmp/cookies.txt -i "https://${GIT_SERVER}/users/auth/ldapmain/callback" \
+                        --data "username=${GITLAB_USER}&password=${gitlabEncodedPassword}" \
+                        --data-urlencode "authenticity_token=${csrf_token}" \
+                        > /dev/null
+    # generate personal access token form
+    body_header=$(curl -k -L -H "Authorization: ${gitlab_basic_auth_string}" -H 'user-agent: curl' -b /tmp/cookies.txt -i "https://${GIT_SERVER}/-/user_settings/personal_access_tokens" -s)
+    csrf_token=$(echo "$body_header" | perl -ne 'print "$1\n" if /csrf-token"[[:blank:]]content="(.+?)"/' | sed -n 1p)
+    # create personal access token
+    body_header=$(curl -k -s -L -H "Authorization: ${gitlab_basic_auth_string}" -b /tmp/cookies.txt "https://${GIT_SERVER}/-/user_settings/personal_access_tokens" \
+                        --data-urlencode "authenticity_token=${csrf_token}" \
+                        --data 'personal_access_token[name]='"${GITLAB_USER}"'&personal_access_token[expires_at]=&personal_access_token[scopes][]=api' \
+                        -w "\nHTTP_STATUS:%{http_code}")
+    http_status=$(echo "$body_header" | grep "HTTP_STATUS" | cut -d: -f2)
+    body_header=$(echo "$body_header" | sed '/HTTP_STATUS/d')
+    # Extract token from JSON response (GitLab 18 returns JSON) - tokens can contain dots
+    GITLAB_PAT=$(echo "$body_header" | perl -ne 'if (/"token"[[:blank:]]*:[[:blank:]]*"([^"]+)"/) { print "$1\n"; exit; }' | sed -n 1p)
+    export GITLAB_PAT
+    echo $GITLAB_PAT
+}
+
+
+# Generate a new GitLab Personal Access Token (old version)
+# This script is left here for retro-compatibility with older versions of GitLab.
+gitlab_pat_old() {
     # checks
     [ -z "$GIT_SERVER" ] && echo "Warning: must supply GIT_SERVER in env" && return
     [ -z "$GITLAB_USER" ] && echo "Warning: must supply GITLAB_USER in env" && return
@@ -34,4 +68,4 @@ gitlab_pat() {
                         --data 'personal_access_token[name]='"${GITLAB_USER}"'&personal_access_token[expires_at]=&personal_access_token[scopes][]=api')
     GITLAB_PAT=$(echo $body_header | perl -ne 'print "$1\n" if /created-personal-access-token"[[:blank:]]value="(.+?)"/' | sed -n 1p)    
     echo $GITLAB_PAT
-}
+}

codereadyworkspaces/tl500-devfile-v2.yaml

@@ -96,7 +96,7 @@ components:
           name: ide-8084
           protocol: http
           targetPort: 8084
-      image: 'quay.io/rht-labs/stack-tl500:3.0.19'
+      image: 'quay.io/rht-labs/stack-tl500:3.0.20'
       memoryLimit: 2Gi
       mountSources: true
       sourceMapping: /projects