aws-architect 6.7.96 → 6.7.98

package/bin/template/make.js

@@ -4,8 +4,25 @@ const commander = require('commander');
 const aws = require('aws-sdk');
 const AwsArchitect = require('aws-architect');
 
-let ci = require('ci-build-tools')(process.env.GIT_TAG_PUSHER);
-let version = ci.GetVersion();
+function getVersion() {
+  let release_version = '0.0';
+  const pull_request = '';
+  const branch = process.env.GITHUB_REF;
+  const build_number = process.env.GITHUB_RUN_NUMBER;
+
+  //Builds of pull requests
+  if (pull_request && !pull_request.match(/false/i)) {
+    release_version = `0.${pull_request}`;
+  } else if (!branch || !branch.match(/^(refs\/heads\/)?release[/-]/i)) {
+    //Builds of branches that aren't master or release
+    release_version = '0.0';
+  } else {
+    //Builds of release branches (or locally or on server)
+    release_version = branch.match(/^(?:refs\/heads\/)?release[/-](\d+(?:\.\d+){0,3})$/i)[1];
+  }
+  return `${release_version}.${(build_number || '0')}.0.0.0.0`.split('.').slice(0, 3).join('.');
+}
+const version = getVersion();
 commander.version(version);
 
 let packageMetadataFile = path.join(__dirname, 'package.json');

package/bin/template/package.json

@@ -16,7 +16,6 @@
   "dependencies": {
     "authress-sdk": "^2.0.56",
     "axios": "^0.21.4",
-    "ci-build-tools": "^1.0.13",
     "fs-extra": "^7.0.1",
     "microservice-utilities": "^0.1.121",
     "openapi-factory": "^5.3.48"
@@ -27,12 +26,11 @@
     "chai": "^4.2.0",
     "commander": "^2.19.0",
     "error-object-polyfill": "^1.0.13",
-    "eslint": "^6.1.0",
-    "eslint-friendly-formatter": "^4.0.1",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-mocha": "^5.2.0",
-    "eslint-plugin-node": "^8.0.0",
-    "eslint-plugin-promise": "^4.0.1",
+    "eslint": "^8.35.0",
+    "eslint-config-cimpress-atsquad": "^1.0.67",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-mocha": "^10.0.5",
+    "eslint-plugin-node": "^11.1.0",
     "glob": "^7.1.3",
     "mocha": "^5.2.0",
     "nodemon": "^1.18.7",
@@ -52,6 +50,6 @@
   },
   "homepage": "https://source-code.com",
   "engines": {
-    "node": ">=8.10.0"
+    "node": ">=16.15.0"
   }
 }

package/lib/BucketManager.js

