From 6fef803ae9ad61fd5103573aaaeb4292108952e7 Mon Sep 17 00:00:00 2001 From: admju Date: Wed, 11 Sep 2024 13:45:09 +0000 Subject: [PATCH] format unix --- publish/occonst/variables.go | 12 +- publish/releases/assets.go | 330 +++++++++++++++++------------------ publish/releases/release.go | 124 ++++++------- 3 files changed, 233 insertions(+), 233 deletions(-) diff --git a/publish/occonst/variables.go b/publish/occonst/variables.go index 39ece06..aa9b07b 100644 --- a/publish/occonst/variables.go +++ b/publish/occonst/variables.go @@ -1,6 +1,6 @@ -package occonst - -var PUBLISH_URL = "https://cloud.o-forge.io" -var PUBLISH_VERSION = "core/oc-deploy" - -var PUBLISH_TOKEN = "8dd3e2d88ff358d86742697f5a431ef96f6da7c7" \ No newline at end of file +package occonst + +var PUBLISH_URL = "https://cloud.o-forge.io" +var PUBLISH_VERSION = "core/oc-deploy" + +var PUBLISH_TOKEN = "" diff --git a/publish/releases/assets.go b/publish/releases/assets.go index 8e4b24b..3387eb7 100644 --- a/publish/releases/assets.go +++ b/publish/releases/assets.go @@ -1,166 +1,166 @@ -package releases - -import ( - "fmt" - "os" - "path/filepath" - "mime/multipart" - "io" - "encoding/json" - "net/http" - "bytes" - - "oc-publish/occonst" -) - -type assetStruct struct { - Name string `json:"name"` - Id int `json:"id"` -} - -func GetAssetId(idRelease int, name string) (int, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets", - occonst.PUBLISH_URL, - occonst.PUBLISH_VERSION, - idRelease) - - res, err := http.Get(url) - if err != nil { - return -1, err - } - body, err := io.ReadAll(res.Body) - if err != nil { - return -2, err - } - - var data []assetStruct - - err = json.Unmarshal(body, &data) - fmt.Println(err) - if err != nil { - return -3, err - } - - for _, ele := range data { - if ele.Name == name { - return ele.Id, nil - } - } - return 0, nil -} - -// curl -X 'POST' \ -// 'https://cloud.o-forge.io/api/v1/repos/core/oc-deploy/releases/2/assets?name=zzzz' \ -// -H 'accept: application/json' \ -// -H 'Content-Type: multipart/form-data' \ -// -F 'attachment=oc-deploy' -func CreateAsset(idRelease int, filename string) (int, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets?name=%s&token=%s", - occonst.PUBLISH_URL, - occonst.PUBLISH_VERSION, - idRelease, - "name", - occonst.PUBLISH_TOKEN) - - // request, err := newfileUploadRequest(url, extraParams, "file", "/tmp/doc.pdf") - - err := uploadFile(url, "attachment", filename) - fmt.Println(url, err) - - - // fmt.Println(url) - - // body := []byte("CONTENU") - // req, err := http.NewRequest("POST", url, bytes.NewBuffer(body)) - // if err != nil { - // return -1, err - // } - // req.Header.Add("accept", "application/json") - // req.Header.Add("Content-Type", "multipart/form-data") - - // client := &http.Client{} - // res, err := client.Do(req) - // fmt.Println(res, err) - - // cnt, err := io.ReadAll(res.Body) - // fmt.Println(string(cnt), err) - - // if err != nil { - // return -1, err - // } - - // if err != nil { - // return -2, err - // } - - // defer res.Body.Close() - - return 0, nil -} - -func uploadFile(url string, paramName string, filePath string) error { - file, err := os.Open(filePath) - if err != nil { - return err - } - defer file.Close() - - body := &bytes.Buffer{} - writer := multipart.NewWriter(body) - part, err := writer.CreateFormFile(paramName, filepath.Base(filePath)) - if err != nil { - return err - } - _, err = io.Copy(part, file) - - err = writer.Close() - if err != nil { - return err - } - - request, err := http.NewRequest("POST", url, body) - request.Header.Add("Content-Type", writer.FormDataContentType()) - request.Header.Add("accept", "application/json") - client := &http.Client{} - response, err := client.Do(request) - - if err != nil { - return err - } - defer response.Body.Close() - - cnt, err := io.ReadAll(response.Body) - fmt.Println(string(cnt), err, writer.FormDataContentType()) - - // Handle the server response... - return nil - } - - -// func newfileUploadRequest(uri string, params map[string]string, paramName, path string) (*http.Request, error) { -// file, err := os.Open(path) -// if err != nil { -// return nil, err -// } -// defer file.Close() - -// body := &bytes.Buffer{} -// writer := multipart.NewWriter(body) -// part, err := writer.CreateFormFile(paramName, filepath.Base(path)) -// if err != nil { -// return nil, err -// } -// _, err = io.Copy(part, file) - -// // for key, val := range params { -// // _ = writer.WriteField(key, val) -// // } -// // err = writer.Close() -// // if err != nil { -// // return nil, err -// // } - -// req, err := http.NewRequest("POST", uri, body) -// req.Header.Set("Content-Type", writer.FormDataContentType()) -// return req, err +package releases + +import ( + "fmt" + "os" + "path/filepath" + "mime/multipart" + "io" + "encoding/json" + "net/http" + "bytes" + + "oc-publish/occonst" +) + +type assetStruct struct { + Name string `json:"name"` + Id int `json:"id"` +} + +func GetAssetId(idRelease int, name string) (int, error) { + url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets", + occonst.PUBLISH_URL, + occonst.PUBLISH_VERSION, + idRelease) + + res, err := http.Get(url) + if err != nil { + return -1, err + } + body, err := io.ReadAll(res.Body) + if err != nil { + return -2, err + } + + var data []assetStruct + + err = json.Unmarshal(body, &data) + fmt.Println(err) + if err != nil { + return -3, err + } + + for _, ele := range data { + if ele.Name == name { + return ele.Id, nil + } + } + return 0, nil +} + +// curl -X 'POST' \ +// 'https://cloud.o-forge.io/api/v1/repos/core/oc-deploy/releases/2/assets?name=zzzz' \ +// -H 'accept: application/json' \ +// -H 'Content-Type: multipart/form-data' \ +// -F 'attachment=oc-deploy' +func CreateAsset(idRelease int, filename string) (int, error) { + url := fmt.Sprintf("%s/api/v1/repos/%s/releases/%d/assets?name=%s&token=%s", + occonst.PUBLISH_URL, + occonst.PUBLISH_VERSION, + idRelease, + "name", + occonst.PUBLISH_TOKEN) + + // request, err := newfileUploadRequest(url, extraParams, "file", "/tmp/doc.pdf") + + err := uploadFile(url, "attachment", filename) + fmt.Println(url, err) + + + // fmt.Println(url) + + // body := []byte("CONTENU") + // req, err := http.NewRequest("POST", url, bytes.NewBuffer(body)) + // if err != nil { + // return -1, err + // } + // req.Header.Add("accept", "application/json") + // req.Header.Add("Content-Type", "multipart/form-data") + + // client := &http.Client{} + // res, err := client.Do(req) + // fmt.Println(res, err) + + // cnt, err := io.ReadAll(res.Body) + // fmt.Println(string(cnt), err) + + // if err != nil { + // return -1, err + // } + + // if err != nil { + // return -2, err + // } + + // defer res.Body.Close() + + return 0, nil +} + +func uploadFile(url string, paramName string, filePath string) error { + file, err := os.Open(filePath) + if err != nil { + return err + } + defer file.Close() + + body := &bytes.Buffer{} + writer := multipart.NewWriter(body) + part, err := writer.CreateFormFile(paramName, filepath.Base(filePath)) + if err != nil { + return err + } + _, err = io.Copy(part, file) + + err = writer.Close() + if err != nil { + return err + } + + request, err := http.NewRequest("POST", url, body) + request.Header.Add("Content-Type", writer.FormDataContentType()) + request.Header.Add("accept", "application/json") + client := &http.Client{} + response, err := client.Do(request) + + if err != nil { + return err + } + defer response.Body.Close() + + cnt, err := io.ReadAll(response.Body) + fmt.Println(string(cnt), err, writer.FormDataContentType()) + + // Handle the server response... + return nil + } + + +// func newfileUploadRequest(uri string, params map[string]string, paramName, path string) (*http.Request, error) { +// file, err := os.Open(path) +// if err != nil { +// return nil, err +// } +// defer file.Close() + +// body := &bytes.Buffer{} +// writer := multipart.NewWriter(body) +// part, err := writer.CreateFormFile(paramName, filepath.Base(path)) +// if err != nil { +// return nil, err +// } +// _, err = io.Copy(part, file) + +// // for key, val := range params { +// // _ = writer.WriteField(key, val) +// // } +// // err = writer.Close() +// // if err != nil { +// // return nil, err +// // } + +// req, err := http.NewRequest("POST", uri, body) +// req.Header.Set("Content-Type", writer.FormDataContentType()) +// return req, err // } \ No newline at end of file diff --git a/publish/releases/release.go b/publish/releases/release.go index af64a20..9bd1131 100644 --- a/publish/releases/release.go +++ b/publish/releases/release.go @@ -1,63 +1,63 @@ -package releases - -import ( - "fmt" - "io" - "encoding/json" - "net/http" - - "oc-publish/occonst" -) - -type checkStruct struct { - Name string `json:"name"` - Id int `json:"id"` -} - -func CheckRelease(version string) (bool, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/releases/tags/%s", - occonst.PUBLISH_URL, - occonst.PUBLISH_VERSION, - version) - - res, err := http.Get(url) - if err != nil { - return false, err - } - body, err := io.ReadAll(res.Body) - if err != nil { - return false, err - } - - var data checkStruct - err = json.Unmarshal(body, &data) - if err != nil { - return false, err - } - - return data.Name != "", nil -} - -func GetReleaseId(version string) (int, error) { - url := fmt.Sprintf("%s/api/v1/repos/%s/releases/tags/%s", - occonst.PUBLISH_URL, - occonst.PUBLISH_VERSION, - version) - - res, err := http.Get(url) - if err != nil { - return 0, err - } - body, err := io.ReadAll(res.Body) - if err != nil { - return 0, err - } - - var data checkStruct - err = json.Unmarshal(body, &data) - if err != nil { - return 0, err - } - - return data.Id, nil +package releases + +import ( + "fmt" + "io" + "encoding/json" + "net/http" + + "oc-publish/occonst" +) + +type checkStruct struct { + Name string `json:"name"` + Id int `json:"id"` +} + +func CheckRelease(version string) (bool, error) { + url := fmt.Sprintf("%s/api/v1/repos/%s/releases/tags/%s", + occonst.PUBLISH_URL, + occonst.PUBLISH_VERSION, + version) + + res, err := http.Get(url) + if err != nil { + return false, err + } + body, err := io.ReadAll(res.Body) + if err != nil { + return false, err + } + + var data checkStruct + err = json.Unmarshal(body, &data) + if err != nil { + return false, err + } + + return data.Name != "", nil +} + +func GetReleaseId(version string) (int, error) { + url := fmt.Sprintf("%s/api/v1/repos/%s/releases/tags/%s", + occonst.PUBLISH_URL, + occonst.PUBLISH_VERSION, + version) + + res, err := http.Get(url) + if err != nil { + return 0, err + } + body, err := io.ReadAll(res.Body) + if err != nil { + return 0, err + } + + var data checkStruct + err = json.Unmarshal(body, &data) + if err != nil { + return 0, err + } + + return data.Id, nil } \ No newline at end of file