Merge pull request #1533 from RoadieHQ/s3-tag-mods

Handle cases where S3 buckets don't have a tag set
RoadieHQ · Aug 6, 2024 · 4fa0b2c · 4fa0b2c
2 parents a515217 + 91f508a
commit 4fa0b2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.changeset/gentle-kiwis-run.md b/.changeset/gentle-kiwis-run.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/catalog-backend-module-aws': patch
+---
+
+Handle cases where S3 buckets don't have a tag set.
diff --git a/plugins/backend/catalog-backend-module-aws/src/providers/AWSS3BucketProvider.ts b/plugins/backend/catalog-backend-module-aws/src/providers/AWSS3BucketProvider.ts
@@ -15,7 +15,7 @@
  */
 
 import { ANNOTATION_VIEW_URL, ResourceEntity } from '@backstage/catalog-model';
-import { S3 } from '@aws-sdk/client-s3';
+import { S3, Tag } from '@aws-sdk/client-s3';
 import * as winston from 'winston';
 import { Config } from '@backstage/config';
 import { AWSEntityProvider } from './AWSEntityProvider';
@@ -94,8 +94,17 @@ export class AWSS3BucketProvider extends AWSEntityProvider {
       if (bucket.Name) {
         const bucketArn = `arn:aws:s3:::${bucket.Name}`;
         const consoleLink = new ARN(bucketArn).consoleLink;
-        const tagsResponse = await s3.getBucketTagging({ Bucket: bucket.Name });
-        const tags = tagsResponse?.TagSet ?? [];
+        let tags: Tag[] = [];
+        try {
+          const tagsResponse = await s3.getBucketTagging({
+            Bucket: bucket.Name,
+          });
+          tags = tagsResponse?.TagSet ?? [];
+        } catch (e) {
+          this.logger.debug('No tags found for bucket', {
+            bucket: bucket.Name,
+          });
+        }
         const resource: ResourceEntity = {
           kind: 'Resource',
           apiVersion: 'backstage.io/v1beta1',