fix: Handle shortening cluster names for clusters named by their FQDN.

Closes #3755

Signed-off-by: James Sharpe <james.sharpe@zenotech.com>

Author: James Sharpe

pkg/kube/cluster/cluster.go

@@ -57,6 +57,9 @@ func ShortNameN(clusterName string, maxLen int) string {
 	if len(clusterName) > maxLen {
 		shortClusterName = clusterName[0:maxLen]
 	}
+
+	shortClusterName = strings.ReplaceAll(shortClusterName, ".", "-")
+
 	if strings.HasSuffix(shortClusterName, "_") || strings.HasSuffix(shortClusterName, "-") {
 		shortClusterName = shortClusterName[0 : len(shortClusterName)-1]
 	}

pkg/kube/cluster/cluster_test.go

@@ -41,6 +41,9 @@ func TestShortClusterName(t *testing.T) {
 		},
 	}
 	When(kuber.LoadConfig()).ThenReturn(&config, nil, nil)
+
+	clusterName, err = cluster.ShortName(kuber)
+
 	assert.NoError(t, err)
 	assert.Equal(t, "short-cluster-na", clusterName)
 
@@ -51,6 +54,9 @@ func TestShortClusterName(t *testing.T) {
 		},
 	}
 	When(kuber.LoadConfig()).ThenReturn(&config, nil, nil)
+
+	clusterName, err = cluster.ShortName(kuber)
+
 	assert.NoError(t, err)
 	assert.Equal(t, "short-cluster-na", clusterName)
 }
@@ -72,6 +78,20 @@ func TestClusterName(t *testing.T) {
 	assert.Equal(t, "my-cluster-name", clusterName)
 }
 
+func TestShortNameN(t *testing.T) {
+	clusterName := cluster.ShortNameN("short.cluster.name", 6)
+	assert.Equal(t, "short", clusterName)
+
+	clusterName = cluster.ShortNameN("short.cluster.name", 14)
+	assert.Equal(t, "short-cluster", clusterName)
+
+	clusterName = cluster.ShortNameN("short_cluster_name", 6)
+	assert.Equal(t, "short", clusterName)
+
+	clusterName = cluster.ShortNameN("short-cluster-name", 6)
+	assert.Equal(t, "short", clusterName)
+}
+
 func TestSystemVaultNameForCluster(t *testing.T) {
 	actual := vault.SystemVaultNameForCluster("jstrachan-kp38")
 	assert.Equal(t, "jx-vault-jstrachan-kp3", actual, "system vault name")