AT-10890: Fix types

https://amplify-education.atlassian.net/browse/AT-10890
amplify-education · Nov 22, 2023 · aa374d0 · aa374d0
1 parent d466f5b
commit aa374d0
Show file tree

Hide file tree

Showing 7 changed files with 199 additions and 120 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/aws/acm-wrapper.ts b/src/aws/acm-wrapper.ts
@@ -1,15 +1,20 @@
 import {
-  ACMClient,
-  CertificateSummary,
-  ListCertificatesCommand,
-  ListCertificatesCommandInput,
-  ListCertificatesCommandOutput
+    CertificateStatus,
+    ACMClient,
+    CertificateSummary,
+    ListCertificatesCommand,
+    ListCertificatesCommandInput,
+    ListCertificatesCommandOutput
 } from "@aws-sdk/client-acm";
 import Globals from "../globals";
 import DomainConfig = require("../models/domain-config");
-import { getAWSPagedResults } from "../utils";
+import {getAWSPagedResults} from "../utils";
 
-const certStatuses = ["PENDING_VALIDATION", "ISSUED", "INACTIVE"];
+const certStatuses = [
+    CertificateStatus.PENDING_VALIDATION,
+    CertificateStatus.ISSUED,
+    CertificateStatus.INACTIVE
+];
 
 class ACMWrapper {
     public acm: ACMClient;
@@ -30,11 +35,11 @@ class ACMWrapper {
 
         try {
             const certificates = await getAWSPagedResults<CertificateSummary, ListCertificatesCommandInput, ListCertificatesCommandOutput>(
-              this.acm,
-              "CertificateSummaryList",
-              "NextToken",
-              "NextToken",
-              new ListCertificatesCommand({ CertificateStatuses: certStatuses })
+                this.acm,
+                "CertificateSummaryList",
+                "NextToken",
+                "NextToken",
+                new ListCertificatesCommand({CertificateStatuses: certStatuses})
             );
             // enhancement idea: weight the choice of cert so longer expires
             // and RenewalEligibility = ELIGIBLE is more preferable

diff --git a/src/aws/api-gateway-v1-wrapper.ts b/src/aws/api-gateway-v1-wrapper.ts
@@ -5,26 +5,28 @@ import DomainConfig = require("../models/domain-config");
 import DomainInfo = require("../models/domain-info");
 import Globals from "../globals";
 import {
-  APIGatewayClient,
-  BasePathMapping,
-  CreateBasePathMappingCommand,
-  CreateDomainNameCommand,
-  CreateDomainNameCommandOutput,
-  DeleteBasePathMappingCommand,
-  DeleteDomainNameCommand,
-  GetBasePathMappingsCommand,
-  GetBasePathMappingsCommandInput,
-  GetBasePathMappingsCommandOutput,
-  GetDomainNameCommand,
-  GetDomainNameCommandOutput,
-  UpdateBasePathMappingCommand
+    APIGatewayClient,
+    BasePathMapping,
+    CreateBasePathMappingCommand,
+    CreateDomainNameCommand,
+    CreateDomainNameCommandOutput,
+    DeleteBasePathMappingCommand,
+    DeleteDomainNameCommand,
+    GetBasePathMappingsCommand,
+    GetBasePathMappingsCommandInput,
+    GetBasePathMappingsCommandOutput,
+    GetDomainNameCommand,
+    GetDomainNameCommandOutput,
+    UpdateBasePathMappingCommand
 } from "@aws-sdk/client-api-gateway";
 import ApiGatewayMap = require("../models/api-gateway-map");
 import APIGatewayBase = require("../models/apigateway-base");
 import Logging from "../logging";
-import { getAWSPagedResults } from "../utils";
+import {getAWSPagedResults} from "../utils";
 
 class APIGatewayV1Wrapper extends APIGatewayBase {
+    public readonly apiGateway: APIGatewayClient;
+
     constructor(credentials?: any) {
         super();
         this.apiGateway = new APIGatewayClient({