From 4bcea339ce8691c15214b7449ca95f5b69936ec5 Mon Sep 17 00:00:00 2001 From: VioletHynes Date: Tue, 2 Jul 2024 16:32:37 -0400 Subject: [PATCH] Fix issue with lowercasing of HCP resources --- connect.go | 9 +++------ connect_test.go | 14 +++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/connect.go b/connect.go index adb4ded..3b9bf1b 100644 --- a/connect.go +++ b/connect.go @@ -242,8 +242,7 @@ func (c *HCPConnectCommand) getOrganization() (organizationID string, err error) for _, org := range organizationsResp.GetPayload().Organizations { if *org.State == hcprmm.HashicorpCloudResourcemanagerOrganizationOrganizationStateACTIVE { c.Ui.Info(fmt.Sprintf("Organization name: %s", org.Name)) - name := strings.ToLower(org.Name) - orgs[name] = org + orgs[org.Name] = org } } userInput, err := c.Ui.Ask(fmt.Sprintf("\nChoose a organization: ")) @@ -288,8 +287,7 @@ func (c *HCPConnectCommand) getProject(organizationID string) (projectID string, for _, proj := range projectResp.GetPayload().Projects { if *proj.State == hcprmm.HashicorpCloudResourcemanagerProjectProjectStateACTIVE { c.Ui.Info(fmt.Sprintf("Project name: %s", proj.Name)) - name := strings.ToLower(proj.Name) - projs[name] = proj + projs[proj.Name] = proj } } userInput, err := c.Ui.Ask(fmt.Sprintf("\nChoose a project: ")) @@ -366,8 +364,7 @@ func (c *HCPConnectCommand) listClusters(organizationID string, projectID string for _, cluster := range clustersResp.GetPayload().Clusters { if *cluster.State == hcpvsm.HashicorpCloudVault20201125ClusterStateRUNNING { c.Ui.Info(fmt.Sprintf("Cluster identification: %s", cluster.ID)) - id := strings.ToLower(cluster.ID) - clusters[id] = cluster + clusters[cluster.ID] = cluster } } userInput, err := c.Ui.Ask("\nChoose a cluster:") diff --git a/connect_test.go b/connect_test.go index 3181e3d..01cadbd 100644 --- a/connect_test.go +++ b/connect_test.go @@ -179,7 +179,7 @@ func Test_HCPConnectCommand(t *testing.T) { Projects: []*models.HashicorpCloudResourcemanagerProject{ { ID: uuid.New().String(), - Name: "mock-project-1", + Name: "Mock-project-1", State: models.NewHashicorpCloudResourcemanagerProjectProjectState( models.HashicorpCloudResourcemanagerProjectProjectStateACTIVE, ), @@ -260,7 +260,7 @@ func Test_getOrganization(t *testing.T) { // Test multiple organizations // UI interaction required "multiple organizations": { - userInputOrganizationName: "mock-organization-2\n", + userInputOrganizationName: "MOCK-organization-2\n", expectedOrganizationID: organizationIDTwo, organizationServiceListResponse: &hcprmo.OrganizationServiceListOK{ Payload: &models.HashicorpCloudResourcemanagerOrganizationListResponse{ @@ -272,7 +272,7 @@ func Test_getOrganization(t *testing.T) { }, { ID: organizationIDTwo, - Name: "mock-organization-2", + Name: "MOCK-organization-2", State: models.NewHashicorpCloudResourcemanagerOrganizationOrganizationState(models.HashicorpCloudResourcemanagerOrganizationOrganizationStateACTIVE), }, { @@ -382,7 +382,7 @@ func Test_getProject(t *testing.T) { // Test multiple projects // UI interaction required "multiple projects": { - userInputProjectName: "mock-project-2\n", + userInputProjectName: "MOCK_-project-2\n", expectedProjectID: projectIDTwo, projectServiceListResponse: &hcprmp.ProjectServiceListOK{ Payload: &models.HashicorpCloudResourcemanagerProjectListResponse{ @@ -394,7 +394,7 @@ func Test_getProject(t *testing.T) { }, { ID: projectIDTwo, - Name: "mock-project-2", + Name: "MOCK_-project-2", State: models.NewHashicorpCloudResourcemanagerProjectProjectState(models.HashicorpCloudResourcemanagerProjectProjectStateACTIVE), }, { @@ -529,7 +529,7 @@ func Test_getCluster(t *testing.T) { // UI interaction required "multiple clusters": { expectedProxyAddr: "https://hcp-proxy-cluster-2.addr:8200", - userInputCluster: "cluster-2\n", + userInputCluster: "CLUSTER-2\n", listClustersServiceListResponse: &hcpvs.ListOK{ Payload: &hcpvsm.HashicorpCloudVault20201125ListResponse{ Clusters: []*hcpvsm.HashicorpCloudVault20201125Cluster{ @@ -544,7 +544,7 @@ func Test_getCluster(t *testing.T) { }, }, { - ID: "cluster-2", + ID: "CLUSTER-2", DNSNames: &hcpvsm.HashicorpCloudVault20201125ClusterDNSNames{Proxy: "hcp-proxy-cluster-2.addr:8200"}, State: hcpvsm.NewHashicorpCloudVault20201125ClusterState(hcpvsm.HashicorpCloudVault20201125ClusterStateRUNNING), Config: &hcpvsm.HashicorpCloudVault20201125ClusterConfig{