Pre release

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: snickerbockers/submodules-init@v4
     - name: apt is for w__p
       run: |
-        wget https://github.com/cosmo-ray/json-search/releases/download/0.2/json-search-x86_64.AppImage
+        wget https://github.com/cosmo-ray/json-search/releases/download/0.3.1/json-search-x86_64.AppImage
         chmod +x json-search-x86_64.AppImage
         sudo cp json-search-x86_64.AppImage /bin/json-search
         sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq

.github/workflows/linux-pkg-build.yaml

@@ -19,7 +19,7 @@ jobs:
         sudo apt-get update --fix-missing
         sudo apt-get install -y -f -o Acquire::Retries=3 cargo libfuse2
         docker build  -t oapi-build ./docker
-        docker run --device /dev/fuse --cap-add SYS_ADMIN --privileged=True -v $PWD:/oapi-cli oapi-build scl enable devtoolset-11 -- /oapi-cli/docker/make.sh cp
+        docker run --device /dev/fuse --cap-add SYS_ADMIN --privileged=True -v $PWD:/oapi-cli oapi-build /oapi-cli/docker/make.sh cp
         sudo chown $(whoami) -R ./docker-package/
         ./docker-package/oapi-cli-x86_64.AppImage --appimage-extract-and-run --help
         ./docker-package/oapi-cli-x86_64.AppImage --help

docker/Dockerfile

@@ -1,12 +1,12 @@
-FROM centos:7
+FROM rockylinux:8
+
+RUN echo "assumeyes=1" >> /etc/yum.conf
 
 RUN yum search epel-release
 RUN yum info epel-release
 RUN yum install -y  epel-release wget
 RUN yum update -y
 
-RUN yum install -y git autoconf automake make cmake3 json-c-devel centos-release-scl-rh libnghttp2 libpsl libtool  pkgconfig fuse-devel file cargo libcurl-devel
-RUN yum install -y devtoolset-11-gcc-c++
-RUN ln -s /usr/bin/cmake3 /usr/bin/cmake
+RUN yum install -y git autoconf automake make cmake json-c-devel libnghttp2 libpsl libtool  pkgconfig fuse-devel file cargo libcurl-devel
 
 RUN yum clean all

local-tests.sh

@@ -43,7 +43,7 @@ oapi-cli   --password=useless --login=non-existant CreateVms ReadVms  ReadVms --
 echo "[Test unknown user is unknown OK]"
 
 trap "echo [Test Create vms and read with user 0 FAIL]" ERR
-oapi-cli  --password='ashita wa dochida' --login='joe' CreateVms ReadVms  ReadVms --Filters.VmIds[] i-00000003 | jq .Vms  > /dev/null
+oapi-cli  --password='ashita wa dochida' --login='joe' CreateVms --ImageId ami-ffffff00 ReadVms  ReadVms --Filters.VmIds[] i-00000003 | jq .Vms  > /dev/null
 echo '[Test Create vms and read with user 0 OK]'
 
 trap "echo [Test read vm with user and --raw-print 0 FAIL]" ERR

main-helper.h

@@ -34,21 +34,29 @@ struct ptr_array {
 		}							\
 	} while (0)
 
+/*
+ * use to be sizeof v, but if I pass "" to SET_NEXT, sizeof v is 1, and I expect
+ * char *,
+ * because the array can contain int and double too, I'll gowith allocated the
+ * biggerst size for all
+ */
+#define OBJ_SIZE 8
+
 #define SET_NEXT(a,v,pa) do {						\
 		int cnt;						\
 		if (!a) {						\
-			a = calloc(64, sizeof(v));			\
+			a = calloc(64, OBJ_SIZE);				\
 			if (!a) break;					\
 			if (ptr_array_append(pa, a) < 0)		\
 				break;					\
 		}							\
 		for (cnt = 0; a[cnt]; ++cnt);				\
 		if (cnt && (cnt % 63) == 0) {				\
 			int idx = ptr_array_get_idx(pa, a);		\
-			pa->ptrs[idx] = realloc(a, (cnt + 1 + 64) * sizeof(v));	\
+			pa->ptrs[idx] = realloc(a, (cnt + 1 + 64) * OBJ_SIZE); \
 			if (!pa->ptrs[idx]) { free(a); break; }		\
 			a = pa->ptrs[idx];				\
-			memset(a + cnt + 1, 0, 64 * sizeof(v));		\
+			memset(a + cnt + 1, 0, 64 * OBJ_SIZE);		\
 		}							\
 		a[cnt] = v;						\
 	} while (0)