Skip to content

Commit

Permalink
Merge pull request #30 from rstudio/aron-passes-for-me
Browse files Browse the repository at this point in the history
recent connect, updated config, passes tests
  • Loading branch information
aronatkins authored Jun 21, 2024
2 parents 0724ec2 + 55fea0d commit 7151f20
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
- 16.x
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v2-beta
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- run: npm install
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ distclean: clean

.PHONY: up
up: .require-license
docker-compose port connect 3939 2>/dev/null | if ! grep -q ':23939$$'; then \
docker-compose up -d; \
docker compose port connect 3939 2>/dev/null | if ! grep -q ':23939$$'; then \
docker compose up -d --wait; \
fi

.PHONY: down
down:
docker-compose down --remove-orphans
docker compose down --remove-orphans

.PHONY: .require-license
.require-license:
Expand Down
2 changes: 1 addition & 1 deletion __tests__/main.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as rsconnect from '../src/main'
jest.setTimeout(1000 * 60 * 2)

const SEED_ADMIN_CONFIG: rsconnect.APIClientConfiguration = {
apiKey: 'f1wc3w4090uv67yhud7j08zjzgvt7yfg',
apiKey: '21232f297a57a5a743894a0e4a801fc3',
baseURL: 'http://127.0.0.1:23939/__api__'
}

Expand Down
46 changes: 23 additions & 23 deletions __tests__/rstudio-connect.test.gcfg
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
; RStudio Connect test environment configuration

[Applications]
RunAs = rstudio-connect
[Server]
DataDir = /data
EmailProvider = print
DatabaseEmailSettings = true
Address = http://127.0.0.1:23939

[Authentication]
Provider = password
BasicAuth = true
InsecureDefaultUserAPIKey = true
APIKeyBcryptCost = 4

[Database]
Provider = Postgres
SeedUsers = true

[Debug]
Log = router
Log = services
Log = url-normalization

[HTTP]
Listen = :3939
NoWarning = true

[Mount]
BaseDir = /connect-test-mount

[Postgres]
URL = postgres://postgres:notasecret@db/postgres?sslmode=disable

[Python]
Enabled = true
Executable = /opt/python/3.6.5/bin/python
Executable = /opt/python/3.12.1/bin/python
Executable = /opt/python/3.11.7/bin/python

[Quarto]
Enabled = true
Executable = /opt/quarto/1.4.552/bin/quarto

[RPackageRepository "CRAN"]
URL = https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest

[RPackageRepository "RSPM"]
URL = https://packagemanager.rstudio.com/cran/__linux__/bionic/latest

[Server]
DataDir = /data
EmailProvider = print
DatabaseEmailSettings = true
Address = http://127.0.0.1:23939
URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest

[Logging]
ServiceLog = STDOUT
ServiceLogFormat = TEXT ; TEXT or JSON
ServiceLogLevel = INFO ; INFO, WARNING or ERROR
AccessLog = STDOUT
AccessLogFormat = COMMON ; COMMON, COMBINED, or JSON
18 changes: 5 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
version: '3.7'

services:
db:
image: postgres:12
volumes:
- ./.cache/pgdata:/var/lib/postgresql/data
environment:
POSTGRES_PASSWORD: notasecret
connect:
privileged: true
depends_on:
- db
# TODO: when available
# image: rstudio/rstudio-connect:1.8.6
image: rstudio/rstudio-connect:1.8.4.2-2
image: rstudio/rstudio-connect:ubuntu2204-2024.05.0
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3939/"]
start_period: 30s
start_interval: 1s
volumes:
- ./.cache/data:/data
- ./__tests__/rstudio-connect.test.gcfg:/etc/rstudio-connect/rstudio-connect.gcfg
Expand Down

0 comments on commit 7151f20

Please sign in to comment.