Revert "Added service team review request support (#9681)"

This reverts commit 89656df.
GoogleCloudPlatform · Dec 22, 2023 · fc91a4a · fc91a4a
1 parent a7305c8
commit fc91a4a
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 347 deletions.
diff --git a/.ci/gcb-generate-diffs-new.yml b/.ci/gcb-generate-diffs-new.yml
@@ -273,14 +273,6 @@ steps:
           - $PROJECT_ID
           - "22"  # Build step
 
-    - name: 'gcr.io/graphite-docker-images/go-plus'
-      entrypoint: '/workspace/.ci/scripts/go-plus/magician/exec.sh'
-      secretEnv: ["GITHUB_TOKEN"]
-      waitFor: ["diff"]
-      args:
-          - 'request-service-reviewers'
-          - $_PR_NUMBER
-
 # Long timeout to enable waiting on VCR test
 timeout: 20000s
 options:

diff --git a/.ci/magician/cmd/interfaces.go b/.ci/magician/cmd/interfaces.go
@@ -24,7 +24,6 @@ type GithubClient interface {
 	GetPullRequestRequestedReviewers(prNumber string) ([]github.User, error)
 	GetPullRequestPreviousReviewers(prNumber string) ([]github.User, error)
 	GetUserType(user string) github.UserType
-	GetTeamMembers(organization, team string) ([]github.User, error)
 	PostBuildStatus(prNumber, title, state, targetURL, commitSha string) error
 	PostComment(prNumber, comment string) error
 	RequestPullRequestReviewer(prNumber, assignee string) error

diff --git a/.ci/magician/cmd/mock_github_test.go b/.ci/magician/cmd/mock_github_test.go
@@ -22,7 +22,6 @@ type mockGithub struct {
 	userType           github.UserType
 	requestedReviewers []github.User
 	previousReviewers  []github.User
-	teamMembers        map[string][]github.User
 	calledMethods      map[string][][]any
 }
 
@@ -46,11 +45,6 @@ func (m *mockGithub) GetPullRequestPreviousReviewers(prNumber string) ([]github.
 	return m.previousReviewers, nil
 }
 
-func (m *mockGithub) GetTeamMembers(organization, team string) ([]github.User, error) {
-	m.calledMethods["GetTeamMembers"] = append(m.calledMethods["GetTeamMembers"], []any{organization, team})
-	return m.teamMembers[team], nil
-}
-
 func (m *mockGithub) RequestPullRequestReviewer(prNumber string, reviewer string) error {
 	m.calledMethods["RequestPullRequestReviewer"] = append(m.calledMethods["RequestPullRequestReviewer"], []any{prNumber, reviewer})
 	return nil

diff --git a/.ci/magician/cmd/request_service_reviewers.go b/.ci/magician/cmd/request_service_reviewers.go
diff --git a/.ci/magician/cmd/request_service_reviewers_test.go b/.ci/magician/cmd/request_service_reviewers_test.go
diff --git a/.ci/magician/github/get.go b/.ci/magician/github/get.go
@@ -85,14 +85,3 @@ func (gh *Client) GetPullRequestPreviousReviewers(prNumber string) ([]User, erro
 
 	return result, nil
 }
-
-func (gh *Client) GetTeamMembers(organization, team string) ([]User, error) {
-	url := fmt.Sprintf("https://api.github.com/orgs/%s/teams/%s/members", organization, team)
-
-	var members []User
-	_, err := utils.RequestCall(url, "GET", gh.token, &members, nil)
-	if err != nil {
-		return nil, err
-	}
-	return members, nil
-}
diff --git a/.ci/magician/go.mod b/.ci/magician/go.mod
@@ -2,14 +2,11 @@ module magician
 
 go 1.20
 
-replace github.com/GoogleCloudPlatform/magic-modules/tools/issue-labeler => ../../tools/issue-labeler
-
 require (
-	github.com/GoogleCloudPlatform/magic-modules/tools/issue-labeler v0.0.0-00010101000000-000000000000
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/exp v0.0.0-20230810033253-352e893a4cad
+	golang.org/x/exp v0.0.0-20230314191032-db074128a8ec
 	google.golang.org/api v0.112.0
 )
 
@@ -18,15 +15,11 @@ require github.com/otiai10/copy v1.12.0
 require (
 	cloud.google.com/go/compute v1.18.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/glog v1.1.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/oauth2 v0.6.0 // indirect
@@ -36,6 +29,4 @@ require (
 	google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 // indirect
 	google.golang.org/grpc v1.53.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )