Merge pull request #150 from concourse/issue-149

Remove github enterprise workaround

Author: taylorsilva

github.go

@@ -35,9 +35,8 @@ type GitHub interface {
 }
 
 type GitHubClient struct {
-	client       *github.Client
-	clientV4     *githubv4.Client
-	isEnterprise bool
+	client   *github.Client
+	clientV4 *githubv4.Client
 
 	owner       string
 	repository  string
@@ -67,7 +66,6 @@ func NewGitHubClient(source Source) (*GitHubClient, error) {
 	client := github.NewClient(httpClient)
 
 	clientV4 := githubv4.NewClient(httpClient)
-	var isEnterprise bool
 
 	if source.GitHubAPIURL != "" {
 		var err error
@@ -85,18 +83,16 @@ func NewGitHubClient(source Source) (*GitHubClient, error) {
 		}
 
 		var v4URL string
-		if strings.HasSuffix(source.GitHubAPIURL, "/v3/") {
-			v4URL = strings.TrimSuffix(source.GitHubAPIURL, "/v3/") + "/graphql"
+		if s, found := strings.CutSuffix(source.GitHubAPIURL, "/v3/"); found {
+			v4URL = s + "/graphql"
 		} else {
 			v4URL = source.GitHubAPIURL + "graphql"
 		}
 		clientV4 = githubv4.NewEnterpriseClient(v4URL, httpClient)
-		isEnterprise = true
 	}
 
 	if source.GitHubV4APIURL != "" {
 		clientV4 = githubv4.NewEnterpriseClient(source.GitHubV4APIURL, httpClient)
-		isEnterprise = true
 	}
 
 	if source.GitHubUploadsURL != "" {
@@ -113,20 +109,16 @@ func NewGitHubClient(source Source) (*GitHubClient, error) {
 	}
 
 	return &GitHubClient{
-		client:       client,
-		clientV4:     clientV4,
-		isEnterprise: isEnterprise,
-		owner:        owner,
-		repository:   source.Repository,
-		accessToken:  source.AccessToken,
+		client:      client,
+		clientV4:    clientV4,
+		owner:       owner,
+		repository:  source.Repository,
+		accessToken: source.AccessToken,
 	}, nil
 }
 
 func (g *GitHubClient) ListReleases() ([]*github.RepositoryRelease, error) {
 	if g.accessToken != "" {
-		if g.isEnterprise {
-			return g.listReleasesV4EnterPrice()
-		}
 		return g.listReleasesV4()
 	}
 	opt := &github.ListOptions{PerPage: 100}

github_graphql.go

@@ -12,77 +12,6 @@ import (
 	"github.com/shurcooL/githubv4"
 )
 
-func (g *GitHubClient) listReleasesV4EnterPrice() ([]*github.RepositoryRelease, error) {
-	if g.clientV4 == nil {
-		return nil, errors.New("github graphql is not been initialised")
-	}
-	var listReleasesEnterprise struct {
-		Repository struct {
-			Releases struct {
-				Edges []struct {
-					Node struct {
-						ReleaseObjectEnterprise
-					}
-				} `graphql:"edges"`
-				PageInfo struct {
-					EndCursor   githubv4.String
-					HasNextPage bool
-				} `graphql:"pageInfo"`
-			} `graphql:"releases(first:$releasesCount, after: $releaseCursor, orderBy: {field: CREATED_AT, direction: DESC})"`
-		} `graphql:"repository(owner:$repositoryOwner,name:$repositoryName)"`
-	}
-
-	vars := map[string]any{
-		"repositoryOwner": githubv4.String(g.owner),
-		"repositoryName":  githubv4.String(g.repository),
-		"releaseCursor":   (*githubv4.String)(nil),
-		"releasesCount":   githubv4.Int(100),
-	}
-
-	var allReleases []*github.RepositoryRelease
-	for {
-		if err := g.clientV4.Query(context.TODO(), &listReleasesEnterprise, vars); err != nil {
-			return nil, err
-		}
-		for _, r := range listReleasesEnterprise.Repository.Releases.Edges {
-			r := r
-			publishedAt, _ := time.ParseInLocation(time.RFC3339, r.Node.PublishedAt.Time.Format(time.RFC3339), time.UTC)
-			createdAt, _ := time.ParseInLocation(time.RFC3339, r.Node.CreatedAt.Time.Format(time.RFC3339), time.UTC)
-			var releaseID int64
-			decodedID, err := base64.StdEncoding.DecodeString(r.Node.ID)
-			if err != nil {
-				return nil, err
-			}
-			re := regexp.MustCompile(`.*[^\d]`)
-			decodedID = re.ReplaceAll(decodedID, []byte(""))
-			if string(decodedID) == "" {
-				return nil, errors.New("bad release id from graph ql api")
-			}
-			releaseID, err = strconv.ParseInt(string(decodedID), 10, 64)
-			if err != nil {
-				return nil, err
-			}
-
-			allReleases = append(allReleases, &github.RepositoryRelease{
-				ID:          &releaseID,
-				TagName:     &r.Node.TagName,
-				Name:        &r.Node.Name,
-				Prerelease:  &r.Node.IsPrerelease,
-				Draft:       &r.Node.IsDraft,
-				URL:         &r.Node.URL,
-				PublishedAt: &github.Timestamp{Time: publishedAt},
-				CreatedAt:   &github.Timestamp{Time: createdAt},
-			})
-		}
-		if !listReleasesEnterprise.Repository.Releases.PageInfo.HasNextPage {
-			break
-		}
-		vars["releaseCursor"] = listReleasesEnterprise.Repository.Releases.PageInfo.EndCursor
-
-	}
-	return allReleases, nil
-}
-
 func (g *GitHubClient) listReleasesV4() ([]*github.RepositoryRelease, error) {
 	if g.clientV4 == nil {
 		return nil, errors.New("github graphql is not been initialised")
@@ -117,7 +46,6 @@ func (g *GitHubClient) listReleasesV4() ([]*github.RepositoryRelease, error) {
 		}
 
 		for _, r := range listReleases.Repository.Releases.Edges {
-			r := r
 			publishedAt, _ := time.ParseInLocation(time.RFC3339, r.Node.PublishedAt.Time.Format(time.RFC3339), time.UTC)
 			createdAt, _ := time.ParseInLocation(time.RFC3339, r.Node.CreatedAt.Time.Format(time.RFC3339), time.UTC)
 			var releaseID int64

model.go

@@ -15,16 +15,3 @@ type ReleaseObject struct {
 	TagName      string            `graphql:"tagName"`
 	URL          string            `graphql:"url"`
 }
-
-// ReleaseObjectEnterprise Workaround until DatabaseId will appear in enterprise installation
-// https://github.com/concourse/github-release-resource/issues/109
-type ReleaseObjectEnterprise struct {
-	CreatedAt    githubv4.DateTime `graphql:"createdAt"`
-	PublishedAt  githubv4.DateTime `graphql:"publishedAt"`
-	ID           string            `graphql:"id"`
-	IsDraft      bool              `graphql:"isDraft"`
-	IsPrerelease bool              `graphql:"isPrerelease"`
-	Name         string            `graphql:"name"`
-	TagName      string            `graphql:"tagName"`
-	URL          string            `graphql:"url"`
-}