Skip to content

fix: Add cacheing CMM examples #187

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

Merged
merged 68 commits into from
Sep 20, 2019
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
d284991
fix: Add cacheing CMM examples
Aug 6, 2019
6ae7f7f
Merge branch 'master' into cacheing-cmm-examples
seebees Aug 7, 2019
9c60c0d
update
seebees Aug 14, 2019
83fcc3c
both files
seebees Aug 14, 2019
92f848c
Merge branch 'master' into cacheing-cmm-examples
seebees Aug 14, 2019
6c143cc
update names
seebees Aug 16, 2019
56b20a0
update to https to test
seebees Aug 16, 2019
406d50c
lint
seebees Aug 16, 2019
9cd07d1
test
seebees Aug 16, 2019
724abf8
add no-sandbox
seebees Aug 16, 2019
053ba74
only run integration once
seebees Aug 17, 2019
2eb0f1c
Merge branch 'master' into cacheing-cmm-examples
seebees Aug 19, 2019
f2de442
udpates
seebees Aug 20, 2019
a6ad904
Merge branch 'master' into cacheing-cmm-examples
seebees Aug 23, 2019
4d85488
lint
seebees Aug 21, 2019
b677790
better comments
seebees Sep 6, 2019
af36ce3
Merge branch 'master' into cacheing-cmm-examples
seebees Sep 9, 2019
d2b91b2
update variable name to make docs happy
seebees Sep 19, 2019
d22b87d
update language re examples
seebees Sep 19, 2019
ebf2f10
Merge branch 'master' into cacheing-cmm-examples
seebees Sep 19, 2019
ee47a20
ciphertest -> result doc changes
seebees Sep 19, 2019
8e5fad2
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
12117e0
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
14bc1cb
Update modules/client-browser/Readme.md
seebees Sep 20, 2019
1e1b542
Update modules/client-node/Readme.md
seebees Sep 20, 2019
96e72b8
Update modules/example-browser/html/caching_materials_manager.html
seebees Sep 20, 2019
a0b9997
Update modules/example-browser/src/aes_simple.ts
seebees Sep 20, 2019
d5f48d6
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
13f083c
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
b4a243e
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
51f6404
Update modules/example-browser/src/multi_keyring.ts
seebees Sep 20, 2019
7cd9b68
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
16fea74
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
604b758
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
75ea690
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
9bf3f5d
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
502c989
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
e80d86c
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
856c902
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
8402ae6
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
d443aef
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
b84d9fb
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
c6dcf32
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
f53b388
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
cb23a77
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
94890ab
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
e7cee67
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
6e5f078
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
185ec65
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
cb0344d
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
f8796d3
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
010d1fa
Update modules/example-browser/src/caching_materials_manager.ts
seebees Sep 20, 2019
d7911d7
reformat lines
seebees Sep 20, 2019
2b8ccf1
update names to caching_cmm
seebees Sep 20, 2019
02c19e1
Merge branch 'master' into cacheing-cmm-examples
seebees Sep 20, 2019
e316d35
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
0d18a07
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
cb22402
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
556cf1c
Update modules/client-browser/Readme.md
seebees Sep 20, 2019
ab9dfbc
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
43a5bae
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
4ee25c0
Update modules/example-node/src/caching_cmm.ts
seebees Sep 20, 2019
57c3687
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
abe1aec
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
720087a
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
3015bb9
Update modules/example-browser/src/caching_cmm.ts
seebees Sep 20, 2019
7a6620f
update from suggestions
seebees Sep 20, 2019
3a4561f
comment from browser -> node
seebees Sep 20, 2019
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
1 change: 0 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Karma configuration
process.env.CHROME_BIN = require('puppeteer').executablePath()
const webpack = require('webpack')

