rocky-linux/peridot
4
0
Fork 0
mirror of https://github.com/rocky-linux/peridot.git synced 2024-11-23 21:51:27 +00:00
Code Issues Projects Releases Activity

feat: allow rpm import to skip upload OR import step

Browse Source 
n.b. skipping both steps can be accomplished by not running the command
:)
This commit is contained in:
Neil Hanlon 2024-03-11 11:47:01 -04:00
parent a019665f84
commit b3c86f8221
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
peridot/cmd/v1/peridot/BUILD.bazel
View File

@ -64,7 +64,7 @@ pkg_rpm(
srcs = [":peridot-files"], srcs = [":peridot-files"],
license = "MIT", license = "MIT",
summary = "Peridot Command Line Interface", summary = "Peridot Command Line Interface",
version = "0.2.0", version = "0.2.1",
release = "0", release = "0",
architecture = "x86_64", architecture = "x86_64",
description = "A command line interface to interact with the Peridot build system", description = "A command line interface to interact with the Peridot build system",

48
peridot/cmd/v1/peridot/build_rpm_import.go
View File

@ -32,12 +32,14 @@ package main
import ( import (
"encoding/base64" "encoding/base64"
"github.com/spf13/cobra"
"io/ioutil"
"log" "log"
"openapi.peridot.resf.org/peridotopenapi"
"os" "os"
"strings"
"time" "time"
"crypto/sha256"
"encoding/hex"
"github.com/spf13/cobra"
"openapi.peridot.resf.org/peridotopenapi"
) )
type LookasideUploadTask struct { type LookasideUploadTask struct {
@ -57,9 +59,11 @@ var buildRpmImport = &cobra.Command{
} }
var buildRpmImportForceOverride bool var buildRpmImportForceOverride bool
var skipStep string
func init() { func init() {
buildRpmImport.Flags().BoolVar(&buildRpmImportForceOverride, "force-override", true, "Force override even if version exists (default: true)") buildRpmImport.Flags().BoolVar(&buildRpmImportForceOverride, "force-override", true, "Force override even if version exists (default: true)")
buildRpmImport.Flags().StringVarP(&skipStep, "skip", "s", "", "which step to skip")
} }
func isFile(path string) bool { func isFile(path string) bool {
@ -70,10 +74,24 @@ func isFile(path string) bool {
return true return true
} }
func buildRpmImportMn(_ *cobra.Command, args []string) { func buildRpmImportMn(c *cobra.Command, args []string) {
// Ensure project id exists // Ensure project id exists
projectId := mustGetProjectID() projectId := mustGetProjectID()
var skipUpload bool = false
var skipImport bool = false
if skipStep != "" {
switch strings.ToLower(skipStep) {
case "upload":
skipUpload = true
case "import":
skipImport = true
default:
log.Fatalf("invalid skip step: %s", skipStep)
}
}
// Ensure all args are valid files // Ensure all args are valid files
for _, arg := range args { for _, arg := range args {
if !isFile(arg) { if !isFile(arg) {
@ -85,16 +103,24 @@ func buildRpmImportMn(_ *cobra.Command, args []string) {
var blobs []string var blobs []string
projectCl := getClient(serviceProject).(peridotopenapi.ProjectServiceApi) projectCl := getClient(serviceProject).(peridotopenapi.ProjectServiceApi)
for _, arg := range args { for _, arg := range args {
bts, err := ioutil.ReadFile(arg) bts, err := os.ReadFile(arg)
errFatal(err) errFatal(err)
base64EncodedBytes := base64.StdEncoding.EncodeToString(bts) base64EncodedBytes := base64.StdEncoding.EncodeToString(bts)
hash := sha256.Sum256(bts)
shasum := hex.EncodeToString(hash[:])
res, _, err := projectCl.LookasideFileUpload(getContext()).Body(peridotopenapi.V1LookasideFileUploadRequest{ if !skipUpload {
File: &base64EncodedBytes, _, _, err := projectCl.LookasideFileUpload(getContext()).Body(peridotopenapi.V1LookasideFileUploadRequest{
}).Execute() File: &base64EncodedBytes,
errFatal(err) }).Execute()
log.Printf("Uploaded %s to lookaside", arg) errFatal(err)
blobs = append(blobs, res.GetDigest()) log.Printf("Uploaded %s to lookaside", arg)
}
blobs = append(blobs, shasum)
}
if skipImport {
return
} }
taskCl := getClient(serviceTask).(peridotopenapi.TaskServiceApi) taskCl := getClient(serviceTask).(peridotopenapi.TaskServiceApi)