Merge pull request #119 from RedisInsight/feature/RI-2088_get_rid_of_python_scripts

#RI-2088 remove python scripts with plain curl commands on test datab…

Author: arthosofteq

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'python' ]
+        language: [ 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 

redisinsight/api/test/test-runs/re-clu/Dockerfile

@@ -1,18 +1,9 @@
-FROM redislabs/redis:6.0.8-28.bionic
+FROM redislabs/redis:6.2.8-50
 
-# Change user to root to install pip
-USER root
-RUN set -ex \
-    && apt-get update \
-    && apt-get install -y python3-pip \
-    && pip3 install requests
-# Change user back to redislabs
-USER redislabs
-
-# Set the env var to instruct RE to create a cluster on startup
+## Set the env var to instruct RE to create a cluster on startup
 ENV BOOTSTRAP_ACTION create_cluster
 ENV BOOTSTRAP_CLUSTER_FQDN cluster.local
 
-COPY run_re_and_create_db.sh create_dbs.py cert.pem ./
+COPY entrypoint.sh db.json ./
 
-ENTRYPOINT [ "bash", "./run_re_and_create_db.sh" ]
+ENTRYPOINT [ "bash", "./entrypoint.sh" ]

redisinsight/api/test/test-runs/re-clu/README.md

@@ -0,0 +1,18 @@
+{
+  "name": "testdb",
+  "type": "redis",
+  "memory_size": 1073741824,
+  "port": 12010,
+  "sharding": true,
+  "shards_count": 3,
+  "proxy_policy": "all-master-shards",
+  "oss_cluster": true,
+  "shard_key_regex": [
+    {
+      "regex": ".*\\{(?<tag>.*)\\}.*"
+    },
+    {
+      "regex": "(?<tag>.*)"
+    }
+  ]
+}

redisinsight/api/test/test-runs/re-clu/cert.pem

@@ -9,9 +9,5 @@ services:
     build: ./re-clu
     cap_add:
       - sys_resource
-    environment:
-      - CREATE_CLUSTER_DB=1
-#    ports:
-#      - 12010:12010
-#      - 8443:8443
-#      - 9443:9443
+    env_file:
+      - ./re-clu/.env

redisinsight/api/test/test-runs/re-clu/create_dbs.py

@@ -1,5 +1,8 @@
 #! /bin/bash
 
+TEST_RE_USER=${TEST_RE_USER:-"[email protected]"}
+TEST_RE_PASS=${TEST_RE_PASS:-"123456"}
+
 set -e
 
 # enable job control
@@ -8,7 +11,7 @@ set -m
 /opt/start.sh &
 
 # This command queries the REST API and outputs the status code
-CURL_CMD="curl --silent --fail --output /dev/null -i -w %{http_code} -u [email protected]:123456 -k https://redis-enterprise:9443/v1/nodes"
+CURL_CMD="curl --silent --fail --output /dev/null -i -w %{http_code} -u $TEST_RE_USER:$TEST_RE_PASS -k https://localhost:9443/v1/nodes"
 
 # Wait to get 2 consecutive 200 responses from the REST API
 while true
@@ -30,9 +33,9 @@ do
     fi
 done
 
-echo "Running Python script to create databases..."
-python3 create_dbs.py
+echo "Creating databases..."
 
+curl -k -u "$TEST_RE_USER:$TEST_RE_PASS" --request POST --url "https://localhost:9443/v1/bdbs" --header 'content-type: application/json' --data-binary "@db.json"
 
 # now we bring the primary process back into the foreground
 # and leave it there

redisinsight/api/test/test-runs/re-clu/db.json

@@ -1,18 +1,9 @@
-FROM redislabs/redis:6.0.8-28.bionic
+FROM redislabs/redis:6.2.8-50
 
-# Change user to root to install pip
-USER root
-RUN set -ex \
-    && apt-get update \
-    && apt-get install -y python3-pip \
-    && pip3 install requests
-# Change user back to redislabs
-USER redislabs
-
-# Set the env var to instruct RE to create a cluster on startup
+## Set the env var to instruct RE to create a cluster on startup
 ENV BOOTSTRAP_ACTION create_cluster
 ENV BOOTSTRAP_CLUSTER_FQDN cluster.local
 
-COPY run_re_and_create_db.sh create_dbs.py cert.pem ./
+COPY entrypoint.sh db.json ./
 
-ENTRYPOINT [ "bash", "./run_re_and_create_db.sh" ]
+ENTRYPOINT [ "bash", "./entrypoint.sh" ]