refactor: inline fields from Cfg (#2159)

Remove the Cfg field from BuildRequest, ConfigureRequest,
GenerateRequest, and ReleaseInitRequest to decouple config.Config from
these structs. Add fields only for the ones that are used.

Also reorder fields on these structs alphabetically.

Author: julieqiu

internal/docker/docker.go

@@ -66,78 +66,108 @@ type Docker struct {
 // BuildRequest contains all the information required for a language
 // container to run the build command.
 type BuildRequest struct {
-	// cfg is a pointer to the [config.Config] struct, holding general configuration
-	// values parsed from flags or environment variables.
-	Cfg *config.Config
-	// state is a pointer to the [config.LibrarianState] struct, representing
-	// the overall state of the generation and release pipeline.
-	State *config.LibrarianState
-	// libraryID specifies the ID of the library to build.
+	// HostMount specifies a mount point from the Docker host into the Docker
+	// container. The format is "{host-dir}:{local-dir}".
+	HostMount string
+
+	// LibraryID specifies the ID of the library to build.
 	LibraryID string
+
 	// RepoDir is the local root directory of the language repository.
 	RepoDir string
+
+	// State is a pointer to the [config.LibrarianState] struct, representing
+	// the overall state of the generation and release pipeline.
+	State *config.LibrarianState
 }
 
 // ConfigureRequest contains all the information required for a language
 // container to run the configure command.
 type ConfigureRequest struct {
-	// cfg is a pointer to the [config.Config] struct, holding general configuration
-	// values parsed from flags or environment variables.
-	Cfg *config.Config
-	// state is a pointer to the [config.LibrarianState] struct, representing
-	// the overall state of the generation and release pipeline.
-	State *config.LibrarianState
-	// apiRoot specifies the root directory of the API specification repo.
+	// ApiRoot specifies the root directory of the API specification repo.
 	ApiRoot string
+
+	// HostMount specifies a mount point from the Docker host into the Docker
+	// container. The format is "{host-dir}:{local-dir}".
+	HostMount string
+
 	// libraryID specifies the ID of the library to configure.
 	LibraryID string
+
 	// RepoDir is the local root directory of the language repository.
 	RepoDir string
+
+	// State is a pointer to the [config.LibrarianState] struct, representing
+	// the overall state of the generation and release pipeline.
+	State *config.LibrarianState
 }
 
 // GenerateRequest contains all the information required for a language
 // container to run the generate command.
 type GenerateRequest struct {
-	// cfg is a pointer to the [config.Config] struct, holding general configuration
-	// values parsed from flags or environment variables.
-	Cfg *config.Config
-	// state is a pointer to the [config.LibrarianState] struct, representing
-	// the overall state of the generation and release pipeline.
-	State *config.LibrarianState
-	// apiRoot specifies the root directory of the API specification repo.
+	// ApiRoot specifies the root directory of the API specification repo.
 	ApiRoot string
-	// libraryID specifies the ID of the library to generate.
+
+	// HostMount specifies a mount point from the Docker host into the Docker
+	// container. The format is "{host-dir}:{local-dir}".
+	HostMount string
+
+	// LibraryID specifies the ID of the library to generate.
 	LibraryID string
-	// output specifies the empty output directory into which the command should
+
+	// Output specifies the empty output directory into which the command should
 	// generate code
 	Output string
+
 	// RepoDir is the local root directory of the language repository.
 	RepoDir string
+
+	// State is a pointer to the [config.LibrarianState] struct, representing
+	// the overall state of the generation and release pipeline.
+	State *config.LibrarianState
 }
 
 // ReleaseInitRequest contains all the information required for a language
 // container to run the  init command.
 type ReleaseInitRequest struct {
-	// Cfg is a pointer to the [config.Config] struct, holding general configuration
-	// values parsed from flags or environment variables.
-	Cfg *config.Config
+	// Branch is the remote branch of the language repository to use.
+	Branch string
+
+	// Commit determines whether to create a commit for the release but not
+	// create a pull request. This flag is ignored if Push is set to true.
+	Commit bool
+
+	// HostMount is used to remap Docker mount paths when running in environments
+	// where Docker containers are siblings (e.g., Kokoro).
+	// It specifies a mount point from the Docker host into the Docker container.
+	// The format is "{host-dir}:{local-dir}".
+	HostMount string
+
 	// LibrarianConfig is a pointer to the [config.LibrarianConfig] struct, holding
 	// global files configuration in a language repository.
 	LibrarianConfig *config.LibrarianConfig
-	// State is a pointer to the [config.LibrarianState] struct, representing
-	// the overall state of the generation and release pipeline.
-	State *config.LibrarianState
+
 	// LibraryID specifies the ID of the library to release.
 	LibraryID string
+
 	// LibraryVersion specifies the version of the library to release.
 	LibraryVersion string
+
 	// Output specifies the empty output directory into which the command should
 	// generate code.
 	Output string
+
 	// PartialRepoDir is the local root directory of language repository contains
 	// files that make up libraries and global files.
 	// This is the directory that container can access.
 	PartialRepoDir string
+
+	// Push determines whether to push changes to GitHub.
+	Push bool
+
+	// State is a pointer to the [config.LibrarianState] struct, representing
+	// the overall state of the generation and release pipeline.
+	State *config.LibrarianState
 }
 
 // New constructs a Docker instance which will invoke the specified
@@ -184,8 +214,7 @@ func (c *Docker) Generate(ctx context.Context, request *GenerateRequest) error {
 		fmt.Sprintf("%s:/output", request.Output),
 		fmt.Sprintf("%s:/source:ro", request.ApiRoot), // readonly volume
 	}
-
-	return c.runDocker(ctx, request.Cfg.HostMount, CommandGenerate, mounts, commandArgs)
+	return c.runDocker(ctx, request.HostMount, CommandGenerate, mounts, commandArgs)
 }
 
 // Build builds the library with an ID of libraryID, as configured in
@@ -212,7 +241,7 @@ func (c *Docker) Build(ctx context.Context, request *BuildRequest) error {
 		"--repo=/repo",
 	}
 
-	return c.runDocker(ctx, request.Cfg.HostMount, CommandBuild, mounts, commandArgs)
+	return c.runDocker(ctx, request.HostMount, CommandBuild, mounts, commandArgs)
 }
 
 // Configure configures an API within a repository, either adding it to an
