Skip to content

Commit 28cdf07

Browse files
committed
Merging upstream main
2 parents 547c4e2 + fe3bf7c commit 28cdf07

File tree

31 files changed

+78
-183
lines changed

31 files changed

+78
-183
lines changed

docs/developer-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This solution uses Amazon CloudFront as the entry point of the administration ap
4747
### Running the client locally
4848
After SaaS Boost is installed and running, you may be interested in making changes to the administration application. If you want to make changes and develop/test them locally, you can navigate to the `/client/web` folder that is part of the code you downloaded when cloning the SaaS Boost repository.
4949

50-
Within the same folder is a `sample.env` file that holds variables that are specific to your deployed environment. Rename this file with the `.env` extension, and edit its settings to allow your local environment to connect to the core services of your deployed SaaS Boost environment.
50+
Within the same folder is a `sample.env` file that holds variables that are specific to your deployed environment. Rename this file to just be `.env` and edit its settings to allow your local environment to connect to the core services of your deployed SaaS Boost environment.
5151

5252
Open the newly named file in an editor of your choice. To run the client locally, there are various environment variables that must be configured. The following is an example of configured settings:
5353
```ini
@@ -57,7 +57,7 @@ REACT_APP_COGNITO_USERPOOL=us-east-1_XXXXXXXXX
5757
REACT_APP_CLIENT_ID=[YOUR CLIENT ID HERE]
5858
REACT_APP_API_URI=[API URI HERE]
5959
```
60-
The values for these settings can be retrieved from the AWS Management Console. The Region is based on the physical location of your SaaS Boost deployment. You can also access the Amazon Cognito service in the console to look up the user pool and client ID settings. To get the URI entry point for backend services, use the API Gateway service in the console.
60+
The values for these settings can be retrieved from the AWS Management Console. The Region is based on the physical location of your SaaS Boost deployment. You can also access the Amazon Cognito service in the console to look up the user pool and client ID settings. To get the URI entry point for backend services, use the API Gateway service in the console and copy the invoke URL for the v1 stage of the public API.
6161

6262
After these environment variables are correctly configured, you can edit and run the client locally from the `/client/web` folder using the following command: `yarn start`
6363

