main: add upload support directly to build
This commit adds support to upload the build image directly to the target cloud. Currently only ami/AWS is supported. If the cloud specific configuration is given at the commandline and the image type is a cloud image the cloud upload will happen automatically (just like with bib). Incomplete upload config is an error.
This commit is contained in:
Michael Vogt
parent
e41377b82a
commit
25f21a3205
7 changed files with 437 additions and 133 deletions
246
cmd/image-builder/upload_test.go
Normal file
246
cmd/image-builder/upload_test.go
Normal file
|
|
@ -0,0 +1,246 @@
|
|||
package main_test
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/osbuild/images/pkg/cloud"
|
||||
"github.com/osbuild/images/pkg/cloud/awscloud"
|
||||
|
||||
main "github.com/osbuild/image-builder-cli/cmd/image-builder"
|
||||
"github.com/osbuild/image-builder-cli/internal/testutil"
|
||||
)
|
||||
|
||||
type fakeAwsUploader struct {
|
||||
checkCalls int
|
||||
|
||||
uploadAndRegisterRead bytes.Buffer
|
||||
uploadAndRegisterCalls int
|
||||
uploadAndRegisterErr error
|
||||
}
|
||||
|
||||
var _ = cloud.Uploader(&fakeAwsUploader{})
|
||||
|
||||
func (fa *fakeAwsUploader) Check(status io.Writer) error {
|
||||
fa.checkCalls++
|
||||
return nil
|
||||
}
|
||||
|
||||
func (fa *fakeAwsUploader) UploadAndRegister(r io.Reader, status io.Writer) error {
|
||||
fa.uploadAndRegisterCalls++
|
||||
_, err := io.Copy(&fa.uploadAndRegisterRead, r)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return fa.uploadAndRegisterErr
|
||||
}
|
||||
|
||||
func TestUploadWithAWSMock(t *testing.T) {
|
||||
fakeDiskContent := "fake-raw-img"
|
||||
|
||||
fakeImageFilePath := filepath.Join(t.TempDir(), "disk.raw")
|
||||
err := os.WriteFile(fakeImageFilePath, []byte(fakeDiskContent), 0644)
|
||||
assert.NoError(t, err)
|
||||
|
||||
var regionName, bucketName, amiName string
|
||||
var fa fakeAwsUploader
|
||||
restore := main.MockAwscloudNewUploader(func(region string, bucket string, ami string, opts *awscloud.UploaderOptions) (cloud.Uploader, error) {
|
||||
regionName = region
|
||||
bucketName = bucket
|
||||
amiName = ami
|
||||
return &fa, nil
|
||||
})
|
||||
defer restore()
|
||||
|
||||
var fakeStdout bytes.Buffer
|
||||
restore = main.MockOsStdout(&fakeStdout)
|
||||
defer restore()
|
||||
|
||||
restore = main.MockOsArgs([]string{
|
||||
"upload",
|
||||
"--to=aws",
|
||||
"--aws-region=aws-region-1",
|
||||
"--aws-bucket=aws-bucket-2",
|
||||
"--aws-ami-name=aws-ami-3",
|
||||
fakeImageFilePath,
|
||||
})
|
||||
defer restore()
|
||||
|
||||
err = main.Run()
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, regionName, "aws-region-1")
|
||||
assert.Equal(t, bucketName, "aws-bucket-2")
|
||||
assert.Equal(t, amiName, "aws-ami-3")
|
||||
|
||||
assert.Equal(t, 0, fa.checkCalls)
|
||||
assert.Equal(t, 1, fa.uploadAndRegisterCalls)
|
||||
assert.Equal(t, fakeDiskContent, fa.uploadAndRegisterRead.String())
|
||||
// progress was rendered
|
||||
assert.Contains(t, fakeStdout.String(), "--] 100.00%")
|
||||
}
|
||||
|
||||
func TestUploadCmdlineErrors(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
cmdline []string
|
||||
expectedErr string
|
||||
}{
|
||||
{
|
||||
nil,
|
||||
`missing --to parameter, try --to=aws`,
|
||||
}, {
|
||||
[]string{"--to=aws"},
|
||||
`missing upload configuration: ["--aws-ami-name" "--aws-bucket" "--aws-region"]`,
|
||||
},
|
||||
{
|
||||
[]string{"--to=aws", "--aws-ami-name=1"},
|
||||
`missing upload configuration: ["--aws-bucket" "--aws-region"]`,
|
||||
},
|
||||
{
|
||||
[]string{"--to=aws", "--aws-ami-name=1", "--aws-bucket=2"},
|
||||
`missing upload configuration: ["--aws-region"]`,
|
||||
},
|
||||
} {
|
||||
t.Run(strings.Join(tc.cmdline, ","), func(t *testing.T) {
|
||||
cmd := append([]string{"upload"}, tc.cmdline...)
|
||||
cmd = append(cmd, "/path/to/some/image")
|
||||
restore := main.MockOsArgs(cmd)
|
||||
defer restore()
|
||||
|
||||
err := main.Run()
|
||||
require.EqualError(t, err, tc.expectedErr)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
var fakeOsbuildScriptAmiFmt = `#!/bin/sh -e
|
||||
cat - > "$0".stdin
|
||||
mkdir -p %[1]s/ami
|
||||
echo -n %[2]s > %[1]s/ami/image.raw
|
||||
`
|
||||
|
||||
func TestBuildAndUploadWithAWSMock(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("manifest generation takes a while")
|
||||
}
|
||||
if !hasDepsolveDnf() {
|
||||
t.Skip("no osbuild-depsolve-dnf binary found")
|
||||
}
|
||||
|
||||
var regionName, bucketName, amiName string
|
||||
var fa fakeAwsUploader
|
||||
restore := main.MockAwscloudNewUploader(func(region string, bucket string, ami string, opts *awscloud.UploaderOptions) (cloud.Uploader, error) {
|
||||
regionName = region
|
||||
bucketName = bucket
|
||||
amiName = ami
|
||||
return &fa, nil
|
||||
})
|
||||
defer restore()
|
||||
|
||||
fakeDiskContent := "fake-raw-img"
|
||||
outputDir := t.TempDir()
|
||||
fakeOsbuildScript := fmt.Sprintf(fakeOsbuildScriptAmiFmt, outputDir, fakeDiskContent)
|
||||
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
|
||||
defer fakeOsbuildCmd.Restore()
|
||||
|
||||
var fakeStdout bytes.Buffer
|
||||
restore = main.MockOsStdout(&fakeStdout)
|
||||
defer restore()
|
||||
|
||||
restore = main.MockOsArgs([]string{
|
||||
"build",
|
||||
"--output-dir", outputDir,
|
||||
"--aws-region=aws-region-1",
|
||||
"--aws-bucket=aws-bucket-2",
|
||||
"--aws-ami-name=aws-ami-3",
|
||||
"ami",
|
||||
"--distro=centos-9",
|
||||
})
|
||||
defer restore()
|
||||
|
||||
err := main.Run()
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, regionName, "aws-region-1")
|
||||
assert.Equal(t, bucketName, "aws-bucket-2")
|
||||
assert.Equal(t, amiName, "aws-ami-3")
|
||||
assert.Equal(t, 1, fa.checkCalls)
|
||||
assert.Equal(t, 1, fa.uploadAndRegisterCalls)
|
||||
assert.Equal(t, fakeDiskContent, fa.uploadAndRegisterRead.String())
|
||||
}
|
||||
|
||||
func TestBuildAmiButNotUpload(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("manifest generation takes a while")
|
||||
}
|
||||
if !hasDepsolveDnf() {
|
||||
t.Skip("no osbuild-depsolve-dnf binary found")
|
||||
}
|
||||
|
||||
fa := fakeAwsUploader{
|
||||
uploadAndRegisterErr: fmt.Errorf("upload should not be called"),
|
||||
}
|
||||
restore := main.MockAwscloudNewUploader(func(region string, bucket string, ami string, opts *awscloud.UploaderOptions) (cloud.Uploader, error) {
|
||||
return &fa, nil
|
||||
})
|
||||
defer restore()
|
||||
|
||||
fakeDiskContent := "fake-raw-img"
|
||||
outputDir := t.TempDir()
|
||||
fakeOsbuildScript := fmt.Sprintf(fakeOsbuildScriptAmiFmt, outputDir, fakeDiskContent)
|
||||
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
|
||||
defer fakeOsbuildCmd.Restore()
|
||||
|
||||
var fakeStdout bytes.Buffer
|
||||
restore = main.MockOsStdout(&fakeStdout)
|
||||
defer restore()
|
||||
|
||||
restore = main.MockOsArgs([]string{
|
||||
"build",
|
||||
"--output-dir", outputDir,
|
||||
"ami",
|
||||
"--distro=centos-9",
|
||||
})
|
||||
defer restore()
|
||||
|
||||
err := main.Run()
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.Equal(t, 0, fa.uploadAndRegisterCalls)
|
||||
}
|
||||
|
||||
func TestBuildAndUploadWithAWSPartialCmdlineErrors(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("manifest generation takes a while")
|
||||
}
|
||||
if !hasDepsolveDnf() {
|
||||
t.Skip("no osbuild-depsolve-dnf binary found")
|
||||
}
|
||||
|
||||
fakeDiskContent := "fake-raw-img"
|
||||
outputDir := t.TempDir()
|
||||
fakeOsbuildScript := fmt.Sprintf(fakeOsbuildScriptAmiFmt, outputDir, fakeDiskContent)
|
||||
fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
|
||||
defer fakeOsbuildCmd.Restore()
|
||||
|
||||
restore := main.MockOsArgs([]string{
|
||||
"build",
|
||||
"--output-dir", outputDir,
|
||||
// note that --aws-{ami-name,bucket} is missing
|
||||
"--aws-region=aws-region-1",
|
||||
"ami",
|
||||
"--distro=centos-9",
|
||||
})
|
||||
defer restore()
|
||||
|
||||
err := main.Run()
|
||||
assert.EqualError(t, err, `partial upload config provided: missing upload configuration: ["--aws-ami-name" "--aws-bucket"]`)
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue