Merge pull request #424 from cncf/release_id_error

[Bug] Fix release id error
cnti-testcatalog · Oct 2, 2020 · 6519a8f · 6519a8f
2 parents b58fc9e + eec14cc
commit 6519a8f
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/tasks/utils/release_manager.cr b/src/tasks/utils/release_manager.cr
@@ -32,6 +32,8 @@ module ReleaseManager
         prerelease = true
         draft = true 
       end
+      LOGGING.info "upsert_version: #{upsert_version}"
+      LOGGING.info "upsert_version comparison: upsert_version =~ /(?i)(master|v[0-1]|test_version)/ : #{upsert_version =~ /(?i)(master|v[0-1]|test_version)/}"
       unless upsert_version =~ /(?i)(master|v[0-1]|test_version)/
         LOGGING.info "Not creating a release for : #{upsert_version}"
         return {found_release, asset} 
@@ -80,24 +82,29 @@ Artifact info:
 
 TEMPLATE
 
+      release_url = "https://api.github.com/repos/cncf/cnf-conformance/releases"
       unless found_release
         # /repos/:owner/:repo/releases
-        found_resp = Halite.basic_auth(user: ENV["GITHUB_USER"], pass: ENV["GITHUB_TOKEN"]).
-          post("https://api.github.com/repos/cncf/cnf-conformance/releases",
-               headers: {Accept: "application/vnd.github.v3+json"},
-               json: { "tag_name" => upsert_version,
-                       "draft" => draft,
-                       "prerelease" => prerelease,
-                       "name" => "#{upsert_version} #{Time.local.to_s("%B, %d %Y")}",
-                       "body" => notes_template })
+          # post(release_url, headers: {Accept: "application/vnd.github.v3+json"}, json: { "tag_name" => upsert_version, "draft" => draft, "prerelease" => prerelease, "name" => "#{upsert_version} #{Time.local.to_s("%B, %d %Y")}", "body" => notes_template }) found_release = JSON.parse(found_resp.body)
+
+        headers = {Accept: "application/vnd.github.v3+json"}
+        json = { "tag_name" => upsert_version, 
+                 "draft" => draft, 
+                 "prerelease" => prerelease, 
+                 "name" => "#{upsert_version} #{Time.local.to_s("%B, %d %Y")}", 
+                 "body" => notes_template }
+
+        LOGGING.info "Release not found.  Creating a release: # url: #{release_url} headers: #{headers} json #{json}"
+
+        found_resp = Halite.basic_auth(user: ENV["GITHUB_USER"], pass: ENV["GITHUB_TOKEN"]).post(release_url, headers: headers, json: json) 
         found_release = JSON.parse(found_resp.body)
         # TODO error if cant create a release
         LOGGING.info "(unless) found_release: #{found_release}"
       end
 
       # PATCH /repos/:owner/:repo/releases/:release_id
       found_resp = Halite.basic_auth(user: ENV["GITHUB_USER"], pass: ENV["GITHUB_TOKEN"]).
-        patch("https://api.github.com/repos/cncf/cnf-conformance/releases/#{found_release["id"]}",
+        patch("#{release_url}/#{found_release["id"]}",
               json: { "tag_name" => upsert_version,
                       "draft" => draft,
                       "prerelease" => prerelease,
@@ -106,7 +113,6 @@ TEMPLATE
       found_release = JSON.parse(found_resp.body)
 
       LOGGING.info "found_release (after create): #{found_release}"
-      LOGGING.info "found_release id: #{found_release["id"]}"
 
       # NOTE: so I wrote all this code... and then recognized tarballs and zips of the source
       # are automatically generated by github whenever you PUBLISH a release...