@adobe/helix-deploy 4.14.0 → 5.0.0

package/src/deploy/AWSDeployer.js

@@ -10,60 +10,47 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-await-in-loop,no-restricted-syntax */
-const chalk = require('chalk');
-const {
-  S3Client,
-  CreateBucketCommand,
+import chalk from 'chalk';
+import {
+  CreateBucketCommand, DeleteBucketCommand, DeleteObjectCommand, DeleteObjectsCommand,
   ListBucketsCommand,
-  ListObjectsV2Command,
-  PutObjectCommand,
-  DeleteBucketCommand,
-  DeleteObjectCommand,
-  DeleteObjectsCommand,
-} = require('@aws-sdk/client-s3');
-const {
-  LambdaClient,
-  CreateFunctionCommand,
+  ListObjectsV2Command, PutObjectCommand,
+  S3Client,
+} from '@aws-sdk/client-s3';
+
+import {
+  AddPermissionCommand,
+  CreateAliasCommand,
+  CreateFunctionCommand, GetAliasCommand,
   GetFunctionCommand,
+  LambdaClient, PublishVersionCommand, UpdateAliasCommand, UpdateFunctionCodeCommand,
   UpdateFunctionConfigurationCommand,
-  UpdateFunctionCodeCommand,
-  GetAliasCommand,
-  PublishVersionCommand,
-  CreateAliasCommand,
-  UpdateAliasCommand,
-  AddPermissionCommand,
-} = require('@aws-sdk/client-lambda');
-const {
+} from '@aws-sdk/client-lambda';
+
+import {
   ApiGatewayV2Client,
-  GetApisCommand,
-  GetApiCommand,
-  GetStagesCommand,
-  GetIntegrationsCommand,
   CreateApiCommand,
+  CreateIntegrationCommand, CreateRouteCommand,
   CreateStageCommand,
-  CreateIntegrationCommand,
   DeleteIntegrationCommand,
-  CreateRouteCommand,
-  GetRoutesCommand,
-  UpdateRouteCommand,
-} = require('@aws-sdk/client-apigatewayv2');
-const {
-  SSMClient,
-  PutParameterCommand,
-} = require('@aws-sdk/client-ssm');
-const {
-  SecretsManagerClient,
-  PutSecretValueCommand,
-} = require('@aws-sdk/client-secrets-manager');
-
-const path = require('path');
-const fse = require('fs-extra');
-const crypto = require('crypto');
-const BaseDeployer = require('./BaseDeployer');
-const ActionBuilder = require('../ActionBuilder.js');
-const AWSConfig = require('./AWSConfig.js');
-
-class AWSDeployer extends BaseDeployer {
+  GetApiCommand,
+  GetApisCommand,
+  GetIntegrationsCommand, GetRoutesCommand,
+  GetStagesCommand, UpdateRouteCommand,
+} from '@aws-sdk/client-apigatewayv2';
+
+import { PutParameterCommand, SSMClient } from '@aws-sdk/client-ssm';
+
+import { PutSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager';
+
+import path from 'path';
+import fse from 'fs-extra';
+import crypto from 'crypto';
+import BaseDeployer from './BaseDeployer.js';
+import ActionBuilder from '../ActionBuilder.js';
+import AWSConfig from './AWSConfig.js';
+
+export default class AWSDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
 
@@ -752,4 +739,3 @@ class AWSDeployer extends BaseDeployer {
 }
 
 AWSDeployer.Config = AWSConfig;
-module.exports = AWSDeployer;

package/src/deploy/AzureConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class AzureConfig {
+export default class AzureConfig {
   constructor() {
     Object.assign(this, {
       appName: '',
@@ -36,5 +36,3 @@ class AzureConfig {
       });
   }
 }
-
-module.exports = AzureConfig;

package/src/deploy/AzureDeployer.js

@@ -9,13 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const msRestNodeAuth = require('@azure/ms-rest-nodeauth');
-const { WebSiteManagementClient } = require('@azure/arm-appservice');
-const fs = require('fs');
-const BaseDeployer = require('./BaseDeployer');
-const AzureConfig = require('./AzureConfig.js');
+import msRestNodeAuth from '@azure/ms-rest-nodeauth';
+import { WebSiteManagementClient } from '@azure/arm-appservice';
 
-class AzureDeployer extends BaseDeployer {
+import fs from 'fs';
+import BaseDeployer from './BaseDeployer.js';
+import AzureConfig from './AzureConfig.js';
+
+export default class AzureDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -229,4 +230,3 @@ class AzureDeployer extends BaseDeployer {
 }
 
 AzureDeployer.Config = AzureConfig;
-module.exports = AzureDeployer;

package/src/deploy/BaseDeployer.js

@@ -9,12 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const path = require('path');
-const chalk = require('chalk');
-const semver = require('semver');
-const fetchAPI = require('@adobe/helix-fetch');
+import path from 'path';
+import chalk from 'chalk';
+import semver from 'semver';
+import { h1, context } from '@adobe/helix-fetch';
 
-class BaseDeployer {
+export default class BaseDeployer {
   constructor(cfg) {
     this.isDeployer = true;
     this.cfg = cfg;
@@ -42,8 +42,8 @@ class BaseDeployer {
   getOrCreateFetchContext() {
     if (!this._fetchContext) {
       this._fetchContext = process.env.HELIX_FETCH_FORCE_HTTP1
-        ? fetchAPI.h1()
-        : fetchAPI.context();
+        ? h1()
+        : context();
     }
     return this._fetchContext;
   }
@@ -179,5 +179,3 @@ class BaseDeployer {
     return sfx;
   }
 }
-
-module.exports = BaseDeployer;

package/src/deploy/CloudflareConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class CloudflareConfig {
+export default class CloudflareConfig {
   constructor() {
     Object.assign(this, {});
   }
@@ -67,5 +67,3 @@ class CloudflareConfig {
       });
   }
 }
-
-module.exports = CloudflareConfig;

package/src/deploy/CloudflareDeployer.js

@@ -9,19 +9,20 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const path = require('path');
-const fs = require('fs');
-const FormData = require('form-data');
-const BaseDeployer = require('./BaseDeployer');
-const CloudflareConfig = require('./CloudflareConfig');
+import path from 'path';
+import fs from 'fs';
+import FormData from 'form-data';
+import BaseDeployer from './BaseDeployer.js';
+import CloudflareConfig from './CloudflareConfig.js';
 
-class CloudflareDeployer extends BaseDeployer {
+export default class CloudflareDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
       id: 'cloudflare',
       name: 'Cloudflare',
       _cfg: config,
+      noGatewayBackend: true,
     });
   }
 
@@ -141,4 +142,3 @@ class CloudflareDeployer extends BaseDeployer {
 }
 
 CloudflareDeployer.Config = CloudflareConfig;
-module.exports = CloudflareDeployer;

package/src/deploy/ComputeAtEdgeConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class ComputeAtEdgeConfig {
+export default class ComputeAtEdgeConfig {
   constructor() {
     Object.assign(this, {});
   }
@@ -89,5 +89,3 @@ class ComputeAtEdgeConfig {
       });
   }
 }
-
-module.exports = ComputeAtEdgeConfig;

package/src/deploy/ComputeAtEdgeDeployer.js

@@ -9,14 +9,18 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { fork } = require('child_process');
-const path = require('path');
-const fs = require('fs/promises');
-const tar = require('tar');
-const getStream = require('get-stream');
-const Fastly = require('@adobe/fastly-native-promises');
-const BaseDeployer = require('./BaseDeployer');
-const ComputeAtEdgeConfig = require('./ComputeAtEdgeConfig');
+import { fork } from 'child_process';
+import { fileURLToPath } from 'url';
+import path from 'path';
+import fs from 'fs/promises';
+import tar from 'tar';
+import getStream from 'get-stream';
+import Fastly from '@adobe/fastly-native-promises';
+import BaseDeployer from './BaseDeployer.js';
+import ComputeAtEdgeConfig from './ComputeAtEdgeConfig.js';
+
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = path.resolve(fileURLToPath(import.meta.url), '..');
 
 /**
  * The class ComputeAtEdgeDeployer deploys to Fastly's Compute(at)Edge (WASM) runtime.
@@ -24,7 +28,7 @@ const ComputeAtEdgeConfig = require('./ComputeAtEdgeConfig');
  * and not confused with the FastlyGateway (which only routes requests, but
  * does not handle them.)
  */
-class ComputeAtEdgeDeployer extends BaseDeployer {
+export default class ComputeAtEdgeDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -32,6 +36,7 @@ class ComputeAtEdgeDeployer extends BaseDeployer {
       name: 'Fastly Compute@Edge',
       _cfg: config,
       _fastly: null,
+      noGatewayBackend: true,
     });
   }
 
@@ -186,4 +191,3 @@ service_id = ""
 }
 
 ComputeAtEdgeDeployer.Config = ComputeAtEdgeConfig;
-module.exports = ComputeAtEdgeDeployer;

package/src/deploy/GoogleConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class GoogleConfig {
+export default class GoogleConfig {
   constructor() {
     Object.assign(this, {
       appName: '',
@@ -69,5 +69,3 @@ class GoogleConfig {
       });
   }
 }
-
-module.exports = GoogleConfig;

package/src/deploy/GoogleDeployer.js

@@ -9,16 +9,17 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-const { CloudFunctionsServiceClient } = require('@google-cloud/functions');
-const { SecretManagerServiceClient } = require('@google-cloud/secret-manager');
-const path = require('path');
-const fs = require('fs');
-const semver = require('semver');
-const BaseDeployer = require('./BaseDeployer');
-const GoogleConfig = require('./GoogleConfig.js');
-const { filterActions } = require('../utils.js');
-
-class GoogleDeployer extends BaseDeployer {
+import { CloudFunctionsServiceClient } from '@google-cloud/functions';
+import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import path from 'path';
+import fs from 'fs';
+import semver from 'semver';
+import chalk from 'chalk';
+import BaseDeployer from './BaseDeployer.js';
+import GoogleConfig from './GoogleConfig.js';
+import { filterActions } from '../utils.js';
+
+export default class GoogleDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
     Object.assign(this, {
@@ -59,7 +60,7 @@ class GoogleDeployer extends BaseDeployer {
         projectId: this._cfg.projectID,
       });
     } catch (e) {
-      this.log.error(`Unable to authenticate with Google: ${e.message}`);
+      this.log.error(chalk`{red error:} Unable to authenticate with Google: ${e.message}`);
       throw e;
     }
   }
@@ -82,9 +83,9 @@ class GoogleDeployer extends BaseDeployer {
         },
         secretId,
       });
-      this.log.info(`Created secret ${secret.name}`);
+      this.log.info(`--: Created secret ${secret.name}`);
     } catch {
-      this.log.info('Using existing secret');
+      this.log.info('--: Using existing secret');
       [secret] = await this._secretclient.getSecret({
         name: `${parent}/secrets/${secretId}`,
       });
@@ -98,7 +99,7 @@ class GoogleDeployer extends BaseDeployer {
       },
     });
 
