fix: failing init if remote is not set

garden-io · Dec 20, 2019 · 938bb20 · 938bb20
1 parent 4b3629b
commit 938bb20
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/garden-service/src/analytics/analytics.ts b/garden-service/src/analytics/analytics.ts
@@ -34,6 +34,7 @@ export interface SystemInfo {
 
 export interface AnalyticsEventProperties {
   projectId: string
+  projectName: string
   system: SystemInfo
   isCI: boolean
   sessionId: string
@@ -107,6 +108,7 @@ export class AnalyticsHandler {
   private globalConfig: AnalyticsGlobalConfig
   private globalConfigStore: GlobalConfigStore
   private projectId = ""
+  private projectName = ""
   private systemConfig: SystemInfo
   private isCI = ci.isCI
   private sessionId = uuid.v4()
@@ -171,7 +173,8 @@ export class AnalyticsHandler {
 
     const vcs = new GitHandler(process.cwd(), [])
     const originName = await vcs.getOriginName(this.log)
-    this.projectId = originName ? hasha(originName, { algorithm: "sha256" }) : "unset"
+    this.projectName = hasha(this.garden.projectName, { algorithm: "sha256" })
+    this.projectId = originName ? hasha(originName, { algorithm: "sha256" }) : this.projectName
 
     if (this.globalConfig.firstRun || this.globalConfig.showOptInMessage) {
       if (!this.isCI) {
@@ -273,6 +276,7 @@ export class AnalyticsHandler {
   private getBasicAnalyticsProperties(): AnalyticsEventProperties {
     return {
       projectId: this.projectId,
+      projectName: this.projectName,
       system: this.systemConfig,
       isCI: this.isCI,
       sessionId: this.sessionId,

diff --git a/garden-service/src/vcs/git.ts b/garden-service/src/vcs/git.ts
@@ -389,6 +389,11 @@ export class GitHandler extends VcsHandler {
   async getOriginName(log: LogEntry) {
     const cwd = process.cwd()
     const git = this.gitCli(log, cwd)
-    return (await git("config", "--get", "remote.origin.url"))[0]
+    try {
+      return (await git("config", "--get", "remote.origin.url"))[0]
+    } catch (error) {
+      log.silly(`Trying to retrieve "git remote origin.url" but encountered an error: ${error}`)
+    }
+    return undefined
   }
 }