fix for a non system admin user to create a deployment (#594)

* fix for a non system admin user to create a deployment * Changing function arguments * fix unit tests & linting changes Co-authored-by: neel-astro <[email protected]>
astronomer · Jun 10, 2022 · 88a2539 · 88a2539
1 parent 50b270b
commit 88a2539
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 36 deletions.
diff --git a/astro-client/astro.go b/astro-client/astro.go
@@ -22,7 +22,7 @@ type Client interface {
 	CreateImage(input ImageCreateInput) (*Image, error)
 	DeployImage(input ImageDeployInput) (*Image, error)
 	// Cluster
-	ListClusters(vars map[string]interface{}) ([]Cluster, error)
+	ListClusters(organizationID string) ([]Cluster, error)
 	// RuntimeRelease
 	ListInternalRuntimeReleases() ([]RuntimeRelease, error)
 	ListPublicRuntimeReleases() ([]RuntimeRelease, error)
@@ -174,10 +174,10 @@ func (c *HTTPClient) DeployImage(input ImageDeployInput) (*Image, error) {
 	return resp.Data.DeployImage, nil
 }
 
-func (c *HTTPClient) ListClusters(vars map[string]interface{}) ([]Cluster, error) {
+func (c *HTTPClient) ListClusters(organizationID string) ([]Cluster, error) {
 	req := Request{
 		Query:     GetClusters,
-		Variables: map[string]interface{}{"input": vars},
+		Variables: map[string]interface{}{"organizationId": organizationID},
 	}
 
 	resp, err := req.DoWithClient(c)

diff --git a/astro-client/astro_test.go b/astro-client/astro_test.go
@@ -592,7 +592,7 @@ func TestListClusters(t *testing.T) {
 		})
 		astroClient := NewAstroClient(client)
 
-		resp, err := astroClient.ListClusters(map[string]interface{}{})
+		resp, err := astroClient.ListClusters("test-org-id")
 		assert.NoError(t, err)
 		assert.Equal(t, resp, mockResponse.Data.GetClusters)
 	})
@@ -607,7 +607,7 @@ func TestListClusters(t *testing.T) {
 		})
 		astroClient := NewAstroClient(client)
 
-		_, err := astroClient.ListClusters(map[string]interface{}{})
+		_, err := astroClient.ListClusters("test-org-id")
 		assert.Contains(t, err.Error(), "Internal Server Error")
 	})
 }

diff --git a/astro-client/mocks/Client.go b/astro-client/mocks/Client.go
diff --git a/cloud/deployment/deployment.go b/cloud/deployment/deployment.go
@@ -288,8 +288,7 @@ func selectCluster(clusterID, organizationID string, client astro.Client) (newCl
 		Header:         []string{"#", "CLUSTER NAME", "CLOUD PROVIDER", "CLUSTER ID"},
 	}
 	// cluster request
-	clusterInput := map[string]interface{}{"organizationId": organizationID}
-	cs, err := client.ListClusters(clusterInput)
+	cs, err := client.ListClusters(organizationID)
 	if err != nil {
 		return "", errors.Wrap(err, astro.AstronomerConnectionErrMsg)
 	}

diff --git a/cloud/deployment/deployment_test.go b/cloud/deployment/deployment_test.go
@@ -177,7 +177,7 @@ func TestCreate(t *testing.T) {
 		mockClient := new(astro_mocks.Client)
 		mockClient.On("GetDeploymentConfig").Return(astro.DeploymentConfig{RuntimeReleases: []astro.RuntimeRelease{{Version: "4.2.5"}}}, nil).Once()
 		mockClient.On("ListWorkspaces").Return([]astro.Workspace{{ID: ws, OrganizationID: "test-org-id"}}, nil).Once()
-		mockClient.On("ListClusters", map[string]interface{}{"organizationId": "test-org-id"}).Return([]astro.Cluster{{ID: csID}}, nil).Once()
+		mockClient.On("ListClusters", "test-org-id").Return([]astro.Cluster{{ID: csID}}, nil).Once()
 		mockClient.On("CreateDeployment", mock.Anything).Return(astro.Deployment{ID: "test-id"}, nil).Once()
 
 		// mock os.Stdin
@@ -266,7 +266,7 @@ func TestSelectCluster(t *testing.T) {
 	csID := "test-cluster-id"
 	t.Run("list cluster failure", func(t *testing.T) {
 		mockClient := new(astro_mocks.Client)
-		mockClient.On("ListClusters", map[string]interface{}{"organizationId": orgID}).Return([]astro.Cluster{}, errMock).Once()
+		mockClient.On("ListClusters", orgID).Return([]astro.Cluster{}, errMock).Once()
 
 		_, err := selectCluster("", orgID, mockClient)
 		assert.ErrorIs(t, err, errMock)
@@ -275,7 +275,7 @@ func TestSelectCluster(t *testing.T) {
 
 	t.Run("cluster id via selection", func(t *testing.T) {
 		mockClient := new(astro_mocks.Client)
-		mockClient.On("ListClusters", map[string]interface{}{"organizationId": orgID}).Return([]astro.Cluster{{ID: csID}}, nil).Once()
+		mockClient.On("ListClusters", orgID).Return([]astro.Cluster{{ID: csID}}, nil).Once()
 
 		// mock os.Stdin
 		input := []byte("1")
@@ -300,7 +300,7 @@ func TestSelectCluster(t *testing.T) {
 
 	t.Run("cluster id invalid selection", func(t *testing.T) {
 		mockClient := new(astro_mocks.Client)
-		mockClient.On("ListClusters", map[string]interface{}{"organizationId": orgID}).Return([]astro.Cluster{{ID: csID}}, nil).Once()
+		mockClient.On("ListClusters", orgID).Return([]astro.Cluster{{ID: csID}}, nil).Once()
 
 		// mock os.Stdin
 		input := []byte("4")
@@ -324,7 +324,7 @@ func TestSelectCluster(t *testing.T) {
 
 	t.Run("not able to find cluster", func(t *testing.T) {
 		mockClient := new(astro_mocks.Client)
-		mockClient.On("ListClusters", map[string]interface{}{"organizationId": orgID}).Return([]astro.Cluster{{ID: csID}}, nil).Once()
+		mockClient.On("ListClusters", orgID).Return([]astro.Cluster{{ID: csID}}, nil).Once()
 
 		_, err := selectCluster("test-invalid-id", orgID, mockClient)
 		assert.Error(t, err)

diff --git a/cmd/cloud/deployment_test.go b/cmd/cloud/deployment_test.go
@@ -83,7 +83,7 @@ func TestDeploymentCreate(t *testing.T) {
 	mockClient := new(astro_mocks.Client)
 	mockClient.On("GetDeploymentConfig").Return(astro.DeploymentConfig{RuntimeReleases: []astro.RuntimeRelease{{Version: "4.2.5"}}}, nil).Once()
 	mockClient.On("ListWorkspaces").Return([]astro.Workspace{{ID: ws, OrganizationID: "test-org-id"}}, nil).Once()
-	mockClient.On("ListClusters", map[string]interface{}{"organizationId": "test-org-id"}).Return([]astro.Cluster{{ID: csID}}, nil).Once()
+	mockClient.On("ListClusters", "test-org-id").Return([]astro.Cluster{{ID: csID}}, nil).Once()
 	mockClient.On("CreateDeployment", mock.Anything).Return(astro.Deployment{ID: "test-id"}, nil).Once()
 	astroClient = mockClient