docs/getting-started.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,10 @@ To initiate this process, perform the following steps:
6868
4. Enter the full path to your AWS SaaS Boost directory: /\<mydir\>/aws-saas-boost.
6969
5. Enter the name of the SaaS Boost environment (dev, QA, test, sandbox, etc.).
7070
6. Enter the email address of the AWS SaaS Boost administrator who will receive the initial temporary password.
71-
7. Indicate whether you want a domain to be setup for AWS SaaS Boost (Y/N).
72-
- If you enter **Y**, you are prompted for a domain name. For example, if your main domain is **example.com**, you can enter **app.example.com** to have that sub-domain setup by the installer. After the installation completes, you need to update the DNS for example.com to add an entry for app.example.com pointing to the nameservers for the Route53 hosted zone created for app.example.com.
73-
- This step can also be done after the install process.
74-
8. Indicate whether you would like the metrics and analytics features of AWS SaaS Boost to be installed (Y/N). This is **optional** and will provision a [Redshift](https://aws.amazon.com/redshift) cluster.
71+
7. Indicate whether you would like the metrics and analytics features of AWS SaaS Boost to be installed (Y/N). This is **optional** and will provision a [Redshift](https://aws.amazon.com/redshift) cluster.
7572
- If you enter **Y**, you are prompted for [QuickSight](https://aws.amazon.com/quicksight/) setup. To select Y for Quicksight setup, _you must have already registered_ for at least a Standard account of Quicksight in your AWS Account by following the steps at [https://docs.aws.amazon.com/quicksight/latest/user/signing-up.html](https://docs.aws.amazon.com/quicksight/latest/user/signing-up.html).
76-
9. If your application is Windows based and needs a shared file system, a [Managed Active Directory](https://aws.amazon.com/directoryservice/) must be deployed to support [Amazon FSx for Windows File Server](https://aws.amazon.com/fsx/windows/). Select y or n as needed.
77-
10. Review the settings for your installation. Enter **y** to proceed or **n** to re-enter or adjust the values.
73+
8. If your application is Windows based and needs a shared file system, a [Managed Active Directory](https://aws.amazon.com/directoryservice/) must be deployed to support [Amazon FSx for Windows File Server](https://aws.amazon.com/fsx/windows/). Select y or n as needed.
74+
9. Review the settings for your installation. Enter **y** to proceed or **n** to re-enter or adjust the values.
7875

7976
The execution of this process will take 30-45 minutes to provision and configure all the resources (this will vary based on the options you've selected). Detailed logs from the installation process are stored in **saas-boost-install.log**.
8077

functions/alb-update/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ limitations under the License.
114114
<dependency>
115115
<groupId>com.amazonaws</groupId>
116116
<artifactId>aws-lambda-java-log4j2</artifactId>
117-
<version>1.2.0</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.apache.logging.log4j</groupId>
121-
<artifactId>log4j-slf4j-impl</artifactId>
122-
<version>2.13.3</version>
123117
</dependency>
124118
<dependency>
125119
<groupId>software.amazon.awssdk</groupId>

functions/ecs-service-update/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ limitations under the License.
9797
<dependency>
9898
<groupId>com.amazonaws</groupId>
9999
<artifactId>aws-lambda-java-core</artifactId>
100-
<version>1.2.0</version>
100+
<version>1.2.1</version>
101101
</dependency>
102102
<dependency>
103103
<groupId>com.amazonaws</groupId>
@@ -107,12 +107,6 @@ limitations under the License.
107107
<dependency>
108108
<groupId>com.amazonaws</groupId>
109109
<artifactId>aws-lambda-java-log4j2</artifactId>
110-
<version>1.2.0</version>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.apache.logging.log4j</groupId>
114-
<artifactId>log4j-slf4j-impl</artifactId>
115-
<version>2.13.3</version>
116110
</dependency>
117111
<dependency>
118112
<groupId>software.amazon.awssdk</groupId>

functions/ecs-shutdown-services/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ limitations under the License.
114114
<dependency>
115115
<groupId>com.amazonaws</groupId>
116116
<artifactId>aws-lambda-java-log4j2</artifactId>
117-
<version>1.2.0</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.apache.logging.log4j</groupId>
121-
<artifactId>log4j-slf4j-impl</artifactId>
122-
<version>2.13.3</version>
123117
</dependency>
124118
<dependency>
125119
<groupId>software.amazon.awssdk</groupId>

functions/ecs-startup-services/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ limitations under the License.
114114
<dependency>
115115
<groupId>com.amazonaws</groupId>
116116
<artifactId>aws-lambda-java-log4j2</artifactId>
117-
<version>1.2.0</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.apache.logging.log4j</groupId>
121-
<artifactId>log4j-slf4j-impl</artifactId>
122-
<version>2.13.3</version>
123117
</dependency>
124118
<dependency>
125119
<groupId>software.amazon.awssdk</groupId>

functions/onboarding-listener/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ limitations under the License.
107107
<dependency>
108108
<groupId>com.amazonaws</groupId>
109109
<artifactId>aws-lambda-java-log4j2</artifactId>
110-
<version>1.2.0</version>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.apache.logging.log4j</groupId>
114-
<artifactId>log4j-slf4j-impl</artifactId>
115-
<version>2.13.3</version>
116110
</dependency>
117111
<dependency>
118112
<groupId>software.amazon.awssdk</groupId>

functions/system-rest-api-client/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ limitations under the License.
114114
<dependency>
115115
<groupId>com.amazonaws</groupId>
116116
<artifactId>aws-lambda-java-log4j2</artifactId>
117-
<version>1.2.0</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.apache.logging.log4j</groupId>
121-
<artifactId>log4j-slf4j-impl</artifactId>
122-
<version>2.13.3</version>
123117
</dependency>
124118
</dependencies>
125119
</project>

functions/workload-deploy/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ limitations under the License.
114114
<dependency>
115115
<groupId>com.amazonaws</groupId>
116116
<artifactId>aws-lambda-java-log4j2</artifactId>
117-
<version>1.2.0</version>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.apache.logging.log4j</groupId>
121-
<artifactId>log4j-slf4j-impl</artifactId>
122-
<version>2.13.3</version>
123117
</dependency>
124118
<dependency>
125119
<groupId>software.amazon.awssdk</groupId>

installer/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,6 @@ limitations under the License.
119119
<version>3.12.4</version>
120120
<scope>test</scope>
121121
</dependency>
122-
<dependency>
123-
<groupId>org.apache.logging.log4j</groupId>
124-
<artifactId>log4j-core</artifactId>
125-
<version>2.13.3</version>
126-
</dependency>
127-
<dependency>
128-
<groupId>org.apache.logging.log4j</groupId>
129-
<artifactId>log4j-api</artifactId>
130-
<version>2.13.3</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>org.apache.logging.log4j</groupId>
134-
<artifactId>log4j-slf4j-impl</artifactId>
135-
<version>2.13.3</version>
136-
</dependency>
137122
<dependency>
138123
<groupId>software.amazon.awssdk</groupId>
139124
<artifactId>cloudformation</artifactId>

0 commit comments

Comments
 (0)