@@ -158,9 +158,9 @@ class BucketManager {
       Bucket: bucket,
       LifecycleConfiguration: {
         Rules: [{
-          ID: 'AutoDeleteOldArtifacts',
+          ID: 'AwsArchitect-AutoDeleteOldArtifacts',
           Expiration: {
-            Days: 365
+            Days: 31
           },
           Prefix: '',
           NoncurrentVersionExpiration: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-architect",
-  "version": "6.7.96",
+  "version": "6.7.98",
   "description": "AWS Architect is a node based tool to configure and deploy AWS-based microservices.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,11 +38,16 @@
     "aws-sdk": ">=2.877.0"
   },
   "devDependencies": {
+    "@authress/eslint-config": "^1.0.2",
     "aws-sdk": "*",
     "chai": "^3.5.0",
-    "ci-build-tools": "^1.0.13",
     "error-object-polyfill": "^1.1.14",
+    "eslint": "~8.35.0",
     "eslint-config-cimpress-atsquad": "^1.0.67",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-mocha": "^10.0.5",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "glob": "^5.0.15",
     "mocha": "^10.1.0",
     "sinon": "^1.17.3"

package/CHANGELOG.md

@@ -1,125 +0,0 @@
-# Change log
-This is the changelog for [AWS Architect](readme.md).
-
-## 6.7 ##
-* Fix handlers for /route and /route/ so that the index.html is always duplicated.
-* Add support for organizational stack set deployment
-* Remove invalid regions from organizational deployment [eu-central-2, ap-south-2, eu-south-2, me-central-1, ap-southeast-4]
-* Support pnpm lock files
-* Support the new version of openapi-factory 5.4.
-* Duplicate all .html files as cleaned files. `file.html` => `file` and `file/`, all three will work
-* Fix validateTemplate so that it actually uses S3 when available.
-* Add support for new status `CONFIGURATION_COMPLETE`
-* Add missing `tags` properties to all interfaces.
-
-## 6.6 ##
-* Add support to `deleteWebsiteVersion(version)`
-* Fix `The function must be in an Active state. The current state for function arn:aws:lambda:Function:514 is Pending`.
-* Automatically delete existing ROLLBACK_COMPLETE stacks.
-* Add Ipv6 records to the cloudformation templates.
-
-## 6.5 ##
-* Support APIGW version 2
-
-## 6.4 ##
-* Add stackset support for AWS to cross regions
-* Skip stack deployment if template body already matches stack
-
-## 6.3 ##
-* Automatically delete the stage lambda alias and version when deleting a stage by passing in the lambda function name as the second parameter to `awsArchitect.removeStagePromise`.
-* Add support for all mime-types for S3 uploads
-
-## 6.2 ##
-* Allow setting upload zip file directly to support creating lambda layers
-* Add `publishZipArchive` to publish layers and other zip files directly to S3, using the package name and version automatically.
-* New option in `publishLambdaArtifactPromise` to allow turning off running npm or yarn for package deployment `autoHandleCompileOfSourceDirectory = false`.
-* Now uploads to the S3 directory file that matches any directory that contains an index.html for automatic redirects to the index.html.
-
-## 6.1 ##
-* Deploy CF templates to S3 deployment bucket before deploying to CF to increase allow size of templates to 450KB.
-* Allow cache control to be the full string, not just an number
-* Dynamically inject `http` and `api` subpath into Location urls.
-* `cacheControlRegexMap` supports array to keep order of regex mappings
-* `deployTemplate` StackConfiguration `options` now accepts `automaticallyProtectStack` which defaults to be `true`, to protect stacks. This will only protect stacks which are successfully created.
-
-## 6.0 ##
-* Remove hosting index html, recommendation is to use nodemon and serve for that.
-* Removed deprecated methods
-* Now supports calling schedule and event triggers locally via the REST api.
-* Nodejs8.10 by default
-* Auto increment port starting at 8080 or specified up to 10 ports before falling back to a random port.
-* Use `-`s in stage names instead of `_` so that more CIs can match their environments stages correctly.
-* Added default override for S3 content type uploads.
-* Allow deploying `.files` using the `bucketManager`
-* Dynamically inject `http` and `api` subpath into url hrefs.
-* Remove autocreation of api gateway when attempting to find it. The expectation is that "searching for the API" happens always after the CF stack creation.
-* `awsArchitect.run` now returns the `server` which contains the only method `stop` allowing manual shutdown.
-
-## 5.1 ##
-* Provide lower case names for methods.
-* Add deprecation warning to removal methods in **6.0**.
-* Index.html is uploaded last.
-* Add in dynamic resolving of ACM certs by domain name.
-
-## 5.0 ##
-* Upgrade to OpenAPI-factory 3.0, see [openapi factory](https://github.com/wparad/openapi-factory.js/blob/master/CHANGELOG.md#30) for breaking changes.  This means that the authorizer now takes `event` and the authorization token must be manually extracted.
-* Support authorizer resolution in express `server.run`
-* Allow providing a custom logger to run function.
-
-## 4.2 ##
-* Include cloud formation deployment for standard resources.
-* Added example cloud formation template to template service.
-* New `RemoveStage` in AWS Architect.
-* Add Support for `yarn.lock` files by assuming `yarn` should be executed.
-
-## 4.1 ##
-* Add `+AwsArchitect.prototype.publishLambdaArtifactPromise` to perform the action to deploy a microservice zip package to S3.
-* Allow specifying S3 artifacts cache-control times as overrides.
-
-## 4.0 ##
-* Removed passing the bucket as configuration into `publishWebsite`.  Bucket is required as part of `contentOptions`.
-* Prevent overwriting the bucket configuration using the `options` parameter in `publishWebsite`.
-
-## 3.7 ##
-* Default to region set in aws config, rather than us-east-1.
-
-## 3.6 ##
-* Allow sending binary Buffer bodies via local server to match API Gateway functionality.
-
-## 3.5 ##
-* Upgrade default nodejs version to 6.10.
-
-## 3.4 ##
-* Upgrade jwt resolution to include by default RS256.
-
-## 3.3 ##
-* Remove CORS headers from local server.
-
-## 3.2 ##
-* Automatically create the service role to execute the lambda functions.
-* Automatically create the s3 bucket with the website policy if it doesn't exist.
-
-## 3.1 ##
-* Moved website bucket configuration to contentOptions.
-* Added `AwsArchitect.promoteToStage(source, stage)` function which will copy a bucket directory.
-
-## 3.0 ##
-* Upgrade to handle ANY on aws resources.
-* Allow running just a website on port 8080, without any extra api files.
-
-## 2.1 ##
-* Add support for creating dynamoDB Tables.
-* Separate policy examples into their own documents.
-* Allow specifying specific port to run on.
-* Deploy content directory to s3.
-
-## 2.0 ##
-* All configuration is now contained in the api files. Generation, run, and testing is completed via index.js.  New templates created.
-* A single lambda function is created, for the purpose of the whole microservice.
-* Introduced configuration options for the api and content (s3).
-
-## 1.1 ##
-* Lambdas are not all specified in the file specified by the constructor call.  Default is the `src/index.js` file in `make.js`.  `aws-config.js` will be removed in version 2.0, and all configuration can be specified in the index.js composition root.
-
-## 1.0 ##
-* Introduced commandline ruby tool `aws-architect` for configuring a AWS Microservice instance using Cloud Formation and AWS API.

package/bin/template/.gitignore

@@ -1 +0,0 @@
-node_modules