@@ -245,7 +274,7 @@ func (c *Docker) Configure(ctx context.Context, request *ConfigureRequest) (stri
 		fmt.Sprintf("%s:/source:ro", request.ApiRoot), // readonly volume
 	}
 
-	if err := c.runDocker(ctx, request.Cfg.HostMount, CommandConfigure, mounts, commandArgs); err != nil {
+	if err := c.runDocker(ctx, request.HostMount, CommandConfigure, mounts, commandArgs); err != nil {
 		return "", err
 	}
 
@@ -277,7 +306,7 @@ func (c *Docker) ReleaseInit(ctx context.Context, request *ReleaseInitRequest) e
 		fmt.Sprintf("%s:/output", request.Output),
 	}
 
-	if err := c.runDocker(ctx, request.Cfg.HostMount, CommandReleaseInit, mounts, commandArgs); err != nil {
+	if err := c.runDocker(ctx, request.HostMount, CommandReleaseInit, mounts, commandArgs); err != nil {
 		return err
 	}
 

internal/docker/docker_test.go

@@ -64,10 +64,6 @@ func TestDockerRun(t *testing.T) {
 	)
 
 	state := &config.LibrarianState{}
-	cfg := &config.Config{}
-	cfgInDocker := &config.Config{
-		HostMount: "hostDir:localDir",
-	}
 	repoDir := filepath.Join(os.TempDir())
 	for _, test := range []struct {
 		name       string
@@ -84,7 +80,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				generateRequest := &GenerateRequest{
-					Cfg:       cfg,
 					State:     state,
 					RepoDir:   repoDir,
 					ApiRoot:   testAPIRoot,
@@ -115,7 +110,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				generateRequest := &GenerateRequest{
-					Cfg:       cfg,
 					State:     state,
 					RepoDir:   "/non-existed-dir",
 					ApiRoot:   testAPIRoot,
@@ -135,7 +129,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				generateRequest := &GenerateRequest{
-					Cfg:       cfg,
 					State:     state,
 					RepoDir:   repoDir,
 					ApiRoot:   testAPIRoot,
@@ -156,12 +149,12 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				generateRequest := &GenerateRequest{
-					Cfg:       cfgInDocker,
 					State:     state,
 					RepoDir:   repoDir,
 					ApiRoot:   testAPIRoot,
 					Output:    "hostDir",
 					LibraryID: testLibraryID,
+					HostMount: "hostDir:localDir",
 				}
 
 				return d.Generate(ctx, generateRequest)
@@ -187,7 +180,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				buildRequest := &BuildRequest{
-					Cfg:       cfg,
 					State:     state,
 					LibraryID: testLibraryID,
 					RepoDir:   repoDir,
@@ -212,7 +204,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				buildRequest := &BuildRequest{
-					Cfg:       cfg,
 					State:     state,
 					LibraryID: testLibraryID,
 					RepoDir:   "/non-exist-dir",
@@ -230,7 +221,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				buildRequest := &BuildRequest{
-					Cfg:       cfg,
 					State:     state,
 					LibraryID: testLibraryID,
 					RepoDir:   repoDir,
@@ -249,7 +239,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				configureRequest := &ConfigureRequest{
-					Cfg:       cfg,
 					State:     state,
 					LibraryID: testLibraryID,
 					RepoDir:   repoDir,
@@ -306,7 +295,6 @@ func TestDockerRun(t *testing.T) {
 					},
 				}
 				configureRequest := &ConfigureRequest{
-					Cfg:       cfg,
 					State:     curState,
 					LibraryID: testLibraryID,
 					RepoDir:   repoDir,
@@ -341,7 +329,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				configureRequest := &ConfigureRequest{
-					Cfg:       cfg,
 					State:     state,
 					LibraryID: testLibraryID,
 					RepoDir:   "/non-exist-dir",
@@ -361,7 +348,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				configureRequest := &ConfigureRequest{
-					Cfg:       cfg,
 					State:     state,
 					LibraryID: testLibraryID,
 					RepoDir:   repoDir,
@@ -388,9 +374,6 @@ func TestDockerRun(t *testing.T) {
 				}
 
 				releaseInitRequest := &ReleaseInitRequest{
-					Cfg: &config.Config{
-						Repo: repoDir,
-					},
 					State:           state,
 					Output:          testOutput,
 					LibrarianConfig: &config.LibrarianConfig{},
@@ -425,9 +408,6 @@ func TestDockerRun(t *testing.T) {
 				}
 
 				releaseInitRequest := &ReleaseInitRequest{
-					Cfg: &config.Config{
-						Repo: repoDir,
-					},
 					State:           state,
 					PartialRepoDir:  partialRepoDir,
 					Output:          testOutput,
@@ -447,9 +427,6 @@ func TestDockerRun(t *testing.T) {
 			},
 			runCommand: func(ctx context.Context, d *Docker) error {
 				releaseInitRequest := &ReleaseInitRequest{
-					Cfg: &config.Config{
-						Repo: os.TempDir(),
-					},
 					State:          state,
 					PartialRepoDir: "/non-exist-dir",
 					Output:         testOutput,
@@ -471,9 +448,6 @@ func TestDockerRun(t *testing.T) {
 					t.Fatal(err)
 				}
 				releaseInitRequest := &ReleaseInitRequest{
-					Cfg: &config.Config{
-						Repo: repoDir,
-					},
 					State:           state,
 					PartialRepoDir:  partialRepoDir,
 					Output:          testOutput,
@@ -508,9 +482,6 @@ func TestDockerRun(t *testing.T) {
 				}
 
 				releaseInitRequest := &ReleaseInitRequest{
-					Cfg: &config.Config{
-						Repo: os.TempDir(),
-					},
 					State:           state,
 					PartialRepoDir:  partialRepoDir,
 					Output:          testOutput,
@@ -888,9 +859,6 @@ func TestReleaseInitRequestContent(t *testing.T) {
 	}
 
 	req := &ReleaseInitRequest{
-		Cfg: &config.Config{
-			Repo: tmpDir,
-		},
 		State:           stateWithChanges,
 		PartialRepoDir:  partialRepoDir,
 		Output:          filepath.Join(tmpDir, "output"),

internal/librarian/generate.go

@@ -321,12 +321,12 @@ func (r *generateRunner) runGenerateCommand(ctx context.Context, libraryID, outp
 	}
 
 	generateRequest := &docker.GenerateRequest{
-		Cfg:       &config.Config{HostMount: r.hostMount},
-		State:     r.state,
 		ApiRoot:   apiRoot,
+		HostMount: r.hostMount,
 		LibraryID: libraryID,
 		Output:    outputDir,
 		RepoDir:   r.repo.GetDir(),
+		State:     r.state,
 	}
 	slog.Info("Performing generation for library", "id", libraryID, "outputDir", outputDir)
 	if err := r.containerClient.Generate(ctx, generateRequest); err != nil {
@@ -363,10 +363,10 @@ func (r *generateRunner) runBuildCommand(ctx context.Context, libraryID string)
 	}
 
 	buildRequest := &docker.BuildRequest{
-		Cfg:       &config.Config{HostMount: r.hostMount},
-		State:     r.state,
+		HostMount: r.hostMount,
 		LibraryID: libraryID,
 		RepoDir:   r.repo.GetDir(),
+		State:     r.state,
 	}
 	slog.Info("Performing build for library", "id", libraryID)
 	if err := r.containerClient.Build(ctx, buildRequest); err != nil {
@@ -425,11 +425,11 @@ func (r *generateRunner) runConfigureCommand(ctx context.Context) (string, error
 	}
 
 	configureRequest := &docker.ConfigureRequest{
-		Cfg:       &config.Config{HostMount: r.hostMount},
-		State:     r.state,
 		ApiRoot:   apiRoot,
+		HostMount: r.hostMount,
 		LibraryID: r.library,
 		RepoDir:   r.repo.GetDir(),
+		State:     r.state,
 	}
 	slog.Info("Performing configuration for library", "id", r.library)
 	if _, err := r.containerClient.Configure(ctx, configureRequest); err != nil {