Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 19 additions & 4 deletions tools/baseimage/cmd/create_gce_base_image/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,25 @@ func main() {
log.Fatal("usage: `-image-name` must not be empty")
}

h, err := gce.NewGceHelper(project, zone)
if err != nil {
log.Fatal(err)
}

if srcExists, err := h.ImageExists(sourceImageProject, sourceImage); err != nil || !srcExists {
if err != nil {
log.Fatal(err)
}
log.Fatalf("source image %q does not exist in project %q", sourceImage, sourceImageProject)
}

if exists, err := h.ImageExists(project, imageName); err != nil || exists {
if err != nil {
log.Fatal(err)
}
log.Fatalf("image %q already exists in project %q", imageName, project)
}

buildImageOpts := gce.BuildImageOpts{
Arch: arch.GceArch(),
SourceImageProject: sourceImageProject,
Expand All @@ -81,10 +100,6 @@ func main() {
},
}

h, err := gce.NewGceHelper(project, zone)
if err != nil {
log.Fatal(err)
}
if err := h.BuildImage(project, zone, buildImageOpts); err != nil {
log.Fatal(err)
}
Expand Down
26 changes: 21 additions & 5 deletions tools/baseimage/cmd/create_gce_fixed_kernel/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,30 @@ func main() {
slices.Collect(maps.Keys(sourceImageMap[arch.GceArch()])))
}

h, err := gce.NewGceHelper(project, zone)
if err != nil {
log.Fatal(err)
}

sourceImage := sourceImageMap[arch.GceArch()][debianVersion]
if srcExists, err := h.ImageExists(debianSourceImageProject, sourceImage); err != nil || !srcExists {
if err != nil {
log.Fatal(err)
}
log.Fatalf("source image %q does not exist in project %q", sourceImage, debianSourceImageProject)
}

if exists, err := h.ImageExists(project, imageName); err != nil || exists {
if err != nil {
log.Fatal(err)
}
log.Fatalf("image %q already exists in project %q", imageName, project)
}

buildImageOpts := gce.BuildImageOpts{
Arch: arch.GceArch(),
SourceImageProject: debianSourceImageProject,
SourceImage: sourceImageMap[arch.GceArch()][debianVersion],
SourceImage: sourceImage,
ImageName: imageName,
ModifyFunc: func(project, zone, insName string) error {
if err := gce.UploadBashScript(project, zone, insName, "install_kernel_main.sh", scripts.InstallKernelMain); err != nil {
Expand All @@ -103,10 +123,6 @@ func main() {
},
}

h, err := gce.NewGceHelper(project, zone)
if err != nil {
log.Fatal(err)
}
if err := h.BuildImage(project, zone, buildImageOpts); err != nil {
log.Fatal(err)
}
Expand Down
32 changes: 32 additions & 0 deletions tools/baseimage/pkg/gce/gce.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ import (
"errors"
"fmt"
"log"
"net/http"
"os/exec"
"path"
"strings"
"time"

"github.com/google/android-cuttlefish/tools/baseimage/pkg/gce/scripts"
"google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
)

type Arch int
Expand Down Expand Up @@ -246,6 +248,30 @@ func (h *GceHelper) CreateImage(ins, disk, name string) error {
return h.waitForGlobalOperation(op)
}

func (h *GceHelper) ImageExists(project, name string) (bool, error) {
_, err := h.Service.Images.Get(project, name).Do()
if err != nil {
var apiErr *googleapi.Error
if errors.As(err, &apiErr) && apiErr.Code == http.StatusNotFound {
return false, nil
}
return false, err
}
return true, nil
}

func (h *GceHelper) DiskExists(project, zone, name string) (bool, error) {
_, err := h.Service.Disks.Get(project, zone, name).Do()
if err != nil {
var apiErr *googleapi.Error
if errors.As(err, &apiErr) && apiErr.Code == http.StatusNotFound {
return false, nil
}
return false, err
}
return true, nil
}

type BuildImageOpts struct {
Arch Arch
SourceImageProject string
Expand All @@ -260,6 +286,12 @@ const BuildImageMountPoint = "/mnt/image"
func (h *GceHelper) BuildImage(project, zone string, opts BuildImageOpts) error {
insName := opts.ImageName
attachedDiskName := fmt.Sprintf("%s-attached-disk", insName)
if diskExists, err := h.DiskExists(project, zone, attachedDiskName); err != nil || diskExists {
if err != nil {
return fmt.Errorf("failed to check if disk %q exists: %w", attachedDiskName, err)
}
return fmt.Errorf("disk %q already exists in project %q zone %q", attachedDiskName, project, zone)
}

log.Println("creating instance...")
inst, err := h.CreateInstance(insName, opts.Arch)
Expand Down
Loading