ovirt-engine-sdk 4.4.1 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cbf21cc36a2d2e6cc01b2c93a66c911d986f701204f5da8c9a546dd03eda60e
-  data.tar.gz: 0102e341d81119a0f2e6c8181e2931c1bf57134836d1cc4a8d28eace0c873287
+  metadata.gz: 2a18fa604006bdf2fff1c9c6ae67d53cfc8421aedca0f5a823fbae736b3b17fa
+  data.tar.gz: 6353e9cba637cd0e739ecfc525720eedd303cf19c7f1c149cd9f336927a9eae4
 SHA512:
-  metadata.gz: ee46d1debeafe7d3fe376f86413aaa650ba99e7bc2e211868b2418a6597c832e0bb3f8aa0da8cfff4ec3501d41af66a74fad9125c5a3550b8ddd4ffa1a3f3c2c
-  data.tar.gz: b0f854782e5e8257056d51c03e070d509972baa175c8006d06e3e75ad13968eef5624b4fd23a58ff65c8258df93060b0b6e9a34d11bc601edcbbfbcffa7729db
+  metadata.gz: 8f1b0c3d6a4b006f7536276da729334719c8507b3fddb7ca03675647c73191ef55b2c0b4411996695c13fbfdca6965a571b5bed2124c5514fc17646ff8c0bdfc
+  data.tar.gz: 519977ad66626c3ec8a3ca01184cfb966fced85b9399e6f548fd37f47bfc1bc0e5481f710f74f43ac3ea945e17fe4cc6e60f46846edec93f5d122bd029ffd88c

data/CHANGES.adoc

@@ -2,8 +2,26 @@
 
 This document describes the relevant changes between releases of the SDK.
 
+== 4.6.1 / Oct 16 2025
+Upgrade to model 4.6.1 and metamodel 1.3.11
+
+New features:
+
+* Add support for Ruby 3
+
+* Use Weld 3
+
+* Build on Java 21
+
+== 4.6.0 / Feb 1 2024
+Upgrade to model 4.6.0 and metamodel 1.3.10
+
+New features:
+
+* Replace rb_cData with rb_cObject, making it compatible with ruby 3.1+
+
 == 4.4.1 / Feb 23 2021
-Upgrade to model 4.4.22, metamodel 1.3.4
+Upgrade to model 4.4.26, metamodel 1.3.4
 
 * Remove python dependencies from build scripts
 
@@ -26,7 +44,7 @@ Deprecations:
 
 * packaging: drop fc28, fc29, el7
 
-* automation: drop fc28, fc29, el7 
+* automation: drop fc28, fc29, el7
 
 == 4.3.0 / Jan 16 2018
 Update to model 4.3.21.
@@ -117,7 +135,7 @@ New features:
 
 * Add `cancel` action to transfer image session.
 
-* Add `export` template as OVA to a given path on a host 
+* Add `export` template as OVA to a given path on a host
   https://bugzilla.redhat.com/1526033[#1526033].
 
 * Add service to list user groups

data/ext/ovirtsdk4c/ov_http_client.c

@@ -34,6 +34,9 @@ limitations under the License.
 #include "ov_http_response.h"
 #include "ov_http_transfer.h"
 
+/* thread.c (export) */
+extern int ruby_thread_has_gvl_p(void);
+
 /* Class: */
 VALUE ov_http_client_class;
 
