tibber-aws 5.6.0 → 5.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,7 +8,12 @@ export declare class S3Bucket {
8
8
  creationDate: CreationDate;
9
9
  private s3;
10
10
  constructor(bucket: AWS.S3.Bucket, endpoint?: string | undefined);
11
- static getBucket(bucketName: string, endpoint?: string): Promise<S3Bucket>;
11
+ static getExistingBucket(bucketName: string, endpoint?: string): Promise<S3Bucket | undefined>;
12
+ /**
13
+ * @deprecated Either use `getExistingBucket` or `getOrCreateBucket` instead since it is not obvious this always tries to create a bucket, potentially causing resource contention
14
+ */
15
+ static getBucket(bucketName: string, endpoint?: string): Promise<S3Bucket | undefined>;
16
+ static getOrCreateBucket(bucketName: string, endpoint?: string): Promise<S3Bucket | undefined>;
12
17
  static getBuckets(endpoint?: string): Promise<S3Bucket[]>;
13
18
  static deleteIfExsists(bucketName: string, endpoint?: string): Promise<boolean>;
14
19
  putObject(key: string, body: AWS.S3.PutObjectRequest['Body'], contentType?: AWS.S3.PutObjectRequest['ContentType']): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.S3.PutObjectOutput, AWS.AWSError>>;
@@ -21,7 +21,17 @@ class S3Bucket {
21
21
  s3ForcePathStyle: !!endpoint,
22
22
  });
23
23
  }
24
+ static async getExistingBucket(bucketName, endpoint) {
25
+ const buckets = await S3Bucket.getBuckets(endpoint);
26
+ return buckets.find(b => b.name === bucketName);
27
+ }
28
+ /**
29
+ * @deprecated Either use `getExistingBucket` or `getOrCreateBucket` instead since it is not obvious this always tries to create a bucket, potentially causing resource contention
30
+ */
24
31
  static async getBucket(bucketName, endpoint) {
32
+ return await this.getOrCreateBucket(bucketName, endpoint);
33
+ }
34
+ static async getOrCreateBucket(bucketName, endpoint) {
25
35
  try {
26
36
  const s3 = new aws_sdk_1.default.S3({
27
37
  apiVersion: '2006-03-01',
@@ -36,7 +46,7 @@ class S3Bucket {
36
46
  }
37
47
  catch (err) {
38
48
  if (err.code === 'BucketAlreadyOwnedByYou') {
39
- return (await S3Bucket.getBuckets(endpoint)).filter(b => b.name === bucketName)[0];
49
+ return (await S3Bucket.getBuckets(endpoint)).find(b => b.name === bucketName);
40
50
  }
41
51
  console.log(err);
42
52
  throw err;
@@ -1 +1 @@
1
- {"version":3,"file":"S3Bucket.js","sourceRoot":"","sources":["../../../src/s3/S3Bucket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"S3Bucket.js","sourceRoot":"","sources":["../../../src/s3/S3Bucket.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tibber-aws",
3
- "version": "5.6.0",
3
+ "version": "5.7.0",
4
4
  "description": "",
5
5
  "main": "./dist/src/index.js",
6
6
  "scripts": {