Merge pull request #4 from coherenceplatform/aa/fix-auth-and-add-more…

…-builds

Add builds and fix auth host

.github/workflows/build-and-release.yml

@@ -57,6 +57,28 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Upload Release Asset (linux/386)
+        id: upload-release-asset-linux-386
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./cocli-linux-386
+          asset_name: cocli-linux-386
+          asset_content_type: application/octet-stream
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload Release Asset (linux/amd64)
+        id: upload-release-asset-linux-amd64
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./cocli-linux-amd64
+          asset_name: cocli-linux-amd64
+          asset_content_type: application/octet-stream
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload Release Asset (windows/arm64)
         id: upload-release-asset-windows-arm64
         uses: actions/upload-release-asset@v1

cocli_build.sh

@@ -6,7 +6,7 @@ if [[ -z "$package_name" ]]; then
   exit 1
 fi
 
-platforms=("darwin/arm64" "linux/arm64" "windows/amd64")
+platforms=("darwin/arm64" "linux/arm64" "linux/386" "linux/amd64" "windows/amd64")
 
 for platform in "${platforms[@]}"
 do

cocli_version.txt

@@ -1 +1 @@
-0.0.1
+0.0.2

pkg/cocli/cliVersionCheck.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strconv"
+	"strings"
 )
 
 type CoherenceMetadata struct {
@@ -37,9 +39,50 @@ func RunCliVersionCheck() {
 
 	metadata := &CoherenceMetadata{}
 	json.Unmarshal(bodyBytes, &metadata)
-	if GetCliVersion() != metadata.CliApiVersion {
+
+	parsedCliVersion, err := semverToFloat(GetCliVersion())
+	if err != nil {
+		panic(err)
+	}
+	parsedMetaCliVersion, err := semverToFloat(metadata.CliApiVersion)
+	if err != nil {
+		panic(err)
+	}
+
+	if parsedCliVersion < parsedMetaCliVersion {
 		fmt.Print("WARNING: There is a newer version of cocli available. Some commands may not work as expected until you update your cocli version\n\n")
 	}
 
 	return
 }
+
+func semverToFloat(version string) (float64, error) {
+	// Split the version string into major and minor parts using the dot as the separator
+	parts := strings.Split(version, ".")
+
+	if len(parts) < 2 {
+		return 0.0, fmt.Errorf("Invalid semver version string: %s", version)
+	}
+
+	// Parse the major component into an integer
+	major, err := strconv.Atoi(parts[0])
+	if err != nil {
+		return 0.0, err
+	}
+
+	// Parse the minor component into a float
+	minorParts := strings.Split(parts[1], "")
+	if len(minorParts) == 0 {
+		return 0.0, fmt.Errorf("Invalid semver version string: %s", version)
+	}
+
+	minorFloat, err := strconv.ParseFloat("0."+strings.Join(minorParts, ""), 64)
+	if err != nil {
+		return 0.0, err
+	}
+
+	// Combine major and minor components into a float
+	versionFloat := float64(major) + minorFloat
+
+	return versionFloat, nil
+}

pkg/cocli/cocli.go

@@ -32,12 +32,12 @@ var devConfig = &CocliConfig{
 
 var prodConfig = &CocliConfig{
 	ClientID:        "YfsRrC0cs29oEMc6Md9QtRopYLWa3785",
-	AuthDomain:      "coherenceplatform.us.auth0.com",
+	AuthDomain:      "auth.withcoherence.com",
 	CoherenceDomain: "app.withcoherence.com",
 }
 
 const (
-	cliVersion    = "0.0.1"
+	cliVersion    = "0.0.2"
 	credsFilename = "~/.cocli/.authtoken"
 )