refactor(surfer): merge gcloud packages (#2833)

Merge `internal/surfer/gcloudyaml` and `internal/surfer/gcloud` into a
single `internal/surfer/gcloud` package to consolidate gcloud logic into
one location.

Remove `gcloudyaml.Config` from the sidekick config, since we plan to
make surfer its own CLI tool.

For #2375

Author: julieqiu

internal/sidekick/config/config.go

@@ -23,7 +23,6 @@ import (
 	"path"
 
 	"github.com/googleapis/librarian/internal/sidekick/license"
-	"github.com/googleapis/librarian/internal/surfer/gcloudyaml"
 	toml "github.com/pelletier/go-toml/v2"
 )
 
@@ -61,10 +60,6 @@ type Config struct {
 	CommentOverrides    []DocumentationOverride `toml:"documentation-overrides,omitempty"`
 	PaginationOverrides []PaginationOverride    `toml:"pagination-overrides,omitempty"`
 	Release             *Release                `toml:"release,omitempty"`
-
-	// Gcloud is used to pass data into gcloud.Generate. It does not use the
-	// normal .sidekick.toml file, but instead reads a gcloud.yaml file.
-	Gcloud *gcloudyaml.Config
 }
 
 // GeneralConfig contains configuration parameters that affect Parsers and Codecs, including the

internal/surfer/gcloud/command.go

@@ -12,21 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package gcloud provides utilities for generating gcloud command configurations and related types.
 package gcloud
 
-import "github.com/googleapis/librarian/internal/surfer/gcloudyaml"
-
 // Command is a single gcloud command.
 type Command struct {
-	ReleaseTracks []gcloudyaml.ReleaseTrack `yaml:"release_tracks,omitempty"`
-	Autogenerated bool                      `yaml:"auto_generated,omitempty"`
-	Hidden        bool                      `yaml:"hidden,omitempty"`
-	HelpText      *CommandHelpText          `yaml:"help_text,omitempty"`
-	Arguments     *Arguments                `yaml:"arguments,omitempty"`
-	Request       *Request                  `yaml:"request,omitempty"`
-	Response      *Response                 `yaml:"response,omitempty"`
-	Async         *Async                    `yaml:"async,omitempty"`
+	ReleaseTracks []ReleaseTrack   `yaml:"release_tracks,omitempty"`
+	Autogenerated bool             `yaml:"auto_generated,omitempty"`
+	Hidden        bool             `yaml:"hidden,omitempty"`
+	HelpText      *CommandHelpText `yaml:"help_text,omitempty"`
+	Arguments     *Arguments       `yaml:"arguments,omitempty"`
+	Request       *Request         `yaml:"request,omitempty"`
+	Response      *Response        `yaml:"response,omitempty"`
+	Async         *Async           `yaml:"async,omitempty"`
 }
 
 // Arguments are the arguments for a gcloud command.

internal/surfer/gcloudyaml/gcloud.go renamed to internal/surfer/gcloud/config.go

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package gcloudyaml provides Go type definitions for parsing and representing
-// Google Cloud CLI (gcloud) configuration files.
-package gcloudyaml
+// Package gcloud generates gcloud command YAML files.
+package gcloud
 
 // Config represents the top-level schema of a gcloud config YAML file.
 type Config struct {

internal/surfer/gcloudyaml/gcloud_test.go renamed to internal/surfer/gcloud/config_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package gcloudyaml
+package gcloud
 
 import (
 	"bytes"