Procházet zdrojové kódy

consistency to fetch the pull request

Mohammed Nafees před 3 roky
rodič
revize
726212f296
1 změnil soubory, kde provedl 16 přidání a 16 odebrání
  1. 16 16
      api/server/handlers/webhook/github_incoming.go

+ 16 - 16
api/server/handlers/webhook/github_incoming.go

@@ -77,7 +77,7 @@ func (c *GithubIncomingWebhookHandler) processPullRequestEvent(event *github.Pul
 		return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s] error reading environment: %w", webhookID, owner, repo, err)
 	}
 
-	if event.PullRequest == nil {
+	if event.GetPullRequest() == nil {
 		return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s] incoming webhook does not have pull request information: %w",
 			webhookID, owner, repo, err)
 	}
@@ -87,26 +87,26 @@ func (c *GithubIncomingWebhookHandler) processPullRequestEvent(event *github.Pul
 
 	if err != nil {
 		return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s, environmentID: %d, prNumber: %d] "+
-			"error getting github client: %w", webhookID, owner, repo, env.ID, event.PullRequest.GetNumber(), err)
+			"error getting github client: %w", webhookID, owner, repo, env.ID, event.GetPullRequest().GetNumber(), err)
 	}
 
 	if env.Mode == "auto" && event.GetAction() == "opened" {
 		_, err := client.Actions.CreateWorkflowDispatchEventByFileName(
 			r.Context(), owner, repo, fmt.Sprintf("porter_%s_env.yml", env.Name),
 			github.CreateWorkflowDispatchEventRequest{
-				Ref: event.PullRequest.GetHead().GetRef(),
+				Ref: event.GetPullRequest().GetHead().GetRef(),
 				Inputs: map[string]interface{}{
-					"pr_number":      strconv.FormatUint(uint64(event.PullRequest.GetNumber()), 10),
-					"pr_title":       event.PullRequest.GetTitle(),
-					"pr_branch_from": event.PullRequest.GetHead().GetRef(),
-					"pr_branch_into": event.PullRequest.GetBase().GetRef(),
+					"pr_number":      strconv.FormatUint(uint64(event.GetPullRequest().GetNumber()), 10),
+					"pr_title":       event.GetPullRequest().GetTitle(),
+					"pr_branch_from": event.GetPullRequest().GetHead().GetRef(),
+					"pr_branch_into": event.GetPullRequest().GetBase().GetRef(),
 				},
 			},
 		)
 
 		if err != nil {
 			return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s, environmentID: %d, prNumber: %d] "+
-				"error creating workflow dispatch event: %w", webhookID, owner, repo, env.ID, event.PullRequest.GetNumber(), err)
+				"error creating workflow dispatch event: %w", webhookID, owner, repo, env.ID, event.GetPullRequest().GetNumber(), err)
 		}
 	} else if event.GetAction() == "synchronize" || event.GetAction() == "closed" {
 		depl, err := c.Repo().Environment().ReadDeploymentByGitDetails(
@@ -115,7 +115,7 @@ func (c *GithubIncomingWebhookHandler) processPullRequestEvent(event *github.Pul
 
 		if err != nil {
 			return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s, environmentID: %d, prNumber: %d] "+
-				"error reading deployment: %w", webhookID, owner, repo, env.ID, event.PullRequest.GetNumber(), err)
+				"error reading deployment: %w", webhookID, owner, repo, env.ID, event.GetPullRequest().GetNumber(), err)
 		}
 
 		if depl.Status == types.DeploymentStatusInactive {
@@ -126,12 +126,12 @@ func (c *GithubIncomingWebhookHandler) processPullRequestEvent(event *github.Pul
 			_, err := client.Actions.CreateWorkflowDispatchEventByFileName(
 				r.Context(), owner, repo, fmt.Sprintf("porter_%s_env.yml", env.Name),
 				github.CreateWorkflowDispatchEventRequest{
-					Ref: event.PullRequest.GetHead().GetRef(),
+					Ref: event.GetPullRequest().GetHead().GetRef(),
 					Inputs: map[string]interface{}{
-						"pr_number":      strconv.FormatUint(uint64(event.PullRequest.GetNumber()), 10),
-						"pr_title":       event.PullRequest.GetTitle(),
-						"pr_branch_from": event.PullRequest.GetHead().GetRef(),
-						"pr_branch_into": event.PullRequest.GetBase().GetRef(),
+						"pr_number":      strconv.FormatUint(uint64(event.GetPullRequest().GetNumber()), 10),
+						"pr_title":       event.GetPullRequest().GetTitle(),
+						"pr_branch_from": event.GetPullRequest().GetHead().GetRef(),
+						"pr_branch_into": event.GetPullRequest().GetBase().GetRef(),
 					},
 				},
 			)
@@ -139,7 +139,7 @@ func (c *GithubIncomingWebhookHandler) processPullRequestEvent(event *github.Pul
 			if err != nil {
 				return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s, environmentID: %d, deploymentID: %d, prNumber: %d] "+
 					"error creating workflow dispatch event: %w", webhookID, owner, repo, env.ID, depl.ID,
-					event.PullRequest.GetNumber(), err)
+					event.GetPullRequest().GetNumber(), err)
 			}
 		} else {
 			err = c.deleteDeployment(r, depl, env, client)
@@ -147,7 +147,7 @@ func (c *GithubIncomingWebhookHandler) processPullRequestEvent(event *github.Pul
 			if err != nil {
 				return fmt.Errorf("[webhookID: %s, owner: %s, repo: %s, environmentID: %d, deploymentID: %d, prNumber: %d] "+
 					"error deleting deployment: %w", webhookID, owner, repo, env.ID, depl.ID,
-					event.PullRequest.GetNumber(), err)
+					event.GetPullRequest().GetNumber(), err)
 			}
 		}
 	}