Merge branch 'main' into chore/update-state

Author: JoeWang1127

doc/config-schema.md

@@ -201,6 +201,7 @@ This document describes the schema for the librarian.yaml.
 | `import_path` | string | Is the Go import path for the API. |
 | `nested_protos` | list of string | Is a list of nested proto files. |
 | `no_metadata` | bool | Indicates whether to skip generating gapic_metadata.json. This is typically false. |
+| `no_snippets` | bool | Indicates whether to skip generating snippets. This is typically false. |
 | `path` | string | Is the source path. |
 | `proto_only` | bool | Determines whether to generate a Proto-only client. A proto-only client does not define a service in the proto files. |
 | `proto_package` | string | Is the proto package name. |

internal/config/language.go

@@ -80,6 +80,9 @@ type GoAPI struct {
 	// NoMetadata indicates whether to skip generating gapic_metadata.json.
 	// This is typically false.
 	NoMetadata bool `yaml:"no_metadata,omitempty"`
+	// NoSnippets indicates whether to skip generating snippets.
+	// This is typically false.
+	NoSnippets bool `yaml:"no_snippets,omitempty"`
 	// Path is the source path.
 	Path string `yaml:"path,omitempty"`
 	// ProtoOnly determines whether to generate a Proto-only client.

internal/librarian/generate.go

@@ -269,6 +269,8 @@ func defaultOutput(language string, name, api, defaultOut string) string {
 		return python.DefaultOutput(name, defaultOut)
 	case config.LanguageRust:
 		return rust.DefaultOutput(api, defaultOut)
+	case config.LanguageSwift:
+		return swift.DefaultOutput(api, defaultOut)
 	default:
 		return defaultOut
 	}

internal/librarian/golang/generate.go

@@ -145,6 +145,9 @@ func buildGAPICOpts(apiPath string, goAPI *config.GoAPI, googleapisDir string) (
 	if !goAPI.NoMetadata {
 		opts = append(opts, "metadata")
 	}
+	if goAPI.NoSnippets {
+		opts = append(opts, "omit-snippets")
+	}
 	if sc != nil && sc.HasRESTNumericEnums(config.LanguageGo) {
 		opts = append(opts, "rest-numeric-enums")
 	}
@@ -199,14 +202,14 @@ func moveAPIDirectory(library *config.Library, goAPI *config.GoAPI, outDir strin
 // moveAndUpdateSnippets moves the generated snippets from the temporary location to their final
 // destination and updates their library versions.
 func moveAndUpdateSnippets(library *config.Library, goAPI *config.GoAPI, outDir string) error {
-	snippetDirPrefix := filepath.Join(outDir, "cloud.google.com", "go", "internal", "generated", "snippets")
 	snippetDest := findSnippetDirectory(library, goAPI, outDir)
 	if snippetDest == "" {
 		return nil
 	}
 	if err := os.MkdirAll(snippetDest, 0755); err != nil {
 		return err
 	}
+	snippetDirPrefix := filepath.Join(outDir, "cloud.google.com", "go", "internal", "generated", "snippets")
 	snippetSrc := filepath.Join(snippetDirPrefix, goAPI.ImportPath)
 	if err := filesystem.MoveAndMerge(snippetSrc, snippetDest); err != nil {
 		return err

internal/librarian/golang/generate_test.go

@@ -594,6 +594,26 @@ func TestBuildGAPICOpts(t *testing.T) {
 				"release-level=ga",
 			},
 		},
+		{
+			name:    "no snippets",
+			apiPath: "google/cloud/gkehub/v1",
+			goAPI: &config.GoAPI{
+				ClientPackage: "gkehub",
+				ImportPath:    "gkehub/apiv1",
+				NoSnippets:    true,
+				Path:          "google/cloud/gkehub/v1",
+			},
+			googleapisDir: googleapisDir,
+			want: []string{
+				"go-gapic-package=cloud.google.com/go/gkehub/apiv1;gkehub",
+				"metadata",
+				"omit-snippets",
+				"rest-numeric-enums",
+				"api-service-config=" + filepath.Join(googleapisDir, "google/cloud/gkehub/v1/gkehub_v1.yaml"),
+				"transport=grpc+rest",
+				"release-level=ga",
+			},
+		},
 		{
 			name:    "generator features",
 			apiPath: "google/cloud/bigquery/v2",
@@ -802,6 +822,37 @@ func TestMoveGeneratedFiles(t *testing.T) {
 				return outDir, filepath.Join(outDir, "apiv1"), filepath.Join(repoRoot, "internal", "generated", "snippets", "lib", "apiv1"), lib
 			},
 		},
+		{
+			name: "no snippets",
+			setup: func(t *testing.T, tmpDir string) (string, string, string, *config.Library) {
+				repoRoot := filepath.Join(tmpDir, "repo")
+				outDir := filepath.Join(repoRoot, "lib")
+				srcDir := filepath.Join(outDir, "cloud.google.com", "go", "lib", "apiv1")
+				if err := os.MkdirAll(srcDir, 0755); err != nil {
+					t.Fatal(err)
+				}
+				if err := os.WriteFile(filepath.Join(srcDir, "main.go"), []byte("package foo"), 0644); err != nil {
+					t.Fatal(err)
+				}
+				// Even if snippet source exists in cloud.google.com/go, it should not be moved.
+				snippetDirSuffix := filepath.Join("internal", "generated", "snippets", "lib", "apiv1")
+				snippetSrcDir := filepath.Join(outDir, "cloud.google.com", "go", snippetDirSuffix)
+				if err := os.MkdirAll(snippetSrcDir, 0755); err != nil {
+					t.Fatal(err)
+				}
+				if err := os.WriteFile(filepath.Join(snippetSrcDir, "snippet.go"), []byte("package internal"), 0644); err != nil {
+					t.Fatal(err)
+				}
+				lib := &config.Library{
+					Name: "lib",
+					APIs: []*config.API{{Path: "lib/v1"}},
+					Go: &config.GoModule{
+						GoAPIs: []*config.GoAPI{{Path: "lib/v1", ImportPath: "lib/apiv1", NoSnippets: true}},
+					},
+				}
+				return outDir, filepath.Join(outDir, "apiv1"), filepath.Join(repoRoot, snippetDirSuffix), lib
+			},
+		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			tmpDir := t.TempDir()
@@ -813,8 +864,14 @@ func TestMoveGeneratedFiles(t *testing.T) {
 			if _, err := os.Stat(filepath.Join(apiDir, "main.go")); err != nil {
 				t.Errorf("expected main.go to exist, got err: %v", err)
 			}
-			if _, err := os.Stat(filepath.Join(snippetDir, "snippet.go")); err != nil {
-				t.Errorf("expected snippet.go to exist, got err: %v", err)
+			if lib.Go.GoAPIs[0].NoSnippets {
+				if _, err := os.Stat(filepath.Join(snippetDir, "snippet.go")); !errors.Is(err, os.ErrNotExist) {
+					t.Errorf("expected snippet.go to not exist, got err: %v", err)
+				}
+			} else {
+				if _, err := os.Stat(filepath.Join(snippetDir, "snippet.go")); err != nil {
+					t.Errorf("expected snippet.go to exist, got err: %v", err)
+				}
 			}
 		})
 	}

internal/librarian/golang/module.go

@@ -174,10 +174,10 @@ func snippetDirectory(output, importPath string) string {
 }
 
 // findSnippetDirectory returns the path to the snippet directory for the given API path and library output directory.
-// It returns an empty string if the API is proto-only or if the snippet directory is in a path marked for deletion
-// after generation.
+// It returns an empty string if the API is proto-only, if snippet generation is disabled,
+// or if the snippet directory is in a path marked for deletion after generation.
 func findSnippetDirectory(library *config.Library, goAPI *config.GoAPI, output string) string {
-	if goAPI.ProtoOnly {
+	if goAPI.ProtoOnly || goAPI.NoSnippets {
 		return ""
 	}
 	snippetDir := snippetDirectory(repoRootPath(output, library.Name), clientPathFromRepoRoot(library, goAPI))

internal/librarian/golang/tidy.go

@@ -59,6 +59,7 @@ func isEmptyAPI(goAPI *config.GoAPI) bool {
 		goAPI.ImportPath == "" &&
 		len(goAPI.NestedProtos) == 0 &&
 		!goAPI.NoMetadata &&
+		!goAPI.NoSnippets &&
 		!goAPI.ProtoOnly &&
 		goAPI.ProtoPackage == ""
 }

internal/librarian/golang/tidy_test.go

@@ -249,6 +249,12 @@ func TestIsEmptyAPI(t *testing.T) {
 				NoMetadata: true,
 			},
 		},
+		{
+			name: "not empty with NoSnippets",
+			goAPI: &config.GoAPI{
+				NoSnippets: true,
+			},
+		},
 		{
 			name: "not empty with ProtoOnly",
 			goAPI: &config.GoAPI{

internal/librarian/java/generate.go

@@ -38,10 +38,9 @@ const (
 )
 
 var (
-	// errExtractVersion is returned when an API version cannot be extracted from its path.
-	errExtractVersion = errors.New("failed to extract version")
-	// errNoProtos is returned when no proto files are found in an API directory.
-	errNoProtos = errors.New("no protos found")
+	errExtractVersion  = errors.New("failed to extract version")
+	errNoProtos        = errors.New("no protos found")
+	errMonorepoVersion = fmt.Errorf("failed to find monorepo version for %q in config", rootLibrary)
 )
 
 // Generate generates a Java client library.
@@ -65,16 +64,32 @@ func Generate(ctx context.Context, cfg *config.Config, library *config.Library,
 	if err != nil {
 		return fmt.Errorf("failed to generate .repo-metadata.json: %w", err)
 	}
+
+	transports := make(map[string]serviceconfig.Transport)
 	for _, api := range library.APIs {
+		apiCfg, err := serviceconfig.Find(googleapisDir, api.Path, config.LanguageJava)
+		if err != nil {
+			return fmt.Errorf("failed to find api config for %s: %w", api.Path, err)
+		}
+		transports[api.Path] = apiCfg.Transport(config.LanguageJava)
 		// metadata is needed for pom.xml generation in post process
-		if err := generateAPI(ctx, cfg, api, library, googleapisDir, outdir, metadata); err != nil {
+		if err := generateAPI(ctx, cfg, api, library, googleapisDir, outdir, metadata, apiCfg); err != nil {
 			return fmt.Errorf("failed to generate api %q: %w", api.Path, err)
 		}
 	}
+
+	monorepoVersion, err := findMonorepoVersion(cfg)
+	if err != nil {
+		return err
+	}
+	if err := generatePomsIfMissing(library, outdir, monorepoVersion, metadata, transports); err != nil {
+		return fmt.Errorf("failed to generate poms: %w", err)
+	}
+
 	return nil
 }
 
-func generateAPI(ctx context.Context, cfg *config.Config, api *config.API, library *config.Library, googleapisDir, outdir string, metadata *repoMetadata) error {
+func generateAPI(ctx context.Context, cfg *config.Config, api *config.API, library *config.Library, googleapisDir, outdir string, metadata *repoMetadata, apiCfg *serviceconfig.API) error {
 	version := serviceconfig.ExtractVersion(api.Path)
 	if version == "" {
 		return fmt.Errorf("%s: %w", api.Path, errExtractVersion)
@@ -125,10 +140,6 @@ func generateAPI(ctx context.Context, cfg *config.Config, api *config.API, libra
 		return fmt.Errorf("failed to generate proto: %w", err)
 	}
 	// 2. Generate gRPC service stubs (skipped if transport is rest).
-	apiCfg, err := serviceconfig.Find(googleapisDir, api.Path, config.LanguageJava)
-	if err != nil {
-		return fmt.Errorf("failed to find api config: %w", err)
-	}
 	transport := apiCfg.Transport(config.LanguageJava)
 	if transport != "rest" {
 		if err := runProtoc(ctx, grpcProtocArgs(apiProtos, googleapisDir, grpcDir)); err != nil {

internal/librarian/java/generate_test.go

@@ -389,7 +389,11 @@ func TestGenerateAPI(t *testing.T) {
 	if err := os.MkdirAll(templatesDir, 0755); err != nil {
 		t.Fatal(err)
 	}
-	err := generateAPI(
+	apiCfg, err := serviceconfig.Find(googleapisDir, "google/cloud/secretmanager/v1", config.LanguageJava)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = generateAPI(
 		t.Context(),
 		cfg,
 		&config.API{Path: "google/cloud/secretmanager/v1"},
@@ -400,6 +404,7 @@ func TestGenerateAPI(t *testing.T) {
 			NamePretty:     "Secret Manager",
 			APIDescription: "Secret Manager API",
 		},
+		apiCfg,
 	)
 	if err != nil {
 		t.Fatal(err)
@@ -453,10 +458,14 @@ func TestGenerateAPI_NoTools(t *testing.T) {
 	if err := os.MkdirAll(templatesDir, 0755); err != nil {
 		t.Fatal(err)
 	}
-	err := generateAPI(t.Context(), cfg, api, library, googleapisDir, outdir, &repoMetadata{
+	apiCfg, err := serviceconfig.Find(googleapisDir, api.Path, config.LanguageJava)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = generateAPI(t.Context(), cfg, api, library, googleapisDir, outdir, &repoMetadata{
 		NamePretty:     "Secret Manager",
 		APIDescription: "Secret Manager API",
-	})
+	}, apiCfg)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -525,12 +534,46 @@ func TestGenerateLibrary_Error(t *testing.T) {
 			},
 			wantErr: syscall.ENOTDIR,
 		},
+		{
+			name: "missing monorepo version",
+			library: &config.Library{
+				Name:   "secretmanager",
+				Output: t.TempDir(),
+				APIs: []*config.API{
+					{Path: "google/cloud/secretmanager/v1"},
+				},
+			},
+			setup: func(t *testing.T, library *config.Library) {
+				// Ensure output artifacts exist for postProcessAPI to succeed.
+				for _, artifact := range []string{"google-cloud-secretmanager", "proto-google-cloud-secretmanager-v1", "grpc-google-cloud-secretmanager-v1", "google-cloud-secretmanager-bom"} {
+					if err := os.MkdirAll(filepath.Join(library.Output, artifact), 0755); err != nil {
+						t.Fatal(err)
+					}
+				}
+				if err := os.WriteFile(filepath.Join(library.Output, "owlbot.py"), []byte("#!/usr/bin/env python3\npass"), 0755); err != nil {
+					t.Fatal(err)
+				}
+				templatesDir := filepath.Join(filepath.Dir(library.Output), owlbotTemplatesRelPath)
+				if err := os.MkdirAll(templatesDir, 0755); err != nil {
+					t.Fatal(err)
+				}
+			},
+			wantErr: errMonorepoVersion,
+		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
+			// Temporarily mock runProtoc to avoid external tool requirements.
+			oldRunProtoc := runProtoc
+			defer func() { runProtoc = oldRunProtoc }()
+			runProtoc = func(ctx context.Context, args []string) error { return nil }
+
 			if test.setup != nil {
 				test.setup(t, test.library)
 			}
-			cfg := &config.Config{Language: "java"}
+			cfg := &config.Config{
+				Language:  config.LanguageJava,
+				Libraries: []*config.Library{test.library},
+			}
 			err := Generate(t.Context(), cfg, test.library, &sources.Sources{Googleapis: googleapisDir})
 			if !errors.Is(err, test.wantErr) {
 				t.Errorf("generate() error = %v, wantErr %v", err, test.wantErr)
@@ -539,6 +582,54 @@ func TestGenerateLibrary_Error(t *testing.T) {
 	}
 }
 
+func TestGenerate_Logic(t *testing.T) {
+	// Tests the orchestration logic, temporarily mock runProtoc to avoid external tool requirements.
+	oldRunProtoc := runProtoc
+	defer func() { runProtoc = oldRunProtoc }()
+	runProtoc = func(ctx context.Context, args []string) error { return nil }
+
+	outdir := t.TempDir()
+	library := &config.Library{
+		Name:    "secretmanager",
+		Version: "0.1.2",
+		Output:  outdir,
+		APIs: []*config.API{
+			{Path: "google/cloud/secretmanager/v1"},
+		},
+	}
+	cfg := &config.Config{
+		Language: config.LanguageJava,
+		Repo:     "googleapis/google-cloud-java",
+		Libraries: []*config.Library{
+			library,
+			{Name: rootLibrary, Version: "1.2.3"},
+		},
+	}
+	// Setup mandatory files for postProcessAPI and generatePomsIfMissing
+	for _, artifact := range []string{"google-cloud-secretmanager", "proto-google-cloud-secretmanager-v1", "grpc-google-cloud-secretmanager-v1", "google-cloud-secretmanager-bom"} {
+		if err := os.MkdirAll(filepath.Join(outdir, artifact), 0755); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := os.WriteFile(filepath.Join(outdir, "owlbot.py"), []byte("#!/usr/bin/env python3\npass"), 0755); err != nil {
+		t.Fatal(err)
+	}
+	templatesDir := filepath.Join(filepath.Dir(outdir), owlbotTemplatesRelPath)
+	if err := os.MkdirAll(templatesDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	err := Generate(t.Context(), cfg, library, &sources.Sources{Googleapis: googleapisDir})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Verify that parent pom was generated in the library root.
+	if _, err := os.Stat(filepath.Join(outdir, "pom.xml")); err != nil {
+		t.Errorf("expected parent pom.xml to exist: %v", err)
+	}
+}
+
 func TestFormat_Success(t *testing.T) {
 	testhelper.RequireCommand(t, "google-java-format")
 	for _, test := range []struct {