fix(cloud): update to use UUIDs (#3834)

* fix(cloud): updated project response types to use id instead of uid

* fix(cloud): bumped to new version of api-types with string ids

---------

Co-authored-by: Emanuele Libralato <[email protected]>

core/package.json

@@ -146,7 +146,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
-    "@garden-io/platform-api-types": "1.367.0",
+    "@garden-io/platform-api-types": "1.455.0",
     "@google-cloud/kms": "^2.11.1",
     "@types/analytics-node": "^3.1.10",
     "@types/async": "^3.2.18",

core/src/cloud/api.ts

@@ -106,14 +106,13 @@ export interface RegisterSessionResponse {
 
 // Represents a cloud environment
 export interface CloudEnvironment {
-  id: number
+  id: string
   name: string
 }
 
 // Represents a cloud project
 export interface CloudProject {
-  id: number
-  uid: string
+  id: string
   name: string
   repositoryUrl: string
   environments: CloudEnvironment[]
@@ -130,7 +129,6 @@ function toCloudProject(
 
   return {
     id: project.id,
-    uid: project.uid,
     name: project.name,
     repositoryUrl: project.repositoryUrl,
     environments,
@@ -415,7 +413,7 @@ export class CloudApi {
 
     // This is necessary to internally configure the project for this instance
     this._project = project
-    this.projectId = project.uid
+    this.projectId = project.id
 
     return project
   }
@@ -650,7 +648,7 @@ export class CloudApi {
     // NOTE: If we wan't to use this with multiple project IDs we need
     // a cache supporting that + check if the remote project metadata
     // was updated.
-    if (this._project && this._project.uid === this.projectId) {
+    if (this._project && this._project.id === this.projectId) {
       return this._project
     }
 

core/src/commands/cloud/groups/groups.ts

@@ -18,7 +18,7 @@ import { noApiMsg, applyFilter } from "../helpers"
 
 // TODO: Add created at and updated at timestamps. Need to add it to the API response first.
 interface Groups {
-  id: number
+  id: string
   name: string
   description: string
   defaultAdminGroup: boolean

core/src/commands/cloud/helpers.ts

@@ -29,29 +29,29 @@ export interface ApiCommandError {
 }
 
 export interface SecretResult {
-  id: number
+  id: string
   createdAt: string
   updatedAt: string
   name: string
   environment?: {
     name: string
-    id: number
+    id: string
   }
   user?: {
     name: string
-    id: number
+    id: string
     vcsUsername: string
   }
 }
 
 export interface UserResult {
-  id: number
+  id: string
   createdAt: string
   updatedAt: string
   name: string
   vcsUsername: string | null | undefined
   groups: {
-    id: number
+    id: string
     name: string
   }[]
 }

core/src/commands/cloud/secrets/secrets-create.ts

@@ -135,7 +135,7 @@ export class SecretsCreateCommand extends Command<Args, Opts> {
       )
     }
 
-    let environmentId: number | undefined
+    let environmentId: string | undefined
 
     if (envName) {
       const environment = project.environments.find((e) => e.name === envName)

core/src/commands/cloud/users/users-create.ts

@@ -79,7 +79,7 @@ export class UsersCreateCommand extends Command<Args, Opts> {
   }
 
   async action({ garden, log, opts, args }: CommandParams<Args, Opts>): Promise<CommandResult<UserResult[]>> {
-    const addToGroups = (opts["add-to-groups"] || []).map((groupId) => parseInt(groupId, 10))
+    const addToGroups: string[] = opts["add-to-groups"] || []
     const fromFile = opts["from-file"] as string | undefined
     let users: StringMap
 

core/test/unit/src/analytics/analytics.ts

@@ -26,14 +26,14 @@ class FakeCloudApi extends CloudApi {
   }
   async getProfile() {
     return {
-      id: 1,
+      id: "1",
       createdAt: new Date().toString(),
       updatedAt: new Date().toString(),
       name: "gordon",
       vcsUsername: "[email protected]",
       serviceAccount: false,
       organization: {
-        id: 1,
+        id: "1",
         name: "garden",
       },
       cachedPermissions: {},