Merge pull request #69 from theBeginner86/thebeginner86/chore/3

[chore] Fix env variables
meshery · Nov 27, 2024 · dfcad30 · dfcad30
2 parents d8cd451 + 09a748e
commit dfcad30
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/.goreleaser.yml b/.github/.goreleaser.yml
@@ -10,8 +10,8 @@ builds:
     ldflags:
       - -s -w
       - -X main.providerToken={{.Env.PROVIDER_TOKEN}}
-      - -X main.MesheryCloudAPIBaseURL="https://cloud.layer5.io"
-      - -X main.MesheryAPIBaseURL="https://playground.meshery.io"
+      - -X main.mesheryCloudAPIBaseURL="https://cloud.layer5.io"
+      - -X main.mesheryAPIBaseURL="https://playground.meshery.io"
     goos:
       - linux
       - darwin

diff --git a/cmd/kanvas-snapshot/cmd.go b/cmd/kanvas-snapshot/cmd.go
@@ -263,7 +263,10 @@ func isValidEmail(email string) bool {
 	return emailRegex.MatchString(email)
 }
 
-func Main() {
+func Main(providerToken, mesheryCloudAPIBaseURL, mesheryAPIBaseURL string) {
+	ProviderToken = providerToken
+	MesheryCloudAPIBaseURL = mesheryCloudAPIBaseURL
+	MesheryAPIBaseURL = mesheryAPIBaseURL
 	generateKanvasSnapshotCmd.Flags().StringVarP(&chartURI, "file", "f", "", "URI to Helm chart (required)")
 	generateKanvasSnapshotCmd.Flags().StringVarP(&designName, "design-name", "n", "", "Optional name for the Meshery design")
 	generateKanvasSnapshotCmd.Flags().StringVarP(&email, "email", "e", "", "Optional email to associate with the Meshery design")

diff --git a/main.go b/main.go
@@ -4,6 +4,12 @@ import (
 	cmd "github.com/meshery/helm-kanvas-snapshot/cmd/kanvas-snapshot"
 )
 
+var (
+	providerToken          string
+	mesheryCloudAPIBaseURL string
+	mesheryAPIBaseURL      string
+)
+
 func main() {
-	cmd.Main()
+	cmd.Main(providerToken, mesheryCloudAPIBaseURL, mesheryAPIBaseURL)
 }