neonctl 2.1.0 → 2.3.0

package/analytics.js

@@ -57,6 +57,9 @@ export const analyticsMiddleware = async (args) => {
             ci: isCi(),
             githubEnvVars: getGithubEnvVars(process.env),
         },
+        context: {
+            direct: true,
+        },
     });
 };
 export const closeAnalytics = async () => {

package/env.js

@@ -7,36 +7,30 @@ export const isDebug = () => {
 export const getGithubEnvVars = (env) => {
     const vars = [
         // github action info
-        'GITHUB_ACTION',
         'GITHUB_ACTION_PATH',
-        'GITHUB_ACTION_REPOSITORY',
-        // source github repository and actor info
-        'GITHUB_REF_TYPE',
-        'GITHUB_REF',
-        'GITHUB_REF_NAME',
-        'GITHUB_BASE_REF',
-        'GITHUB_HEAD_REF',
-        'GITHUB_JOB',
-        'GITHUB_SHA',
+        // source github repository
         'GITHUB_REPOSITORY',
-        'GITHUB_REPOSITORY_ID',
-        'GITHUB_REPOSITORY_OWNER',
-        'GITHUB_REPOSITORY_OWNER_ID',
-        'GITHUB_TRIGGERING_ACTOR',
-        'GITHUB_ACTOR',
-        'GITHUB_ACTOR_ID',
-        'GITHUB_EVENT_NAME',
+        // environment info
+        'GITHUB_RUN_ID',
         'GITHUB_RUN_NUMBER',
-        // reusable workflow info
-        'GITHUB_WORKFLOW',
+        'GITHUB_SERVER_URL',
         'GITHUB_WORKFLOW_REF',
-        'GITHUB_WORKFLOW_SHA',
+        'RUNNER_ARCH',
+        'RUNNER_ENVIRONMENT',
+        'RUNNER_OS',
     ];
     const map = new Map();
     vars.forEach((v) => {
-        if (env[v]) {
-            map.set(v, env[v]);
+        let value = env[v];
+        if (value === undefined || value === '') {
+            return;
         }
+        if (v === 'GITHUB_ACTION_PATH') {
+            value = value.includes('actions/')
+                ? value.replace(/^.*actions\/(.+)$/, '$1')
+                : value;
+        }
+        map.set(v, value);
     });
     return Object.fromEntries(map);
 };

package/env.test.js

@@ -3,54 +3,53 @@ import { getGithubEnvVars } from './env';
 describe('getGithubEnvVars', () => {
     it('success all keys', () => {
         const env = {
-            GITHUB_ACTION: '1',
-            GITHUB_ACTION_PATH: '2',
-            GITHUB_ACTION_REPOSITORY: '3',
-            GITHUB_REF_TYPE: '4',
-            GITHUB_REF: '5',
-            GITHUB_REF_NAME: '6',
-            GITHUB_BASE_REF: '7',
-            GITHUB_HEAD_REF: '8',
-            GITHUB_JOB: '9',
-            GITHUB_SHA: '10',
-            GITHUB_REPOSITORY: '11',
-            GITHUB_REPOSITORY_ID: '12',
-            GITHUB_REPOSITORY_OWNER: '13',
-            GITHUB_REPOSITORY_OWNER_ID: '14',
-            GITHUB_TRIGGERING_ACTOR: '15',
-            GITHUB_ACTOR: '16',
-            GITHUB_ACTOR_ID: '17',
-            GITHUB_EVENT_NAME: '18',
-            GITHUB_RUN_NUMBER: '19',
-            GITHUB_WORKFLOW: '20',
-            GITHUB_WORKFLOW_REF: '21',
-            GITHUB_WORKFLOW_SHA: '22',
+            GITHUB_ACTION_PATH: '1',
+            GITHUB_REPOSITORY: '2',
+            GITHUB_RUN_ID: '3',
+            GITHUB_RUN_NUMBER: '4',
+            GITHUB_SERVER_URL: '5',
+            GITHUB_WORKFLOW_REF: '6',
+            RUNNER_ARCH: '7',
+            RUNNER_ENVIRONMENT: '8',
+            RUNNER_OS: '9',
             unrelated: 'unrelated',
         };
         const ret = {
-            GITHUB_ACTION: '1',
-            GITHUB_ACTION_PATH: '2',
-            GITHUB_ACTION_REPOSITORY: '3',
-            GITHUB_REF_TYPE: '4',
-            GITHUB_REF: '5',
-            GITHUB_REF_NAME: '6',
-            GITHUB_BASE_REF: '7',
-            GITHUB_HEAD_REF: '8',
-            GITHUB_JOB: '9',
-            GITHUB_SHA: '10',
-            GITHUB_REPOSITORY: '11',
-            GITHUB_REPOSITORY_ID: '12',
-            GITHUB_REPOSITORY_OWNER: '13',
-            GITHUB_REPOSITORY_OWNER_ID: '14',
-            GITHUB_TRIGGERING_ACTOR: '15',
-            GITHUB_ACTOR: '16',
-            GITHUB_ACTOR_ID: '17',
-            GITHUB_EVENT_NAME: '18',
-            GITHUB_RUN_NUMBER: '19',
-            GITHUB_WORKFLOW: '20',
-            GITHUB_WORKFLOW_REF: '21',
-            GITHUB_WORKFLOW_SHA: '22',
+            GITHUB_ACTION_PATH: '1',
+            GITHUB_REPOSITORY: '2',
+            GITHUB_RUN_ID: '3',
+            GITHUB_RUN_NUMBER: '4',
+            GITHUB_SERVER_URL: '5',
+            GITHUB_WORKFLOW_REF: '6',
+            RUNNER_ARCH: '7',
+            RUNNER_ENVIRONMENT: '8',
+            RUNNER_OS: '9',
         };
         expect(getGithubEnvVars(env)).toEqual(ret);
     });
+    it('empty all keys', () => {
+        expect(getGithubEnvVars({})).toEqual({});
+    });
+    it('action path', () => {
+        expect(getGithubEnvVars({
+            GITHUB_ACTION_PATH: '/home/runner/work/_actions/neondatabase/create-branch-action/v5',
+        })).toEqual({
+            GITHUB_ACTION_PATH: 'neondatabase/create-branch-action/v5',
+        });
+        expect(getGithubEnvVars({
+            GITHUB_ACTION_PATH: '/home/runner/actions-runner/_work/actions/neondatabase/create-branch-action/v5',
+        })).toEqual({
+            GITHUB_ACTION_PATH: 'neondatabase/create-branch-action/v5',
+        });
+        expect(getGithubEnvVars({
+            GITHUB_ACTION_PATH: 'C:\\b\\_actions\\neondatabase\\create-branch-action\\v5',
+        })).toEqual({
+            GITHUB_ACTION_PATH: 'C:\\b\\_actions\\neondatabase\\create-branch-action\\v5',
+        });
+        expect(getGithubEnvVars({
+            GITHUB_ACTION_PATH: '/home/runner/work/app/app/./.github/actions/custom-action',
+        })).toEqual({
+            GITHUB_ACTION_PATH: 'custom-action',
+        });
+    });
 });

package/index.js

@@ -28,6 +28,7 @@ import { currentContextFile, enrichFromContext } from './context.js';
 const NO_SUBCOMMANDS_VERBS = [
     // aliases
     'auth',
+    'login',
     'me',
     // aliases
     'cs',

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+ssh://git@github.com/neondatabase/neonctl.git"
   },
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "CLI tool for NeonDB Cloud management",
   "main": "index.js",
   "author": "NeonDB",