bump: @humanitec/autogen

dist/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package.json

@@ -10,6 +10,7 @@
   },
   "author": "[email protected]",
   "license": "ISC",
+  "type": "module",
   "devDependencies": {
     "@jest/globals": "^29.7.0",
     "@tsconfig/node20": "^20.1.4",
@@ -29,8 +30,7 @@
   "dependencies": {
     "@actions/core": "^1.10.1",
     "@actions/github": "^5.1.1",
-    "@humanitec/autogen": "^0.0.9",
-    "axios": "^1.6.8",
+    "@humanitec/autogen": "^0.0.10",
     "mustache": "^4.2.0"
   },
   "private": true

src/action.ts

@@ -1,9 +1,10 @@
 import {getOctokit, context} from '@actions/github';
 import {getInput, setOutput, info, getBooleanInput} from '@actions/core';
-import {render} from 'mustache';
+import Mustache from 'mustache';
 
-import {branchNameToEnvId} from './utils';
-import {createApiClient, HumanitecClient} from './humanitec';
+import {branchNameToEnvId} from './utils.js';
+import {createApiClient, HumanitecClient} from './humanitec/index.js';
+import { ResponseError } from '@humanitec/autogen';
 
 type octokit = ReturnType<typeof getOctokit>
 
@@ -17,58 +18,47 @@ async function createEnvironment(input: ActionInput): Promise<void> {
   const image = getInput('image') || `registry.humanitec.io/${orgId}/${imageName}`;
 
 
-  const baseEnvRes = await humClient.orgsOrgIdAppsAppIdEnvsEnvIdGet({
+  const baseEnv = await humClient.getEnvironment({
     orgId,
     appId,
     envId: baseEnvId,
   });
-  if (baseEnvRes.status != 200) {
-    throw new Error(`Unexpected response fetching env: ${baseEnvRes.status}, ${baseEnvRes.data}`);
-  }
-
-  const baseEnv = baseEnvRes.data;
 
   if (!baseEnv.last_deploy) {
     throw new Error(`Environment ${baseEnv.id} has never been deployed`);
   }
 
-  const createEnvRes = await humClient.orgsOrgIdAppsAppIdEnvsPost(
+  const createEnv = await humClient.createEnvironment(
     {
       orgId,
       appId,
-      environmentDefinitionRequest: {
+      EnvironmentDefinitionRequest: {
         from_deploy_id: baseEnv.last_deploy.id,
         id: envId,
         name: envId,
         type: baseEnv.type,
       },
     },
   );
-  if (createEnvRes.status != 201) {
-    throw new Error(`Unexpected response creating env: ${baseEnvRes.status}, ${baseEnvRes.data}`);
-  }
 
-  console.log(`Created environment: ${envId}, ${environmentUrl}`);
+  console.log(`Created environment: ${createEnv.id}, ${environmentUrl}`);
 
 
   if (createAutomationRule) {
     const matchRef =`refs/heads/${branchName}`;
-    const createRuleRes = await humClient.orgsOrgIdAppsAppIdEnvsEnvIdRulesPost({
+    const createRule = await humClient.createAutomationRule({
       orgId,
       appId,
       envId,
-      automationRuleRequest: {
+      AutomationRuleRequest: {
         active: true,
         artefacts_filter: [image],
         type: 'update',
         match_ref: matchRef,
       },
     });
-    if (createRuleRes.status != 201) {
-      throw new Error(`Unexpected response creating rule: ${baseEnvRes.status}, ${baseEnvRes.data}`);
-    }
 
-    console.log(`Created auto-deployment rule for ${matchRef} and image ${image}`);
+    console.log(`Created auto-deployment rule for ${createRule.match_ref} and image ${createRule.artefacts_filter[0]}`);
   }
 
 
@@ -171,11 +161,16 @@ async function notifyDeploy(input: NotifyInput): Promise<void> {
 async function deleteEnvironment(input: ActionInput): Promise<void> {
   const {orgId, appId, envId, context, octokit, humClient} = input;
 
-  const delEnvRes = await humClient.orgsOrgIdAppsAppIdEnvsEnvIdDelete({
-    orgId, appId, envId,
-  });
-  if (delEnvRes.status != 204 && delEnvRes.status != 404) {
-    throw new Error(`Unexpected response creating rule: ${delEnvRes.status}, ${delEnvRes.data}`);
+  try {
+    await humClient.deleteEnvironment({
+      orgId, appId, envId,
+    });
+  } catch (e) {
+    if (e instanceof ResponseError && e.response.status == 404) {
+      // Environment already deleted
+    } else {
+      throw e;
+    }
   }
 
   console.log(`Deleted environment: ${envId}`);
@@ -240,7 +235,7 @@ export async function runAction(): Promise<void> {
   const templateParams = {envId, appId, orgId, branchName};
   let environmentUrl = webAppUrl;
   if (environmentUrlTemplate) {
-    environmentUrl = render(environmentUrlTemplate, templateParams);
+    environmentUrl = Mustache.render(environmentUrlTemplate, templateParams);
   }
   info('Using environment: '+environmentUrl);
   setOutput('environment-url', environmentUrl);

src/index.ts

@@ -1,18 +1,18 @@
 import * as core from '@actions/core';
-import {runAction} from './action';
-import axios from 'axios';
+import {runAction} from './action.js';
+import { ResponseError } from '@humanitec/autogen';
 
-runAction().catch((e) => {
+runAction().catch(async (e) => {
   core.error('Action failed');
 
   core.setFailed(`${e.name} ${e.message}`);
-  if (axios.isAxiosError(e)) {
-    if (e.config) {
-      core.error(`method: ${e.config.method}`);
-      core.error(`request: ${e.config.url}`);
-    }
-    if (e.response) {
-      core.error(`response: ${JSON.stringify(e.response.data)}`);
+
+  if (e instanceof ResponseError) {
+    const {response} = e;
+    core.error(`API response:`);
+    core.error(`status: ${response.status}`);
+    if (response.body && response.bodyUsed) {
+      core.error(`response: ${await response.text()}`);
     }
   }
 });