Use env config only for creating devices.

Bug: b/519240653

Author: ser-io

pkg/app/app_test.go

@@ -413,11 +413,7 @@ func TestHostForwarderInjectCredentialsUsingHTTPHeader(t *testing.T) {
 
 func TestHostForwarderDoesNotInjectCredentials(t *testing.T) {
 	reqURL := "http://test.com/v1/zones/foo/hosts/bar/cvds"
-	msg, _ := json.Marshal(&hoapi.CreateCVDRequest{
-		CVD: &hoapi.CVD{
-			Name: "cvdname",
-		},
-	})
+	msg, _ := json.Marshal(&hoapi.CreateCVDRequest{})
 	credentials := "abcdef"
 
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

pkg/cli/cli.go

@@ -104,15 +104,6 @@ const (
 	buildIDFlag                = "build_id"
 	buildTargetFlag            = "build_target"
 	localImageFlag             = "local_image"
-	kernelBranchFlag           = "kernel_branch"
-	kernelBuildIDFlag          = "kernel_build_id"
-	kernelBuildTargetFlag      = "kernel_build_target"
-	bootloaderBranchFlag       = "bootloader_branch"
-	bootloaderBuildIDFlag      = "bootloader_build_id"
-	bootloaderBuildTargetFlag  = "bootloader_build_target"
-	systemImgBranchFlag        = "system_branch"
-	systemImgBuildIDFlag       = "system_build_id"
-	systemImgBuildTargetFlag   = "system_build_target"
 	numInstancesFlag           = "num_instances"
 	connectAgentFlag           = "connect_agent"
 	autoConnectFlag            = "auto_connect"
@@ -606,33 +597,13 @@ func createCommand(opts *subCommandOpts) *cobra.Command {
 		},
 	}
 	create.Flags().StringVar(&createFlags.Host, hostFlag, "", "Specifies the host. Creates a new host when it's not specified")
-	// Main build flags.
+	// Remote build flags.
 	create.Flags().StringVar(&createFlags.MainBuild.Branch, branchFlag, "aosp-main", "The branch name")
 	create.Flags().StringVar(&createFlags.MainBuild.BuildID, buildIDFlag, "", "Android build identifier")
 	create.Flags().StringVar(&createFlags.MainBuild.Target, buildTargetFlag, "aosp_cf_x86_64_phone-trunk_staging-userdebug",
 		"Android build target")
 	create.MarkFlagsMutuallyExclusive(branchFlag, buildIDFlag)
-	// Kernel build flags
-	create.Flags().StringVar(&createFlags.KernelBuild.Branch, kernelBranchFlag, "", "Kernel branch name")
-	create.Flags().StringVar(&createFlags.KernelBuild.BuildID, kernelBuildIDFlag, "", "Kernel build identifier")
-	create.Flags().StringVar(&createFlags.KernelBuild.Target, kernelBuildTargetFlag, "", "Kernel build target")
-	create.MarkFlagsMutuallyExclusive(kernelBranchFlag, kernelBuildIDFlag)
-	// Bootloader build flags
-	create.Flags().StringVar(&createFlags.BootloaderBuild.Branch, bootloaderBranchFlag, "", "Bootloader branch name")
-	create.Flags().StringVar(&createFlags.BootloaderBuild.BuildID, bootloaderBuildIDFlag, "", "Bootloader build identifier")
-	create.Flags().StringVar(&createFlags.BootloaderBuild.Target, bootloaderBuildTargetFlag, "", "Bootloader build target")
-	create.MarkFlagsMutuallyExclusive(bootloaderBranchFlag, bootloaderBuildIDFlag)
-	// System image build flags
-	create.Flags().StringVar(&createFlags.SystemImgBuild.Branch, systemImgBranchFlag, "", "System image branch name")
-	create.Flags().StringVar(&createFlags.SystemImgBuild.BuildID, systemImgBuildIDFlag, "", "System image build identifier")
-	create.Flags().StringVar(&createFlags.SystemImgBuild.Target, systemImgBuildTargetFlag, "", "System image build target")
-	create.MarkFlagsMutuallyExclusive(systemImgBranchFlag, systemImgBuildIDFlag)
-	remoteBuildFlags := []string{
-		branchFlag, buildIDFlag, buildTargetFlag,
-		kernelBranchFlag, kernelBuildIDFlag, kernelBuildTargetFlag,
-		bootloaderBranchFlag, bootloaderBuildIDFlag, bootloaderBuildTargetFlag,
-		systemImgBranchFlag, systemImgBuildIDFlag, systemImgBuildTargetFlag,
-	}
+	remoteBuildFlags := []string{branchFlag, buildIDFlag, buildTargetFlag}
 	// Local image
 	create.Flags().BoolVar(&createFlags.LocalImage, localImageFlag, false,
 		"Create instance from a local build, the required files are https://cs.android.com/android/platform/superproject/+/master:device/google/cuttlefish/required_images and cvd-host-packages.tar.gz")

pkg/cli/cli_test.go

@@ -103,30 +103,6 @@ func TestCommandSucceeds(t *testing.T) {
 			Args:   []string{"host", "delete", "foo", "bar"},
 			ExpOut: "",
 		},
-		{
-			Name: "create",
-			Args: []string{"create", "--build_id=123"},
-			ExpOut: expectedOutput(unitTestServiceURL, "foo", &hoapi.CVD{
-				Group:          "cvd-1",
-				Name:           "1",
-				Status:         "Running",
-				Displays:       []string{"720 x 1280 (320)"},
-				WebRTCDeviceID: "cvd-1-1",
-				ADBSerial:      "0.0.0.0:6520",
-			}, 12345),
-		},
-		{
-			Name: "create with --host",
-			Args: []string{"create", "--host=bar", "--build_id=123"},
-			ExpOut: expectedOutput(unitTestServiceURL, "bar", &hoapi.CVD{
-				Group:          "cvd-1",
-				Name:           "1",
-				Status:         "Running",
-				Displays:       []string{"720 x 1280 (320)"},
-				WebRTCDeviceID: "cvd-1-1",
-				ADBSerial:      "0.0.0.0:6520",
-			}, 12345),
-		},
 		{
 			Name: "list",
 			Args: []string{"list"},

pkg/cli/cvd.go

@@ -83,13 +83,29 @@ type CreateCVDLocalOpts struct {
 	LocalImagesZipSrc  string
 }
 
+// Represents a build from ci.android.com.
+type AndroidCIBuild struct {
+	// The branch name. If omitted the passed `BuildID` will determine the branch.
+	Branch string
+	// Uniquely identifies a branch's snapshot. If empty, the latest green snapshot of the used branch will
+	// be used.
+	BuildID string
+	// A string to determine the specific device product and flavor
+	Target string
+}
+
+func (b *AndroidCIBuild) EnvConfigURI() string {
+	branch := b.Branch
+	if b.BuildID != "" {
+		branch = b.BuildID
+	}
+	return fmt.Sprintf("@ab/%s/%s", branch, b.Target)
+}
+
 type CreateCVDOpts struct {
-	Host            string
-	MainBuild       hoapi.AndroidCIBuild
-	KernelBuild     hoapi.AndroidCIBuild
-	BootloaderBuild hoapi.AndroidCIBuild
-	SystemImgBuild  hoapi.AndroidCIBuild
-	LocalImage      bool
+	Host       string
+	MainBuild  AndroidCIBuild
+	LocalImage bool
 	// Creates multiple instances. Only relevant if given a single build source.
 	NumInstances int
 	// TODO(b/378123925): Work with https://github.com/google/android-cuttlefish/blob/main/base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_config.proto
@@ -159,7 +175,7 @@ func (c *cvdCreator) Create() ([]*hoapi.CVD, error) {
 	if !c.opts.CreateCVDLocalOpts.empty() {
 		return c.createCVDFromLocalSrcs()
 	}
-	return c.createCVDFromAndroidCI()
+	return c.createWithOpts()
 }
 
 var uaEnvConfigTmpl *template.Template
@@ -263,13 +279,6 @@ const (
 	stateMsgFetchAndStart   = "Fetching, starting and waiting for boot complete"
 )
 
-func (c *cvdCreator) createCVDFromAndroidCI() ([]*hoapi.CVD, error) {
-	if c.opts.EnvConfig != nil {
-		return c.createWithCanonicalConfig()
-	}
-	return c.createWithOpts()
-}
-
 func (c *cvdCreator) createWithCanonicalConfig() ([]*hoapi.CVD, error) {
 	hostSrv := c.client.HostClient(c.opts.Host)
 	envConfig := make(map[string]any)
@@ -386,46 +395,12 @@ func (c *cvdCreator) uploadImagesAndUpdateEnvConfig(client hoclient.HostOrchestr
 }
 
 func (c *cvdCreator) createWithOpts() ([]*hoapi.CVD, error) {
-	var mainBuild, kernelBuild, bootloaderBuild, systemImageBuild *hoapi.AndroidCIBuild
-	mainBuild = &c.opts.MainBuild
-	if c.opts.KernelBuild != (hoapi.AndroidCIBuild{}) {
-		kernelBuild = &c.opts.KernelBuild
-	}
-	if c.opts.BootloaderBuild != (hoapi.AndroidCIBuild{}) {
-		bootloaderBuild = &c.opts.BootloaderBuild
-	}
-	if c.opts.SystemImgBuild != (hoapi.AndroidCIBuild{}) {
-		systemImageBuild = &c.opts.SystemImgBuild
-	}
-	fetchReq := &hoapi.FetchArtifactsRequest{
-		AndroidCIBundle: &hoapi.AndroidCIBundle{Build: mainBuild, Type: hoapi.MainBundleType},
-	}
-	c.statePrinter.Print(stateMsgFetchMainBundle)
-	fetchMainBuildRes, err := c.client.HostClient(c.opts.Host).FetchArtifacts(fetchReq, c.credentialsFactory())
-	c.statePrinter.PrintDone(stateMsgFetchMainBundle, err)
+	envConfig, err := buildUAEnvConfig([]string{c.opts.MainBuild.EnvConfigURI()}, c.opts.MainBuild.EnvConfigURI(), c.opts.NumInstances)
 	if err != nil {
 		return nil, err
 	}
-	createReq := &hoapi.CreateCVDRequest{
-		CVD: &hoapi.CVD{
-			BuildSource: &hoapi.BuildSource{
-				AndroidCIBuildSource: &hoapi.AndroidCIBuildSource{
-					MainBuild:        fetchMainBuildRes.AndroidCIBundle.Build,
-					KernelBuild:      kernelBuild,
-					BootloaderBuild:  bootloaderBuild,
-					SystemImageBuild: systemImageBuild,
-				},
-			},
-		},
-		AdditionalInstancesNum: c.opts.AdditionalInstancesNum(),
-	}
-	c.statePrinter.Print(stateMsgStartCVD)
-	res, err := c.client.HostClient(c.opts.Host).CreateCVD(createReq, c.credentialsFactory())
-	c.statePrinter.PrintDone(stateMsgStartCVD, err)
-	if err != nil {
-		return nil, err
-	}
-	return res.CVDs, nil
+	c.opts.EnvConfig = envConfig
+	return c.createWithCanonicalConfig()
 }
 
 func (c *cvdCreator) createCVDFromLocalSrcs() ([]*hoapi.CVD, error) {