Merge pull request #31 from rstudio/aron-v1-vanity

Use the v1 vanity API

Makefile

@@ -25,7 +25,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf __tests__/data/*
+	rm -rf .cache/
 
 .PHONY: up
 up: .require-license

jest.config.js

@@ -2,7 +2,7 @@ module.exports = {
   clearMocks: true,
   collectCoverage: true,
   coverageDirectory: 'coverage',
-  modulePathIgnorePatterns: ["./__tests__/data/"],
+  modulePathIgnorePatterns: ["./.cache/"],
   preset: 'ts-jest',
   testEnvironment: 'node'
 }

src/APIClient.ts

@@ -111,10 +111,10 @@ export class APIClient {
       .then((resp: AxiosResponse) => keysToCamel(resp.data))
   }
 
-  public async updateAppVanityURL (appID: number, vanityURL: string): Promise<VanityRecordResponse> {
-    return await this.client.post(
-            `applications/${appID}/vanities`,
-            { app_id: appID, path_prefix: vanityURL }
+  public async setContentVanityURL (contentGUID: string, vanityURL: string): Promise<VanityRecordResponse> {
+    return await this.client.put(
+            `v1/content/${contentGUID}/vanity`,
+            { path: vanityURL }
     ).then((resp: AxiosResponse) => keysToCamel(resp.data))
   }
 

src/Deployer.ts

@@ -156,7 +156,7 @@ export class Deployer {
         `path=${JSON.stringify(resolvedAppPath)}`
       ].join(' '))
 
-      await this.client.updateAppVanityURL(app.id, resolvedAppPath)
+      await this.client.setContentVanityURL(app.guid, resolvedAppPath)
         .catch((err: any) => {
           debugLog(() => [
             'Deployer: failed to update vanity URL for',

src/api-types.ts

@@ -102,9 +102,7 @@ export interface ListApplicationsResponse {
 }
 
 export interface VanityRecordResponse {
-  id?: number
-  appId: number
-  appGuid: string
-  pathPrefix: string
-  createdTime?: Date
+  contentGuid: string
+  path: string
+  createdTime: Date
 }

tsconfig.eslint.json

@@ -1,4 +1,4 @@
 {
-  "exclude": ["node_modules", "__tests__/data/**/*", "lib/**/*"],
+  "exclude": ["node_modules", ".cache/**/*", "lib/**/*"],
   "extends": "./tsconfig.json"
 }

tsconfig.json

@@ -9,6 +9,6 @@
     "outDir": "./lib",
     "resolveJsonModule": true
   },
-  "exclude": ["node_modules", "__tests__/**/*.spec.ts", "__tests__/data/**/*", "lib/**/*"],
+  "exclude": ["node_modules", "__tests__/**/*.spec.ts", ".cache/**/*", "lib/**/*"],
   "extends": "@tsconfig/node16/tsconfig.json"
 }