Skip to content

feat: create internal package #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 17, 2025
Merged

feat: create internal package #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5bdd5e
feat: create internal package
thewhitewizard Oct 17, 2025
fa47367
feat: create internal package and move/rename existing package
thewhitewizard Oct 17, 2025
6fa8dea
refactor: csv prefix to cvm prefix
thewhitewizard Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 9 additions & 141 deletions apploader/csv-app/csv-app.go → apploader/internal/cvm/cvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package csvapp
package cvm

/*
#include <unistd.h>
Expand All @@ -7,11 +7,10 @@ package csvapp
*/
import "C"
import (
"apploader/internal/secret"
"apploader/pkg/conversion"
"apploader/pkg/file"
"apploader/secret_server"
"fmt"
"io/ioutil"
"log"
"os"
"os/exec"
Expand All @@ -36,42 +35,13 @@ const (
SUPERVISOR_PATH = "/workplace/supervisord/apploader"
)

type CsvApp struct {
Kind string `yaml:"kind"`
AppInfo []*TaskInfo `yaml:"app"`
CsvAssistants []*TaskInfo `yaml:"csvAssistants"`
}

type TaskInfo struct {
TLSInfo *TLSInfo `yaml:"tls"`
Name string `yaml:"name"`
Type string `yaml:"type"`
Entrypoint string `yaml:"entrypoint"`
Env interface{} `yaml:"env"`
Priority int `yaml:"-"`
Args []string `yaml:"args"`
}

type SupervisorConf struct {
Name string
Command string
Workplace string
Environment string
Priority int
}

type TLSInfo struct {
CertPath string `yaml:"certPath"`
CommonName string `yaml:"commonName"`
}

func DoJob(ca *TaskInfo) error {
if ca.Type != JOB {
return fmt.Errorf("this task is not a job")
}

envs := make([]string, 0)
for k, v := range secret_server.Secret {
for k, v := range secret.Secret {
envs = append(envs, fmt.Sprintf("%s=%s", k, v))
}

Expand All @@ -86,43 +56,6 @@ func DoJob(ca *TaskInfo) error {
}
}

if ca.TLSInfo != nil {
encryptedDir := "/workplace/encryptedData"
log.Printf("[warning] use PKI, please make sure %s is an encrypted disk", encryptedDir)
caPath := path.Join(encryptedDir, "pki")
if !file.Exists(path.Join(caPath, "existed")) {
err := RunCommand("/workplace/csv-agent/csvassistants/pkitool/pkitool", nil, "cert", "-m", "ca", "-a", caPath, "-c", "/workplace/csv-agent/csvassistants/pkitool/conf/cert-conf")
if err != nil {
return fmt.Errorf("init pki ca failed, error: %s", err.Error())
}
err = ioutil.WriteFile(path.Join(caPath, "existed"), []byte("existed"), os.ModePerm)
if err != nil {
os.RemoveAll(caPath)
return fmt.Errorf("mark ca existed faield, error: %s", err.Error())
}
}
if !file.Exists(path.Join(ca.TLSInfo.CertPath, "existed")) {
err := RunCommand("/workplace/csv-agent/csvassistants/pkitool/pkitool", nil, "cert", "-m", "server", "-a", caPath, "-o", ca.TLSInfo.CertPath, "-n", ca.TLSInfo.CommonName)
if err != nil {
return fmt.Errorf("create tls cert failed, error: %s\n", err.Error())
}

err = ioutil.WriteFile(path.Join(ca.TLSInfo.CertPath, "existed"), []byte("existed"), os.ModePerm)
if err != nil {
os.RemoveAll(ca.TLSInfo.CertPath)
return fmt.Errorf("mark ca existed faield, error: %s", err.Error())
}
}

caString, err := ioutil.ReadFile(path.Join(caPath, "ca.crt"))
if err != nil {
return fmt.Errorf("read ca.crt failed, error: %s", err.Error())
}
log.Println("the ca.crt is as follow")
fmt.Printf("%s", caString)
log.Println("*********************************")
}

log.Printf("entrypoint is %s", ca.Entrypoint)
return RunCommand(ca.Entrypoint, envs, ca.Args...)

Expand Down Expand Up @@ -189,36 +122,7 @@ func ExecvDockerApp(ca *TaskInfo) {
log.Fatalf("task is not a docker app")
}

if ca.TLSInfo != nil {
encryptedDir := "/workplace/encryptedData"
log.Printf("[warning] use PKI, please make sure %s is an encrypted disk", encryptedDir)
caPath := path.Join(encryptedDir, "pki")
if !file.Exists(path.Join(caPath, "existed")) {
err := RunCommand("/workplace/csv-agent/csvassistants/pkitool/pkitool", nil, "cert", "-m", "ca", "-a", caPath, "-c", "/workplace/csv-agent/csvassistants/pkitool/conf/cert-conf")
if err != nil {
log.Fatalf("init pki ca failed, error: %s", err.Error())
}
err = ioutil.WriteFile(path.Join(caPath, "existed"), []byte("existed"), os.ModePerm)
if err != nil {
os.RemoveAll(caPath)
log.Fatalf("mark ca existed faield, error: %s", err.Error())
}
}
if !file.Exists(path.Join(ca.TLSInfo.CertPath, "existed")) {
err := RunCommand("/workplace/csv-agent/csvassistants/pkitool/pkitool", nil, "cert", "-m", "server", "-a", caPath, "-o", ca.TLSInfo.CertPath, "-n", ca.TLSInfo.CommonName)
if err != nil {
log.Fatalf("create tls cert failed, error: %s\n", err.Error())
}

err = ioutil.WriteFile(path.Join(ca.TLSInfo.CertPath, "existed"), []byte("existed"), os.ModePerm)
if err != nil {
os.RemoveAll(ca.TLSInfo.CertPath)
log.Fatalf("mark ca existed faield, error: %s", err.Error())
}
}
}

for k, v := range secret_server.Secret {
for k, v := range secret.Secret {
err := os.Setenv(k, v)
if err != nil {
log.Fatalf("set secret env failed, error: %s\n", err.Error())
Expand Down Expand Up @@ -246,42 +150,6 @@ func CreateSevers(ca *TaskInfo) error {
if ca.Type != SERVER {
return fmt.Errorf("task is not a server")
}
if ca.TLSInfo != nil {
encryptedDir := "/workplace/encryptedData"
log.Printf("[warning] use PKI, please make sure %s is an encrypted disk", encryptedDir)
caPath := path.Join(encryptedDir, "pki")
if !file.Exists(path.Join(caPath, "existed")) {
err := RunCommand("/workplace/csv-agent/csvassistants/pkitool/pkitool", nil, "cert", "-m", "ca", "-a", caPath, "-c", "/workplace/csv-agent/csvassistants/pkitool/conf/cert-conf")
if err != nil {
return fmt.Errorf("init pki ca failed, error: %s", err.Error())
}
err = ioutil.WriteFile(path.Join(caPath, "existed"), []byte("existed"), os.ModePerm)
if err != nil {
os.RemoveAll(caPath)
return fmt.Errorf("mark ca existed faield, error: %s", err.Error())
}
}
if !file.Exists(path.Join(ca.TLSInfo.CertPath, "existed")) {
err := RunCommand("/workplace/csv-agent/csvassistants/pkitool/pkitool", nil, "cert", "-m", "server", "-a", caPath, "-o", ca.TLSInfo.CertPath, "-n", ca.TLSInfo.CommonName)
if err != nil {
return fmt.Errorf("create tls cert failed, error: %s\n", err.Error())
}

err = ioutil.WriteFile(path.Join(ca.TLSInfo.CertPath, "existed"), []byte("existed"), os.ModePerm)
if err != nil {
os.RemoveAll(ca.TLSInfo.CertPath)
return fmt.Errorf("mark ca existed faield, error: %s", err.Error())
}
}

caString, err := ioutil.ReadFile(path.Join(caPath, "ca.crt"))
if err != nil {
return fmt.Errorf("read ca.crt failed, error: %s", err.Error())
}
log.Println("the ca.crt is as follow")
fmt.Printf("%s", caString)
log.Println("*********************************")
}

envs := make([]string, 0)

Expand Down Expand Up @@ -332,22 +200,22 @@ func CreateSevers(ca *TaskInfo) error {
}

func Start() {
appfile, err := ioutil.ReadFile("conf/app.yml")
appfile, err := os.ReadFile("conf/app.yml")
if err != nil {
log.Fatalf("read app.yml failed, error: %s\n", err.Error())
}
csvApp := new(CsvApp)
err = yaml.Unmarshal(appfile, &csvApp)
cvmApp := new(CvmApp)
err = yaml.Unmarshal(appfile, &cvmApp)
if err != nil {
log.Fatalf("unmarshal app.yml failed, error: %s\n", err.Error())
}
time.Sleep(5 * time.Second)

log.Println("do all the job over")

startTask(csvApp.CsvAssistants)
startTask(cvmApp.CvmAssistants)

startTask(csvApp.AppInfo)
startTask(cvmApp.AppInfo)
}

func startTask(tasks []*TaskInfo) {
Expand Down
27 changes: 27 additions & 0 deletions apploader/internal/cvm/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package cvm

// CvmApp is the main application configuration
type CvmApp struct {
Kind string `yaml:"kind"`
AppInfo []*TaskInfo `yaml:"app"`
CvmAssistants []*TaskInfo `yaml:"csvAssistants"`
}

// TaskInfo is the information of a task
type TaskInfo struct {
Name string `yaml:"name"`
Type string `yaml:"type"`
Entrypoint string `yaml:"entrypoint"`
Env interface{} `yaml:"env"`
Priority int `yaml:"-"`
Args []string `yaml:"args"`
}

// SupervisorConf is the configuration of a supervisor
type SupervisorConf struct {
Name string
Command string
Workplace string
Environment string
Priority int
}
13 changes: 1 addition & 12 deletions apploader/secret_server/secret.go → apploader/internal/secret/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package secret_server
package secret

import (
"log"
Expand Down Expand Up @@ -29,17 +29,6 @@ func StartSecretServer() {
})
})

//r.GET("/secret", func(c *gin.Context) {
// k := c.PostForm("key")
//
// v := Secret[k]
// fmt.Println(v)
// c.JSON(http.StatusOK, gin.H{
// "code": 200,
// "message": "update secret successful",
// "value":v,
// })
//})
log.Printf("secret server start successful")
r.Run(":9090") // listen and serve on 0.0.0.0:8080
}
8 changes: 4 additions & 4 deletions apploader/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package main

import (
csvapp "apploader/csv-app"
"apploader/secret_server"
"apploader/internal/cvm"
"apploader/internal/secret"
"log"
"os"
)

func main() {
log.SetFlags(log.Lshortfile | log.LstdFlags)
go secret_server.StartSecretServer()
csvapp.Start()
go secret.StartSecretServer()
cvm.Start()
os.Exit(0)
}