Skip to content

Commit b6974c0

Browse files
authored
Merge pull request #982 from topcoder-platform/dev
PROD - Remove hard-coded tokens
2 parents 1caee75 + 165f7dc commit b6974c0

File tree

797 files changed

+3836
-73956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

797 files changed

+3836
-73956
lines changed

Diff for: .circleci/config.yml

+7-48
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@ version: 2.1
22

33
defaults: &defaults
44
docker:
5-
- image: node:16.14
5+
- image: node:22.13
66

77
deploy_defaults: &deploy_defaults
88
docker:
9-
- image: cimg/python:3.10.2
10-
11-
test_defaults: &test_defaults
12-
docker:
13-
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
9+
- image: cimg/python:3.12.1-browsers
1410

1511
install_build_dependency: &install_build_dependency
1612
name: Installation of build and deployment dependencies.
1713
command: |
1814
apt update
1915
apt install jq -y
20-
apt install python3-pip -y
21-
pip3 install awscli --upgrade
16+
apt install python3-pip python-is-python3 python3.11-venv -y
17+
curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
18+
unzip awscli-bundle.zip
19+
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
2220
2321
install_dependency: &install_dependency
2422
name: Installation of build and deployment dependencies.
@@ -60,14 +58,6 @@ running_yarn_sb_build: &running_yarn_sb_build
6058
source buildenvvar
6159
yarn sb:build
6260
63-
running_yarn_test: &running_yarn_test
64-
name: Running Yarn Test Build
65-
command: |
66-
yarn install
67-
yarn cypress install
68-
yarn build
69-
yarn cy:ci
70-
7161
workspace_persist: &workspace_persist
7262
root: .
7363
paths:
@@ -98,26 +88,6 @@ build_steps: &build_steps # Initialization.
9888
- run: *running_yarn_sb_build
9989
- persist_to_workspace: *workspace_persist
10090

101-
test_steps: &test_steps # Initialization.
102-
- checkout
103-
- setup_remote_docker
104-
- restore_cache:
105-
key: test-node-modules-{{ checksum "yarn.lock" }}
106-
- run: *running_yarn_test
107-
- save_cache:
108-
key: test-node-modules-{{ checksum "yarn.lock" }}
109-
paths:
110-
- node_modules
111-
- /root/.cache/Cypress
112-
- store_test_results:
113-
path: cypress/test-report
114-
- store_artifacts:
115-
path: cypress/test-report
116-
- store_artifacts:
117-
path: cypress/videos
118-
- store_artifacts:
119-
path: cypress/screenshots
120-
12191
deploy_steps: &deploy_steps
12292
- checkout
12393
- attach_workspace: *workspace_attach
@@ -173,14 +143,6 @@ jobs:
173143
APPNAME: "platform-ui-mvp"
174144
steps: *build_steps
175145

176-
test-dev:
177-
<<: *test_defaults
178-
environment:
179-
DEPLOY_ENV: "DEV"
180-
LOGICAL_ENV: "dev"
181-
APPNAME: "platform-ui-mvp"
182-
steps: *test_steps
183-
184146
# Just tests commited code.
185147
deployDev:
186148
<<: *deploy_defaults
@@ -277,7 +239,4 @@ workflows:
277239
filters: &filters-prod
278240
branches:
279241
only:
280-
- master
281-
282-
- test-dev:
283-
context: org-global
242+
- master

Diff for: .environments/.env.dev

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
66
REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
77
REACT_APP_STRIPE_API_VERSION=2020-08-27
88

9-
# Vanilla Forums
10-
REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
11-
129
# DataDogLogging
1310
REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
1411

Diff for: .environments/.env.prod

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
66
REACT_APP_STRIPE_API_KEY=pk_live_m3bCBVSfkfMOEp3unZFRsHXi
77
REACT_APP_STRIPE_API_VERSION=2020-08-27
88

9-
# Vanilla Forums
10-
REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
11-
129
# DataDogLogging
1310
REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
1411

Diff for: .environments/.env.qa

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
66
REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
77
REACT_APP_STRIPE_API_VERSION=2020-08-27
88

9-
# Vanilla Forums
10-
REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
11-
129
# DataDogLogging
1310
REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
1411

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
Related JIRA Ticket:
2-
https://topcoder.atlassian.net/browse/<!-- JIRA TICKET ID -->
1+
<!--
2+
NOTE: you can leave these comments as they are,
3+
no need to delete them as they won't appear in the final PR description
4+
-->
5+
<!-- Please make sure to link the JIRA ticket related to this PR, if any -->
6+
## Related JIRA Ticket:
7+
https://topcoder.atlassian.net/browse/
38

4-
# What's in this PR?
5-
<!-- Please add a brief description of what this PR accomplishes -->
69

7-
<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->
10+
<!-- Please add a brief description of what this PR accomplishes -->
11+
<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->
12+
# What's in this PR?

Diff for: .nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.15.0
1+
22.13.0

Diff for: README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ e.g.: `PROD-001 #comment adding readme notes #time 45m`
8484
- Typescript
8585
- React Scripts
8686

87-
This app uses React 18, Typescript 4, and Node 16.
87+
This app uses React 18, Typescript 4, and Node 22.
8888

8989
### IDE
9090

@@ -103,13 +103,13 @@ Once nvm is installed, run:
103103
At the root of the project directory you'll notice a file called `.nvmrc` which specifies the node version used by the project. The command `nvm use` will use the version specified in the file if no version is supplied on the command line.
104104
See [the nvm Github README](https://github.com/nvm-sh/nvm/blob/master/README.md#nvmrc) for more information on setting this up.
105105

106-
>**NOTE:** The current node version mentioned in the `.nvmrc` is `16.15.0`
106+
>**NOTE:** The current node version mentioned in the `.nvmrc` is `22.13.0`
107107
108108
You can verify the versions of `nvm`, `node`, and `npm` using the commands below.
109109
| Command | Supported Version |
110110
| ----------------- | -------- |
111111
| `% npm -v` | 8.5.5 |
112-
| `% node -v` | v16.15.0 |
112+
| `% node -v` | v22.13.0 |
113113
| `% nvm --version` | 0.39.1 |
114114
| `% nvm current` | v15.15.0 |
115115

Diff for: cypress.config.ts

-32
This file was deleted.

Diff for: cypress/.eslintrc

-3
This file was deleted.

Diff for: cypress/e2e/home/home.spec.ts

-12
This file was deleted.

Diff for: cypress/support/commands.ts

-8
This file was deleted.

Diff for: cypress/support/e2e.ts

-2
This file was deleted.

Diff for: cypress/tsconfig.json

-12
This file was deleted.

0 commit comments

Comments
 (0)