@liquidmetal-ai/raindrop 0.4.4 → 0.4.7

package/dist/commands/object/put.js

@@ -66,42 +66,24 @@ Upload myfile.txt to my-bucket with key 'my-key'
         if (!this.flags.bucket && !this.flags.moduleId) {
             this.error('Either --bucket or --moduleId flag must be specified.');
         }
-        const { args, flags } = await this.parse(ObjectPut);
-        let moduleId = this.flags.moduleId || '';
-        let bucket;
-        const { client: catalogService, userId, organizationId } = await this.catalogService();
-        if (!moduleId && this.flags.bucket) {
-            // If moduleId is not provided and bucket is specified, we need to fetch the moduleId from the catalog service
-            //string split on # to get bucket name and version
-            const [bucketName, version] = this.flags.bucket.split('#');
-            bucket = (await catalogService.resolveBucketLocationToModuleId({
-                userId,
-                organizationId,
+        const bucketLocation = this.flags.bucket
+            ? {
                 bucketLocation: {
-                    bucketLocation: {
-                        case: 'bucket',
-                        value: {
-                            name: bucketName,
-                            version: version || '',
-                        },
+                    case: 'bucket',
+                    value: {
+                        name: this.flags.bucket,
+                        version: '',
                     },
                 },
-            })).bucket;
-            if (!bucket || !bucket.moduleId) {
-                this.error(`Bucket "${this.flags.bucket}" not found or does not belong to any module.`);
             }
-            moduleId = bucket.moduleId;
-        }
-        else {
-            // query for the bucket if moduleId is provided
-            bucket = (await catalogService.resolveModuleIdToBucketLocation({
-                userId,
-                organizationId,
-                moduleId,
-            })).bucket;
-        }
-        console.log(`Using moduleId: ${moduleId}`);
-        const { client: objectService } = await this.objectService(moduleId);
+            : {
+                bucketLocation: {
+                    case: 'moduleId',
+                    value: this.flags.moduleId,
+                },
+            };
+        const { args, flags } = await this.parse(ObjectPut);
+        const { client: objectService, userId, organizationId } = await this.objectService();
         // Read the file
         const fileContent = await fs.readFile(args.file);
         // Get content type if not specified
@@ -109,19 +91,17 @@ Upload myfile.txt to my-bucket with key 'my-key'
         const response = await objectService.putObject({
             userId,
             organizationId,
-            moduleId,
+            bucketLocation,
             key: args.key,
             content: fileContent,
             contentType,
         });
-        //attach the bucket to the response
-        response.bucket = bucket;
         if (flags.output === 'json') {
             console.log(toJsonString(PutObjectResponseSchema, response, { prettySpaces: 2 }));
         }
         else {
             console.log('Successfully uploaded file:');
-            console.log(`Bucket: ${response.bucket.bucketName}`);
+            console.log(`Bucket: ${response.bucket?.bucketName}`);
             console.log(`Key: ${response.key}`);
         }
     }