Merge branch 'main' of https://github.com/env0/terraform-provider-env0 …

…into feat_cloud_cost_credentials-#218

client/api_client.go

@@ -36,13 +36,13 @@ type ApiClientInterface interface {
 	SshKeys() ([]SshKey, error)
 	SshKeyCreate(payload SshKeyCreatePayload) (SshKey, error)
 	SshKeyDelete(id string) error
-	CloudCredentials(id string) (ApiKey, error)
-	CloudCredentialsList() ([]ApiKey, error)
-	AwsCredentialsCreate(request AwsCredentialsCreatePayload) (ApiKey, error)
+	CloudCredentials(id string) (Credentials, error)
+	CloudCredentialsList() ([]Credentials, error)
+	AwsCredentialsCreate(request AwsCredentialsCreatePayload) (Credentials, error)
 	CloudCredentialsDelete(id string) error
-	GcpCredentialsCreate(request GcpCredentialsCreatePayload) (ApiKey, error)
-	GoogleCostCredentialsCreate(request GoogleCostCredentialsCreatePayload) (ApiKey, error)
-	AzureCredentialsCreate(request AzureCredentialsCreatePayload) (ApiKey, error)
+	GcpCredentialsCreate(request GcpCredentialsCreatePayload) (Credentials, error)
+	GoogleCostCredentialsCreate(request GoogleCostCredentialsCreatePayload) (Credentials, error)
+	AzureCredentialsCreate(request AzureCredentialsCreatePayload) (Credentials, error)
 	AssignCloudCredentialsToProject(projectId string, credentialId string) (CloudCredentialsProjectAssignment, error)
 	RemoveCloudCredentialsFromProject(projectId string, credentialId string) error
 	CloudCredentialIdsInProject(projectId string) ([]string, error)
@@ -84,6 +84,13 @@ type ApiClientInterface interface {
 	ModuleDelete(id string) error
 	ModuleUpdate(id string, payload ModuleUpdatePayload) (*Module, error)
 	Modules() ([]Module, error)
+	GitToken(id string) (*GitToken, error)
+	GitTokens() ([]GitToken, error)
+	GitTokenCreate(payload GitTokenCreatePayload) (*GitToken, error)
+	GitTokenDelete(id string) error
+	ApiKeyCreate(payload ApiKeyCreatePayload) (*ApiKey, error)
+	ApiKeyDelete(id string) error
+	ApiKeys() ([]ApiKey, error)
 }
 
 func NewApiClient(client http.HttpClientInterface) ApiClientInterface {

client/api_key.go

@@ -0,0 +1,43 @@
+package client
+
+type ApiKeyCreatePayloadWith struct {
+	ApiKeyCreatePayload
+	OrganizationId string `json:"organizationId"`
+}
+
+func (ac *ApiClient) ApiKeyCreate(payload ApiKeyCreatePayload) (*ApiKey, error) {
+	organizationId, err := ac.organizationId()
+	if err != nil {
+		return nil, err
+	}
+
+	payloadWith := ApiKeyCreatePayloadWith{
+		ApiKeyCreatePayload: payload,
+		OrganizationId:      organizationId,
+	}
+
+	var result ApiKey
+	if err := ac.http.Post("/api-keys", payloadWith, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (ac *ApiClient) ApiKeyDelete(id string) error {
+	return ac.http.Delete("/api-keys/" + id)
+}
+
+func (ac *ApiClient) ApiKeys() ([]ApiKey, error) {
+	organizationId, err := ac.organizationId()
+	if err != nil {
+		return nil, err
+	}
+
+	var result []ApiKey
+	if err := ac.http.Get("/api-keys", map[string]string{"organizationId": organizationId}, &result); err != nil {
+		return nil, err
+	}
+
+	return result, err
+}

client/api_key_test.go

@@ -0,0 +1,97 @@
+package client_test
+
+import (
+	. "github.com/env0/terraform-provider-env0/client"
+	"github.com/golang/mock/gomock"
+	"github.com/jinzhu/copier"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("ApiKey Client", func() {
+	mockApiKey := ApiKey{
+		Id:           "id",
+		Name:         "name",
+		ApiKeyId:     "keyid",
+		ApiKeySecret: "keysecret",
+	}
+
+	Describe("Get All ApiKeys", func() {
+		var returnedApiKeys []ApiKey
+		mockApiKeys := []ApiKey{mockApiKey}
+
+		BeforeEach(func() {
+			mockOrganizationIdCall(organizationId)
+			httpCall = mockHttpClient.EXPECT().
+				Get("/api-keys", map[string]string{"organizationId": organizationId}, gomock.Any()).
+				Do(func(path string, request interface{}, response *[]ApiKey) {
+					*response = mockApiKeys
+				})
+			returnedApiKeys, _ = apiClient.ApiKeys()
+		})
+
+		It("Should get organization id", func() {
+			organizationIdCall.Times(1)
+		})
+
+		It("Should send GET request", func() {
+			httpCall.Times(1)
+		})
+
+		It("Should return ApiKeys", func() {
+			Expect(returnedApiKeys).To(Equal(mockApiKeys))
+		})
+	})
+
+	Describe("Create ApiKeys", func() {
+		var createdApiKey *ApiKey
+		var err error
+
+		BeforeEach(func() {
+			mockOrganizationIdCall(organizationId)
+
+			createApiKeyPayload := ApiKeyCreatePayload{}
+			copier.Copy(&createApiKeyPayload, &mockApiKey)
+
+			expectedCreateRequest := ApiKeyCreatePayloadWith{
+				ApiKeyCreatePayload: createApiKeyPayload,
+				OrganizationId:      organizationId,
+			}
+
+			httpCall = mockHttpClient.EXPECT().
+				Post("/api-keys", expectedCreateRequest, gomock.Any()).
+				Do(func(path string, request interface{}, response *ApiKey) {
+					*response = mockApiKey
+				})
+
+			createdApiKey, err = apiClient.ApiKeyCreate(createApiKeyPayload)
+		})
+
+		It("Should get organization id", func() {
+			organizationIdCall.Times(1)
+		})
+
+		It("Should send POST request with params", func() {
+			httpCall.Times(1)
+		})
+
+		It("Should not return error", func() {
+			Expect(err).To(BeNil())
+		})
+
+		It("Should return created ApiKey", func() {
+			Expect(*createdApiKey).To(Equal(mockApiKey))
+		})
+	})
+
+	Describe("Delete ApiKey", func() {
+		BeforeEach(func() {
+			httpCall = mockHttpClient.EXPECT().Delete("/api-keys/" + mockApiKey.Id)
+			apiClient.ApiKeyDelete(mockApiKey.Id)
+		})
+
+		It("Should send DELETE request with ApiKey id", func() {
+			httpCall.Times(1)
+		})
+	})
+})