add body message + asset testing before upload

Author: eksrha

main.go

@@ -57,6 +57,7 @@ func init() {
 	releaseSet.Create.Fs = flag.NewFlagSet("release create", flag.ExitOnError)
 	releaseSet.Create.Fs.IntVar(&releaseSet.Create.PrNumber, "prnumber", 0, "overwrite the issue number")
 	releaseSet.Create.Fs.StringVar(&releaseSet.Create.Version, "version", "", "override version to Update")
+	releaseSet.Create.Fs.StringVar(&releaseSet.Create.Body, "body", "", "custom release message (markdow string or file)")
 	releaseSet.Create.Fs.StringVar(&releaseSet.Create.PatchLevel, "patchLevel", "", "predefine version to Update")
 	releaseSet.Create.Fs.BoolVar(&releaseSet.Create.DryRun, "dry-run", false, "make dry-run before writing version to Git by calling it")
 	releaseSet.Create.Fs.Usage = func() {
@@ -66,6 +67,7 @@ func init() {
 	releaseSet.Publish.Fs = flag.NewFlagSet("release publish", flag.ExitOnError)
 	releaseSet.Publish.Fs.IntVar(&releaseSet.Publish.PrNumber, "prnumber", 0, "overwrite the issue number")
 	releaseSet.Publish.Fs.StringVar(&releaseSet.Publish.Version, "version", "", "override version to Update")
+	releaseSet.Publish.Fs.StringVar(&releaseSet.Publish.Body, "body", "", "custom release message (markdow string or file)")
 	releaseSet.Publish.Fs.StringVar(&releaseSet.Publish.PatchLevel, "patchLevel", "", "predefine version to Update")
 	releaseSet.Publish.Fs.StringVar(&releaseSet.Publish.Assets, "assets", "", "upload assets to release. eg.: \"file=awesome-ci\"")
 	releaseSet.Publish.Fs.Int64Var(&releaseSet.Publish.ReleaseId, "releaseid", 0, "publish an early defined release")

src/acigithub/release.go

@@ -11,7 +11,7 @@ import (
 )
 
 // CreateRelease
-func CreateRelease(version string, draft bool) (createdRelease *github.RepositoryRelease, err error) {
+func CreateRelease(version string, body string, draft bool) (createdRelease *github.RepositoryRelease, err error) {
 	if !isgithubRepository {
 		log.Fatalln("make shure the GITHUB_REPOSITORY is available!")
 	}
@@ -20,11 +20,20 @@ func CreateRelease(version string, draft bool) (createdRelease *github.Repositor
 	relName := "Release " + version
 	defaultBranch := tools.GetDefaultBranch()
 
+	// get body for release
+	if body != "" {
+		bodyFile, err := tools.CheckIsFile(body)
+		if err == nil {
+			body = bodyFile
+		}
+	}
+
 	releaseObject := github.RepositoryRelease{
 		TargetCommitish: &defaultBranch,
 		TagName:         &version,
 		Name:            &relName,
 		Draft:           &draft,
+		Body:            &body,
 	}
 	createdRelease, _, err = GithubClient.Repositories.CreateRelease(
 		ctx,
@@ -46,7 +55,7 @@ func CreateRelease(version string, draft bool) (createdRelease *github.Repositor
 }
 
 // PublishRelease
-func PublishRelease(version string, releaseId int64, uploadArtifacts *string) (err error) {
+func PublishRelease(version string, body string, releaseId int64, uploadArtifacts *string) (err error) {
 	draftFalse := false
 	if !isgithubRepository {
 		log.Fatalln("make shure the GITHUB_REPOSITORY is available!")
@@ -57,7 +66,7 @@ func PublishRelease(version string, releaseId int64, uploadArtifacts *string) (e
 		releaseIdStr, releaseIdBool := os.LookupEnv("ACI_RELEASE_ID")
 		if !releaseIdBool {
 			log.Println("No release found, creating one...")
-			release, err := CreateRelease(version, false)
+			release, err := CreateRelease(version, body, false)
 			if err != nil {
 				log.Fatalln(err)
 			}
@@ -92,7 +101,7 @@ func PublishRelease(version string, releaseId int64, uploadArtifacts *string) (e
 	}
 
 	if uploadArtifacts != nil {
-		filesAndInfos, err := tools.GetFilesAndInfos(uploadArtifacts)
+		filesAndInfos, err := tools.GetAsstes(uploadArtifacts, false)
 		if err != nil {
 			return err
 		}

src/service/getBuildInfos.go

@@ -3,6 +3,7 @@ package service
 import (
 	"awesome-ci/src/acigithub"
 	"awesome-ci/src/semver"
+	"awesome-ci/src/tools"
 	"errors"
 	"flag"
 	"fmt"
@@ -23,6 +24,7 @@ type ReleaseCreateSet struct {
 	PatchLevel string
 	PrNumber   int
 	DryRun     bool
+	Body       string
 }
 
 type ReleasePublishSet struct {
@@ -33,6 +35,7 @@ type ReleasePublishSet struct {
 	Assets     string
 	PrNumber   int
 	DryRun     bool
+	Body       string
 }
 
 func ReleaseCreate(args *ReleaseCreateSet) {
@@ -65,17 +68,11 @@ func ReleaseCreate(args *ReleaseCreateSet) {
 		fmt.Printf("Would create new release with version: %s\n", version)
 	} else {
 		fmt.Printf("Writing new release: %s\n", version)
-		createdRelease, err := acigithub.CreateRelease(version, true)
+		createdRelease, err := acigithub.CreateRelease(version, args.Body, true)
 		if err != nil {
 			log.Fatalln(err)
 		}
 		fmt.Println("Create release successful. ID:", *createdRelease.ID)
-		envVars, err := acigithub.OpenEnvFile()
-		if err != nil {
-			log.Fatalln(err)
-		}
-		envVars.Set("ACI_RELEASE_ID", fmt.Sprint(*createdRelease.ID))
-		envVars.SaveEnvFile()
 	}
 }
 
@@ -105,11 +102,19 @@ func ReleasePublish(args *ReleasePublishSet) {
 		version = prInfos.NextVersion
 	}
 
+	_, err = tools.GetAsstes(&args.Assets, true)
+	if err != nil {
+		log.Fatalln("not all specified asstes available, please check")
+	}
+
 	if args.DryRun {
 		fmt.Printf("Would publishing release: %s\n", version)
 	} else {
 		fmt.Printf("Publishing release: %s - %d\n", version, args.ReleaseId)
-		acigithub.PublishRelease(version, args.ReleaseId, &args.Assets)
+		err = acigithub.PublishRelease(version, args.Body, args.ReleaseId, &args.Assets)
+		if err != nil {
+			log.Fatalln(err)
+		}
 	}
 }
 

src/service/release.go

@@ -2,36 +2,10 @@ package tools
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
 	"strings"
 )
 
-type UploadArtifact struct {
-	File os.File
-	Name string
-}
-
-func GetFilesAndInfos(uploadArtifacts *string) (artifacts []UploadArtifact, err error) {
-	artifactsToUpload := strings.Split(*uploadArtifacts, ",")
-	for _, artifact := range artifactsToUpload {
-		var sanFilename string
-		if strings.HasPrefix(artifact, "file=") {
-			sanFilename = artifact[5:]
-		}
-		file, err := os.OpenFile(sanFilename, os.O_RDWR, 0644)
-		if err != nil {
-			return nil, err
-		}
-		info, _ := file.Stat()
-		artifacts = append(artifacts, UploadArtifact{
-			File: *file,
-			Name: info.Name(),
-		})
-	}
-	return
-}
-
 func GetDefaultBranch() string {
 	branch := runcmd(`git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'`, true)
 	return strings.TrimSuffix(branch, "\n")

src/tools/tools.go

@@ -8,6 +8,6 @@ ACI_VERSION=0.7.7
 ACI_LATEST_VERSION=0.7.6
 ACI_OWNER=fullstack-devops
 ACI_REPO=awesome-ci
-ACI_RELEASE_ID=58283687
+ACI_RELEASE_ID=58286218
 ACI_ARTIFACT_0_URL=https://github.com/eksrha/playground/releases/download/2.0.0/awesome-ci
 ACI_ARTIFACT_1_URL=https://github.com/eksrha/playground/releases/download/4.0.0/awesome-ci