chore(internal/config): remove VersionSuffix from Go configuration (#4283)

With the import path and client package refactoration in #4251,
`VersionSuffix` is no longer needed to build the import path.

A follow up PR will remove `ClientPackageOverride`.

For #3617

Author: JoeWang1127

doc/config-schema.md

@@ -131,7 +131,6 @@ This document describes the schema for the librarian.yaml.
 | `no_rest_numeric_enums` | bool | Determines whether to use numeric enums in REST requests. The "No" prefix is used because the default behavior (when this field is `false` or omitted) is to generate numeric enums |
 | `path` | string | Is the source path. |
 | `proto_package` | string | Is the proto package name. |
-| `version_suffix` | string | Is an optional suffix appended to the version part of the GAPIC import path. |
 
 ## GoModule Configuration
 

internal/config/language.go

@@ -58,8 +58,6 @@ type GoAPI struct {
 	Path string `yaml:"path,omitempty"`
 	// ProtoPackage is the proto package name.
 	ProtoPackage string `yaml:"proto_package,omitempty"`
-	// VersionSuffix is an optional suffix appended to the version part of the GAPIC import path.
-	VersionSuffix string `yaml:"version_suffix,omitempty"`
 }
 
 // RustDefault contains Rust-specific default configuration.

internal/librarian/golang/generate.go

@@ -224,10 +224,6 @@ func buildGAPICOpts(apiPath string, library *config.Library, goAPI *config.GoAPI
 }
 
 func buildGAPICImportPath(library *config.Library, goAPI *config.GoAPI) string {
-	importPath := goAPI.ImportPath
-	if goAPI.VersionSuffix != "" {
-		importPath = fmt.Sprintf("%s/%s", importPath, goAPI.VersionSuffix)
-	}
 	clientPkg := goAPI.ClientDirectory
 	if goAPI.ClientPackageOverride != "" {
 		clientPkg = goAPI.ClientPackageOverride
@@ -237,7 +233,7 @@ func buildGAPICImportPath(library *config.Library, goAPI *config.GoAPI) string {
 		modulePathVersion = "/" + library.Go.ModulePathVersion
 	}
 	return fmt.Sprintf("cloud.google.com/go/%s%s;%s",
-		importPath, modulePathVersion, clientPkg)
+		goAPI.ImportPath, modulePathVersion, clientPkg)
 }
 
 // fixVersioning moves {name}/{version}/* up to {name}/ for versioned modules.

internal/librarian/golang/generate_test.go

@@ -628,19 +628,6 @@ func TestBuildGAPICImportPath(t *testing.T) {
 			},
 			want: "cloud.google.com/go/storage/internal/apiv2;storage",
 		},
-		{
-			name: "version suffix",
-			library: &config.Library{
-				Name: "monitoring",
-			},
-			goAPI: &config.GoAPI{
-				ClientDirectory: "monitoring",
-				ImportPath:      "monitoring/apiv3",
-				Path:            "google/monitoring/v3",
-				VersionSuffix:   "v2",
-			},
-			want: "cloud.google.com/go/monitoring/apiv3/v2;monitoring",
-		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			got := buildGAPICImportPath(test.library, test.goAPI)

internal/librarian/golang/repometadata.go

@@ -48,7 +48,7 @@ func generateRepoMetadata(api *serviceconfig.API, library *config.Library) error
 		LibraryType:         repometadata.GAPICAutoLibraryType,
 		ReleaseLevel:        level,
 	}
-	return metadata.Write(filepath.Join(library.Output, goAPI.ImportPath, goAPI.VersionSuffix))
+	return metadata.Write(filepath.Join(library.Output, goAPI.ImportPath))
 }
 
 // clientDocURL builds the client documentation URL for Go SDK.

internal/librarian/golang/version.go

@@ -69,7 +69,7 @@ func generateClientVersionFile(library *config.Library, apiPath string) (err err
 		// Therefore, version.go does not need to be generated.
 		return nil
 	}
-	dir := filepath.Join(library.Output, goAPI.ImportPath, goAPI.VersionSuffix)
+	dir := filepath.Join(library.Output, goAPI.ImportPath)
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return err
 	}