build: specify full repo in repositories.yaml (#1818)

Towards #1778

Accompanies cl/799250047

Author: chingor13

infra/prod/generate.yaml

@@ -21,7 +21,7 @@ steps:
     args:
       - 'clone'
       - '--depth=1'
-      - https://github.com/$_ORGANIZATION/$_REPOSITORY
+      - $_FULL_REPOSITORY
   - name: gcr.io/cloud-builders/git
     id: configure-language-repo-name
     waitFor: ['clone-language-repo']

infra/prod/publish-release.yaml

@@ -25,7 +25,7 @@ steps:
       - '--depth=1'
       - '--single-branch'
       - '--branch=$_BRANCH'
-      - https://github.com/googleapis/$_REPOSITORY
+      - $_FULL_REPOSITORY
   - name: 'us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-dev/librarian'
     id: publish-release
     waitFor: ['clone-language-repo']

infra/prod/stage-release.yaml

@@ -23,7 +23,7 @@ steps:
     args:
       - 'clone'
       - '--depth=1'
-      - https://github.com/googleapis/$_REPOSITORY
+      - $_FULL_REPOSITORY
   - name: gcr.io/cloud-builders/git
     id: clone-googleapis
     waitFor: ['-']

internal/automation/prod/repositories.yaml

@@ -1,5 +1,6 @@
 repositories:
   - name: "google-cloud-python"
+    full-name: https://github.com/googleapis/google-cloud-python
     github-token-secret-name: "google-cloud-python-github-token"
     supported-commands:
       - generate

internal/automation/repositories.go

@@ -35,6 +35,7 @@ var availableCommands = map[string]bool{
 // RepositoryConfig represents a single registered librarian GitHub repository.
 type RepositoryConfig struct {
 	Name              string   `yaml:"name"`
+	FullName          string   `yaml:"full-name"`
 	SecretName        string   `yaml:"github-token-secret-name"`
 	SupportedCommands []string `yaml:"supported-commands"`
 }
@@ -44,10 +45,21 @@ type RepositoriesConfig struct {
 	Repositories []*RepositoryConfig `yaml:"repositories"`
 }
 
+// GitURL returns the full git url to clone.
+func (c *RepositoryConfig) GitURL() (string, error) {
+	if c.FullName == "" {
+		if c.Name == "" {
+			return "", fmt.Errorf("name or full name is required")
+		}
+		return fmt.Sprintf("https://github.com/googleapis/%s", c.Name), nil
+	}
+	return c.FullName, nil
+}
+
 // Validate checks the the RepositoryConfig is valid.
 func (c *RepositoryConfig) Validate() error {
-	if c.Name == "" {
-		return fmt.Errorf("name is required")
+	if c.FullName == "" && c.Name == "" {
+		return fmt.Errorf("name or full name is required")
 	}
 	if c.SecretName == "" {
 		return fmt.Errorf("secret name is required")

internal/automation/repositories_test.go

@@ -39,6 +39,19 @@ func TestRepositoriesConfig_Validate(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "valid full name",
+			config: &RepositoriesConfig{
+				Repositories: []*RepositoryConfig{
+					{
+						FullName:          "https://github.com/googleapis/google-cloud-foo",
+						SecretName:        "google-cloud-foo-github-token",
+						SupportedCommands: []string{"generate", "stage-release", "publish-release"},
+					},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "missing name",
 			config: &RepositoriesConfig{
@@ -136,6 +149,27 @@ func TestParseRepositoriesConfig(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "valid state with full name",
+			content: `repositories:
+  - name: google-cloud-python
+    full-name: https://github.com/some-org/google-cloud-python
+    github-token-secret-name: google-cloud-python-github-token
+    supported-commands:
+      - generate
+      - stage-release
+`,
+			want: &RepositoriesConfig{
+				Repositories: []*RepositoryConfig{
+					{
+						Name:              "google-cloud-python",
+						FullName:          "https://github.com/some-org/google-cloud-python",
+						SecretName:        "google-cloud-python-github-token",
+						SupportedCommands: []string{"generate", "stage-release"},
+					},
+				},
+			},
+		},
 		{
 			name: "invalid yaml",
 			content: `repositories:
@@ -225,3 +259,55 @@ func TestRepositoriesForCommand(t *testing.T) {
 		})
 	}
 }
+
+func TestRepositoryGitUrl(t *testing.T) {
+	for _, test := range []struct {
+		name       string
+		repository *RepositoryConfig
+		want       string
+		wantError  bool
+	}{
+		{
+			name: "sets default organization",
+			repository: &RepositoryConfig{
+				Name: "google-cloud-python",
+			},
+			want: "https://github.com/googleapis/google-cloud-python",
+		},
+		{
+			name: "reads full name",
+			repository: &RepositoryConfig{
+				FullName: "https://github.com/some-org/google-cloud-python",
+			},
+			want: "https://github.com/some-org/google-cloud-python",
+		},
+		{
+			name: "prefers full name",
+			repository: &RepositoryConfig{
+				Name:     "google-cloud-python",
+				FullName: "https://github.com/some-org/google-cloud-python",
+			},
+			want: "https://github.com/some-org/google-cloud-python",
+		},
+		{
+			name: "missing name",
+			repository: &RepositoryConfig{
+				Name:     "google-cloud-python",
+				FullName: "https://github.com/some-org/google-cloud-python",
+			},
+			want:      "https://github.com/some-org/google-cloud-python",
+			wantError: true,
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			got, err := test.repository.GitURL()
+			if err != nil && test.wantError {
+				t.Errorf("expected to return error")
+				return
+			}
+			if diff := cmp.Diff(test.want, got); diff != "" {
+				t.Errorf("parseRepositoriesConfig() mismatch (-want +got): %s", diff)
+			}
+		})
+	}
+}

internal/automation/trigger.go

@@ -79,6 +79,15 @@ func RunCommand(ctx context.Context, command string, projectId string, push bool
 }
 
 func runCommandWithClient(ctx context.Context, client CloudBuildClient, ghClient GitHubClient, command string, projectId string, push bool, build bool) error {
+	config, err := loadRepositoriesConfig()
+	if err != nil {
+		slog.Error("error loading repositories config", slog.Any("err", err))
+		return err
+	}
+	return runCommandWithConfig(ctx, client, ghClient, command, projectId, push, build, config)
+}
+
+func runCommandWithConfig(ctx context.Context, client CloudBuildClient, ghClient GitHubClient, command string, projectId string, push bool, build bool, config *RepositoriesConfig) error {
 	// validate command is allowed
 	triggerName := triggerNameByCommandName[command]
 	if triggerName == "" {
@@ -87,18 +96,19 @@ func runCommandWithClient(ctx context.Context, client CloudBuildClient, ghClient
 
 	errs := make([]error, 0)
 
-	config, err := loadRepositoriesConfig()
-	if err != nil {
-		slog.Error("error loading repositories config", slog.Any("err", err))
-		return err
-	}
-
 	repositories := config.RepositoriesForCommand(command)
 	for _, repository := range repositories {
-		slog.Debug("running command", slog.String("command", command), slog.String("repository", repository.Name))
+		slog.Debug("running command", "command", command, "repository", repository.Name)
+
+		gitUrl, err := repository.GitURL()
+		if err != nil {
+			slog.Error("repository has no configured git url", slog.Any("repository", repository))
+			return err
+		}
 
 		substitutions := map[string]string{
 			"_REPOSITORY":               repository.Name,
+			"_FULL_REPOSITORY":          gitUrl,
 			"_GITHUB_TOKEN_SECRET_NAME": repository.SecretName,
 			"_PUSH":                     fmt.Sprintf("%v", push),
 		}

internal/automation/trigger_test.go

@@ -176,3 +176,83 @@ func TestRunCommandWithClient(t *testing.T) {
 		})
 	}
 }
+
+func TestRunCommandWithConfig(t *testing.T) {
+	var buildTriggers = []*cloudbuildpb.BuildTrigger{
+		{
+			Name: "generate",
+			Id:   "generate-trigger-id",
+		},
+		{
+			Name: "prepare-release",
+			Id:   "prepare-release-trigger-id",
+		},
+	}
+	for _, test := range []struct {
+		name     string
+		command  string
+		config   *RepositoriesConfig
+		want     string
+		runError error
+		wantErr  bool
+		ghPRs    []*github.PullRequest
+		ghError  error
+	}{
+		{
+			name:    "runs generate trigger with name",
+			command: "generate",
+			config: &RepositoriesConfig{
+				Repositories: []*RepositoryConfig{
+					{
+						Name:              "google-cloud-python",
+						SupportedCommands: []string{"generate"},
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:    "runs generate trigger with full name",
+			command: "generate",
+			config: &RepositoriesConfig{
+				Repositories: []*RepositoryConfig{
+					{
+						Name:              "https://github.com/googleapis/google-cloud-python",
+						SupportedCommands: []string{"generate"},
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name:    "runs generate trigger without name",
+			command: "generate",
+			config: &RepositoriesConfig{
+				Repositories: []*RepositoryConfig{
+					{
+						SupportedCommands: []string{"generate"},
+					},
+				},
+			},
+			wantErr: true,
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			ctx := context.Background()
+			client := &mockCloudBuildClient{
+				runError:      test.runError,
+				buildTriggers: buildTriggers,
+			}
+			ghClient := &mockGitHubClient{
+				prs: test.ghPRs,
+				err: test.ghError,
+			}
+			err := runCommandWithConfig(ctx, client, ghClient, test.command, "some-project", true, true, test.config)
+			if test.wantErr && err == nil {
+				t.Errorf("expected error, but did not return one")
+			} else if !test.wantErr && err != nil {
+				t.Errorf("did not expect error, but received one: %s", err)
+			}
+		})
+	}
+}