chore(ci): use with-connect in integration tests (#45)

Author: nealrichardson

.github/workflows/main.yml

@@ -5,34 +5,51 @@ on:
     tags: [v*]
   pull_request:
     branches: [main]
-env:
-  RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
 jobs:
-  main:
+  test:
     strategy:
       matrix:
         os:
           - ubuntu-latest
         node:
           - 18.x
           - 20.x
+        connect-version:
+          - preview
+          # This version is the first Docker image that has R 4.3, which the
+          # example app requires.
+          - "2024.05.0"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node }}
       - run: npm install
-      - run: make
+      - run: npm run lint
+      - run: npm run build
+      - uses: posit-dev/with-connect@main
+        with:
+          license: ${{ secrets.CONNECT_LICENSE_FILE }}
+          version: ${{ matrix.connect-version }}
+          command: npm test
       - run: git diff --exit-code
-      - if: failure()
-        run: docker compose logs
-      - run: make down
+
+  publish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 20.x
+      - run: npm install
+      - run: npm run build
       - run: printf '//registry.npmjs.org/:_authToken=%s\n' "${NPM_AUTH_TOKEN}" | tee .npmrc
         env:
           NPM_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
       - run: npm info
-      - if: matrix.node == '20.x' && startsWith(github.ref, 'refs/tags')
+      - if: startsWith(github.ref, 'refs/tags')
         run: npm publish
       - if: startsWith(github.ref, 'refs/heads')
         run: npm publish --dry-run

.gitignore

@@ -43,3 +43,6 @@ npm-debug.log*
 pids
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 typings/
+
+# License files
+*.lic

Makefile

@@ -1,12 +1,16 @@
-RSC_LICENSE ?=
+CONNECT_LICENSE_FILE ?= rstudio-connect.lic
 SHELL := bash
 VERSION := $(shell node -e 'console.log(require("$(CURDIR)/package.json").version)')
 
 npm-%:
 	npm run $*
 
 .PHONY: all
-all: up npm-lint lib/main.js npm-test
+all: npm-lint lib/main.js test
+
+.PHONY: test
+test:
+	uvx with-connect --license "$(CONNECT_LICENSE_FILE)" -- npm test
 
 .PHONY: publish
 publish: lib/main.js
@@ -26,19 +30,3 @@ clean:
 .PHONY: distclean
 distclean: clean
 	rm -rf .cache/
-
-.PHONY: up
-up: .require-license
-	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
-
-.PHONY: .require-license
-.require-license:
-ifndef RSC_LICENSE
-	$(error Missing required RSC_LICENSE env var)
-endif

__tests__/main.spec.ts

@@ -8,8 +8,8 @@ import * as rsconnect from '../src/main'
 jest.setTimeout(1000 * 60 * 2)
 
 const SEED_ADMIN_CONFIG: rsconnect.APIClientConfiguration = {
-  apiKey: '21232f297a57a5a743894a0e4a801fc3',
-  baseURL: 'http://127.0.0.1:23939/__api__'
+  apiKey: process.env.CONNECT_API_KEY as string,
+  baseURL: `${process.env.CONNECT_SERVER as string}/__api__`
 }
 
 describe('rsconnect', () => {
@@ -109,4 +109,37 @@ describe('rsconnect', () => {
       })
     })
   })
+
+  describe('EnvironmentUpdater', () => {
+    it('updateAppEnvironment', async () => {
+      // Deploy an app to get a valid appGUID
+      const top = execSync('git rev-parse --show-toplevel').toString().trim()
+      const plumberManifest = path.join(top, '__tests__/apps/plumber/manifest.json')
+      const client = new rsconnect.APIClient(SEED_ADMIN_CONFIG)
+      const deployer = new rsconnect.Deployer(client)
+
+      const deployResp = await deployer.deployManifest({
+        manifestPath: plumberManifest,
+        appIdentifier: '/env-updater-test'
+      })
+      expect(deployResp.appGuid).not.toBeNull()
+
+      // Wait for deployment to complete
+      const poller = new rsconnect.ClientTaskPoller(client, deployResp.taskId)
+      for await (const result of poller.poll()) {
+        expect(result).not.toBeNull()
+      }
+
+      // Set environment variables using EnvironmentUpdater
+      process.env.CONNECT_ENV_SET_TEST_VAR = 'test-value'
+      const envUpdater = new rsconnect.EnvironmentUpdater(client)
+      const envVars = await envUpdater.updateAppEnvironment(deployResp.appGuid)
+
+      // Verify the environment variable was set
+      expect(envVars).toContain('TEST_VAR')
+
+      // Clean up
+      delete process.env.CONNECT_ENV_SET_TEST_VAR
+    })
+  })
 })

__tests__/rstudio-connect.test.gcfg

@@ -21,6 +21,7 @@
     "access": "public"
   },
   "scripts": {
+    "prebuild": "node -e \"const p=require('./package.json'); const fs=require('fs'); fs.writeFileSync('src/Version.ts', '// WARNING: this file is generated\\nexport const Version = \\\"' + p.version + '\\\"\\n')\"",
     "build": "tsc",
     "lint": "ts-standard --fix ./src/*.ts ./__tests__/*.ts",
     "test": "jest"