From 6ee121a70ac9c9f04e0d7fe755af5f4e6113fd37 Mon Sep 17 00:00:00 2001
From: Abin Simon <abinsimon10@gmail.com>
Date: Thu, 8 Dec 2022 13:37:52 +0530
Subject: [PATCH] Use corso version with event reporting (#1721)

## Description

Add version of the current binary when reporting.

## Type of change

<!--- Please check the type of change your PR introduces: --->
- [ ] :sunflower: Feature
- [ ] :bug: Bugfix
- [ ] :world_map: Documentation
- [ ] :robot: Test
- [ ] :computer: CI/Deployment
- [x] :hamster: Trivial/Minor

## Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. -->
* https://github.com/alcionai/corso/issues/1594

## Test Plan

<!-- How will this be tested prior to merging.-->
- [x] :muscle: Manual
- [ ] :zap: Unit test
- [ ] :green_heart: E2E
---
 .github/workflows/ci.yml        | 2 +-
 src/.goreleaser.yaml            | 2 +-
 src/cli/cli.go                  | 5 ++---
 src/internal/events/events.go   | 3 ++-
 src/internal/version/version.go | 3 +++
 5 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 src/internal/version/version.go

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6daa96974..ea2e3fdd3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -492,7 +492,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            CORSO_BUILD_LDFLAGS=-X 'github.com/alcionai/corso/src/internal/events.RudderStackWriteKey=${{ secrets.RUDDERSTACK_CORSO_WRITE_KEY }}' -X 'github.com/alcionai/corso/src/internal/events.RudderStackDataPlaneURL=${{ secrets.RUDDERSTACK_CORSO_DATA_PLANE_URL }}' -X 'github.com/alcionai/corso/src/cli.version=${{ needs.SetEnv.outputs.version }}'
+            CORSO_BUILD_LDFLAGS=-X 'github.com/alcionai/corso/src/internal/events.RudderStackWriteKey=${{ secrets.RUDDERSTACK_CORSO_WRITE_KEY }}' -X 'github.com/alcionai/corso/src/internal/events.RudderStackDataPlaneURL=${{ secrets.RUDDERSTACK_CORSO_DATA_PLANE_URL }}' -X 'github.com/alcionai/corso/src/internal/version.Version=${{ needs.SetEnv.outputs.version }}'
           # use the github cache
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/src/.goreleaser.yaml b/src/.goreleaser.yaml
index 51c0b3461..c6045222e 100644
--- a/src/.goreleaser.yaml
+++ b/src/.goreleaser.yaml
@@ -13,7 +13,7 @@ builds:
       - goos: windows
         goarch: arm64
     ldflags:
-          - -X 'github.com/alcionai/corso/src/cli.version={{.Env.CORSO_VERSION}}'
+          - -X 'github.com/alcionai/corso/src/internal/version.Version={{.Env.CORSO_VERSION}}'
           - -X 'github.com/alcionai/corso/src/internal/events.RudderStackWriteKey={{.Env.RUDDERSTACK_CORSO_WRITE_KEY}}'
           - -X 'github.com/alcionai/corso/src/internal/events.RudderStackDataPlaneURL={{.Env.RUDDERSTACK_CORSO_DATA_PLANE_URL}}'
 
diff --git a/src/cli/cli.go b/src/cli/cli.go
index 378675003..c9b2a333e 100644
--- a/src/cli/cli.go
+++ b/src/cli/cli.go
@@ -16,11 +16,10 @@ import (
 	"github.com/alcionai/corso/src/cli/repo"
 	"github.com/alcionai/corso/src/cli/restore"
 	"github.com/alcionai/corso/src/internal/observe"
+	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/logger"
 )
 
-var version = "dev"
-
 // ------------------------------------------------------------------------------------------
 // Corso Command
 // ------------------------------------------------------------------------------------------
@@ -40,7 +39,7 @@ var corsoCmd = &cobra.Command{
 func handleCorsoCmd(cmd *cobra.Command, args []string) error {
 	v, _ := cmd.Flags().GetBool("version")
 	if v {
-		print.Outf(cmd.Context(), "Corso\nversion: "+version)
+		print.Outf(cmd.Context(), "Corso\nversion: "+version.Version)
 		return nil
 	}
 
diff --git a/src/internal/events/events.go b/src/internal/events/events.go
index 6a6b1a60b..b4e949044 100644
--- a/src/internal/events/events.go
+++ b/src/internal/events/events.go
@@ -10,6 +10,7 @@ import (
 	"github.com/pkg/errors"
 	analytics "github.com/rudderlabs/analytics-go"
 
+	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/logger"
 	"github.com/alcionai/corso/src/pkg/storage"
@@ -98,7 +99,7 @@ func NewBus(ctx context.Context, s storage.Storage, tenID string, opts control.O
 		client:  client,
 		repoID:  repoHash(s),
 		tenant:  tenantHash(tenID),
-		version: "vTODO", // TODO: corso versioning implementation
+		version: version.Version,
 	}, nil
 }
 
diff --git a/src/internal/version/version.go b/src/internal/version/version.go
new file mode 100644
index 000000000..4a07d07ba
--- /dev/null
+++ b/src/internal/version/version.go
@@ -0,0 +1,3 @@
+package version
+
+var Version = "dev"