Updated github provider

futugyou · Jan 11, 2025 · a1b63bc · a1b63bc
1 parent 07bd0b8
commit a1b63bc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 26 deletions.
diff --git a/infr-project/docs/docs.go b/infr-project/docs/docs.go
@@ -1954,13 +1954,13 @@ const docTemplate = `{
                 "createdAt": {
                     "type": "string"
                 },
-                "id": {
+                "environment": {
                     "type": "string"
                 },
-                "name": {
+                "id": {
                     "type": "string"
                 },
-                "plan": {
+                "name": {
                     "type": "string"
                 },
                 "readyState": {

diff --git a/infr-project/docs/swagger.json b/infr-project/docs/swagger.json
@@ -1943,13 +1943,13 @@
                 "createdAt": {
                     "type": "string"
                 },
-                "id": {
+                "environment": {
                     "type": "string"
                 },
-                "name": {
+                "id": {
                     "type": "string"
                 },
-                "plan": {
+                "name": {
                     "type": "string"
                 },
                 "readyState": {

diff --git a/infr-project/docs/swagger.yaml b/infr-project/docs/swagger.yaml
@@ -327,12 +327,12 @@ definitions:
         type: string
       createdAt:
         type: string
+      environment:
+        type: string
       id:
         type: string
       name:
         type: string
-      plan:
-        type: string
       readyState:
         type: string
       readySubstate:

diff --git a/infr-project/platform_provider/github.go b/infr-project/platform_provider/github.go
@@ -249,24 +249,18 @@ func (g *GithubClient) GetProjectAsync(ctx context.Context, filter ProjectFilter
 			}
 		}
 
-		runs := map[string]Deployment{}
-		if gitRuns, _, err := g.client.Actions.ListRepositoryWorkflowRuns(ctx, GITHUB_OWNER, filter.Name, &github.ListWorkflowRunsOptions{
-			Branch:      repository.GetDefaultBranch(),
+		deployments := map[string]Deployment{}
+		if gitDeployments, _, err := g.client.Repositories.ListDeployments(ctx, GITHUB_OWNER, filter.Name, &github.DeploymentsListOptions{
 			ListOptions: github.ListOptions{Page: 1, PerPage: 20},
 		}); err != nil {
 			log.Println(err.Error())
 		} else {
-			for _, v := range gitRuns.WorkflowRuns {
-				badgeUrl, badgeMarkdown := g.buildGithubWorkflowBadge(v.GetName(), v.GetStatus(), v.GetURL())
-				runs[fmt.Sprintf("%d", v.GetID())] = Deployment{
-					ID:            fmt.Sprintf("%d", v.GetID()),
-					Name:          v.GetName(),
-					Plan:          "",
-					ReadyState:    v.GetStatus(),
-					ReadySubstate: v.GetStatus(),
-					CreatedAt:     v.GetCreatedAt().Format(time.RFC3339Nano),
-					BadgeURL:      badgeUrl,
-					BadgeMarkdown: badgeMarkdown,
+			for _, v := range gitDeployments {
+				deployments[fmt.Sprintf("%d", v.GetID())] = Deployment{
+					ID:          fmt.Sprintf("%d", v.GetID()),
+					Name:        v.GetTask(),
+					Environment: v.GetEnvironment(),
+					CreatedAt:   v.GetCreatedAt().Format(time.RFC3339Nano),
 				}
 			}
 		}
@@ -286,7 +280,7 @@ func (g *GithubClient) GetProjectAsync(ctx context.Context, filter ProjectFilter
 		project.WebHooks = hooks
 		project.EnvironmentVariables = envs
 		project.Workflows = wfs
-		project.Deployments = runs
+		project.Deployments = deployments
 		project.Environments = environments
 		resultChan <- &project
 	}()

diff --git a/infr-project/platform_provider/provider.go b/infr-project/platform_provider/provider.go
@@ -55,7 +55,7 @@ type Workflow struct {
 type Deployment struct {
 	ID            string
 	Name          string
-	Plan          string
+	Environment   string
 	ReadyState    string
 	ReadySubstate string
 	CreatedAt     string

diff --git a/infr-project/platform_provider/vercel.go b/infr-project/platform_provider/vercel.go
@@ -248,7 +248,7 @@ func (g *VercelClient) buildVercelDeployment(vercelDeployments []vercel.LatestDe
 		deployments[v.ID] = Deployment{
 			ID:            v.ID,
 			Name:          v.Name,
-			Plan:          v.Plan,
+			Environment:   v.Target,
 			ReadyState:    v.ReadyState,
 			ReadySubstate: v.ReadySubstate,
 			CreatedAt:     tool.Int64ToTime(v.CreatedAt).Format(time.RFC3339Nano),

diff --git a/infr-project/view_models/platform.go b/infr-project/view_models/platform.go
@@ -118,7 +118,7 @@ type Workflow struct {
 type Deployment struct {
 	ID            string `json:"id"`
 	Name          string `json:"name"`
-	Plan          string `json:"plan"`
+	Environment   string `json:"environment"`
 	ReadyState    string `json:"readyState"`
 	ReadySubstate string `json:"readySubstate"`
 	CreatedAt     string `json:"createdAt"`