PR comments

rilldata · Jul 30, 2024 · 880f729 · 880f729
1 parent f31a127
commit 880f729
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 33 deletions.
diff --git a/admin/server/github.go b/admin/server/github.go
@@ -23,11 +23,11 @@ import (
 	"github.com/google/go-github/v50/github"
 	"github.com/rilldata/rill/admin"
 	"github.com/rilldata/rill/admin/database"
-	"github.com/rilldata/rill/admin/pkg/archive"
 	"github.com/rilldata/rill/admin/pkg/gitutil"
 	"github.com/rilldata/rill/admin/pkg/urlutil"
 	"github.com/rilldata/rill/admin/server/auth"
 	adminv1 "github.com/rilldata/rill/proto/gen/rill/admin/v1"
+	"github.com/rilldata/rill/runtime/pkg/archive"
 	"github.com/rilldata/rill/runtime/pkg/httputil"
 	"github.com/rilldata/rill/runtime/pkg/middleware"
 	"github.com/rilldata/rill/runtime/pkg/observability"
@@ -323,7 +323,7 @@ func (s *Server) ConnectProjectToGithub(ctx context.Context, req *adminv1.Connec
 
 	claims := auth.GetClaims(ctx)
 	if !claims.ProjectPermissions(ctx, proj.OrganizationID, proj.ID).ManageProject {
-		return nil, status.Error(codes.PermissionDenied, "does not have permission to delete project")
+		return nil, status.Error(codes.PermissionDenied, "does not have permission to update project's github connection")
 	}
 
 	user, err := s.admin.DB.FindUser(ctx, claims.OwnerID())
@@ -1006,18 +1006,18 @@ func (s *Server) pushToGit(ctx context.Context, copyData func(dir, projPath stri
 		SingleBranch:  true,
 	})
 	if err != nil {
-		if errors.Is(err, transport.ErrEmptyRemoteRepository) {
-			empty = true
-			ghRepo, err = git.PlainInitWithOptions(gitPath, &git.PlainInitOptions{
-				InitOptions: git.InitOptions{
-					DefaultBranch: plumbing.NewBranchReferenceName(branch),
-				},
-				Bare: false,
-			})
-			if err != nil {
-				return fmt.Errorf("failed to init git repo: %w", err)
-			}
-		} else {
+		if !errors.Is(err, transport.ErrEmptyRemoteRepository) {
+			return fmt.Errorf("failed to init git repo: %w", err)
+		}
+
+		empty = true
+		ghRepo, err = git.PlainInitWithOptions(gitPath, &git.PlainInitOptions{
+			InitOptions: git.InitOptions{
+				DefaultBranch: plumbing.NewBranchReferenceName(branch),
+			},
+			Bare: false,
+		})
+		if err != nil {
 			return fmt.Errorf("failed to init git repo: %w", err)
 		}
 	}

diff --git a/runtime/drivers/admin/admin.go b/runtime/drivers/admin/admin.go
@@ -16,10 +16,10 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/mitchellh/mapstructure"
 	"github.com/rilldata/rill/admin/client"
-	"github.com/rilldata/rill/admin/pkg/archive"
 	adminv1 "github.com/rilldata/rill/proto/gen/rill/admin/v1"
 	"github.com/rilldata/rill/runtime/drivers"
 	"github.com/rilldata/rill/runtime/pkg/activity"
+	"github.com/rilldata/rill/runtime/pkg/archive"
 	"github.com/rilldata/rill/runtime/pkg/ctxsync"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"

diff --git a/admin/pkg/archive/archive.go → runtime/pkg/archive/archive.go b/admin/pkg/archive/archive.go → runtime/pkg/archive/archive.go
diff --git a/web-admin/src/features/projects/github/GithubConnectionUpdater.ts b/web-admin/src/features/projects/github/GithubConnectionUpdater.ts
@@ -28,21 +28,17 @@ export class GithubConnectionUpdater {
     private readonly project: string,
   ) {}
 
-  public updateCurrentFields(
-    currentUrl: string,
-    currentSubpath: string,
-    currentBranch: string,
-  ) {
-    this.githubUrl.set(currentUrl);
-    this.subpath.set(currentSubpath);
-    this.branch.set(currentBranch);
-    this.isConnected = !!currentUrl;
+  public init(githubUrl: string, subpath: string, branch: string) {
+    this.githubUrl.set(githubUrl);
+    this.subpath.set(subpath);
+    this.branch.set(branch);
+    this.isConnected = !!githubUrl;
   }
 
   public onRepoChange(repo: ListGithubUserReposResponseRepo) {
     this.subpath.set("");
-    this.branch.set(repo.defaultBranch);
-    this.defaultBranch = repo.defaultBranch;
+    this.branch.set(repo.defaultBranch ?? "");
+    this.defaultBranch = repo.defaultBranch ?? "";
   }
 
   public async update({

diff --git a/web-admin/src/features/projects/github/GithubRepoSelectionDialog.svelte b/web-admin/src/features/projects/github/GithubRepoSelectionDialog.svelte
@@ -56,11 +56,7 @@
     organization,
     project,
   );
-  $: githubConnectionUpdater.updateCurrentFields(
-    currentUrl,
-    currentSubpath,
-    currentBranch,
-  );
+  $: githubConnectionUpdater.init(currentUrl, currentSubpath, currentBranch);
 
   const connectToGithubMutation =
     githubConnectionUpdater.connectToGithubMutation;

diff --git a/web-common/src/metrics/service/BehaviourEventTypes.ts b/web-common/src/metrics/service/BehaviourEventTypes.ts
@@ -10,8 +10,6 @@ export enum BehaviourEventAction {
   DeploySuccess = "deploy-success",
   LoginStart = "login-start",
   LoginSuccess = "login-success",
-  GithubConnectStart = "ghconnected-start",
-  GithubConnectSuccess = "ghconnected-success",
 
   UserInvite = "user-invite",
   UserDomainWhitelist = "user-domain-whitelist",