-    this.log.info(`Added secret version ${version.name}`);
+    this.log.info(chalk`{green ok}: Added secret version ${version.name}`);
 
     /*
     const [retversion] = await this._secretclient.accessSecretVersion({
@@ -191,23 +192,23 @@ class GoogleDeployer extends BaseDeployer {
           function: func,
         });
 
-        this.log.info('updating existing function');
+        this.log.info('--: updating existing function');
         const [res] = await op.promise();
         this._function = res;
-        this.log.info('function deployed');
+        this.log.info(chalk`{green ok:} function deployed`);
       } else {
         const [op] = await this._client.createFunction({
           location: `projects/${this._cfg.projectID}/locations/${this._cfg.region}`,
           function: func,
         });
 
-        this.log.info('creating function, please wait (Google deployments are slow).');
+        this.log.info('--: creating function, please wait (Google deployments are slow).');
         const [res] = await op.promise();
         this._function = res;
-        this.log.info('function deployed');
+        this.log.info(chalk`{green ok:} function deployed`);
       }
 
-      this.log.info('enabling unauthenticated requests');
+      this.log.info('--: enabling unauthenticated requests');
       await this._client.setIamPolicy({
         resource: name,
         policy: {
@@ -222,11 +223,8 @@ class GoogleDeployer extends BaseDeployer {
         },
       });
     } catch (err) {
-      this.log.error(err);
-      // eslint-disable-next-line max-len
-      this.log.error('bad request:', err.metadata.internalRepr.get('google.rpc.badrequest-bin').toString());
-      // eslint-disable-next-line max-len
-      this.log.error('details:', err.metadata.internalRepr.get('grpc-status-details-bin').toString());
+      this.log.error(chalk`{red error:} bad request: ${err.metadata.internalRepr.get('google.rpc.badrequest-bin').toString()}`);
+      this.log.error(chalk`{red error:} details: ${err.metadata.internalRepr.get('grpc-status-details-bin').toString()}`);
       throw err;
     }
 
@@ -239,8 +237,7 @@ class GoogleDeployer extends BaseDeployer {
       await this.createFunction();
     } catch (err) {
       const message = err.metadata ? err.metadata.get('grpc-status-details-bin')[0].toString() : err.message;
-      this.log.error(`Unable to deploy Google Cloud function: ${message}`, err.metadata);
-
+      this.log.error(chalk`{red error:} Unable to deploy Google Cloud function: ${message}`, err.metadata);
       throw err;
     }
   }
@@ -299,15 +296,14 @@ class GoogleDeployer extends BaseDeployer {
         },
         versionspec,
       ).map((fn) => {
-        this.log.info(`Cleaning up outdated function '${fn.fqName}`);
+        this.log.info(`--: Cleaning up outdated function '${fn.fqName}`);
 
         return this._client.deleteFunction({
           name: fn.fqName,
         });
       }));
     } catch (e) {
-      this.log.error('Cleanup failed, proceeding anyway.');
-      this.log.error(e);
+      this.log.error(chalk`{red error:} Cleanup failed, proceeding anyway.`, e);
     }
   }
 
@@ -348,4 +344,3 @@ class GoogleDeployer extends BaseDeployer {
 }
 
 GoogleDeployer.Config = GoogleConfig;
-module.exports = GoogleDeployer;

package/src/deploy/OpenWhiskConfig.js

@@ -14,7 +14,7 @@
  * @field {string} actionName Action as it would be deployed (package + name)
  * @field {boolean} packageShared If package is shared.
  */
