Generate the CRN (#10)

Reviewed-on: #10
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>

.gitea/workflows/publish.yaml

@@ -1,34 +1,31 @@
-name: Publish ApplicationRecord to Registry
+name: Publish ApplicationRecord to Registry
-on:
+on:
-  release:
+  release:
-    types: [published]
+    types: [published]
-jobs:
+
-  cns_publish:
+env:
-    runs-on: ubuntu-latest
+  CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
-    steps:
+  CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
-      - name: "Clone project repository"
+
-        uses: actions/checkout@v3
+jobs:
-      - name: Use Node.js
+  cns_publish:
-        uses: actions/setup-node@v3
+    runs-on: ubuntu-latest
-        with:
+    steps:
-          node-version: 18
+      - name: "Clone project repository"
-      - name: "Install Yarn"
+        uses: actions/checkout@v3
-        run: npm install -g yarn
+      - name: Use Node.js
-      - name: "Install registry CLI"
+        uses: actions/setup-node@v3
-        run: |
+        with:
-          npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
+          node-version: 18
-          yarn global add @cerc-io/laconic-registry-cli
+      - name: "Install Yarn"
-      - name: "Install jq"
+        run: npm install -g yarn
-        run: apt -y update && apt -y install jq
+      - name: "Install registry CLI"
-      - name: "Publish Application Record"
+        run: |
-        env:
+          npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
-          CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_CERCIO_USER_KEY }}
+          yarn global add @cerc-io/laconic-registry-cli
-          CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_CERCIO_BOND_ID }}
+      - name: "Install jq"
-          CERC_REGISTRY_APP_CRN: "crn://cerc-io/applications/test-progressive-web-app"
+        run: apt -y update && apt -y install jq
-        run: scripts/publish-app-record.sh
+      - name: "Publish Application Record"
-      - name: "Request Deployment"
+        run: scripts/publish-app-record.sh
-        env:
+      - name: "Request Deployment"
-          CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
+        run: scripts/request-app-deployment.sh
-          CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
-          CERC_REGISTRY_APP_CRN: "crn://cerc-io/applications/test-progressive-web-app"
-        run: scripts/request-app-deployment.sh

package.json

@@ -1,22 +1,22 @@
-{
+{
-  "private": true,
+  "private": true,
-  "name": "@cerc-io/test-progressive-web-app",
+  "name": "@cerc-io/test-progressive-web-app",
-  "version": "0.1.2",
+  "version": "0.1.4",
-  "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app",
+  "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app",
-  "scripts": {
+  "scripts": {
-    "dev": "next dev",
+    "dev": "next dev",
-    "build": "next build",
+    "build": "next build",
-    "start": "next start"
+    "start": "next start"
-  },
+  },
-  "dependencies": {
+  "dependencies": {
-    "next": "latest",
+    "next": "latest",
-    "next-pwa": "^5.6.0",
+    "next-pwa": "^5.6.0",
-    "react": "^18.2.0",
+    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0"
-  },
+  },
-  "devDependencies": {
+  "devDependencies": {
-    "@types/node": "17.0.4",
+    "@types/node": "17.0.4",
-    "@types/react": "17.0.38",
+    "@types/react": "17.0.38",
-    "typescript": "4.5.4"
+    "typescript": "4.5.4"
-  }
+  }
-}
+}

scripts/publish-app-record.sh

@@ -54,13 +54,17 @@ cat $RECORD_FILE
 RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
 echo $RECORD_ID
 
-if [ -n "$CERC_REGISTRY_APP_CRN" ]; then
+if [ -z "$CERC_REGISTRY_APP_CRN" ]; then
-  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${rcd_app_version}" "$RECORD_ID"
+  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
-  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${CERC_REPO_REF}" "$RECORD_ID"
+  app=$(echo "$rcd_name" | cut -d'/' -f2-)
-  if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
+  CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
-    laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN" "$RECORD_ID"
+fi
-    laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@latest" "$RECORD_ID"
+
-  fi
+laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${rcd_app_version}" "$RECORD_ID"
+laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${CERC_REPO_REF}" "$RECORD_ID"
+if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
+  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN" "$RECORD_ID"
+  laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@latest" "$RECORD_ID"
 fi
 
 rm -f $RECORD_FILE $CONFIG_FILE

scripts/request-app-deployment.sh

@@ -19,8 +19,9 @@ services:
 EOF
 
 if [ -z "$CERC_REGISTRY_APP_CRN" ]; then
-  echo "CERC_REGISTRY_APP_CRN is required." 1>&2
+  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
-  exit 1
+  app=$(echo "$rcd_name" | cut -d'/' -f2-)
+  CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
 fi
 
 APP_RECORD=$(laconic -c $CONFIG_FILE cns name resolve "$CERC_REGISTRY_APP_CRN" | jq '.[0]')