rds_ssm_connect 1.1.7 → 1.2.1

package/SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

package/connect.js

@@ -14,7 +14,7 @@ const awsConfigPath = path.join(os.homedir(), '.aws', 'config')
 // Read the contents of the AWS config file
 const awsConfig = fs.readFileSync(awsConfigPath, 'utf-8')
 
-// Extract environments from AWS config file
+// Extract environments from the AWS config file
 const ENVS = awsConfig
   .split('\n')
   .filter(line => line.startsWith('[') && line.endsWith(']'))
@@ -31,7 +31,6 @@ inquirer
       choices: ENVS
     }
   ])
-
   .then((answers) => {
     const ENV = answers.ENV // Get the selected environment from the user's answers
     console.log(`You selected: ${ENV}`)
@@ -52,23 +51,28 @@ inquirer
 
     // Set up the commands to run inside the aws-vault environment
     const awsVaultExecCommand = ['aws-vault', 'exec', ENV, '--']
-    const ssmDescribeCommand = `aws ssm describe-parameters --region ${REGION} --query "Parameters[?ends_with(Name, '/rds/rds-aurora-password')].Name" --output text | head -n 1`
+    const secretsDescribeCommand = `aws secretsmanager list-secrets --region ${REGION} --query 'SecretList[?starts_with(Name, \`rds!cluster\`)].Name' --output text | head -n 1`
 
     // Run the commands inside aws-vault environment
-    const ssmDescribeProcess = spawn('sh', ['-c', `${awsVaultExecCommand.join(' ')} ${ssmDescribeCommand}`])
+    const secretsDescribeProcess = spawn('sh', ['-c', `${awsVaultExecCommand.join(' ')} ${secretsDescribeCommand}`])
+
+    // Get the name of the secret containing the RDS credentials
+    secretsDescribeProcess.stdout.on('data', (data) => {
+      const SECRET_NAME = data.toString().trim()
 
-    // Get the name of the parameter containing the RDS password
-    ssmDescribeProcess.stdout.on('data', (data) => {
-      const PARAM_NAME = data.toString().trim()
+      if (!SECRET_NAME) {
+        console.error('No secret found with name starting with rds!cluster.')
+        return
+      }
 
-      // Get the RDS credentials
-      const ssmGetCommand = `aws ssm get-parameter --region ${REGION} --name '${PARAM_NAME}' --with-decryption --query Parameter.Value --output text`
-      const ssmGetProcess = spawn('sh', ['-c', `${awsVaultExecCommand.join(' ')} ${ssmGetCommand}`])
+      // Get the RDS credentials from Secrets Manager
+      const secretsGetCommand = `aws secretsmanager get-secret-value --region ${REGION} --secret-id '${SECRET_NAME}' --query SecretString --output text`
+      const secretsGetProcess = spawn('sh', ['-c', `${awsVaultExecCommand.join(' ')} ${secretsGetCommand}`])
 
-      // Parse the JSON output of the ssm get-parameter command to get the RDS credentials
-      ssmGetProcess.stdout.on('data', (data) => {
+      // Parse the JSON output of the secretsmanager get-secret-value command to get the RDS credentials
+      secretsGetProcess.stdout.on('data', (data) => {
         const CREDENTIALS = JSON.parse(data.toString())
-        const USERNAME = CREDENTIALS.user // Get the RDS username from the credentials
+        const USERNAME = CREDENTIALS.username // Get the RDS username from the credentials
         const PASSWORD = CREDENTIALS.password // Get the RDS password from the credentials
 
         // Display connection credentials and connection string
@@ -122,12 +126,12 @@ inquirer
         })
       })
 
-      ssmGetProcess.stderr.on('data', (data) => {
+      secretsGetProcess.stderr.on('data', (data) => {
         console.error(`Command execution error: ${data.toString()}`)
       })
     })
 
-    ssmDescribeProcess.stderr.on('data', (data) => {
+    secretsDescribeProcess.stderr.on('data', (data) => {
       console.error(`Command execution error: ${data.toString()}`)
     })
   })

package/envPortMapping.js

@@ -7,7 +7,8 @@ export const envPortMapping = {
   dev2: '5437',
   stage2: '5438',
   sandbox: '5439',
-  'perf-dev': '5440'
+  'perf-dev': '5440',
+  support: '5441'
 }
 
 // Define the table name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rds_ssm_connect",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "type": "module",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.495.0",