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.

Sign up for GitHub

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

Jump to bottom

Push out SWB 1.1.1 to AA Non-Fisma Dev #117

Merged
merged 2 commits into from
Aug 10, 2023
Merged

Push out SWB 1.1.1 to AA Non-Fisma Dev #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7099724
Update NodeJS for Lambdas (#113)
srpiatt Aug 10, 2023
40892e6
Update linting. (#116)
srpiatt Aug 10, 2023
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. As our fork has diverged from AWS SWB mainline branch, we are noting the SWB version and the lab version together, as <swb version>\_<lab version>, starting from SWB mainline, 5.0.0.

## [5.0.0_1.1.1](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.1.0...v5.0.0_1.1.1) (08/10/2023)
- Cherry pick [a0c7eeed34eea02ec56f49411cf499d1c59f0d3a](https://github.com/awslabs/service-workbench-on-aws/commit/a0c7eeed34eea02ec56f49411cf499d1c59f0d3a) to upgrade nodejs version and dependencies for lambda runtimes.
## [5.0.0_1.1.0](https://github.com/hms-dbmi/service-workbench-on-aws/compare/v5.0.0_1.0.3...v5.0.0_1.1.0) (07/21/2023)
- Add S3 GetObject and List permission to access embed data for workspaces.
- Add logos to workspace types on user creation step so it's easier to visually find the types they want.
Expand Down
18 changes: 9 additions & 9 deletions addons/addon-base-post-deployment/packages/base-post-deployment/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
"@aws-ee/base-api-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/base-services-container": "workspace:*",
"aws-sdk": "^2.1000.0",
"generate-password": "^1.5.0",
"aws-sdk": "^2.1228.0",
"generate-password": "^1.7.0",
"lodash": "^4.17.21"
},
"devDependencies": {
"aws-sdk-mock": "^5.1.0",
"aws-sdk-mock": "^5.7.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
16 changes: 8 additions & 8 deletions addons/addon-base-pre-deployment/packages/base-pre-deployment/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
"@aws-ee/base-api-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/base-services-container": "workspace:*",
"aws-sdk": "^2.1000.0",
"generate-password": "^1.5.0",
"aws-sdk": "^2.1228.0",
"generate-password": "^1.7.0",
"lodash": "^4.17.21"
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
12 changes: 6 additions & 6 deletions addons/addon-base-raas-appstream/packages/base-raas-appstream-rest-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"test": "NODE_ENV=test jest --config jest.config.js --passWithNoTests",
Expand Down
14 changes: 7 additions & 7 deletions addons/addon-base-raas-appstream/packages/base-raas-appstream-services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
"uuid": "^3.4.0"
},
"devDependencies": {
"aws-sdk-mock": "^5.1.0",
"aws-sdk-mock": "^5.7.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
1 change: 1 addition & 0 deletions addons/addon-base-raas-ui/packages/base-raas-ui/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"react/jsx-props-no-spreading": 0,
"react/jsx-one-expression-per-line": 0,
"react/jsx-filename-extension": 0,
"react/jsx-pascal-case": 0,
"react/destructuring-assignment": 0,
"react/sort-comp": 0,
"react/prop-types": 0,
Expand Down
80 changes: 40 additions & 40 deletions addons/addon-base-raas-ui/packages/base-raas-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@
"author": "Amazon Web Services",
"license": "Apache-2.0",
"dependencies": {
"@auth0/auth0-spa-js": "^1.2.3",
"@auth0/auth0-spa-js": "^1.22.4",
"@aws-ee/base-ui": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/key-pair-mgmt-ui": "workspace:*",
"aws-sdk": "^2.1000.0",
"aws-sdk": "^2.1228.0",
"chart.js": "^2.9.4",
"classnames": "^2.2.6",
"classnames": "^2.3.2",
"crypto-browserify": "^3.12.0",
"csvtojson": "^2.0.10",
"is-cidr": "^3.1.0",
"is-cidr": "^3.1.1",
"jwt-decode": "^2.2.0",
"lodash": "^4.17.21",
"mobx": "^5.15.4",
"mobx-react": "^6.1.7",
"mobx-react-form": "^2.0.8",
"mobx-state-tree": "^3.15.0",
"mobx": "^5.15.7",
"mobx-react": "^6.3.1",
"mobx-react-form": "^2.0.9",
"mobx-state-tree": "^3.17.3",
"numeral": "^2.0.6",
"pretty-bytes": "^5.3.0",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-avatar": "^3.9.0",
"react-chartjs-2": "^2.9.0",
"react-copy-to-clipboard": "^5.0.2",
"react-dom": "^16.12.0",
"pretty-bytes": "^5.6.0",
"prop-types": "^15.8.1",
"react": "^16.14.0",
"react-avatar": "^3.10.0",
"react-chartjs-2": "^2.11.2",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^16.14.0",
"react-dotdotdot": "^1.3.1",
"react-dropzone": "^10.1.9",
"react-router-dom": "^5.1.2",
"react-select": "^3.0.8",
"react-dropzone": "^10.2.2",
"react-router-dom": "^5.3.4",
"react-select": "^3.2.0",
"react-sparklines": "^1.7.0",
"react-syntax-highlighter": "^15.4.4",
"react-syntax-highlighter": "^15.5.0",
"react-table": "^6.11.5",
"react-timeago": "^4.4.0",
"request": "^2.34",
Expand All @@ -43,41 +43,41 @@
"toastr": "^2.1.4",
"typeface-lato": "0.0.75",
"uuid": "^3.4.0",
"validatorjs": "^3.18.1"
"validatorjs": "^3.22.1"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7.8.6",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-transform-react-jsx": "^7.8.3",
"@babel/preset-env": "^7.8.6",
"@babel/preset-react": "^7.8.3",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.19.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-transform-react-jsx": "^7.19.0",
"@babel/preset-env": "^7.19.3",
"@babel/preset-react": "^7.18.6",
"babel-jest": "^24.9.0",
"babel-loader": "^8.0.6",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.2.5",
"babel-eslint": "^10.1.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.18.3",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-react": "^7.31.8",
"eslint-plugin-react-hooks": "^1.7.0",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"prop-types": "^15.7.2",
"serverless": "^1.63.0",
"serverless-deployment-bucket": "^1.1.0",
"typescript": "^3.7.5",
"serverless": "^3.22.0",
"serverless-deployment-bucket": "^1.6.0",
"typescript": "^3.9.10",
"webpack": "4.41.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"regenerator-runtime": "^0.13.5"
"enzyme-adapter-react-16": "^1.15.6",
"regenerator-runtime": "^0.13.9"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
3 changes: 1 addition & 2 deletions ...ase-raas-ui/packages/base-raas-ui/src/parts/environments-builtin/EnvironmentDetailPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* permissions and limitations under the License.
*/

import crypto from 'crypto';
import _ from 'lodash';
import React from 'react';
import { observer, inject, Observer } from 'mobx-react';
Expand All @@ -36,8 +37,6 @@ import {
} from 'semantic-ui-react';
import { CopyToClipboard } from 'react-copy-to-clipboard';

import crypto from 'crypto';

import { gotoFn } from '@aws-ee/base-ui/dist/helpers/routing';
import { swallowError } from '@aws-ee/base-ui/dist/helpers/utils';
import { displayError } from '@aws-ee/base-ui/dist/helpers/notification';
Expand Down
2 changes: 1 addition & 1 deletion addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/users/DragDrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class DragDrop extends Component {
return (
<div {...getRootProps()}>
<input {...getInputProps()} />
{<Icon name="cloud upload" size="massive" color="grey" />}
<Icon name="cloud upload" size="massive" color="grey" />
{isFileTooLarge && <div className="text-danger mt-2">File is too large.</div>}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion addons/addon-base-raas-ui/packages/base-raas-ui/src/parts/users/UserOnboarding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ class UserOnboarding extends React.Component {
) : (
<p>Drag and drop a credentials.csv files here, or click to select a file</p>
)}
{<Icon name="cloud upload" size="huge" color="grey" />}
<Icon name="cloud upload" size="huge" color="grey" />
{isFileTooLarge && <div className="text-danger mt-2">File is too large.</div>}
</div>
);
Expand Down
18 changes: 9 additions & 9 deletions addons/addon-base-raas/packages/base-raas-cfn-templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
"author": "Amazon Web Services",
"license": "Apache-2.0",
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7.9.0",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.19.3",
"babel-plugin-inline-import": "^3.0.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"babel": "babel src/ --out-dir dist/ --source-maps",
Expand Down
14 changes: 7 additions & 7 deletions addons/addon-base-raas/packages/base-raas-post-deployment/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
12 changes: 6 additions & 6 deletions addons/addon-base-raas/packages/base-raas-rest-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
},
"devDependencies": {
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint-plugin-import": "^2.20.1",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-config-prettier": "^6.15.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^22.21.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"pretty-quick": "^1.11.1",
"source-map-support": "^0.5.16"
"source-map-support": "^0.5.21"
},
"scripts": {
"coverage": "NODE_ENV=test jest --config jest.config.js --passWithNoTests --verbose --collectCoverage --watchAll=false --coverage && codecov --disable=gcov",
Expand Down
3 changes: 2 additions & 1 deletion addons/addon-base-raas/packages/base-raas-services/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"no-underscore-dangle": 0,
"no-param-reassign": 0,
"class-methods-use-this": 0,
"no-use-before-define": 0
"no-use-before-define": 0,
"no-console": 0
},
"env": {
"jest/globals": true
Expand Down
2 changes: 1 addition & 1 deletion ...ns/addon-base-raas/packages/base-raas-services/lib/__tests__/cfn-template-service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* permissions and limitations under the License.
*/

const ServicesContainer = require('@aws-ee/base-services-container/lib/services-container');
const fs = require('fs');
const ServicesContainer = require('@aws-ee/base-services-container/lib/services-container');
const SettingsServiceMock = require('@aws-ee/base-services/lib/settings/env-settings-service');

const { yamlParse } = require('yaml-cfn');
Expand Down
Loading