Merge pull request #5 from Aiven-Open/add_tags

add AI tags

Author: HelenMel

skills/aiven-kafka-setup-avn/SKILL.md

@@ -8,7 +8,7 @@ description: >
   no need to specify it explicitly. This skill covers the avn CLI workflow; other skills
   cover Terraform, MCP, and REST API approaches. Use when the user mentions Kafka —
   e.g. "create a Kafka cluster", "set up Kafka", "start a Kafka", or "start a Kafka service".
-version: "0.1"
+version: "0.1.1"
 license: Apache-2.0
 allowed-tools: Bash(avn:*) Bash(jq:*) Bash(curl:*) Read
 ---
@@ -36,13 +36,22 @@ Run the following to check if the user is logged in:
 avn user info
 ```
 
-**If the command fails**, instruct the user:
+**If the command fails**, inspect the error and guide the user accordingly:
 
 ```
-You are not logged in to the Aiven CLI. Please run:
+If the error contains "Expired db token":
 
+  Your Aiven login token expired. Please run:
   avn user login <your-email>
 
+If the error contains "ERROR: Not logged in" or "UserError: not authenticated":
+
+  You are not logged in to the Aiven CLI. Please run:
+  avn user login <your-email>
+
+  If you are a new user, create an account via:
+  https://console.aiven.io/login
+
 Then confirm when you are logged in.
 ```
 
@@ -68,8 +77,9 @@ Follow **[SERVICE_CREATION_AVN.md](SERVICE_CREATION_AVN.md)** sections 1–4 in
 
 1. **Choose a region** — ask the user with AskQuestion, mapping their choice to the **EXACT** `CLOUD_NAME` from the table in **[SERVICE_CREATION_AVN.md](SERVICE_CREATION_AVN.md)**.
 2. **Choose a plan** — default `startup-4`; **never** use `free-0` or `startup-2`.
-3. **Run the setup script** — a single command creates the service, users, ACLs,
-   schema, extracts all connection details, and writes them to `env.sh`.
+3. **Run the setup script** — a single command creates the service, tags it with
+   `AI-skill-generated=true`, creates users and ACLs, registers the schema,
+   extracts all connection details, and writes them to `env.sh`.
 4. **Source `env.sh`** — loads `KAFKA_HOST`, `KAFKA_PORT`, `SCHEMA_REGISTRY_URL`,
    `AVNADMIN_PASS`, `PRODUCER_PASSWORD`, `CONSUMER_PASSWORD` into the shell.
 

skills/aiven-kafka-setup-avn/reference.md

@@ -45,6 +45,9 @@ avn service create <SERVICE_NAME> \
 # Wait until service is RUNNING
 avn service wait <SERVICE_NAME>
 
+# Tag the service for AI-generated demo environments
+avn service tags update <SERVICE_NAME> --add-tag AI-skill-generated=true
+
 # Get service details as JSON (preferred — use jq to extract fields)
 avn service get <SERVICE_NAME> --json | jq '{service_uri, service_uri_params, components: [.components[] | {component, route, host, port}]}'
 
@@ -150,7 +153,8 @@ avn service schema get <SERVICE_NAME> --subject <SUBJECT> --version latest
 
 | Problem | Cause | Fix |
 |---------|-------|-----|
-| `avn user info` fails | Not logged in | Run `avn user login <email>` |
+| `avn user info` fails with `Expired db token` | Login token expired | Run `avn user login <email>` again |
+| `avn user info` fails with `ERROR: Not logged in` or `UserError: not authenticated` | Not authenticated yet | Run `avn user login <email>` or create an account via `https://console.aiven.io/login` |
 | Service stuck in POWERING_OFF | Ongoing operations | Wait or contact Aiven support |
 | `SASL authentication failed` | Wrong password or user not created | Re-run `avn service user-password-reset` and re-export env var |
 | `SSL: CERTIFICATE_VERIFY_FAILED` | Missing or wrong CA cert | Re-download certs: `avn service user-creds-download` |

skills/aiven-kafka-setup-avn/scripts/setup_aiven_kafka.sh

@@ -23,7 +23,28 @@ KAFKA_VERSION="${4:-4.1}"
 TOPIC="orders"
 
 echo "==> Checking avn login..."
-avn user info || { echo "ERROR: Not logged in. Run: avn user login <email>"; exit 1; }
+set +e
+AVN_USER_INFO_OUTPUT=$(avn user info 2>&1)
+AVN_USER_INFO_EXIT=$?
+set -e
+
+if [ "$AVN_USER_INFO_EXIT" -ne 0 ]; then
+  # Reason: `avn user info` uses different error messages for expired tokens
+  # and users who have not authenticated yet, so surface the right next step.
+  case "$AVN_USER_INFO_OUTPUT" in
+    *"Expired db token"*)
+      echo "ERROR: Aiven login token expired. Run: avn user login <email>" >&2
+      ;;
+    *"ERROR: Not logged in"*|*"UserError: not authenticated"*)
+      echo "ERROR: Not authenticated. Run: avn user login <email> or, if you are a new user, create an account via https://console.aiven.io/login" >&2
+      ;;
+    *)
+      printf '%s\n' "$AVN_USER_INFO_OUTPUT" >&2
+      echo "ERROR: Failed to verify avn login. Run: avn user login <email> if needed." >&2
+      ;;
+  esac
+  exit 1
+fi
 
 echo "==> Creating Kafka service: $KAFKA_SERVICE (cloud=$CLOUD_NAME, plan=$PLAN, kafka=$KAFKA_VERSION)"
 if ! avn service get "$KAFKA_SERVICE" >/dev/null 2>&1; then
@@ -40,6 +61,10 @@ fi
 echo "==> Waiting for service to be RUNNING..."
 avn service wait "$KAFKA_SERVICE"
 
+echo "==> Tagging service..."
+# Reason: `avn` expects tags in `key=value` form rather than a bare label.
+avn service tags update "$KAFKA_SERVICE" --add-tag AI-skill-generated=true
+
 echo "==> Downloading certificates..."
 mkdir -p cert
 avn service user-creds-download "$KAFKA_SERVICE" --username avnadmin -d cert/