-class OpenWhiskConfig {
+export default class OpenWhiskConfig {
   constructor() {
     Object.assign(this, {
       namespace: '',
@@ -52,5 +52,3 @@ class OpenWhiskConfig {
       });
   }
 }
-
-module.exports = OpenWhiskConfig;

package/src/deploy/OpenWhiskDeployer.js

@@ -10,18 +10,16 @@
  * governing permissions and limitations under the License.
  */
 /* eslint-disable no-underscore-dangle */
+import ow from 'openwhisk';
+import os from 'os';
+import fse from 'fs-extra';
+import path from 'path';
+import chalk from 'chalk';
+import dotenv from 'dotenv';
+import BaseDeployer from './BaseDeployer.js';
+import OpenWhiskConfig from './OpenWhiskConfig.js';
 
-const ow = require('openwhisk');
-const os = require('os');
-const fse = require('fs-extra');
-const path = require('path');
-const chalk = require('chalk');
-const dotenv = require('dotenv');
-
-const BaseDeployer = require('./BaseDeployer');
-const OpenWhiskConfig = require('./OpenWhiskConfig.js');
-
-class OpenWhiskDeployer extends BaseDeployer {
+export default class OpenWhiskDeployer extends BaseDeployer {
   constructor(baseConfig, config) {
     super(baseConfig);
 
@@ -283,4 +281,3 @@ class OpenWhiskDeployer extends BaseDeployer {
 }
 
 OpenWhiskDeployer.Config = OpenWhiskConfig;
-module.exports = OpenWhiskDeployer;

package/src/gateway/FastlyConfig.js

@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-class FastlyConfig {
+export default class FastlyConfig {
   constructor() {
     Object.assign(this, {
       service: null,
@@ -94,5 +94,3 @@ class FastlyConfig {
       });
   }
 }
-
-module.exports = FastlyConfig;