Merge pull request #132 from scality/improvement/OSIS-137-canonicalID-as-bucket-owner

Author: anurag4DSB

osis-core/src/main/java/com/scality/osis/model/OsisTenant.java

@@ -21,6 +21,8 @@ public class OsisTenant {
     //  @NotNull
     private String tenantId;
 
+    private String canonicalId;
+
     private List<String> cdTenantIds;
 
     public OsisTenant active(boolean active) {
@@ -75,6 +77,30 @@ public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
 
+    /**
+     * tenant canonical id
+     * @param canonicalId
+     * @return
+     */
+    public OsisTenant canonicalId(String canonicalId) {
+        this.canonicalId = canonicalId;
+        return this;
+    }
+
+    /**
+     * tenant canonical id
+     *
+     * @return canonicalId
+     */
+    @Schema(description = "tenant canonical id", required = true, example = "4f6117a3fd3a4aca27000e4b1c518d28484115e5722beb3ce5f380583000531f")
+    public String getCanonicalId() {
+        return canonicalId;
+    }
+
+    public void setCanonicalId(String canonicalId) {
+        this.canonicalId = canonicalId;
+    }
+
     public OsisTenant cdTenantIds(List<String> cdTenantIds) {
         this.cdTenantIds = cdTenantIds;
         return this;

osis-core/src/main/java/com/scality/osis/service/impl/ScalityOsisServiceImpl.java

@@ -1178,21 +1178,23 @@ public PageOfOsisBucketMeta getBucketList(String tenantId, long offset, long lim
             final AmazonS3 s3Client = this.s3.getS3Client(tempCredentials,
                     appEnv.getRegionInfo().get(0));
 
+            // Get account info by tenant ID for canonical ID
+            GetAccountRequestDTO getAccountRequest = ScalityModelConverter.toGetAccountRequestWithID(tenantId);
+            logger.debug("[Vault]GetAccount request:{}", new Gson().toJson(getAccountRequest));
+
+            AccountData accountData = vaultAdmin.getAccount(getAccountRequest);
+            logger.debug("[Vault]GetAccount response:{}", new Gson().toJson(accountData));
+
             //s3 listBucket has no pagination, so list all
             List<Bucket> buckets = s3Client.listBuckets();
-
             logger.debug("[S3] List all Buckets size:{}", buckets.size());
 
-            final PageOfUsers pageOfUsers = listUsers(tenantId, 0, 1);
-            final String userId = pageOfUsers.getItems().get(0).getUserId();
-
-            PageOfOsisBucketMeta pageOfOsisBucketMeta = ScalityModelConverter.toPageOfOsisBucketMeta(buckets, userId, offset, limit);
-
+            PageOfOsisBucketMeta pageOfOsisBucketMeta = ScalityModelConverter.toPageOfOsisBucketMeta(
+                buckets, accountData.getCanonicalId(), offset, limit);
             logger.info("List Buckets response:{}", new Gson().toJson(pageOfOsisBucketMeta));
 
             return pageOfOsisBucketMeta;
         } catch (Exception e) {
-
             if (isAdminPolicyError(e)) {
                 try {
                     generateAdminPolicy(tenantId);

osis-core/src/main/java/com/scality/osis/utils/ScalityModelConverter.java

@@ -831,32 +831,33 @@ public static String maskSecretKey(String logStatement) {
      * Converts S3 Bucket to OSIS bucket meta
      *
      * @param bucket S3 Bucket instance
+     * @param canonicalId canonicalId
      * @return the OSIS bucket meta
      */
-    public static OsisBucketMeta toOsisBucketMeta(Bucket bucket, String userId) {
+    public static OsisBucketMeta toOsisBucketMeta(Bucket bucket, String canonicalId) {
 
         return new OsisBucketMeta()
                 .name(bucket.getName())
                 .creationDate(bucket.getCreationDate().toInstant().toString())
-                .userId(userId);
+                .userId(canonicalId);
     }
 
     /**
      * Converts S3 list buckets response to OSIS page of bucket meta
      *
      * @param buckets the bucket list response
-     * @param userId userId
+     * @param canonicalId canonical ID
      * @param offset offset
      * @param limit limit
      * @return the OSIS page of bucket meta
      */
-    public static PageOfOsisBucketMeta toPageOfOsisBucketMeta(List<Bucket> buckets, String userId, long offset, long limit) {
+    public static PageOfOsisBucketMeta toPageOfOsisBucketMeta(List<Bucket> buckets, String canonicalId, long offset, long limit) {
         List<OsisBucketMeta> bucketItems = new ArrayList<>();
 
         List<Bucket> selectedBuckets = buckets.stream().skip(offset).limit(limit).collect(Collectors.toList());
 
         for (Bucket bucket : selectedBuckets) {
-            bucketItems.add(toOsisBucketMeta(bucket, userId));
+            bucketItems.add(toOsisBucketMeta(bucket, canonicalId));
         }
 
         PageInfo pageInfo = new PageInfo(limit, offset, (long) buckets.size());

osis-core/src/test/java/com/scality/osis/service/impl/BaseOsisServiceTest.java

@@ -343,7 +343,8 @@ protected void initGetAccountMocks() {
                     final String accountArn = request.getAccountArn();
                     final String emailAddress = request.getEmailAddress() == null ? SAMPLE_SCALITY_ACCOUNT_EMAIL
                             : request.getEmailAddress();
-                    final String canonicalId = request.getCanonicalId() == null ? SAMPLE_ID : request.getCanonicalId();
+                    final String canonicalId = request.getCanonicalId() == null ? TEST_CANONICAL_ID
+                        : request.getCanonicalId();
                     final Map<String, String> customAttributestes = new HashMap<>();
                     customAttributestes.put(CD_TENANT_ID_PREFIX + SAMPLE_CD_TENANT_ID, "");
 
@@ -550,7 +551,7 @@ protected List<Bucket> getBucketListMockResponse() {
             final Bucket bucket = new Bucket();
             bucket.setName(TEST_BUCKET_NAME + (index));
             bucket.setCreationDate(new Date());
-            bucket.setOwner(new Owner(SAMPLE_TENANT_ID, SAMPLE_TENANT_NAME));
+            bucket.setOwner(new Owner(TEST_CANONICAL_ID, SAMPLE_TENANT_NAME));
 
             buckets.add(bucket);
         }

osis-core/src/test/java/com/scality/osis/service/impl/ScalityOsisServiceMiscTests.java

@@ -128,6 +128,7 @@ void testGetBucketList() {
 
         // Verify the results
         assertEquals(TEST_BUCKET_TOTAL_NUMBER, response.getPageInfo().getTotal());
+        assertEquals(TEST_CANONICAL_ID, response.getItems().get(0).getUserId());
         assertEquals(offset, response.getPageInfo().getOffset());
         assertEquals(limit, response.getPageInfo().getLimit());
         assertEquals((int) limit, response.getItems().size());