@adobe/helix-deploy 6.1.0 → 6.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -0
- package/index.js +5 -13
- package/package.json +18 -18
- package/src/deploy/AWSConfig.js +13 -0
- package/src/deploy/AWSDeployer.js +2 -1
- package/src/deploy/GoogleDeployer.js +2 -2
- package/src/index.js +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,31 @@
|
|
|
1
|
+
## [6.2.3](https://github.com/adobe/helix-deploy/compare/v6.2.2...v6.2.3) (2022-02-04)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **deps:** update adobe fixes ([478db45](https://github.com/adobe/helix-deploy/commit/478db455cd8313cea648f49b85f0329514fe38a5))
|
|
7
|
+
|
|
8
|
+
## [6.2.2](https://github.com/adobe/helix-deploy/compare/v6.2.1...v6.2.2) (2022-01-31)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **deps:** update external fixes ([#365](https://github.com/adobe/helix-deploy/issues/365)) ([1c5d845](https://github.com/adobe/helix-deploy/commit/1c5d8450ea20a2605d74b0fd82701bb7f771728b))
|
|
14
|
+
|
|
15
|
+
## [6.2.1](https://github.com/adobe/helix-deploy/compare/v6.2.0...v6.2.1) (2022-01-28)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* properly export development server ([a3b60d8](https://github.com/adobe/helix-deploy/commit/a3b60d8107285a93ba72ed99ec21112b1ee565ed))
|
|
21
|
+
|
|
22
|
+
# [6.2.0](https://github.com/adobe/helix-deploy/compare/v6.1.0...v6.2.0) (2022-01-28)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Features
|
|
26
|
+
|
|
27
|
+
* allow to set authorizer identity sources ([#363](https://github.com/adobe/helix-deploy/issues/363)) ([b4b6e30](https://github.com/adobe/helix-deploy/commit/b4b6e30f5e35449c123fcfe38fde851223fd3d4f))
|
|
28
|
+
|
|
1
29
|
# [6.1.0](https://github.com/adobe/helix-deploy/compare/v6.0.1...v6.1.0) (2022-01-25)
|
|
2
30
|
|
|
3
31
|
|
package/index.js
CHANGED
|
@@ -9,16 +9,8 @@
|
|
|
9
9
|
* OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
10
|
* governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
module.exports = {
|
|
19
|
-
ActionBuilder,
|
|
20
|
-
Bundler,
|
|
21
|
-
BaseConfig,
|
|
22
|
-
CLI,
|
|
23
|
-
DevelopmentServer,
|
|
24
|
-
};
|
|
12
|
+
export { default as ActionBuilder } from './src/ActionBuilder.js';
|
|
13
|
+
export { default as Bundler } from './src/bundler/WebpackBundler.js';
|
|
14
|
+
export { default as BaseConfig } from './src/BaseConfig.js';
|
|
15
|
+
export { default as CLI } from './src/cli.js';
|
|
16
|
+
export { default as DevelopmentServer } from './src/DevelopmentServer.js';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adobe/helix-deploy",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.3",
|
|
4
4
|
"description": "Library and Commandline Tools to build and deploy OpenWhisk Actions",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"homepage": "https://github.com/adobe/helix-deploy#readme",
|
|
@@ -38,16 +38,16 @@
|
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@adobe/fastly-native-promises": "2.0.0",
|
|
41
|
-
"@adobe/helix-fetch": "3.0.
|
|
42
|
-
"@aws-sdk/client-apigatewayv2": "3.
|
|
43
|
-
"@aws-sdk/client-lambda": "3.
|
|
44
|
-
"@aws-sdk/client-s3": "3.
|
|
45
|
-
"@aws-sdk/client-secrets-manager": "3.
|
|
46
|
-
"@aws-sdk/client-ssm": "3.
|
|
41
|
+
"@adobe/helix-fetch": "3.0.2",
|
|
42
|
+
"@aws-sdk/client-apigatewayv2": "3.49.0",
|
|
43
|
+
"@aws-sdk/client-lambda": "3.49.0",
|
|
44
|
+
"@aws-sdk/client-s3": "3.49.0",
|
|
45
|
+
"@aws-sdk/client-secrets-manager": "3.49.0",
|
|
46
|
+
"@aws-sdk/client-ssm": "3.49.0",
|
|
47
47
|
"@fastly/js-compute": "0.2.1",
|
|
48
48
|
"@google-cloud/functions": "1.2.0",
|
|
49
49
|
"@google-cloud/secret-manager": "3.10.1",
|
|
50
|
-
"@google-cloud/storage": "5.18.
|
|
50
|
+
"@google-cloud/storage": "5.18.1",
|
|
51
51
|
"@rollup/plugin-alias": "3.1.9",
|
|
52
52
|
"@rollup/plugin-commonjs": "21.0.1",
|
|
53
53
|
"@rollup/plugin-json": "4.1.0",
|
|
@@ -55,15 +55,15 @@
|
|
|
55
55
|
"archiver": "5.3.0",
|
|
56
56
|
"chalk-template": "0.3.1",
|
|
57
57
|
"constants-browserify": "1.0.0",
|
|
58
|
-
"dotenv": "
|
|
58
|
+
"dotenv": "15.0.0",
|
|
59
59
|
"express": "4.17.2",
|
|
60
60
|
"form-data": "4.0.0",
|
|
61
61
|
"fs-extra": "10.0.0",
|
|
62
62
|
"get-stream": "6.0.1",
|
|
63
|
-
"isomorphic-git": "1.
|
|
63
|
+
"isomorphic-git": "1.11.1",
|
|
64
64
|
"openwhisk": "3.21.6",
|
|
65
65
|
"proxyquire": "2.1.3",
|
|
66
|
-
"rollup": "2.66.
|
|
66
|
+
"rollup": "2.66.1",
|
|
67
67
|
"rollup-plugin-terser": "7.0.2",
|
|
68
68
|
"semver": "7.3.5",
|
|
69
69
|
"tar": "6.1.11",
|
|
@@ -72,26 +72,26 @@
|
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
74
|
"@adobe/eslint-config-helix": "1.3.2",
|
|
75
|
-
"@adobe/helix-shared-wrap": "1.0.
|
|
75
|
+
"@adobe/helix-shared-wrap": "1.0.1",
|
|
76
76
|
"@adobe/helix-status": "9.2.4",
|
|
77
|
-
"@adobe/helix-universal-logger": "2.0.
|
|
77
|
+
"@adobe/helix-universal-logger": "2.0.1",
|
|
78
78
|
"@semantic-release/changelog": "6.0.1",
|
|
79
79
|
"@semantic-release/git": "10.0.1",
|
|
80
80
|
"c8": "7.11.0",
|
|
81
|
-
"chai": "4.3.
|
|
81
|
+
"chai": "4.3.6",
|
|
82
82
|
"chai-http": "4.3.0",
|
|
83
83
|
"codecov": "3.8.3",
|
|
84
|
-
"eslint": "8.
|
|
84
|
+
"eslint": "8.8.0",
|
|
85
85
|
"eslint-plugin-header": "3.1.1",
|
|
86
86
|
"eslint-plugin-import": "2.25.4",
|
|
87
87
|
"husky": "7.0.4",
|
|
88
|
-
"lint-staged": "12.3.
|
|
89
|
-
"mocha": "9.
|
|
88
|
+
"lint-staged": "12.3.2",
|
|
89
|
+
"mocha": "9.2.0",
|
|
90
90
|
"mocha-junit-reporter": "2.0.2",
|
|
91
91
|
"mocha-multi-reporters": "1.5.1",
|
|
92
92
|
"nock": "13.2.2",
|
|
93
93
|
"semantic-release": "19.0.2",
|
|
94
|
-
"sinon": "
|
|
94
|
+
"sinon": "13.0.0",
|
|
95
95
|
"yauzl": "2.10.0"
|
|
96
96
|
},
|
|
97
97
|
"engines": {
|
package/src/deploy/AWSConfig.js
CHANGED
|
@@ -26,6 +26,7 @@ export default class AWSConfig {
|
|
|
26
26
|
parameterMgr: ['system', 'secret'],
|
|
27
27
|
createAuthorizer: '',
|
|
28
28
|
attachAuthorizer: '',
|
|
29
|
+
identitySources: ['$request.header.Authorization'],
|
|
29
30
|
});
|
|
30
31
|
}
|
|
31
32
|
|
|
@@ -37,6 +38,7 @@ export default class AWSConfig {
|
|
|
37
38
|
.withAWSLambdaFormat(argv.awsLambdaFormat)
|
|
38
39
|
.withAWSCreateAuthorizer(argv.awsCreateAuthorizer)
|
|
39
40
|
.withAWSAttachAuthorizer(argv.awsAttachAuthorizer)
|
|
41
|
+
.withAWSIdentitySources(argv.awsIdentitySource)
|
|
40
42
|
.withAWSCleanUpBuckets(argv.awsCleanupBuckets)
|
|
41
43
|
.withAWSCleanUpIntegrations(argv.awsCleanupIntegrations)
|
|
42
44
|
.withAWSCreateRoutes(argv.awsCreateRoutes)
|
|
@@ -93,6 +95,11 @@ export default class AWSConfig {
|
|
|
93
95
|
return this;
|
|
94
96
|
}
|
|
95
97
|
|
|
98
|
+
withAWSIdentitySources(value) {
|
|
99
|
+
this.identitySources = value;
|
|
100
|
+
return this;
|
|
101
|
+
}
|
|
102
|
+
|
|
96
103
|
static yarg(yargs) {
|
|
97
104
|
return yargs
|
|
98
105
|
.group(['aws-region', 'aws-api', 'aws-role', 'aws-cleanup-buckets', 'aws-cleanup-integrations',
|
|
@@ -136,6 +143,12 @@ export default class AWSConfig {
|
|
|
136
143
|
+ 'Example: "helix-authorizer_${version}".',
|
|
137
144
|
type: 'string',
|
|
138
145
|
})
|
|
146
|
+
.option('aws-identity-source', {
|
|
147
|
+
description: 'Identity source to used when creating the authorizer',
|
|
148
|
+
type: 'string',
|
|
149
|
+
array: true,
|
|
150
|
+
default: ['$request.header.Authorization'],
|
|
151
|
+
})
|
|
139
152
|
.option('aws-attach-authorizer', {
|
|
140
153
|
description: 'Attach specified authorizer to routes during linking.',
|
|
141
154
|
type: 'string',
|
|
@@ -757,6 +757,7 @@ export default class AWSDeployer extends BaseDeployer {
|
|
|
757
757
|
ApiId,
|
|
758
758
|
AuthorizerId,
|
|
759
759
|
AuthorizerUri: `${AUTH_URI_PREFIX}${aliasArn}/invocations`,
|
|
760
|
+
IdentitySource: this._cfg.identitySources,
|
|
760
761
|
}));
|
|
761
762
|
this.log.info(chalk`{green ok}: updated authorizer: {blue ${res.Name}}`);
|
|
762
763
|
} else {
|
|
@@ -767,7 +768,7 @@ export default class AWSDeployer extends BaseDeployer {
|
|
|
767
768
|
AuthorizerUri: `${AUTH_URI_PREFIX}${aliasArn}/invocations`,
|
|
768
769
|
AuthorizerResultTtlInSeconds: 0,
|
|
769
770
|
EnableSimpleResponses: true,
|
|
770
|
-
IdentitySource:
|
|
771
|
+
IdentitySource: this._cfg.identitySources,
|
|
771
772
|
Name: authorizerName,
|
|
772
773
|
}));
|
|
773
774
|
AuthorizerId = res.AuthorizerId;
|
|
@@ -223,8 +223,8 @@ export default class GoogleDeployer extends BaseDeployer {
|
|
|
223
223
|
},
|
|
224
224
|
});
|
|
225
225
|
} catch (err) {
|
|
226
|
-
this.log.error(chalk`{red error:} bad request: ${err.metadata.internalRepr
|
|
227
|
-
this.log.error(chalk`{red error:} details: ${err.metadata.internalRepr
|
|
226
|
+
this.log.error(chalk`{red error:} bad request: ${err.metadata.internalRepr?.get('google.rpc.badrequest-bin')?.toString()}`);
|
|
227
|
+
this.log.error(chalk`{red error:} details: ${err.metadata.internalRepr?.get('grpc-status-details-bin')?.toString()}`);
|
|
228
228
|
throw err;
|
|
229
229
|
}
|
|
230
230
|
|