From 4ab4e477a610331927d67ccfc18bfd6cad9b07cc Mon Sep 17 00:00:00 2001
From: Aron Atkins <aron@gweep.net>
Date: Thu, 13 Jun 2024 16:54:50 -0400
Subject: [PATCH] recent connect, updated config, passes tests

---
 __tests__/main.spec.ts              |  2 +-
 __tests__/rstudio-connect.test.gcfg | 42 ++++++++++++++++-------------
 docker-compose.yml                  |  6 +----
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/__tests__/main.spec.ts b/__tests__/main.spec.ts
index 03b4aeb8..7bde0f46 100644
--- a/__tests__/main.spec.ts
+++ b/__tests__/main.spec.ts
@@ -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__'
 }
 
diff --git a/__tests__/rstudio-connect.test.gcfg b/__tests__/rstudio-connect.test.gcfg
index ac39e99b..d4987b60 100644
--- a/__tests__/rstudio-connect.test.gcfg
+++ b/__tests__/rstudio-connect.test.gcfg
@@ -1,42 +1,46 @@
 ; RStudio Connect test environment configuration
 
-[Applications]
-RunAs = rstudio-connect
+[Server]
+DataDir = /data
+EmailProvider = print
+DatabaseEmailSettings = true
+Address = http://localhost: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
diff --git a/docker-compose.yml b/docker-compose.yml
index bc499cf9..6e924dd2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   db:
     image: postgres:12
@@ -11,9 +9,7 @@ services:
     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
     volumes:
       - ./.cache/data:/data
       - ./__tests__/rstudio-connect.test.gcfg:/etc/rstudio-connect/rstudio-connect.gcfg