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

[ALS-4752] Remove included packages in favor of using a lambda layer built on requirements file #124

Merged
merged 2 commits into from
Sep 25, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { nicePrice } from '@aws-ee/base-ui/dist/helpers/utils';
// expected props
// - configurations (via props) and array of the compute configurations MST
// - formField (via props) an instance of the mobx form field
class SelectConfigurationCards extends React.Component {
class SelectConfigurationCardsCompute extends React.Component {
get configurations() {
return this.props.configurations;
}
Expand Down Expand Up @@ -138,11 +138,11 @@ class SelectConfigurationCards extends React.Component {
}

// see https://medium.com/@mweststrate/mobx-4-better-simpler-faster-smaller-c1fbc08008da
decorate(SelectConfigurationCards, {
decorate(SelectConfigurationCardsCompute, {
configurations: computed,
configurationId: computed,
formField: computed,
handleSelectConfigurationId: action,
});

export default inject()(observer(SelectConfigurationCards));
export default inject()(observer(SelectConfigurationCardsCompute));
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { enableBuiltInWorkspaces } from '../../helpers/settings';
import { blueDatasets } from './graphs/graph-options';
import BarGraph from './graphs/BarGraph';

class Dashboard extends React.Component {
class BaseDashboard extends React.Component {
constructor(props) {
super(props);
this.state = {
Expand Down Expand Up @@ -335,7 +335,7 @@ async function getAccumulatedEnvCost(getEnvironmentsFn, getEnvironmentCostFn) {
}

// see https://medium.com/@mweststrate/mobx-4-better-simpler-faster-smaller-c1fbc08008da
decorate(Dashboard, {});
decorate(BaseDashboard, {});

export default inject('userStore')(withRouter(observer(Dashboard)));
export default inject('userStore')(withRouter(observer(BaseDashboard)));
export { getAccumulatedEnvCost, getCosts, getLabels };
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import AccountStatusMessage from './parts/AccountStatusMessage';
// This component is used with the TabPane to replace the default Segment wrapper since
// we don't want to display the border.
// eslint-disable-next-line react/prefer-stateless-function
class TabPaneWrapper extends React.Component {
class TabPaneWrapperDataSource extends React.Component {
render() {
return <>{this.props.children}</>;
}
Expand Down Expand Up @@ -129,23 +129,23 @@ class DataSourceAccountCard extends React.Component {
{
menuItem: <Menu.Item key="studies">Studies {getMenuItemLabel()}</Menu.Item>,
render: () => (
<Tab.Pane attached={false} key="studies" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="studies" as={TabPaneWrapperDataSource}>
<Observer>{() => <DataSourceStudiesList account={account} />}</Observer>
</Tab.Pane>
),
},
{
menuItem: 'CloudFormation',
render: () => (
<Tab.Pane attached={false} key="cloudformation" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="cloudformation" as={TabPaneWrapperDataSource}>
<Observer>{() => <DataSourceAccountCfn account={account} />}</Observer>
</Tab.Pane>
),
},
{
menuItem: 'Account Information',
render: () => (
<Tab.Pane attached={false} key="accountInfo" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="accountInfo" as={TabPaneWrapperDataSource}>
<Observer>{() => <DataSourceAccountInfo account={account} />}</Observer>
</Tab.Pane>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class EnvironmentConnectButton extends React.Component {

const url = await this.getUrl(environment);
// Change to the notebook
newTab.opener = null;
newTab.location = url;
environment.setFetchingUrl(false);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import localStorageKeys from '../../models/constants/local-storage-keys';
// expected props
// - environmentsStore (via injection)
// - location (from react router)
class EnvironmentsList extends React.Component {
class EnvironmentsListBuiltin extends React.Component {
constructor(props) {
super(props);
const user = this.getUserStore().user;
Expand Down Expand Up @@ -203,7 +203,7 @@ class EnvironmentsList extends React.Component {
}

// see https://medium.com/@mweststrate/mobx-4-better-simpler-faster-smaller-c1fbc08008da
decorate(EnvironmentsList, {
decorate(EnvironmentsListBuiltin, {
handleDetailClick: action,
setOnboarding: action,
hidePinModal: action,
Expand All @@ -212,4 +212,4 @@ decorate(EnvironmentsList, {
pinModalOpen: observable,
});

export default inject('environmentsStore', 'userStore')(withRouter(observer(EnvironmentsList)));
export default inject('environmentsStore', 'userStore')(withRouter(observer(EnvironmentsListBuiltin)));
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import ScEnvironmentCostTable from './parts/ScEnvironmentCostTable';
// This component is used with the TabPane to replace the default Segment wrapper since
// we don't want to display the border.
// eslint-disable-next-line react/prefer-stateless-function
class TabPaneWrapper extends React.Component {
class TabPaneWrapperEnvs extends React.Component {
render() {
return <>{this.props.children}</>;
}
Expand Down Expand Up @@ -306,15 +306,15 @@ class ScEnvironmentDetailPage extends React.Component {
{
menuItem: 'Cost',
render: () => (
<Tab.Pane attached={false} key="cost" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="cost" as={TabPaneWrapperEnvs}>
<Observer>{() => <ScEnvironmentCostTable envId={env.id} />}</Observer>
</Tab.Pane>
),
},
{
menuItem: 'CloudFormation Output',
render: () => (
<Tab.Pane attached={false} key="cfn-outputs" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="cfn-outputs" as={TabPaneWrapperEnvs}>
<Observer>{() => this.renderCfnOutput(env)}</Observer>
</Tab.Pane>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import StudyStepsProgress from './StudyStepsProgress';
// This component is used with the TabPane to replace the default Segment wrapper since
// we don't want to display the border.
// eslint-disable-next-line react/prefer-stateless-function
class TabPaneWrapper extends React.Component {
class TabPaneWrapperStudies extends React.Component {
render() {
return <>{this.props.children}</>;
}
Expand Down Expand Up @@ -122,7 +122,7 @@ class StudiesPage extends React.Component {
</Menu.Item>
),
render: () => (
<Tab.Pane attached={false} key={category.id} as={TabPaneWrapper}>
<Tab.Pane attached={false} key={category.id} as={TabPaneWrapperStudies}>
<Observer>{() => <StudiesTab category={category} />}</Observer>
</Tab.Pane>
),
Expand Down
6 changes: 3 additions & 3 deletions addons/addon-base-ui/packages/base-ui/src/parts/helpers/By.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import c from 'classnames';
// - user (via props)
// - userDisplayName (via injection)
// - className (via props)
class By extends React.Component {
class BaseBy extends React.Component {
get uid() {
return this.props.uid;
}
Expand All @@ -45,6 +45,6 @@ class By extends React.Component {
}

// see https://medium.com/@mweststrate/mobx-4-better-simpler-faster-smaller-c1fbc08008da
decorate(By, {});
decorate(BaseBy, {});

export default inject('userDisplayName')(withRouter(observer(By)));
export default inject('userDisplayName')(withRouter(observer(BaseBy)));
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { displayError } from '../../helpers/notification';
import { createLink } from '../../helpers/routing';
import validate from '../../models/forms/Validate';

class AddUser extends React.Component {
class BaseAddUser extends React.Component {
constructor(props) {
super(props);

Expand Down Expand Up @@ -248,9 +248,9 @@ class AddUser extends React.Component {
}

// see https://medium.com/@mweststrate/mobx-4-better-simpler-faster-smaller-c1fbc08008da
decorate(AddUser, {
decorate(BaseAddUser, {
formProcessing: observable,
user: observable,
validationErrors: observable,
});
export default inject('userStore', 'usersStore')(withRouter(observer(AddUser)));
export default inject('userStore', 'usersStore')(withRouter(observer(BaseAddUser)));
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { displayError } from '../../helpers/notification';
import BasicProgressPlaceholder from '../helpers/BasicProgressPlaceholder';
import { swallowError } from '../../helpers/utils';

class UsersList extends React.Component {
class BaseUsersList extends React.Component {
constructor(props) {
super(props);

Expand Down Expand Up @@ -393,9 +393,9 @@ class UsersList extends React.Component {
}

// see https://medium.com/@mweststrate/mobx-4-better-simpler-faster-smaller-c1fbc08008da
decorate(UsersList, {
decorate(BaseUsersList, {
mapOfUsersBeingEdited: observable,
formProcessing: observable,
});

export default inject('userStore', 'usersStore')(withRouter(observer(UsersList)));
export default inject('userStore', 'usersStore')(withRouter(observer(BaseUsersList)));
2 changes: 1 addition & 1 deletion addons/addon-base-ui/packages/base-ui/src/render-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ function renderError(err) {
);
}

export { renderAppContainer, renderProgress, renderError };
export { renderAppContainer, renderProgress, renderError };
10 changes: 6 additions & 4 deletions addons/addon-custom/packages/main/data/terms.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default [
your access is no more than necessary to perform your legitimate tasks or
assigned duties. If you believe you are being granted access that you should
not have, you must immediately notify
<a href="mailto:{CONTACT}" target="_blank">{CONTACT}</a>.
<a href="mailto:{CONTACT}" target="_blank" rel=”noreferrer”>{CONTACT}</a>.
</li>
<li>
Safeguard system resources against waste, loss, abuse, unauthorized use or
Expand All @@ -49,11 +49,11 @@ export default [
<li>
Report all security incidents or suspected incidents (e.g., lost passwords,
improper or suspicious acts) related to Service Workbench
<a href="mailto:{CONTACT}" target="_blank">{CONTACT}</a>
<a href="mailto:{CONTACT}" target="_blank" rel=”noreferrer”>{CONTACT}</a>
</li>
<li>
Contact
<a href="mailto:{CONTACT}" target="_blank">{CONTACT}</a>
<a href="mailto:{CONTACT}" target="_blank" rel=”noreferrer”>{CONTACT}</a>
if you do not understand any of these rules.
</li>
</ul>
Expand Down Expand Up @@ -88,7 +88,9 @@ export default [
<li>
The University maintains the right to modify these Terms of Service at any
time, and may do so by posting notice of such modifications to
<a href="https://{HOSTNAME}/legal" target="_blank">https://{HOSTNAME}/legal</a>
<a href="https://{HOSTNAME}/legal" target="_blank" rel=”noreferrer”>
https://{HOSTNAME}/legal
</a>
</li>
<li>
Any modification made is effective immediately upon posting the modification
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import ConfigStep from './env-type-editor-steps/ConfigStep';

// This component is used with the TabPane to replace the default Segment wrapper since
// we don't want to display the border.
function TabPaneWrapper(props) {
function TabPaneWrapperTypeEditor(props) {
return <>{props.children}</>;
}

Expand Down Expand Up @@ -136,7 +136,7 @@ class EnvTypeEditor extends React.Component {
const stepPanes = _.map(this.wizardModel.steps, step => ({
menuItem: step.title,
render: () => (
<Tab.Pane attached={false} key={step.key} as={TabPaneWrapper}>
<Tab.Pane attached={false} key={step.key} as={TabPaneWrapperTypeEditor}>
<Observer>{() => this.renderEnvTypeStep(step.key)}</Observer>
</Tab.Pane>
// <Observer>{() => this.renderEnvTypeStep(step.key)}</Observer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Input from '@aws-ee/base-ui/dist/parts/helpers/fields/Input';
import TextArea from '@aws-ee/base-ui/dist/parts/helpers/fields/TextArea';
import BaseEnvTypeConfigStep from './BaseEnvTypeConfigStep';

class BasicInfoStep extends BaseEnvTypeConfigStep {
class BasicInfoStepConfig extends BaseEnvTypeConfigStep {
renderFormFields({ form, processing }) {
const isUpdating = this.isEditAction();

Expand All @@ -39,4 +39,4 @@ class BasicInfoStep extends BaseEnvTypeConfigStep {
}
}

export default observer(BasicInfoStep);
export default observer(BasicInfoStepConfig);
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import KeyPairButtons from './parts/KeyPairButtons';
// This component is used with the TabPane to replace the default Segment wrapper since
// we don't want to display the border.
// eslint-disable-next-line react/prefer-stateless-function
class TabPaneWrapper extends React.Component {
class TabPaneWrapperKeyCard extends React.Component {
render() {
return <>{this.props.children}</>;
}
Expand Down Expand Up @@ -63,15 +63,15 @@ class KeyPairCard extends React.Component {
{
menuItem: 'Public Key',
render: () => (
<Tab.Pane attached={false} key="public-key" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="public-key" as={TabPaneWrapperKeyCard}>
<Observer>{() => this.renderPublicKey(keyPair)}</Observer>
</Tab.Pane>
),
},
{
menuItem: 'Private Key',
render: () => (
<Tab.Pane attached={false} key="private-key" as={TabPaneWrapper}>
<Tab.Pane attached={false} key="private-key" as={TabPaneWrapperKeyCard}>
<Observer>{() => this.renderPrivateKey()}</Observer>
</Tab.Pane>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ phases:
install:
runtime-versions:
nodejs: 12
python: 3.11

pre_build:
commands:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ phases:
# See supported runtimes at https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-available.html
runtime-versions:
nodejs: 12
python: 3.11

pre_build:
commands:
Expand Down
1 change: 1 addition & 0 deletions main/cicd/cicd-pipeline/config/buildspec/buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ phases:
runtime-versions:
nodejs: 14
golang: 1.15
python: 3.11

pre_build:
commands:
Expand Down
8 changes: 0 additions & 8 deletions main/solution/infrastructure/bin/normalizer

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions main/solution/infrastructure/certifi-2021.10.8.dist-info/LICENSE

This file was deleted.

Loading
Loading