Merge pull request #376 from aerospike/v7.6.0

V7.6.0
aerospike · Jul 30, 2024 · c3ec34b · c3ec34b
2 parents bfb5159 + e36a59b
commit c3ec34b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/backendAwsKeys.go b/src/backendAwsKeys.go
@@ -15,6 +15,12 @@ func (d *backendAws) GetKeyPath(clusterName string) (keyPath string, err error)
 }
 
 func (d *backendAws) getKeyPathNoCheck(clusterName string) (keyPath string) {
+	homeDir, err := a.aerolabRootDir()
+	if err == nil {
+		if _, err := os.Stat(path.Join(homeDir, "sshkey")); err == nil {
+			return path.Join(homeDir, "sshkey")
+		}
+	}
 	keyName := fmt.Sprintf("aerolab-%s_%s", clusterName, a.opts.Config.Backend.Region)
 	keyPath = path.Join(string(a.opts.Config.Backend.SshKeyPath), keyName)
 	if _, err := os.Stat(keyPath); os.IsNotExist(err) {
@@ -25,6 +31,12 @@ func (d *backendAws) getKeyPathNoCheck(clusterName string) (keyPath string) {
 
 // get KeyPair
 func (d *backendAws) getKey(clusterName string) (keyName string, keyPath string, err error) {
+	homeDir, err := a.aerolabRootDir()
+	if err == nil {
+		if _, err := os.Stat(path.Join(homeDir, "sshkey")); err == nil {
+			return "manual-aerolab-agi-shared", path.Join(homeDir, "sshkey"), nil
+		}
+	}
 	keyName = fmt.Sprintf("aerolab-%s_%s", clusterName, a.opts.Config.Backend.Region)
 	keyPath = path.Join(string(a.opts.Config.Backend.SshKeyPath), keyName)
 	// check keyName exists, if not, error
@@ -47,6 +59,12 @@ func (d *backendAws) getKey(clusterName string) (keyName string, keyPath string,
 
 // get KeyPair
 func (d *backendAws) makeKey(clusterName string) (keyName string, keyPath string, err error) {
+	homeDir, err := a.aerolabRootDir()
+	if err == nil {
+		if _, err := os.Stat(path.Join(homeDir, "sshkey")); err == nil {
+			return "manual-aerolab-agi-shared", path.Join(homeDir, "sshkey"), nil
+		}
+	}
 	keyName = fmt.Sprintf("aerolab-%s_%s", clusterName, a.opts.Config.Backend.Region)
 	keyPath = path.Join(string(a.opts.Config.Backend.SshKeyPath), keyName)
 	_, _, err = d.getKey(clusterName)
@@ -74,6 +92,12 @@ func (d *backendAws) makeKey(clusterName string) (keyName string, keyPath string
 
 // get KeyPair
 func (d *backendAws) killKey(clusterName string) (keyName string, keyPath string, err error) {
+	homeDir, err := a.aerolabRootDir()
+	if err == nil {
+		if _, err := os.Stat(path.Join(homeDir, "sshkey")); err == nil {
+			return "manual-aerolab-agi-shared", path.Join(homeDir, "sshkey"), nil
+		}
+	}
 	keyName = fmt.Sprintf("aerolab-%s_%s", clusterName, a.opts.Config.Backend.Region)
 	keyPath = path.Join(string(a.opts.Config.Backend.SshKeyPath), keyName)
 	os.Remove(keyPath)

diff --git a/web/dev/index.js b/web/dev/index.js
@@ -833,7 +833,7 @@ function initDatatable() {
             {
                 className: 'btn btn-warning dtTooltip',
                 titleAttr: 'Open form: Extend node(s) expiry time',
-                text: 'Extend Expiry',
+                text: 'Change Expiry',
                 action: function ( e, dt, node, config ) {
                     let arr = [];
                     dt.rows({selected: true}).every(function(rowIdx, tableLoop, rowLoop) {arr.push(this.data());});
@@ -1135,8 +1135,8 @@ function initDatatable() {
             {extend: 'myspacer'},
             {
                 className: 'btn btn-warning dtTooltip',
-                titleAttr: 'Go to form: extend expiry of instance(s)',
-                text: 'Extend Expiry',
+                titleAttr: 'Go to form: Change Expiry of instance(s)',
+                text: 'Change Expiry',
                 action: function ( e, dt, node, config ) {
                     let arr = [];
                     dt.rows({selected: true}).every(function(rowIdx, tableLoop, rowLoop) {arr.push(this.data());});
@@ -1276,7 +1276,7 @@ function initDatatable() {
             {
                 className: 'btn btn-warning dtTooltip',
                 titleAttr: 'Open form: Extend node(s) expiry time',
-                text: 'Extend Expiry',
+                text: 'Change Expiry',
                 action: function ( e, dt, node, config ) {
                     let arr = [];
                     dt.rows({selected: true}).every(function(rowIdx, tableLoop, rowLoop) {arr.push(this.data());});