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

chore: Move appsmithctl to RTS #37531

Merged
merged 9 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
99 changes: 0 additions & 99 deletions .github/workflows/appsmithctl.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .github/workflows/docs/integration-tests-command.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ The `client-build` job builds the client-side codebase. It uses the configuratio

The `rts-build` job builds the "rts" (real-time suggestions) package of the client-side codebase. It uses the configuration defined in the `.github/workflows/rts-build.yml` file.

### `test-appsmithctl`

The `test-appsmithctl` job runs tests for the `appsmithctl` utility. It uses the configuration from the `.github/workflows/appsmithctl.yml` file.

### `build-docker-image`

The `build-docker-image` job builds and pushes the Docker image for the application. It depends on the successful completion of the `client-build`, `server-build`, and `rts-build` jobs. The Docker image is built with support for both `linux/arm64` and `linux/amd64` platforms.
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/pr-cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ jobs:
with:
pr: ${{ github.event.number }}

test-appsmithctl:
if: success()
name: appsmithctl
uses: ./.github/workflows/appsmithctl.yml
secrets: inherit
with:
pr: ${{ github.event.number }}

build-docker-image:
needs: [client-build, server-build, rts-build]
# Only run if the build step is successful
Expand Down
8 changes: 1 addition & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,11 @@ COPY ./app/client/build editor/
# Add RTS - Application Layer
COPY ./app/client/packages/rts/dist rts/

ENV PATH /opt/bin:/opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
ENV PATH /opt/bin:/opt/java/bin:/opt/node/bin:$PATH

RUN <<END
set -o errexit

cd ./utils
npm install --only=prod
npm install --only=prod -g .
rm -rf utils/node_modules/resolve/test
cd -

# Make all `*.sh` files executable, excluding `node_modules`.
find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +

Expand Down
2 changes: 1 addition & 1 deletion app/client/packages/rts/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": ["../../.eslintrc.base.json"],
"ignorePatterns": ["dist", "server.test.ts", "build.js"],
"ignorePatterns": ["dist", "server.test.ts", "build.js", "src/ctl"],
sharat87 marked this conversation as resolved.
Show resolved Hide resolved
"rules": {
"@typescript-eslint/prefer-nullish-coalescing": "off",
"@typescript-eslint/strict-boolean-expressions": "off",
Expand Down
2 changes: 1 addition & 1 deletion app/client/packages/rts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const getWorkflowDependencies = () => {
const bundle = async () => {
return esbuild
.build({
entryPoints: ["src/server.ts"],
entryPoints: ["src/server.ts", "src/ctl/index.js"],
bundle: true,
sourcemap: true,
platform: "node",
Expand Down
4 changes: 4 additions & 0 deletions app/client/packages/rts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@
"@opentelemetry/semantic-conventions": "^1.27.0",
"@shared/ast": "workspace:^",
"axios": "^1.7.4",
"dotenv": "10.0.0",
"express": "^4.20.0",
"express-validator": "^6.14.2",
"http-status-codes": "^2.2.0",
"loglevel": "^1.8.1",
"mongodb": "^5.8.0",
"nodemailer": "6.9.9",
"readline-sync": "1.4.10",
"socket.io": "^4.6.2"
},
"devDependencies": {
Expand Down
6 changes: 6 additions & 0 deletions app/client/packages/rts/src/ctl/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# `appsmithctl`

This is the source for the `appsmithctl` command in Appsmith containers.

- Test with `yarn test`.
- Build with `yarn build`.
2 changes: 1 addition & 1 deletion app/client/packages/rts/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
}
},
"include": ["src/**/*", "src/**/*.json"],
"exclude": ["jest.config.js", "src/test", "index.js", "build.js"],
"exclude": ["jest.config.js", "src/test", "index.js", "build.js", "src/ctl"],
sharat87 marked this conversation as resolved.
Show resolved Hide resolved
"lib": ["es2015"]
}
Loading
Loading