module.exports = function (config) {
config.set({
Expand Down
5 changes: 5 additions & 0 deletions modules/example-browser/html/aes_simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@
<script src="../build/aes_simple_bundle.js"></script>
</head>
<body>
<script>
// This is exported via the webpack library setting
test.testAES()
</script>
</body>
</html>
15 changes: 15 additions & 0 deletions modules/example-browser/html/caching_materials_manager.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE>

<html>
<head>
<meta charset="utf-8">
<title>Client Side Caching Materials Manager Encryption Test</title>
<script src="../build/caching_materials_manager_bundle.js"></script>
</head>
<body>
<script>
// This is exported via the webpack library setting
test.testCachingMaterialsManagerExample()
</script>
</body>
</html>
5 changes: 5 additions & 0 deletions modules/example-browser/html/kms_simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@
<script src="../build/kms_simple_bundle.js"></script>
</head>
<body>
<script>
// This is exported via the webpack library setting
test.testKmsSimpleExample()
</script>
</body>
</html>
5 changes: 5 additions & 0 deletions modules/example-browser/html/multi_keyring.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@
<script src="../build/multi_keyring_bundle.js"></script>
</head>
<body>
<script>
// This is exported via the webpack library setting
test.testMultiKeyringExample()
</script>
</body>
</html>
4 changes: 4 additions & 0 deletions modules/example-browser/html/rsa_simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
<script src="../build/rsa_simple_bundle.js"></script>
</head>
<body>
<script>
// This is exported via the webpack library setting
test.testRSA()
</script>
</body>
</html>
92 changes: 92 additions & 0 deletions modules/example-browser/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
const webpack = require('webpack')
const {defaultProvider} = require('@aws-sdk/credential-provider-node')

// Karma configuration
process.env.CHROME_BIN = require('puppeteer').executablePath()

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['mocha', 'chai'],
files: [
'test/**/*.ts',
// 'src/**/*.ts'
],
preprocessors: {
// 'src/**/*.ts': ['credentials'],
'test/**/*.ts': ['webpack', 'credentials']
},
webpack: {
resolve: {
extensions: [ '.ts', '.js' ]
},
mode: 'development',
module: {
rules: [
{
test: /\.tsx?$/,
use: [
{
loader: 'ts-loader',
options: {
configFile: 'tsconfig.module.json',
compilerOptions: {
rootDir: './'
}
}
}
],
exclude: /node_modules/,
},
{
test: /\.ts$/,
exclude: [ /\/test\// ],
enforce: 'post',
use: {
loader: 'istanbul-instrumenter-loader',
options: { esModules: true }
}
}
]
},
stats: {
colors: true,
modules: true,
reasons: true,
errorDetails: true
},
devtool: 'inline-source-map',
node: {
fs: 'empty'
},
},
coverageIstanbulReporter: {
reports: [ 'json' ],
dir: '.karma_output',
fixWebpackSourcePaths: true
},
plugins: [
'@aws-sdk/karma-credential-loader',
'karma-chrome-launcher',
'karma-mocha',
'karma-chai',
'karma-webpack',
'karma-coverage-istanbul-reporter'
],
reporters: ['progress', 'coverage-istanbul'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: false,
browsers: ['ChromeHeadlessDisableCors'],
customLaunchers: {
ChromeHeadlessDisableCors: {
base: 'ChromeHeadless',
flags: ['--disable-web-security']
}
},
singleRun: true,
concurrency: Infinity,
exclude: ['**/*.d.ts']
})
}
18 changes: 16 additions & 2 deletions modules/example-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
"scripts": {
"prepublishOnly": "npm run build",
"build": "tsc -b tsconfig.json && tsc -b tsconfig.module.json",
"test": "mocha --require ts-node/register tests/**/*tests.ts",
"lint": "standard src/*.ts test/**/*.ts",
"karma": "karma start karma.conf.js",
"test": "npm run lint && npm run coverage",
"coverage": "npm run karma && nyc report --exclude-after-remap false -t .karma_output --check-coverage",
"example-rsa": "webpack -d --config webpack_configs/rsa.webpack.config.js",
"example-aes": "webpack -d --config webpack_configs/aes.webpack.config.js",
"example-kms": "webpack -d --config webpack_configs/kms.webpack.config.js",
"example-multi-keyring": "webpack -d --config webpack_configs/multi_keyring.webpack.config.js"
"example-multi-keyring": "webpack -d --config webpack_configs/multi_keyring.webpack.config.js",
"example-caching-materials-manager": "webpack -d --config webpack_configs/caching_materials_manager.webpack.config.js"
},
"author": {
"name": "AWS Crypto Tools Team",
Expand All @@ -25,11 +29,21 @@
"@aws-sdk/credential-provider-node": "^0.1.0-preview.4",
"@types/chai": "^4.1.4",
"@types/mocha": "^5.2.5",
"@typescript-eslint/eslint-plugin": "^1.9.0",
"@typescript-eslint/parser": "^1.9.0",
"chai": "^4.1.2",
"mocha": "^5.2.0",
"ts-loader": "^5.3.3",
"ts-node": "^7.0.1",
"typescript": "^3.5.0",
"karma": "^4.1.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-mocha": "^1.3.0",
"karma-webpack": "^3.0.5",
"nyc": "^14.0.0",
"standard": "^12.0.1",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.0"
},
Expand Down
8 changes: 6 additions & 2 deletions modules/example-browser/src/aes_simple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import {
} from '@aws-crypto/client-browser'
import { toBase64 } from '@aws-sdk/util-base64-browser'

;(async function testAES () {
/* This is done to facilitate testing. */
export async function testAES () {
/* You need to specify a name
* and a namespace for raw encryption key providers.
* The name and namespace that you use in the decryption keyring *must* be an exact,
Expand Down Expand Up @@ -105,4 +106,7 @@ import { toBase64 } from '@aws-sdk/util-base64-browser'
*/
document.write('</br>plaintext:' + plaintext)
console.log(plaintext)
})()

/* Return the values to make testing easy. */
return { plainText, plaintext }
}
Loading