refactor: Cloud build service invocation

src/placeos-build/api/driver.cr

@@ -60,6 +60,7 @@ module PlaceOS::Build::Api
       in Build::Compilation::NotFound
         head code: :not_found
       in Build::Compilation::Success
+        PlaceOS::Build.call_cloud_build_service(repository_uri, branch || "HEAD", file, commit, username: username, password: password)
         path = builder.binary_store.path(result.executable)
 
         response.content_type = "application/octet-stream"

src/placeos-build/cli/build.cr

@@ -1,7 +1,4 @@
 require "placeos-log-backend"
-require "http/client"
-require "uri"
-require "http/headers"
 require "../driver_store/s3"
 
 module PlaceOS::Build
@@ -26,10 +23,10 @@
       getter password : String? = nil
 
       @[Clip::Doc("Extract driver info on build")]
       getter strict_driver_info : Bool = true
 
       @[Clip::Doc("Discover drivers and compile them")]
       getter discover : Bool = false
 
       @[Clip::Doc("URI of the git repository")]
       @[Clip::Option]
@@ -60,7 +57,7 @@
           args = {entrypoint: entrypoint, commit: ref, crystal_version: crystal_version}
           ::Log.with_context(**args) do
             begin
               if (path = repository_path)
                 Log.debug { "local compile" }
                 builder.local_compile(Path[path].expand, **args)
               else
@@ -71,7 +68,7 @@
                   password: password,
                 )
               end
-              call_cloud_build_service(entrypoint, ref, username: username, password: password)
+              PlaceOS::Build.call_cloud_build_service(repository_uri, branch, entrypoint, ref, username: username, password: password)
             rescue e
               Log.warn(exception: e) { "failed to compile #{entrypoint}" }
             end
@@ -93,7 +90,7 @@
         end
 
         if discover
           found = if (path = repository_path)
                     builder.local_discover_drivers?(Path[path].expand)
                   else
                     builder.discover_drivers?(repository_uri, ref, username, password)
@@ -104,39 +101,9 @@
         valid_driver_entrypoints
       end
 
       protected def self.is_driver?(path : Path)
         !path.to_s.ends_with?("_spec.cr") && File.read_lines(path).any? &.includes?("< PlaceOS::Driver")
       end
-
-      private def call_cloud_build_service(entrypoint, commit, username, password)
-        headers = HTTP::Headers.new
-        if token = BUILD_GIT_TOKEN
-          headers["X-Git-Token"] = token
-        elsif (user = username) && (pwd = password)
-          headers["X-Git-Username"] = user
-          headers["X-Git-Password"] = pwd
-        end
-        uri = URI.encode_www_form(entrypoint)
-        params = HTTP::Params{
-          "url"    => repository_uri,
-          "branch" => branch,
-          "commit" => commit,
-        }
-
-        client = HTTP::Client.new(URI.parse(BUILD_SERVICE_URL))
-        begin
-          ["amd64", "arm64"].each do |arch|
-            Log.debug { "Sending #{entrypoint} compilation request for architecture #{arch}" }
-            resp = client.post("/api/build/v1/#{arch}/#{uri}?#{params}", headers: headers)
-            unless resp.status_code == 202
-              Log.warn { "Compilation request for #{arch} returned status code #{resp.status_code}, while 202 expected" }
-              Log.debug { "Cloud build service returned with response: #{resp.body}" }
-            end
-          end
-        rescue e
-          Log.warn(exception: e) { "failed to invoke cloud build service #{entrypoint}" }
-        end
-      end
     end
   end
 end

src/placeos-build/cli/cloud_builder.cr

@@ -0,0 +1,35 @@
+require "http/client"
+require "uri"
+require "http/headers"
+
+module PlaceOS::Build
+  def self.call_cloud_build_service(repository_uri : String, branch : String, entrypoint : String, commit : String, username : String?, password : String?)
+    headers = HTTP::Headers.new
+    if token = BUILD_GIT_TOKEN
+      headers["X-Git-Token"] = token
+    elsif (user = username) && (pwd = password)
+      headers["X-Git-Username"] = user
+      headers["X-Git-Password"] = pwd
+    end
+    uri = URI.encode_www_form(entrypoint)
+    params = HTTP::Params{
+      "url"    => repository_uri,
+      "branch" => branch,
+      "commit" => commit,
+    }
+
+    client = HTTP::Client.new(URI.parse(BUILD_SERVICE_URL))
+    begin
+      ["amd64", "arm64"].each do |arch|
+        Log.debug { "Sending #{entrypoint} compilation request for architecture #{arch}" }
+        resp = client.post("/api/build/v1/#{arch}/#{uri}?#{params}", headers: headers)
+        unless resp.status_code == 202
+          Log.warn { "Compilation request for #{arch} returned status code #{resp.status_code}, while 202 expected" }
+          Log.debug { "Cloud build service returned with response: #{resp.body}" }
+        end
+      end
+    rescue e
+      Log.warn(exception: e) { "failed to invoke cloud build service #{entrypoint}" }
+    end
+  end
+end