Merge pull request #11 from aws-samples/app/upgrade/nodejs

Fix SDK Javascript V3 for ElastiCache Serverless
aws-samples · Jan 31, 2024 · eb84fdf · eb84fdf
2 parents eb6b248 + d59e115
commit eb84fdf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/frontend/src/pages/Sm-clustersElasticache-01.js b/frontend/src/pages/Sm-clustersElasticache-01.js
@@ -345,21 +345,28 @@ function Login() {
                                       else
                                           authMode = "modeNonAuth";
 
-                                      rdsItems.push({
-                                                    identifier : item['ServerlessCacheName'],
-                                                    status : item['Status'] ,
-                                                    size : (parseFloat(item['CacheUsageLimits']['ECPUPerSecond']['Maximum'])).toLocaleString('en-US', {minimumFractionDigits:0, maximumFractionDigits:0}) +  " (ECPUs)",
-                                                    engine : "elasticache:redis-serverless" ,
-                                                    shards : "-",
-                                                    nodes: "-",
-                                                    mode: "-",
-                                                    endpoint: item['Endpoint']['Address'],
-                                                    port : item['Endpoint']['Port'],
-                                                    multiaz : "true",
-                                                    ssl : "required",
-                                                    auth : authMode,
-                                                    authmode : authMode,
-                                      });
+                                      if ( item['Engine'] == "redis") {
+                                          rdsItems.push({
+                                                        identifier : item['ServerlessCacheName'],
+                                                        status : item['Status'] ,
+                                                        size : (
+                                                                  ( parseFloat(item['CacheUsageLimits']?.['ECPUPerSecond']?.['Maximum']) || 0 ) > 0 ?
+                                                                  ( parseFloat(item['CacheUsageLimits']?.['ECPUPerSecond']?.['Maximum']) || 0 ).toLocaleString('en-US', {minimumFractionDigits:0, maximumFractionDigits:0}) +  " (ECPUs)"
+                                                                  :
+                                                                  ""
+                                                               ),
+                                                        engine : "elasticache:" + item['Engine'] + "-serverless" ,
+                                                        shards : "-",
+                                                        nodes: "-",
+                                                        mode: "-",
+                                                        endpoint: item['Endpoint']['Address'],
+                                                        port : item['Endpoint']['Port'],
+                                                        multiaz : "true",
+                                                        ssl : "required",
+                                                        auth : authMode,
+                                                        authmode : authMode,
+                                          });
+                                      }
 
 
                                 }

diff --git a/server/class.aws.js b/server/class.aws.js
@@ -12,7 +12,7 @@ const { RDSClient, DescribeDBClustersCommand, DescribeDBInstancesCommand } = req
 const { DocDBClient, /*DescribeDBClustersCommand*/ } = require("@aws-sdk/client-docdb"); 
 const { CloudWatchClient, GetMetricDataCommand } = require("@aws-sdk/client-cloudwatch");
 const { CloudWatchLogsClient, GetLogEventsCommand } = require("@aws-sdk/client-cloudwatch-logs");
-const { DocDBElasticClient, GetClusterCommand } = require("@aws-sdk/client-docdb-elastic");
+const { DocDBElasticClient, GetClusterCommand, ListClustersCommand  } = require("@aws-sdk/client-docdb-elastic");
 const { DynamoDBClient, DescribeTableCommand, ListTablesCommand } = require("@aws-sdk/client-dynamodb");
 const { STSClient, GetCallerIdentityCommand } = require("@aws-sdk/client-sts"); 
 
@@ -1446,7 +1446,7 @@ class classAWS {
 
             try {
 
-                const command = new GetClusterCommand(parameter);
+                const command = new ListClustersCommand(parameter);
                 const data = await docdbelastic.send(command);
                 return data;