Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 8.0.0 #642

Merged
merged 13 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ 14.x, 16.x, 18.x, 20.x ]
node-version: [ 16.x, 18.x, 20.x, 22.x ]
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [8.0.0] - 2024-11-20

### Changed
- Dropped Serverless V2 support.
- Dropped Node14 support.
- Updated packages.

## [7.4.0] - 2024-08-28

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# serverless-domain-manager
[![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
[![serverless](http://public.serverless.com/badges/v3.svg)](https://www.serverless.com/plugins/serverless-domain-manager)
[![npm version](https://badge.fury.io/js/serverless-domain-manager.svg)](https://badge.fury.io/js/serverless-domain-manager)
[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/amplify-education/serverless-domain-manager/main/LICENSE)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/235fe249b8354a3db0cc5926dba47899)](https://www.codacy.com/gh/amplify-education/serverless-domain-manager/dashboard?utm_source=github.com&utm_medium=referral&utm_content=amplify-education/serverless-domain-manager&utm_campaign=Badge_Grade)
Expand Down
30,403 changes: 6,345 additions & 24,058 deletions package-lock.json

Large diffs are not rendered by default.

66 changes: 34 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "serverless-domain-manager",
"version": "7.4.0",
"version": "8.0.0",
"engines": {
"node": ">=14"
"node": ">=16"
},
"description": "Serverless plugin for managing custom domains with API Gateways.",
"author": "Amplify Education Inc",
Expand Down Expand Up @@ -49,47 +49,49 @@
]
},
"devDependencies": {
"@types/mocha": "^10.0.6",
"@types/node": "^20.11.24",
"@types/randomstring": "^1.1.12",
"@types/chai": "^4.3.20",
"@types/chai-spies": "^1.0.6",
"@types/mocha": "^10.0.9",
"@types/node": "^22.9.0",
"@types/randomstring": "^1.3.0",
"@types/shelljs": "^0.8.15",
"aws-sdk-client-mock": "^3.0.1",
"chai": "^4.4.1",
"@typescript-eslint/eslint-plugin": "^8.14.0",
"@typescript-eslint/parser": "^8.14.0",
"aws-sdk-client-mock": "^4.1.0",
"chai": "^4.5.0",
"chai-spies": "^1.1.0",
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint": "^8.57.1",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"mocha": "^10.3.0",
"eslint-plugin-promise": "^6.6.0",
"mocha": "^10.8.2",
"mocha-param": "^2.0.1",
"nyc": "^15.1.0",
"nyc": "^17.1.0",
"randomstring": "^1.3.0",
"serverless": "^3.38.0",
"serverless-plugin-split-stacks": "^1.13.0",
"serverless": "4.2.5",
"serverless-plugin-split-stacks": "^1.14.0",
"shelljs": "^0.8.5",
"ts-node": "^10.9.2",
"typescript": "^5.1.6 && <5.2"
"typescript": "^5.6.3"
},
"dependencies": {
"@aws-sdk/client-acm": "^3.635.0",
"@aws-sdk/client-api-gateway": "^3.635.0",
"@aws-sdk/client-apigatewayv2": "^3.635.0",
"@aws-sdk/client-cloudformation": "^3.635.0",
"@aws-sdk/client-route-53": "^3.635.0",
"@aws-sdk/client-s3": "^3.635.0",
"@aws-sdk/credential-providers": "^3.635.0",
"@smithy/config-resolver": "^2.2.0",
"@smithy/node-config-provider": "^2.3.0",
"@smithy/node-http-handler": "^2.5.0",
"@smithy/smithy-client": "^2.5.1",
"@smithy/types": "^2.12.0",
"@smithy/util-retry": "^2.2.0",
"@aws-sdk/client-acm": "^3.693.0",
"@aws-sdk/client-api-gateway": "^3.693.0",
"@aws-sdk/client-apigatewayv2": "^3.693.0",
"@aws-sdk/client-cloudformation": "^3.693.0",
"@aws-sdk/client-route-53": "^3.693.0",
"@aws-sdk/client-s3": "^3.693.0",
"@aws-sdk/credential-providers": "^3.693.0",
"@smithy/config-resolver": "^3.0.12",
"@smithy/node-config-provider": "^3.1.11",
"@smithy/node-http-handler": "^3.3.1",
"@smithy/smithy-client": "^3.4.4",
"@smithy/types": "^3.7.1",
"@smithy/util-retry": "^3.0.10",
"proxy-agent": "^6.4.0"
},
"peerDependencies": {
"serverless": ">=2.60"
"serverless": ">=3"
}
}
2 changes: 1 addition & 1 deletion src/globals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default class Globals {
public static CFFuncNames = {
fnImport: "Fn::ImportValue",
ref: "Ref"
}
};

/* eslint camelcase: ["error", {allow: ["^tls_"]}] */
public static tlsVersions = {
Expand Down
20 changes: 10 additions & 10 deletions src/models/api-gateway-map.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
class ApiGatewayMap {
public apiId: string;
public basePath: string;
public stage: string;
public apiMappingId: string | null;
public apiId: string;
public basePath: string;
public stage: string;
public apiMappingId: string | null;

constructor (apiId: string, basePath: string, stage: string, apiMappingId: string | null) {
this.apiId = apiId;
this.basePath = basePath;
this.stage = stage;
this.apiMappingId = apiMappingId;
}
constructor (apiId: string, basePath: string, stage: string, apiMappingId: string | null) {
this.apiId = apiId;
this.basePath = basePath;
this.stage = stage;
this.apiMappingId = apiMappingId;
}
}

export = ApiGatewayMap;
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# APIGateway with export outputs
service: ${env:PLUGIN_IDENTIFIER}-apigateway-with-export-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
endpointType: REGIONAL
stage: test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# APIGateway with import other CloudFormation stack outputs
service: ${env:PLUGIN_IDENTIFIER}-apigateway-with-import-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
apiGateway:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/basic/basepath-mapping/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Enabled and testing basepath mapping
service: ${env:PLUGIN_IDENTIFIER}-basepath-mapping-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
stackTags:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Creating a domain should be idempotent
service: ${env:PLUGIN_IDENTIFIER}-create-domain-idempotent-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Deploying should be idempotent
service: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Deploying should be idempotent for the same domain and different paths
service: ${env:PLUGIN_IDENTIFIER}-deploy-idempotent2-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
service: ${env:PLUGIN_IDENTIFIER}-http-api-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
stackTags:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/basic/mutual-tls/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
service: ${env:PLUGIN_IDENTIFIER}-mutual-tls-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Enabled and testing basepath mapping
service: ${env:PLUGIN_IDENTIFIER}-null-basepath-mapping-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
stackTags:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/basic/route53-profile/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Creating a domain should be idempotent
service: ${env:PLUGIN_IDENTIFIER}-route53-profile-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/deploy/auto-domain/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# create_domain should be run as part of deployment
service: ${env:PLUGIN_IDENTIFIER}-auto-domain-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Enabled with custom basepath
service: ${env:PLUGIN_IDENTIFIER}-basepath-nested-stack-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/deploy/basepath/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Enabled with custom basepath
service: ${env:PLUGIN_IDENTIFIER}-basepath-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Enabled with default values
service: ${env:PLUGIN_IDENTIFIER}-custom-apigateway-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
apiGateway:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/deploy/default/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Enabled with default values
service: ${env:PLUGIN_IDENTIFIER}-default-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
5 changes: 4 additions & 1 deletion test/integration-tests/deploy/http-api/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
service: ${env:PLUGIN_IDENTIFIER}-http-api-${env:RANDOM_STRING}

frameworkVersion: "4.2.5"

provider:
name: aws
iam:
role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
runtime: nodejs16.x
runtime: nodejs18.x
region: us-west-2
stage: test
functions:
Expand Down
Loading