fix get licenseid

Author: diamonwiggins

.github/workflows/mlflow-ci.yml

@@ -193,34 +193,17 @@ jobs:
           CUSTOMER_NAME="${{ needs.create-release.outputs.customer-id }}"
           echo "Using customer name: $CUSTOMER_NAME"
           
-          # Try to get license ID, with error handling
-          echo "Attempting to get license ID..."
-          set +e
+          # Get license ID using the task
+          echo "Getting license ID..."
           INSTALLATION_ID=$(CUSTOMER_NAME="$CUSTOMER_NAME" task customer:get-license-id)
-          GET_LICENSE_RESULT=$?
-          set -e
-          
-          if [ $GET_LICENSE_RESULT -ne 0 ]; then
-            echo "Failed to get license ID. Error code: $GET_LICENSE_RESULT"
-            echo "Output from get-license-id task:"
-            echo "$INSTALLATION_ID"
-            # List customers as a diagnostic step
-            echo "Listing all customers for diagnostic purposes:"
-            docker run --rm \
-              -e REPLICATED_API_TOKEN=${{ secrets.REPLICATED_PLATFORM_EXAMPLES_TOKEN }} \
-              -e REPLICATED_APP=${{ env.APP_SLUG }} \
-              replicated/vendor-cli:latest \
-              customer ls
-            exit 1
-          fi
           
-          # Check that we got a valid looking license ID
-          if [[ ! "$INSTALLATION_ID" =~ ^[a-zA-Z0-9]+$ ]]; then
-            echo "License ID doesn't look valid: '$INSTALLATION_ID'"
+          # Check if we got a result
+          if [ -z "$INSTALLATION_ID" ]; then
+            echo "ERROR: Got empty license ID"
             exit 1
           fi
           
-          echo "Successfully retrieved license ID: $INSTALLATION_ID"
+          echo "License ID: $INSTALLATION_ID"
           echo "license_id=$INSTALLATION_ID" >> $GITHUB_OUTPUT
         env:
           REPLICATED_API_TOKEN: ${{ secrets.REPLICATED_PLATFORM_EXAMPLES_TOKEN }}

applications/mlflow/Taskfile.yml

@@ -263,37 +263,54 @@ tasks:
           -e REPLICATED_API_TOKEN=$REPLICATED_API_TOKEN \
           -e REPLICATED_APP={{.APP_NAME}} \
           replicated/vendor-cli:latest \
-          customer inspect --customer "{{.CUSTOMER_NAME}}" --output json > $OUTPUT_FILE 2>&1
+          customer inspect --customer "{{.CUSTOMER_NAME}}" > $OUTPUT_FILE 2>&1
         
-        # Check if the output contains valid JSON
-        if ! grep -q "{" $OUTPUT_FILE; then
-          echo "ERROR: vendor-cli did not return valid JSON. Output:"
+        # Check if the command succeeded
+        if [ $? -ne 0 ]; then
+          echo "ERROR: vendor-cli command failed. Output:"
           cat $OUTPUT_FILE
           rm $OUTPUT_FILE
           exit 1
         fi
         
-        # Try to extract installationId from the JSON
-        if command -v jq >/dev/null 2>&1; then
-          # If jq is available, use it for proper JSON parsing
-          INSTALLATION_ID=$(cat $OUTPUT_FILE | jq -r '.installationId // empty')
-        else
-          # Fallback to grep/sed if jq is not available
-          INSTALLATION_ID=$(grep -o '"installationId"[[:space:]]*:[[:space:]]*"[^"]*"' $OUTPUT_FILE | sed 's/.*"\([^"]*\)".*/\1/')
+        # Try direct extraction using grep pattern for the installationId
+        INSTALLATION_ID=$(grep -o '"installationId": *"[^"]*"' $OUTPUT_FILE | grep -o '"[^"]*"$' | tr -d '"' || true)
+        
+        # If grep didn't find it, try as a fallback to parse via jq if the file looks like JSON
+        if [ -z "$INSTALLATION_ID" ] && grep -q "^{" $OUTPUT_FILE; then
+          echo "Attempting to extract installation ID with jq..."
+          set +e # Don't exit on error
+          if command -v jq >/dev/null 2>&1; then
+            INSTALLATION_ID=$(cat $OUTPUT_FILE | jq -r '.installationId // empty' 2>/dev/null || true)
+          fi
+          set -e
         fi
         
         # Check if we got a valid ID
         if [ -z "$INSTALLATION_ID" ]; then
-          echo "Failed to extract installationId from customer JSON"
-          echo "JSON structure:" 
-          cat $OUTPUT_FILE
-          rm $OUTPUT_FILE
-          exit 1
+          echo "Failed to extract installationId from vendor-cli output"
+          echo "Output content:" 
+          cat $OUTPUT_FILE | head -n 20
+          
+          # Special case: If the output appears to be just a plain string already, use that
+          if [ $(wc -l < $OUTPUT_FILE) -eq 1 ] && [ $(wc -w < $OUTPUT_FILE) -eq 1 ]; then
+            echo "Output appears to be a single token, using it directly as the license ID"
+            INSTALLATION_ID=$(cat $OUTPUT_FILE | tr -d '[:space:]')
+          else
+            rm $OUTPUT_FILE
+            exit 1
+          fi
         fi
         
         # Clean up the temporary file
         rm $OUTPUT_FILE
         
+        # Validate the ID format (alphanumeric)
+        if ! [[ $INSTALLATION_ID =~ ^[a-zA-Z0-9]+$ ]]; then
+          echo "ERROR: Extracted installation ID doesn't match expected format: '$INSTALLATION_ID'"
+          exit 1
+        fi
+        
         # Print the license ID so it can be captured
         echo "$INSTALLATION_ID"