@@ -130,7 +133,7 @@ typedef struct {
 
 typedef struct {
     CURLM* handle;
-    CURLcode code;
+    CURLMcode code;
     bool cancel;
 } ov_http_client_wait_context;
 
@@ -176,7 +179,7 @@ static void ov_http_client_check_closed(ov_http_client_object* object) {
 static void ov_http_client_mark(void* vptr) {
     ov_http_client_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_client_object*)vptr;
     rb_gc_mark(ptr->log);
     rb_gc_mark(ptr->queue);
     rb_gc_mark(ptr->pending);
@@ -187,7 +190,7 @@ static void ov_http_client_free(void* vptr) {
     ov_http_client_object* ptr;
 
     /* Get the pointer to the object: */
-    ptr = vptr;
+    ptr = (ov_http_client_object*)vptr;
 
     /* Release the resources used by libcurl: */
     if (ptr->handle != NULL) {
@@ -213,7 +216,7 @@ rb_data_type_t ov_http_client_type = {
         .dmark = ov_http_client_mark,
         .dfree = ov_http_client_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -384,7 +387,7 @@ static void* ov_http_client_header_task(void* data) {
     }
 
     /* Parse the header and add it to the response object: */
-    pointer = memchr(buffer, ':', length);
+    pointer = (char*) memchr(buffer, ':', length);
     if (pointer != NULL) {
         name = rb_str_new(buffer, pointer - buffer);
         name = rb_funcall(name, DOWNCASE_ID, 0);
@@ -490,12 +493,20 @@ static int ov_http_client_debug_function(CURL* handle, curl_infotype type, char*
     /* Get the pointer to the transfer: */
     ov_http_transfer_ptr(transfer, transfer_ptr);
 
-    /* Execute the debug code with the global interpreter lock acquired, as it needs to call Ruby methods: */
+    /* The global interpreter lock may be acquired or not, so we need to check and either call the task directly
+       or else call it after acquiring the lock. Note that the `ruby_thread_has_gvl_p` function that we use to
+       check if the GVL is acquired is marked as experimental, and not defined in `thread.h`, so it may be
+       removed at any time, but I didn't find any other way to check if the GVL is acquired. */
     context.client = transfer_ptr->client;
     context.type = type;
     context.data = data;
     context.size = size;
-    rb_thread_call_with_gvl(ov_http_client_debug_task, &context);
+    if (ruby_thread_has_gvl_p()) {
+      ov_http_client_debug_task(&context);
+    }
+    else {
+      rb_thread_call_with_gvl(ov_http_client_debug_task, &context);
+    }
     return 0;
 }
 
@@ -728,7 +739,7 @@ static VALUE ov_http_client_build_url( VALUE url, VALUE query) {
     if (!NIL_P(query)) {
         Check_Type(query, T_HASH);
         if (RHASH_SIZE(query) > 0) {
-            url = rb_sprintf("%"PRIsVALUE"?%"PRIsVALUE"", url, rb_funcall(URI_CLASS, ENCODE_WWW_FORM_ID, 1, query));
+            url = rb_sprintf("%" PRIsVALUE "?%" PRIsVALUE "", url, rb_funcall(URI_CLASS, ENCODE_WWW_FORM_ID, 1, query));
         }
     }
 
@@ -738,7 +749,7 @@ static VALUE ov_http_client_build_url( VALUE url, VALUE query) {
 static int ov_http_client_add_header(VALUE name, VALUE value, struct curl_slist** headers) {
     VALUE header = Qnil;
 
-    header = rb_sprintf("%"PRIsVALUE": %"PRIsVALUE"", name, value);
+    header = rb_sprintf("%" PRIsVALUE ": %" PRIsVALUE "", name, value);
     *headers = curl_slist_append(*headers, StringValueCStr(header));
 
     return ST_CONTINUE;
@@ -784,7 +795,7 @@ static void* ov_http_client_complete_task(void* data) {
         /* Send a summary of the response to the log: */
         ov_http_client_log_info(
             client_ptr->log,
-            "Received response code %"PRIsVALUE" for %"PRIsVALUE" request to URL '%"PRIsVALUE"'.",
+            "Received response code %" PRIsVALUE " for %" PRIsVALUE " request to URL '%" PRIsVALUE "'.",
             response_ptr->code,
             request_ptr->method,
             request_ptr->url
@@ -832,7 +843,7 @@ static void* ov_http_client_wait_task(void* data) {
 #endif
 
     /* The passed data is the wait context: */
-    context_ptr = data;
+    context_ptr = (ov_http_client_wait_context*) data;
 
     /* Get the timeout preferred by libcurl, or one 100 ms by default: */
     curl_multi_timeout(context_ptr->handle, &timeout);
@@ -843,7 +854,7 @@ static void* ov_http_client_wait_task(void* data) {
 #if LIBCURL_VERSION_NUM >= 0x071c00
     /* Wait till there is activity: */
     context_ptr->code = curl_multi_wait(context_ptr->handle, NULL, 0, timeout, NULL);
-    if (context_ptr->code != CURLE_OK) {
+    if (context_ptr->code != CURLM_OK) {
         return NULL;
     }
 #else
@@ -864,7 +875,7 @@ static void* ov_http_client_wait_task(void* data) {
     /* Let libcurl do its work, even if no file descriptor needs attention. This is necessary because some of its
        activities can't be monitored using file descriptors. */
     context_ptr->code = curl_multi_perform(context_ptr->handle, &pending);
-    if (context_ptr->code != CURLE_OK) {
+    if (context_ptr->code != CURLM_OK) {
         return NULL;
     }
 
@@ -882,7 +893,7 @@ static void* ov_http_client_wait_task(void* data) {
     }
 
     /* Everything worked correctly: */
-    context_ptr->code = CURLE_OK;
+    context_ptr->code = CURLM_OK;
     return NULL;
 }
 
@@ -890,7 +901,7 @@ static void ov_http_client_wait_cancel(void* data) {
     ov_http_client_wait_context* context_ptr;
 
     /* The passed data is the wait context: */
-    context_ptr = data;
+    context_ptr = (ov_http_client_wait_context*) data;
 
     /* Set the cancel flag so that the operation will be actually aborted in the next operation of the wait loop: */
     context_ptr->cancel = true;
@@ -972,7 +983,6 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
     else if (rb_eql(request_ptr->method, PUT_SYMBOL)) {
        *headers = curl_slist_append(*headers, "Expect:");
        curl_easy_setopt(handle, CURLOPT_UPLOAD, 1L);
-       curl_easy_setopt(handle, CURLOPT_PUT, 1L);
     }
     else if (rb_eql(request_ptr->method, DELETE_SYMBOL)) {
        curl_easy_setopt(handle, CURLOPT_HTTPGET, 1L);
@@ -984,7 +994,7 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
 
     /* Set authentication details: */
     if (!NIL_P(request_ptr->token)) {
-        header = rb_sprintf("Authorization: Bearer %"PRIsVALUE"", request_ptr->token);
+        header = rb_sprintf("Authorization: Bearer %" PRIsVALUE "", request_ptr->token);
         *headers = curl_slist_append(*headers, StringValueCStr(header));
     }
     else if (!NIL_P(request_ptr->username) && !NIL_P(request_ptr->password)) {
@@ -998,14 +1008,14 @@ static void ov_http_client_prepare_handle(ov_http_client_object* client_ptr, ov_
 
     /* Set the headers: */
     if (!NIL_P(request_ptr->headers)) {
-        rb_hash_foreach(request_ptr->headers, ov_http_client_add_header, (VALUE) headers);
+        rb_hash_foreach(request_ptr->headers, (int (*)(VALUE, VALUE, VALUE)) ov_http_client_add_header, (VALUE) headers);
     }
     curl_easy_setopt(handle, CURLOPT_HTTPHEADER, *headers);
 
     /* Send a summary of the request to the log: */
     ov_http_client_log_info(
         client_ptr->log,
-        "Sending %"PRIsVALUE" request to URL '%"PRIsVALUE"'.",
+        "Sending %" PRIsVALUE " request to URL '%" PRIsVALUE "'.",
         request_ptr->method,
         url
     );
@@ -1111,7 +1121,7 @@ static VALUE ov_http_client_wait(VALUE self, VALUE request) {
 
     /* Work till the transfer has been completed. */
     context.handle = ptr->handle;
-    context.code = CURLE_OK;
+    context.code = CURLM_OK;
     context.cancel = false;
     for (;;) {
         /* Move requests from the queue to libcurl: */
@@ -1136,8 +1146,8 @@ static VALUE ov_http_client_wait(VALUE self, VALUE request) {
         if (context.cancel) {
             return Qnil;
         }
-        if (context.code != CURLE_OK) {
-            rb_raise(ov_error_class, "Unexpected error while waiting: %s", curl_easy_strerror(context.code));
+        if (context.code != CURLM_OK) {
+            rb_raise(ov_error_class, "Unexpected error while waiting: %s", curl_multi_strerror(context.code));
         }
     }
 
@@ -1148,7 +1158,7 @@ static VALUE ov_http_client_inspect(VALUE self) {
     ov_http_client_object* ptr;
 
     ov_http_client_ptr(self, ptr);
-    return rb_sprintf("#<%"PRIsVALUE":%p>", ov_http_client_class, ptr);
+    return rb_sprintf("#<%" PRIsVALUE ":%p>", ov_http_client_class, ptr);
 }
 
 void ov_http_client_define(void) {

data/ext/ovirtsdk4c/ov_http_request.c

@@ -45,7 +45,7 @@ static VALUE CONNECT_TIMEOUT_SYMBOL;
 static void ov_http_request_mark(void* vptr) {
     ov_http_request_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_request_object*)vptr;
     rb_gc_mark(ptr->method);
     rb_gc_mark(ptr->url);
     rb_gc_mark(ptr->query);
@@ -62,7 +62,7 @@ static void ov_http_request_mark(void* vptr) {
 static void ov_http_request_free(void* vptr) {
     ov_http_request_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_request_object*)vptr;
     xfree(ptr);
 }
 
@@ -72,7 +72,7 @@ rb_data_type_t ov_http_request_type = {
         .dmark = ov_http_request_mark,
         .dfree = ov_http_request_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -305,7 +305,7 @@ static VALUE ov_http_request_inspect(VALUE self) {
 
     ov_http_request_ptr(self, ptr);
     return rb_sprintf(
-        "#<%"PRIsVALUE":%"PRIsVALUE" %"PRIsVALUE">",
+        "#<%" PRIsVALUE ":%" PRIsVALUE " %" PRIsVALUE ">",
         ov_http_request_class,
         ptr->method,
         ptr->url
@@ -344,7 +344,7 @@ static VALUE ov_http_request_initialize(int argc, VALUE* argv, VALUE self) {
 
 void ov_http_request_define(void) {
     /* Define the class: */
-    ov_http_request_class = rb_define_class_under(ov_module, "HttpRequest", rb_cData);
+    ov_http_request_class = rb_define_class_under(ov_module, "HttpRequest", rb_cObject);
 
     /* Define the constructor: */
     rb_define_alloc_func(ov_http_request_class, ov_http_request_alloc);

data/ext/ovirtsdk4c/ov_http_response.c

@@ -31,7 +31,7 @@ static VALUE MESSAGE_SYMBOL;
 static void ov_http_response_mark(void* vptr) {
     ov_http_response_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_response_object*)vptr;
     rb_gc_mark(ptr->body);
     rb_gc_mark(ptr->code);
     rb_gc_mark(ptr->headers);
@@ -41,7 +41,7 @@ static void ov_http_response_mark(void* vptr) {
 static void ov_http_response_free(void* vptr) {
     ov_http_response_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_response_object*)vptr;
     xfree(ptr);
 }
 
@@ -51,7 +51,7 @@ rb_data_type_t ov_http_response_type = {
         .dmark = ov_http_response_mark,
         .dfree = ov_http_response_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -151,7 +151,7 @@ static VALUE ov_http_response_inspect(VALUE self) {
 
     ov_http_response_ptr(self, ptr);
     return rb_sprintf(
-        "#<%"PRIsVALUE":%"PRIsVALUE" %"PRIsVALUE">",
+        "#<%" PRIsVALUE ":%" PRIsVALUE " %" PRIsVALUE ">",
         ov_http_response_class,
         ptr->code,
         ptr->message
@@ -184,7 +184,7 @@ static VALUE ov_http_response_initialize(int argc, VALUE* argv, VALUE self) {
 
 void ov_http_response_define(void) {
     /* Define the class: */
-    ov_http_response_class = rb_define_class_under(ov_module, "HttpResponse", rb_cData);
+    ov_http_response_class = rb_define_class_under(ov_module, "HttpResponse", rb_cObject);
 
     /* Define the constructor: */
     rb_define_alloc_func(ov_http_response_class, ov_http_response_alloc);

data/ext/ovirtsdk4c/ov_http_transfer.c

@@ -27,7 +27,7 @@ VALUE ov_http_transfer_class;
 static void ov_http_transfer_mark(void* vptr) {
     ov_http_transfer_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_transfer_object*)vptr;
     rb_gc_mark(ptr->client);
     rb_gc_mark(ptr->request);
     rb_gc_mark(ptr->response);
@@ -38,7 +38,7 @@ static void ov_http_transfer_mark(void* vptr) {
 static void ov_http_transfer_free(void* vptr) {
     ov_http_transfer_object* ptr;
 
-    ptr = vptr;
+    ptr = (ov_http_transfer_object*)vptr;
     xfree(ptr);
 }
 
@@ -48,7 +48,7 @@ rb_data_type_t ov_http_transfer_type = {
         .dmark = ov_http_transfer_mark,
         .dfree = ov_http_transfer_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -75,12 +75,12 @@ static VALUE ov_http_transfer_inspect(VALUE self) {
     ov_http_transfer_object* ptr;
 
     ov_http_transfer_ptr(self, ptr);
-    return rb_sprintf("#<%"PRIsVALUE":%p>", ov_http_transfer_class, ptr);
+    return rb_sprintf("#<%" PRIsVALUE ":%p>", ov_http_transfer_class, ptr);
 }
 
 void ov_http_transfer_define(void) {
     /* Define the class: */
-    ov_http_transfer_class = rb_define_class_under(ov_module, "HttpTransfer", rb_cData);
+    ov_http_transfer_class = rb_define_class_under(ov_module, "HttpTransfer", rb_cObject);
 
     /* Define the constructor: */
     rb_define_alloc_func(ov_http_transfer_class, ov_http_transfer_alloc);

data/ext/ovirtsdk4c/ov_xml_reader.c

@@ -72,7 +72,7 @@ rb_data_type_t ov_xml_reader_type = {
         .dmark = ov_xml_reader_mark,
         .dfree = ov_xml_reader_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -430,7 +430,7 @@ void ov_xml_reader_define(void) {
     rb_require("stringio");
 
     /* Define the class: */
-    ov_xml_reader_class = rb_define_class_under(ov_module, "XmlReader", rb_cData);
+    ov_xml_reader_class = rb_define_class_under(ov_module, "XmlReader", rb_cObject);
 
     /* Define the constructor: */
     rb_define_alloc_func(ov_xml_reader_class, ov_xml_reader_alloc);

data/ext/ovirtsdk4c/ov_xml_writer.c

@@ -66,7 +66,7 @@ rb_data_type_t ov_xml_writer_type = {
         .dmark = ov_xml_writer_mark,
         .dfree = ov_xml_writer_free,
         .dsize = NULL,
-        .reserved = { NULL, NULL }
+        .reserved = { NULL }
     },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
     .parent = NULL,
@@ -181,7 +181,7 @@ static VALUE ov_xml_writer_string(VALUE self) {
     if (rc < 0) {
         rb_raise(ov_error_class, "Can't flush XML writer");
     }
-    return rb_funcall(ptr->io, STRING_ID, 0, NULL);
+    return rb_funcall(ptr->io, STRING_ID, 0, Qnil);
 }
 
 static VALUE ov_xml_writer_write_start(VALUE self, VALUE name) {