@jcoreio/aws-ecr-utils 1.3.0 → 2.0.0

package/checkECRImageAccess.d.ts

@@ -1,14 +1,14 @@
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig } from '@aws-sdk/client-ecr';
 export default function checkECRImageAccess({ ecr, awsConfig, repoAccountAwsConfig, imageUri, log, }: {
-    ecr?: AWS.ECR;
-    awsConfig?: AWS.ConfigurationOptions;
+    ecr?: ECRClient;
+    awsConfig?: ECRClientConfig;
     /**
      * Config for the AWS account containing the ECR repository.
      * Optional; if given, will prompt to add/update the policy on the
      * ECR repository, if access checks failed and the terminal is
      * interactive.
      */
-    repoAccountAwsConfig?: AWS.ConfigurationOptions;
+    repoAccountAwsConfig?: ECRClientConfig;
     imageUri: string;
     log?: {
         info: (...args: any[]) => void;

package/checkECRImageAccess.js

@@ -10,7 +10,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
+var _clientEcr = require("@aws-sdk/client-ecr");
+var _clientSts = require("@aws-sdk/client-sts");
 var _parseECRImageUri2 = _interopRequireDefault(require("./parseECRImageUri.js"));
 var _ImageManifestSchema = require("./ImageManifestSchema.js");
 var _isInteractive = _interopRequireDefault(require("is-interactive"));
@@ -23,31 +24,31 @@ function checkECRImageAccess(_x) {
 }
 function _checkECRImageAccess() {
   _checkECRImageAccess = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
-    var ecr, awsConfig, repoAccountAwsConfig, imageUri, _ref$log, log, _parseECRImageUri, registryId, region, repositoryName, imageTag, _yield$ecr$batchGetIm, _yield$ecr$batchGetIm2, _yield$ecr$batchGetIm3, _yield$ecr$batchGetIm4, image, imageManifest, _ImageManifestSchema$, config, layers, Action, _yield$AWS$STS$getCal, Account, _yield$inquirer$promp, update, srcEcr, _yield$srcEcr$getRepo, policyText, policy;
+    var ecr, awsConfig, repoAccountAwsConfig, imageUri, _ref$log, log, _parseECRImageUri, registryId, region, repositoryName, imageTag, _yield$ecr$send, _yield$ecr$send$image, _yield$ecr$send$image2, _yield$ecr$send$image3, image, imageManifest, _ImageManifestSchema$, config, layers, Action, _yield$STSClient$send, Account, _yield$inquirer$promp, update, srcEcr, _yield$srcEcr$send$ca, policyText, policy;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           ecr = _ref.ecr, awsConfig = _ref.awsConfig, repoAccountAwsConfig = _ref.repoAccountAwsConfig, imageUri = _ref.imageUri, _ref$log = _ref.log, log = _ref$log === void 0 ? console : _ref$log;
           log.error('checking access to ECR image:', imageUri, '...');
           _parseECRImageUri = (0, _parseECRImageUri2["default"])(imageUri), registryId = _parseECRImageUri.registryId, region = _parseECRImageUri.region, repositoryName = _parseECRImageUri.repositoryName, imageTag = _parseECRImageUri.imageTag;
-          if (!ecr) ecr = new _awsSdk["default"].ECR(_objectSpread(_objectSpread({}, awsConfig), {}, {
+          if (!ecr) ecr = new _clientEcr.ECRClient(_objectSpread(_objectSpread({}, awsConfig), {}, {
             region: region
           }));
           _context.prev = 4;
           _context.next = 7;
-          return ecr.batchGetImage({
+          return ecr.send(new _clientEcr.BatchGetImageCommand({
             registryId: registryId,
             repositoryName: repositoryName,
             imageIds: [{
               imageTag: imageTag
             }]
-          }).promise();
+          }));
         case 7:
-          _yield$ecr$batchGetIm = _context.sent;
-          _yield$ecr$batchGetIm2 = _yield$ecr$batchGetIm.images;
-          _yield$ecr$batchGetIm3 = _yield$ecr$batchGetIm2 === void 0 ? [] : _yield$ecr$batchGetIm2;
-          _yield$ecr$batchGetIm4 = (0, _slicedToArray2["default"])(_yield$ecr$batchGetIm3, 1);
-          image = _yield$ecr$batchGetIm4[0];
+          _yield$ecr$send = _context.sent;
+          _yield$ecr$send$image = _yield$ecr$send.images;
+          _yield$ecr$send$image2 = _yield$ecr$send$image === void 0 ? [] : _yield$ecr$send$image;
+          _yield$ecr$send$image3 = (0, _slicedToArray2["default"])(_yield$ecr$send$image2, 1);
+          image = _yield$ecr$send$image3[0];
           imageManifest = image === null || image === void 0 ? void 0 : image.imageManifest;
           if (imageManifest) {
             _context.next = 15;
@@ -57,20 +58,20 @@ function _checkECRImageAccess() {
         case 15:
           _ImageManifestSchema$ = _ImageManifestSchema.ImageManifestSchema.parse(JSON.parse(imageManifest)), config = _ImageManifestSchema$.config, layers = _ImageManifestSchema$.layers;
           _context.next = 18;
-          return ecr.batchCheckLayerAvailability({
+          return ecr.send(new _clientEcr.BatchCheckLayerAvailabilityCommand({
             registryId: registryId,
             repositoryName: repositoryName,
             layerDigests: [config.digest].concat((0, _toConsumableArray2["default"])(layers.map(function (l) {
               return l.digest;
             })))
-          }).promise();
+          }));
         case 18:
           _context.next = 20;
-          return ecr.getDownloadUrlForLayer({
+          return ecr.send(new _clientEcr.GetDownloadUrlForLayerCommand({
             registryId: registryId,
             repositoryName: repositoryName,
             layerDigest: layers[0].digest
-          }).promise();
+          }));
         case 20:
           log.error("ECR image is accessible: ".concat(imageUri));
           return _context.abrupt("return", true);
@@ -96,17 +97,17 @@ function _checkECRImageAccess() {
             }]
           }, null, 2).replace(/\n/gm, '\n  '), "\n"));
           if (!(repoAccountAwsConfig && (0, _isInteractive["default"])())) {
-            _context.next = 55;
+            _context.next = 57;
             break;
           }
           _context.next = 34;
-          return new _awsSdk["default"].STS({
+          return new _clientSts.STSClient({
             credentials: ecr.config.credentials,
             region: region
-          }).getCallerIdentity().promise();
+          }).send(new _clientSts.GetCallerIdentityCommand());
         case 34:
-          _yield$AWS$STS$getCal = _context.sent;
-          Account = _yield$AWS$STS$getCal.Account;
+          _yield$STSClient$send = _context.sent;
+          Account = _yield$STSClient$send.Account;
           if (Account) {
             _context.next = 39;
             break;
@@ -130,23 +131,23 @@ function _checkECRImageAccess() {
           }
           return _context.abrupt("return", false);
         case 45:
-          srcEcr = new _awsSdk["default"].ECR(_objectSpread(_objectSpread({}, repoAccountAwsConfig), {}, {
+          srcEcr = new _clientEcr.ECRClient(_objectSpread(_objectSpread({}, repoAccountAwsConfig), {}, {
             region: region
           }));
           _context.next = 48;
-          return srcEcr.getRepositoryPolicy({
+          return srcEcr.send(new _clientEcr.GetRepositoryPolicyCommand({
             registryId: registryId,
             repositoryName: repositoryName
-          }).promise()["catch"](function (error) {
+          }))["catch"](function (error) {
             if (error.name === 'RepositoryPolicyNotFoundException') return {};
             throw error;
           });
         case 48:
-          _yield$srcEcr$getRepo = _context.sent;
-          policyText = _yield$srcEcr$getRepo.policyText;
+          _yield$srcEcr$send$ca = _context.sent;
+          policyText = _yield$srcEcr$send$ca.policyText;
           policy = JSON.parse(policyText || '{}');
           _context.next = 53;
-          return srcEcr.setRepositoryPolicy({
+          return srcEcr.send(new _clientEcr.SetRepositoryPolicyCommand({
             repositoryName: repositoryName,
             policyText: JSON.stringify(_objectSpread(_objectSpread({
               Version: '2012-10-17'
@@ -159,17 +160,25 @@ function _checkECRImageAccess() {
                 Action: Action
               }])
             }), null, 2)
-          }).promise();
+          }));
         case 53:
           log.info("updated policy on ECR repository ".concat((0, _formatECRRepositoryHostname["default"])({
             registryId: registryId,
             region: region,
             repositoryName: repositoryName
           })));
-          return _context.abrupt("return", true);
-        case 55:
-          return _context.abrupt("return", false);
+          _context.next = 56;
+          return checkECRImageAccess({
+            awsConfig: awsConfig,
+            imageUri: imageUri,
+            log: log,
+            ecr: ecr
+          });
         case 56:
+          return _context.abrupt("return", _context.sent);
+        case 57:
+          return _context.abrupt("return", false);
+        case 58:
         case "end":
           return _context.stop();
       }

package/checkECRImageAccess.mjs

@@ -1,4 +1,5 @@
-import AWS from 'aws-sdk';
+import { BatchCheckLayerAvailabilityCommand, BatchGetImageCommand, ECRClient, GetDownloadUrlForLayerCommand, GetRepositoryPolicyCommand, SetRepositoryPolicyCommand } from '@aws-sdk/client-ecr';
+import { STSClient, GetCallerIdentityCommand } from '@aws-sdk/client-sts';
 import parseECRImageUri from "./parseECRImageUri.mjs";
 import { ImageManifestSchema } from "./ImageManifestSchema.mjs";
 import isInteractive from 'is-interactive';
@@ -18,20 +19,20 @@ export default async function checkECRImageAccess({
     repositoryName,
     imageTag
   } = parseECRImageUri(imageUri);
-  if (!ecr) ecr = new AWS.ECR({
+  if (!ecr) ecr = new ECRClient({
     ...awsConfig,
     region
   });
   try {
     const {
       images: [image] = []
-    } = await ecr.batchGetImage({
+    } = await ecr.send(new BatchGetImageCommand({
       registryId,
       repositoryName,
       imageIds: [{
         imageTag
       }]
-    }).promise();
+    }));
     const imageManifest = image === null || image === void 0 ? void 0 : image.imageManifest;
     if (!imageManifest) {
       throw new Error(`imageManifest not found for: ${imageUri}`);
@@ -40,16 +41,16 @@ export default async function checkECRImageAccess({
       config,
       layers
     } = ImageManifestSchema.parse(JSON.parse(imageManifest));
-    await ecr.batchCheckLayerAvailability({
+    await ecr.send(new BatchCheckLayerAvailabilityCommand({
       registryId,
       repositoryName,
       layerDigests: [config.digest, ...layers.map(l => l.digest)]
-    }).promise();
-    await ecr.getDownloadUrlForLayer({
+    }));
+    await ecr.send(new GetDownloadUrlForLayerCommand({
       registryId,
       repositoryName,
       layerDigest: layers[0].digest
-    }).promise();
+    }));
     log.error(`ECR image is accessible: ${imageUri}`);
     return true;
   } catch (error) {
@@ -77,10 +78,10 @@ The policy should include:
   if (repoAccountAwsConfig && isInteractive()) {
     const {
       Account
-    } = await new AWS.STS({
+    } = await new STSClient({
       credentials: ecr.config.credentials,
       region
-    }).getCallerIdentity().promise();
+    }).send(new GetCallerIdentityCommand());
     if (!Account) {
       log.error(`failed to determine AWS account`);
       return false;
@@ -94,21 +95,21 @@ The policy should include:
       default: false
     }]);
     if (!update) return false;
-    const srcEcr = new AWS.ECR({
+    const srcEcr = new ECRClient({
       ...repoAccountAwsConfig,
       region
     });
     const {
       policyText
-    } = await srcEcr.getRepositoryPolicy({
+    } = await srcEcr.send(new GetRepositoryPolicyCommand({
       registryId,
       repositoryName
-    }).promise().catch(error => {
+    })).catch(error => {
       if (error.name === 'RepositoryPolicyNotFoundException') return {};
       throw error;
     });
     const policy = JSON.parse(policyText || '{}');
-    await srcEcr.setRepositoryPolicy({
+    await srcEcr.send(new SetRepositoryPolicyCommand({
       repositoryName,
       policyText: JSON.stringify({
         Version: '2012-10-17',
@@ -121,13 +122,18 @@ The policy should include:
           Action
         }]
       }, null, 2)
-    }).promise();
+    }));
     log.info(`updated policy on ECR repository ${formatECRRepositoryHostname({
       registryId,
       region,
       repositoryName
     })}`);
-    return true;
+    return await checkECRImageAccess({
+      awsConfig,
+      imageUri,
+      log,
+      ecr
+    });
   }
   return false;
 }

package/checkECRRepositoryPolicy.d.ts

@@ -1,4 +1,4 @@
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig } from '@aws-sdk/client-ecr';
 /**
  * Checks if the given ECR repository has a sufficient repository
  * policy to allow the given AWS principal to access docker images.
@@ -7,8 +7,8 @@ import AWS from 'aws-sdk';
  * would like to add/update the repository policy.
  */
 export default function checkECRRepositoryPolicy({ ecr, awsConfig, repositoryName, awsPrincipal, Action, log, }: {
-    ecr?: AWS.ECR;
-    awsConfig?: AWS.ConfigurationOptions;
+    ecr?: ECRClient;
+    awsConfig?: ECRClientConfig;
     repositoryName: string;
     awsPrincipal: string;
     Action?: string[];

package/checkECRRepositoryPolicy.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
+var _clientEcr = require("@aws-sdk/client-ecr");
 var _inquirer = _interopRequireDefault(require("inquirer"));
 var _isInteractive = _interopRequireDefault(require("is-interactive"));
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -27,7 +27,7 @@ function checkECRRepositoryPolicy(_x) {
 function _checkECRRepositoryPolicy() {
   _checkECRRepositoryPolicy = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
     var _policy$Statement, _statementForAction$P;
-    var ecr, awsConfig, repositoryName, awsPrincipal, _ref$Action, Action, _ref$log, log, rootUserMatch, principalAliases, _yield$ecr$getReposit, policyText, policy, statementForAction, statementPrincipal, _yield$inquirer$promp, update, _statementForAction$A, finalPolicy;
+    var ecr, awsConfig, repositoryName, awsPrincipal, _ref$Action, Action, _ref$log, log, rootUserMatch, principalAliases, _yield$ecr$send$catch, policyText, policy, statementForAction, statementPrincipal, _yield$inquirer$promp, update, _statementForAction$A, finalPolicy;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -35,17 +35,17 @@ function _checkECRRepositoryPolicy() {
           rootUserMatch = /^arn:aws:iam::(\d+):root$/.exec(awsPrincipal);
           if (rootUserMatch) awsPrincipal = rootUserMatch[1];
           principalAliases = /^(\d+)$/.test(awsPrincipal) ? [awsPrincipal, "arn:aws:iam::".concat(awsPrincipal, ":root")] : [awsPrincipal];
-          if (!ecr) ecr = new _awsSdk["default"].ECR(awsConfig);
+          if (!ecr) ecr = new _clientEcr.ECRClient(_objectSpread({}, awsConfig));
           _context.next = 7;
-          return ecr.getRepositoryPolicy({
+          return ecr.send(new _clientEcr.GetRepositoryPolicyCommand({
             repositoryName: repositoryName
-          }).promise()["catch"](function (error) {
+          }))["catch"](function (error) {
             if (error.name === 'RepositoryPolicyNotFoundException') return {};
             throw error;
           });
         case 7:
-          _yield$ecr$getReposit = _context.sent;
-          policyText = _yield$ecr$getReposit.policyText;
+          _yield$ecr$send$catch = _context.sent;
+          policyText = _yield$ecr$send$catch.policyText;
           policy = JSON.parse(policyText || '{}');
           statementForAction = (_policy$Statement = policy.Statement) === null || _policy$Statement === void 0 ? void 0 : _policy$Statement.find(function (s) {
             return s.Effect === 'Allow' && Array.isArray(Action) && Action.every(function (a) {
@@ -112,10 +112,10 @@ function _checkECRRepositoryPolicy() {
             });
           }
           _context.next = 26;
-          return ecr.setRepositoryPolicy({
+          return ecr.send(new _clientEcr.SetRepositoryPolicyCommand({
             repositoryName: repositoryName,
             policyText: JSON.stringify(finalPolicy, null, 2)
-          }).promise();
+          }));
         case 26:
           log.info("updated policy on ECR repository ".concat(repositoryName));
           return _context.abrupt("return", true);

package/checkECRRepositoryPolicy.mjs

@@ -1,4 +1,4 @@
-import AWS from 'aws-sdk';
+import { ECRClient, GetRepositoryPolicyCommand, SetRepositoryPolicyCommand } from '@aws-sdk/client-ecr';
 import inquirer from 'inquirer';
 import isInteractive from 'is-interactive';
 
@@ -21,12 +21,14 @@ export default async function checkECRRepositoryPolicy({
   const rootUserMatch = /^arn:aws:iam::(\d+):root$/.exec(awsPrincipal);
   if (rootUserMatch) awsPrincipal = rootUserMatch[1];
   const principalAliases = /^(\d+)$/.test(awsPrincipal) ? [awsPrincipal, `arn:aws:iam::${awsPrincipal}:root`] : [awsPrincipal];
-  if (!ecr) ecr = new AWS.ECR(awsConfig);
+  if (!ecr) ecr = new ECRClient({
+    ...awsConfig
+  });
   const {
     policyText
-  } = await ecr.getRepositoryPolicy({
+  } = await ecr.send(new GetRepositoryPolicyCommand({
     repositoryName
-  }).promise().catch(error => {
+  })).catch(error => {
     if (error.name === 'RepositoryPolicyNotFoundException') return {};
     throw error;
   });
@@ -88,10 +90,10 @@ The policy should include:
           }]
         };
       }
-      await ecr.setRepositoryPolicy({
+      await ecr.send(new SetRepositoryPolicyCommand({
         repositoryName,
         policyText: JSON.stringify(finalPolicy, null, 2)
-      }).promise();
+      }));
       log.info(`updated policy on ECR repository ${repositoryName}`);
       return true;
     }

package/copyECRImage.d.ts

@@ -1,13 +1,13 @@
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig } from '@aws-sdk/client-ecr';
 export default function copyECRImage({ from, to, }: {
     from: {
         imageUri: string;
-        ecr?: AWS.ECR;
-        awsConfig?: AWS.ConfigurationOptions;
+        ecr?: ECRClient;
+        awsConfig?: ECRClientConfig;
     };
     to: {
         imageUri: string;
-        ecr?: AWS.ECR;
-        awsConfig?: AWS.ConfigurationOptions;
+        ecr?: ECRClient;
+        awsConfig?: ECRClientConfig;
     };
 }): Promise<void>;

package/ecrImageExists.d.ts

@@ -1,7 +1,7 @@
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig } from '@aws-sdk/client-ecr';
 export default function ecrImageExists({ ecr, awsConfig, imageUri, registryId, repositoryName, imageTag, }: {
-    ecr?: AWS.ECR;
-    awsConfig?: AWS.ConfigurationOptions;
+    ecr?: ECRClient;
+    awsConfig?: ECRClientConfig;
     imageUri?: string;
     registryId?: string;
     repositoryName?: string;

package/ecrImageExists.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
+var _clientEcr = require("@aws-sdk/client-ecr");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function ecrImageExists(_x) {
@@ -40,7 +40,7 @@ function _ecrImageExists() {
           imageTag = _match[4];
         case 10:
           if (!region) region = awsConfig === null || awsConfig === void 0 ? void 0 : awsConfig.region;
-          if (!ecr) ecr = new _awsSdk["default"].ECR(_objectSpread(_objectSpread({}, awsConfig), {}, {
+          if (!ecr) ecr = new _clientEcr.ECRClient(_objectSpread(_objectSpread({}, awsConfig), {}, {
             region: region
           }));
           if (!(!repositoryName || !imageTag)) {
@@ -50,13 +50,13 @@ function _ecrImageExists() {
           throw new Error("missing repositoryName/imageTag or imageUri");
         case 14:
           _context.next = 16;
-          return ecr.describeImages({
+          return ecr.send(new _clientEcr.DescribeImagesCommand({
             registryId: registryId,
             repositoryName: repositoryName,
             imageIds: [{
               imageTag: imageTag
             }]
-          }).promise().then(function () {
+          })).then(function () {
             return true;
           }, function () {
             return false;

package/ecrImageExists.mjs

@@ -1,4 +1,4 @@
-import AWS from 'aws-sdk';
+import { DescribeImagesCommand, ECRClient } from '@aws-sdk/client-ecr';
 export default async function ecrImageExists({
   ecr,
   awsConfig,
@@ -14,18 +14,18 @@ export default async function ecrImageExists({
     [, registryId, region, repositoryName, imageTag] = match;
   }
   if (!region) region = awsConfig === null || awsConfig === void 0 ? void 0 : awsConfig.region;
-  if (!ecr) ecr = new AWS.ECR({
+  if (!ecr) ecr = new ECRClient({
     ...awsConfig,
     region
   });
   if (!repositoryName || !imageTag) {
     throw new Error(`missing repositoryName/imageTag or imageUri`);
   }
-  return await ecr.describeImages({
+  return await ecr.send(new DescribeImagesCommand({
     registryId,
     repositoryName,
     imageIds: [{
       imageTag
     }]
-  }).promise().then(() => true, () => false);
+  })).then(() => true, () => false);
 }

package/formatECRImageUri.d.ts

@@ -1,6 +1,6 @@
 export default function formatECRImageUri({ registryId, region, repositoryName, imageTag, }: {
-    registryId: AWS.ECR.RegistryId;
+    registryId: string;
     region: string;
-    repositoryName: AWS.ECR.RepositoryName;
-    imageTag: AWS.ECR.ImageTag;
+    repositoryName: string;
+    imageTag: string;
 }): string;

package/formatECRRepositoryHostname.d.ts

@@ -1,5 +1,5 @@
 export default function formatECRRepositoryHostname({ registryId, region, repositoryName, }: {
-    registryId: AWS.ECR.RegistryId;
+    registryId: string;
     region: string;
-    repositoryName: AWS.ECR.RepositoryName;
+    repositoryName: string;
 }): string;

package/loginToECR.d.ts

@@ -1,8 +1,5 @@
-/**
- * @prettier
- */
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig } from '@aws-sdk/client-ecr';
 export default function loginToECR({ ecr, awsConfig, }: {
-    ecr?: AWS.ECR;
-    awsConfig?: AWS.ConfigurationOptions;
+    ecr?: ECRClient;
+    awsConfig?: ECRClientConfig;
 }): Promise<void>;

package/loginToECR.js

@@ -7,11 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = loginToECR;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
 var _promisifyChildProcess = require("promisify-child-process");
 var _base64Js = _interopRequireDefault(require("base64-js"));
-/**
+var _clientEcr = require("@aws-sdk/client-ecr");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
  * @prettier
  */
 function loginToECR(_x) {
@@ -19,17 +21,17 @@ function loginToECR(_x) {
 }
 function _loginToECR() {
   _loginToECR = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
-    var ecr, awsConfig, _yield$ecr$getAuthori, authorizationData, _ref2, authorizationToken, proxyEndpoint, decoded, _decoded$split, _decoded$split2, user, password, child;
+    var ecr, awsConfig, _yield$ecr$send, authorizationData, _ref2, authorizationToken, proxyEndpoint, decoded, _decoded$split, _decoded$split2, user, password, child;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           ecr = _ref.ecr, awsConfig = _ref.awsConfig;
-          if (!ecr) ecr = new _awsSdk["default"].ECR(awsConfig);
+          if (!ecr) ecr = new _clientEcr.ECRClient(_objectSpread({}, awsConfig));
           _context.next = 4;
-          return ecr.getAuthorizationToken().promise();
+          return ecr.send(new _clientEcr.GetAuthorizationTokenCommand());
         case 4:
-          _yield$ecr$getAuthori = _context.sent;
-          authorizationData = _yield$ecr$getAuthori.authorizationData;
+          _yield$ecr$send = _context.sent;
+          authorizationData = _yield$ecr$send.authorizationData;
           _ref2 = (authorizationData === null || authorizationData === void 0 ? void 0 : authorizationData[0]) || {}, authorizationToken = _ref2.authorizationToken, proxyEndpoint = _ref2.proxyEndpoint;
           if (authorizationToken) {
             _context.next = 9;

package/loginToECR.mjs

@@ -1,17 +1,19 @@
 /**
  * @prettier
  */
-import AWS from 'aws-sdk';
 import { spawn } from 'promisify-child-process';
 import base64 from 'base64-js';
+import { ECRClient, GetAuthorizationTokenCommand } from '@aws-sdk/client-ecr';
 export default async function loginToECR({
   ecr,
   awsConfig
 }) {
-  if (!ecr) ecr = new AWS.ECR(awsConfig);
+  if (!ecr) ecr = new ECRClient({
+    ...awsConfig
+  });
   const {
     authorizationData
-  } = await ecr.getAuthorizationToken().promise();
+  } = await ecr.send(new GetAuthorizationTokenCommand());
   const {
     authorizationToken,
     proxyEndpoint

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/aws-ecr-utils",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "utilities for working with AWS Elastic Container Registry",
   "sideEffects": false,
   "repository": {
@@ -19,8 +19,9 @@
   },
   "homepage": "https://github.com/jcoreio/aws-ecr-utils#readme",
   "dependencies": {
+    "@aws-sdk/client-ecr": "^3.577.0",
+    "@aws-sdk/client-sts": "^3.577.0",
     "@babel/runtime": "^7.18.6",
-    "aws-sdk": "^2.1070.0",
     "base64-js": "^1.5.1",
     "inquirer": "^8.2.6",
     "is-interactive": "^1.0.0",
@@ -46,5 +47,5 @@
   "engines": {
     "node": ">=16"
   },
-  "packageManager": "pnpm@8.3.1"
+  "packageManager": "pnpm@8.11.0"
 }

package/parseECRImageUri.d.ts

@@ -1,7 +1,6 @@
-import AWS from 'aws-sdk';
 export default function parseECRImageUri(imageUri: string): {
-    registryId: AWS.ECR.RegistryId;
+    registryId: string;
     region: string;
-    repositoryName: AWS.ECR.RepositoryName;
+    repositoryName: string;
     imageTag: string;
 };

package/parseECRRepositoryHostname.d.ts

@@ -1,6 +1,5 @@
-import AWS from 'aws-sdk';
 export default function parseECRRepositoryHostname(hostname: string): {
-    registryId: AWS.ECR.RegistryId;
+    registryId: string;
     region: string;
-    repositoryName: AWS.ECR.RepositoryName;
+    repositoryName: string;
 };

package/tagECRImage.d.ts

@@ -1,10 +1,10 @@
 /**
  * @prettier
  */
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig } from '@aws-sdk/client-ecr';
 export default function tagECRImage({ ecr, awsConfig, imageUri, tags, }: {
-    ecr?: AWS.ECR;
-    awsConfig?: AWS.ConfigurationOptions;
+    ecr?: ECRClient;
+    awsConfig?: ECRClientConfig;
     imageUri: string;
     tags: string[];
 }): Promise<void>;

package/tagECRImage.js

@@ -8,7 +8,7 @@ exports["default"] = tagECRImage;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
+var _clientEcr = require("@aws-sdk/client-ecr");
 var _parseECRImageUri2 = _interopRequireDefault(require("./parseECRImageUri.js"));
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -28,16 +28,16 @@ function _tagECRImage() {
         case 0:
           ecr = _ref.ecr, awsConfig = _ref.awsConfig, imageUri = _ref.imageUri, tags = _ref.tags;
           _parseECRImageUri = (0, _parseECRImageUri2["default"])(imageUri), region = _parseECRImageUri.region, repositoryName = _parseECRImageUri.repositoryName, imageTag = _parseECRImageUri.imageTag;
-          if (!ecr) ecr = new _awsSdk["default"].ECR(_objectSpread(_objectSpread({}, awsConfig), {}, {
+          if (!ecr) ecr = new _clientEcr.ECRClient(_objectSpread(_objectSpread({}, awsConfig), {}, {
             region: region
           }));
           _context.next = 5;
-          return ecr.batchGetImage({
+          return ecr.send(new _clientEcr.BatchGetImageCommand({
             repositoryName: repositoryName,
             imageIds: [{
               imageTag: imageTag
             }]
-          }).promise().then(function (r) {
+          })).then(function (r) {
             var _r$images;
             return r === null || r === void 0 || (_r$images = r.images) === null || _r$images === void 0 || (_r$images = _r$images[0]) === null || _r$images === void 0 ? void 0 : _r$images.imageManifest;
           });
@@ -67,11 +67,11 @@ function _tagECRImage() {
           console.error("Adding tag ".concat(repositoryName, ":").concat(tag));
           _context.prev = 15;
           _context.next = 18;
-          return ecr.putImage({
+          return ecr.send(new _clientEcr.PutImageCommand({
             repositoryName: repositoryName,
             imageManifest: imageManifest,
             imageTag: tag.substring(tag.indexOf(':') + 1)
-          }).promise();
+          }));
         case 18:
           _context.next = 24;
           break;

package/tagECRImage.mjs

@@ -1,7 +1,7 @@
 /**
  * @prettier
  */
-import AWS from 'aws-sdk';
+import { BatchGetImageCommand, ECRClient, PutImageCommand } from '@aws-sdk/client-ecr';
 import parseECRImageUri from "./parseECRImageUri.mjs";
 export default async function tagECRImage({
   ecr,
@@ -14,16 +14,16 @@ export default async function tagECRImage({
     repositoryName,
     imageTag
   } = parseECRImageUri(imageUri);
-  if (!ecr) ecr = new AWS.ECR({
+  if (!ecr) ecr = new ECRClient({
     ...awsConfig,
     region
   });
-  const imageManifest = await ecr.batchGetImage({
+  const imageManifest = await ecr.send(new BatchGetImageCommand({
     repositoryName,
     imageIds: [{
       imageTag
     }]
-  }).promise().then(r => {
+  })).then(r => {
     var _r$images;
     return r === null || r === void 0 || (_r$images = r.images) === null || _r$images === void 0 || (_r$images = _r$images[0]) === null || _r$images === void 0 ? void 0 : _r$images.imageManifest;
   });
@@ -36,11 +36,11 @@ export default async function tagECRImage({
       // eslint-disable-next-line no-console
       console.error(`Adding tag ${repositoryName}:${tag}`);
       try {
-        await ecr.putImage({
+        await ecr.send(new PutImageCommand({
           repositoryName,
           imageManifest,
           imageTag: tag.substring(tag.indexOf(':') + 1)
-        }).promise();
+        }));
       } catch (error) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         if ((error === null || error === void 0 ? void 0 : error.code) !== 'ImageAlreadyExistsException') throw error;

package/upsertECRRepository.d.ts

@@ -1,6 +1,6 @@
-import AWS from 'aws-sdk';
+import { ECRClient, ECRClientConfig, Repository } from '@aws-sdk/client-ecr';
 export default function upsertECRRepository({ ecr, awsConfig, repositoryName, }: {
-    ecr?: AWS.ECR;
-    awsConfig?: AWS.ConfigurationOptions;
+    ecr?: ECRClient;
+    awsConfig?: ECRClientConfig;
     repositoryName: string;
-}): Promise<AWS.ECR.Repository>;
+}): Promise<Repository>;

package/upsertECRRepository.js

@@ -6,28 +6,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = upsertECRRepository;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
-// @flow
+var _clientEcr = require("@aws-sdk/client-ecr");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // @flow
 function upsertECRRepository(_x) {
   return _upsertECRRepository.apply(this, arguments);
 }
 function _upsertECRRepository() {
   _upsertECRRepository = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_ref) {
-    var ecr, awsConfig, repositoryName, _yield$ecr$describeRe, repositories, _repository, _yield$ecr$createRepo, repository;
+    var ecr, awsConfig, repositoryName, _yield$ecr$send, repositories, _repository, _yield$ecr$send2, repository;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           ecr = _ref.ecr, awsConfig = _ref.awsConfig, repositoryName = _ref.repositoryName;
-          if (!ecr) ecr = new _awsSdk["default"].ECR(awsConfig);
+          if (!ecr) ecr = new _clientEcr.ECRClient(_objectSpread({}, awsConfig));
           _context.prev = 2;
           _context.next = 5;
-          return ecr.describeRepositories({
+          return ecr.send(new _clientEcr.DescribeRepositoriesCommand({
             repositoryNames: [repositoryName]
-          }).promise();
+          }));
         case 5:
-          _yield$ecr$describeRe = _context.sent;
-          repositories = _yield$ecr$describeRe.repositories;
+          _yield$ecr$send = _context.sent;
+          repositories = _yield$ecr$send.repositories;
           _repository = repositories === null || repositories === void 0 ? void 0 : repositories[0];
           if (!_repository) {
             _context.next = 10;
@@ -44,12 +46,12 @@ function _upsertECRRepository() {
           // eslint-disable-next-line no-console
           console.error("Creating ECR repository {bold ".concat(repositoryName, "}..."));
           _context.next = 17;
-          return ecr.createRepository({
+          return ecr.send(new _clientEcr.CreateRepositoryCommand({
             repositoryName: repositoryName
-          }).promise();
+          }));
         case 17:
-          _yield$ecr$createRepo = _context.sent;
-          repository = _yield$ecr$createRepo.repository;
+          _yield$ecr$send2 = _context.sent;
+          repository = _yield$ecr$send2.repository;
           if (repository) {
             _context.next = 21;
             break;

package/upsertECRRepository.mjs

@@ -1,18 +1,20 @@
 // @flow
 
-import AWS from 'aws-sdk';
+import { CreateRepositoryCommand, DescribeRepositoriesCommand, ECRClient } from '@aws-sdk/client-ecr';
 export default async function upsertECRRepository({
   ecr,
   awsConfig,
   repositoryName
 }) {
-  if (!ecr) ecr = new AWS.ECR(awsConfig);
+  if (!ecr) ecr = new ECRClient({
+    ...awsConfig
+  });
   try {
     const {
       repositories
-    } = await ecr.describeRepositories({
+    } = await ecr.send(new DescribeRepositoriesCommand({
       repositoryNames: [repositoryName]
-    }).promise();
+    }));
     const repository = repositories === null || repositories === void 0 ? void 0 : repositories[0];
     if (repository) return repository;
   } catch (error) {
@@ -23,9 +25,9 @@ export default async function upsertECRRepository({
   console.error(`Creating ECR repository {bold ${repositoryName}}...`);
   const {
     repository
-  } = await ecr.createRepository({
+  } = await ecr.send(new CreateRepositoryCommand({
     repositoryName
-  }).promise();
+  }));
   if (!repository) {
     throw new Error(`repository is missing from createRepository response`);
   }

package/copyECRImage.js.flow

@@ -1,14 +0,0 @@
-// @flow
-
-declare export default function copyECRImage(options: {|
-  from: {|
-    imageUri: string,
-    ecr?: any,
-    awsConfig?: { ... },
-  |},
-  to: {|
-    imageUri: string,
-    ecr?: any,
-    awsConfig?: { ... },
-  |},
-|}): Promise<void>

package/copyECRImage.mjs.flow

@@ -1,14 +0,0 @@
-// @flow
-
-declare export default function copyECRImage(options: {|
-  from: {|
-    imageUri: string,
-    ecr?: any,
-    awsConfig?: { ... },
-  |},
-  to: {|
-    imageUri: string,
-    ecr?: any,
-    awsConfig?: { ... },
-  |},
-|}): Promise<void>

package/ecrImageExists.js.flow

@@ -1,10 +0,0 @@
-// @flow
-
-declare export default function ecrImageExists(options: {|
-  ecr?: any,
-  awsConfig?: { ... },
-  imageUri?: string,
-  registryId?: string,
-  repositoryName?: string,
-  imageTag?: string,
-|}): Promise<boolean>

package/ecrImageExists.mjs.flow

@@ -1,10 +0,0 @@
-// @flow
-
-declare export default function ecrImageExists(options: {|
-  ecr?: any,
-  awsConfig?: { ... },
-  imageUri?: string,
-  registryId?: string,
-  repositoryName?: string,
-  imageTag?: string,
-|}): Promise<boolean>

package/index.js.flow

@@ -1,8 +0,0 @@
-// @flow
-
-export { default as copyECRImage } from './copyECRImage'
-export { default as ecrImageExists } from './ecrImageExists'
-export { default as loginToECR } from './loginToECR'
-export { default as tagECRImage } from './tagECRImage'
-export { default as parseECRImageUri } from './parseECRImageUri'
-export { default as upsertECRRepository } from './upsertECRRepository'

package/index.mjs.flow

@@ -1,8 +0,0 @@
-// @flow
-
-export { default as copyECRImage } from './copyECRImage'
-export { default as ecrImageExists } from './ecrImageExists'
-export { default as loginToECR } from './loginToECR'
-export { default as tagECRImage } from './tagECRImage'
-export { default as parseECRImageUri } from './parseECRImageUri'
-export { default as upsertECRRepository } from './upsertECRRepository'

package/loginToECR.js.flow

@@ -1,6 +0,0 @@
-// @flow
-
-declare export default function loginToECR(options: {
-  ecr?: any,
-  awsConfig?: { ... },
-}): Promise<void>

package/loginToECR.mjs.flow

@@ -1,6 +0,0 @@
-// @flow
-
-declare export default function loginToECR(options: {
-  ecr?: any,
-  awsConfig?: { ... },
-}): Promise<void>

package/parseECRImageUri.js.flow

@@ -1,8 +0,0 @@
-// @flow
-
-declare export default function parseECRImageUri(imageUri: string): {|
-  registryId: string,
-  region: string,
-  repositoryName: string,
-  imageTag: string,
-|}

package/parseECRImageUri.mjs.flow

@@ -1,8 +0,0 @@
-// @flow
-
-declare export default function parseECRImageUri(imageUri: string): {|
-  registryId: string,
-  region: string,
-  repositoryName: string,
-  imageTag: string,
-|}

package/tagECRImage.js.flow

@@ -1,8 +0,0 @@
-// @flow
-
-declare export default function tagECRImage(options: {|
-  ecr?: any,
-  awsConfig?: { ... },
-  imageUri: string,
-  tags: string[],
-|}): Promise<void>

package/tagECRImage.mjs.flow

@@ -1,8 +0,0 @@
-// @flow
-
-declare export default function tagECRImage(options: {|
-  ecr?: any,
-  awsConfig?: { ... },
-  imageUri: string,
-  tags: string[],
-|}): Promise<void>

package/upsertECRRepository.js.flow

@@ -1,7 +0,0 @@
-// @flow
-
-declare export default function upsertECRRepository(options: {
-  ecr?: any,
-  awsConfig?: { ... },
-  repositoryName: string,
-}): Promise<any>

package/upsertECRRepository.mjs.flow

@@ -1,7 +0,0 @@
-// @flow
-
-declare export default function upsertECRRepository(options: {
-  ecr?: any,
-  awsConfig?: { ... },
-  repositoryName: string,
-}): Promise<any>