Skip to content

changes how import/export of prebuilts functions #86

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
privateip merged 1 commit into from
Mar 24, 2025
Merged

changes how import/export of prebuilts functions #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 29 additions & 19 deletions internal/runners/prebuilts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ func NewPrebuiltRunner(client client.Client, cfg *config.Config) *PrebuiltRunner
}
}

//////////////////////////////////////////////////////////////////////////////
// Reader Interface
//
/*
******************************************************************************
Reader interface
******************************************************************************
*/

// Get implements the "get prebuilts ..." command
func (r *PrebuiltRunner) Get(in Request) (*Response, error) {
Expand Down Expand Up @@ -77,9 +79,11 @@ func (r *PrebuiltRunner) Describe(in Request) (*Response, error) {
), nil
}

//////////////////////////////////////////////////////////////////////////////
// Writer Interface
//
/*
******************************************************************************
Writer interface
******************************************************************************
*/

// Create implements the `create prebuilt ...` command
func (r *PrebuiltRunner) Create(in Request) (*Response, error) {
Expand Down Expand Up @@ -235,9 +239,11 @@ func (r *PrebuiltRunner) Clear(in Request) (*Response, error) {
return NewResponse(fmt.Sprintf("Deleted %v prebuilt(s)", cnt)), nil
}

//////////////////////////////////////////////////////////////////////////////
// Importer Interface
//
/*
******************************************************************************
Importer interface
******************************************************************************
*/

// Import implements the `import prebuilt ...` command
func (r *PrebuiltRunner) Import(in Request) (*Response, error) {
Expand Down Expand Up @@ -267,8 +273,8 @@ func (r *PrebuiltRunner) Import(in Request) (*Response, error) {
for _, ele := range mPkg["bundles"].([]interface{}) {
item := ele.(map[string]interface{})

if _, exists := item["filename"]; exists {
fp := filepath.Join(wd, item["filename"].(string))
if strings.HasPrefix(item["data"].(string), "@") {
fp := filepath.Join(wd, item["data"].(string)[1:])

var b map[string]interface{}

Expand Down Expand Up @@ -308,9 +314,11 @@ func (r *PrebuiltRunner) Import(in Request) (*Response, error) {

}

//////////////////////////////////////////////////////////////////////////////
// Exporter Interface
//
/*
******************************************************************************
Exporter interface
******************************************************************************
*/

// Export implements the `export prebuilt ...` command
func (r *PrebuiltRunner) Export(in Request) (*Response, error) {
Expand Down Expand Up @@ -377,9 +385,11 @@ func (r *PrebuiltRunner) Export(in Request) (*Response, error) {
), nil
}

//////////////////////////////////////////////////////////////////////////////
// Private functions
//
/*
******************************************************************************
Private functions
******************************************************************************
*/

func (r *PrebuiltRunner) validatePackage(in services.PrebuiltPackage) error {
logger.Trace()
Expand Down Expand Up @@ -510,8 +520,8 @@ func (r *PrebuiltRunner) expandPrebuilt(pkg *services.PrebuiltPackage, path stri
}

bundles = append(bundles, map[string]interface{}{
"type": ele.Type,
"filename": filepath.Join(fmt.Sprintf("bundles/%ss", ele.Type), fn),
"type": ele.Type,
"data": fmt.Sprintf("@%s", filepath.Join(fmt.Sprintf("bundles/%ss", ele.Type), fn)),
})
}

Expand Down