Feat: support new vcs_connection resource (#999)

* Feat: support new vcs_connection resource

* disable integration test

* update description

README.md

@@ -185,7 +185,7 @@ export PATH=$PATH:$(go env GOPATH)  # if not
 2. Install mockgen
 
 ```
-go install go.uber.org/mock/mockgen@v0.3.0
+go install go.uber.org/mock/mockgen@v0.5.0
 ```
 
 3. Make sure to add this line in files that include the interface you'd wish to mock:

client/api_client.go

@@ -170,6 +170,11 @@ type ApiClientInterface interface {
 	CloudAccount(id string) (*CloudAccount, error)
 	CloudAccounts() ([]CloudAccount, error)
 	VcsToken(vcsType string, repository string) (*VscToken, error)
+	VcsConnection(id string) (*VcsConnection, error)
+	VcsConnectionCreate(payload VcsConnectionCreatePayload) (*VcsConnection, error)
+	VcsConnectionUpdate(id string, payload VcsConnectionUpdatePayload) (*VcsConnection, error)
+	VcsConnectionDelete(id string) error
+	VcsConnections() ([]VcsConnection, error)
 }
 
 func NewApiClient(client http.HttpClientInterface, defaultOrganizationId string) ApiClientInterface {

client/vcs_connection.go

@@ -0,0 +1,81 @@
+package client
+
+type VcsConnection struct {
+	Id          string `json:"id"`
+	Name        string `json:"name"`
+	Type        string `json:"type"`
+	Url         string `json:"url"`
+	VcsAgentKey string `json:"vcsAgentKey"`
+}
+
+type VcsConnectionCreatePayload struct {
+	Name        string `json:"name"`
+	Type        string `json:"type"`
+	Url         string `json:"url"`
+	VcsAgentKey string `json:"vcsAgentKey,omitempty"`
+}
+
+type VcsConnectionUpdatePayload struct {
+	Name        string `json:"name"`
+	VcsAgentKey string `json:"vcsAgentKey,omitempty"`
+}
+
+func (client *ApiClient) VcsConnection(id string) (*VcsConnection, error) {
+	var result VcsConnection
+
+	if err := client.http.Get("/vcs/connections/"+id, nil, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (client *ApiClient) VcsConnectionCreate(payload VcsConnectionCreatePayload) (*VcsConnection, error) {
+	organizationId, err := client.OrganizationId()
+	if err != nil {
+		return nil, err
+	}
+
+	payloadWithOrg := struct {
+		VcsConnectionCreatePayload
+		OrganizationId string `json:"organizationId"`
+	}{
+		VcsConnectionCreatePayload: payload,
+		OrganizationId:             organizationId,
+	}
+
+	var result VcsConnection
+	if err := client.http.Post("/vcs/connections", payloadWithOrg, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (client *ApiClient) VcsConnectionUpdate(id string, payload VcsConnectionUpdatePayload) (*VcsConnection, error) {
+	var result VcsConnection
+
+	if err := client.http.Put("/vcs/connections/"+id, payload, &result); err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func (client *ApiClient) VcsConnectionDelete(id string) error {
+	return client.http.Delete("/vcs/connections/"+id, nil)
+}
+
+func (client *ApiClient) VcsConnections() ([]VcsConnection, error) {
+	organizationId, err := client.OrganizationId()
+	if err != nil {
+		return nil, err
+	}
+
+	var result []VcsConnection
+	if err := client.http.Get("/vcs/connections", map[string]string{"organizationId": organizationId}, &result); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}

client/vcs_connection_test.go

@@ -0,0 +1,171 @@
+package client_test
+
+import (
+	. "github.com/env0/terraform-provider-env0/client"
+	"github.com/jinzhu/copier"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"go.uber.org/mock/gomock"
+)
+
+var _ = Describe("VcsConnection Client", func() {
+	mockVcsConnection := VcsConnection{
+		Id:          "id0",
+		Name:        "test-connection",
+		Type:        "GitHubEnterprise",
+		Url:         "https://github.example.com",
+		VcsAgentKey: "ENV0_DEFAULT",
+	}
+
+	Describe("Get VcsConnection", func() {
+		var returnedVcsConnection *VcsConnection
+		var err error
+
+		BeforeEach(func() {
+			httpCall = mockHttpClient.EXPECT().
+				Get("/vcs/connections/"+mockVcsConnection.Id, nil, gomock.Any()).
+				Do(func(path string, request interface{}, response *VcsConnection) {
+					*response = mockVcsConnection
+				})
+			returnedVcsConnection, err = apiClient.VcsConnection(mockVcsConnection.Id)
+		})
+
+		It("Should send GET request", func() {
+			httpCall.Times(1)
+		})
+
+		It("Should return vcs connection", func() {
+			Expect(*returnedVcsConnection).To(Equal(mockVcsConnection))
+		})
+
+		It("Should not return error", func() {
+			Expect(err).To(BeNil())
+		})
+	})
+
+	Describe("Create VcsConnection", func() {
+		var createdVcsConnection *VcsConnection
+		var err error
+
+		BeforeEach(func() {
+			mockOrganizationIdCall()
+
+			createPayload := VcsConnectionCreatePayload{}
+			_ = copier.Copy(&createPayload, &mockVcsConnection)
+
+			expectedCreateRequest := struct {
+				VcsConnectionCreatePayload
+				OrganizationId string `json:"organizationId"`
+			}{
+				VcsConnectionCreatePayload: createPayload,
+				OrganizationId:             organizationId,
+			}
+
+			httpCall = mockHttpClient.EXPECT().
+				Post("/vcs/connections", expectedCreateRequest, gomock.Any()).
+				Do(func(path string, request interface{}, response *VcsConnection) {
+					*response = mockVcsConnection
+				})
+
+			createdVcsConnection, err = apiClient.VcsConnectionCreate(createPayload)
+		})
+
+		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 vcs connection", func() {
+			Expect(*createdVcsConnection).To(Equal(mockVcsConnection))
+		})
+	})
+
+	Describe("Update VcsConnection", func() {
+		var updatedVcsConnection *VcsConnection
+		var err error
+
+		BeforeEach(func() {
+			updatePayload := VcsConnectionUpdatePayload{
+				Name:        mockVcsConnection.Name,
+				VcsAgentKey: mockVcsConnection.VcsAgentKey,
+			}
+
+			httpCall = mockHttpClient.EXPECT().
+				Put("/vcs/connections/"+mockVcsConnection.Id, updatePayload, gomock.Any()).
+				Do(func(path string, request interface{}, response *VcsConnection) {
+					*response = mockVcsConnection
+				})
+
+			updatedVcsConnection, err = apiClient.VcsConnectionUpdate(mockVcsConnection.Id, updatePayload)
+		})
+
+		It("Should send PUT request with params", func() {
+			httpCall.Times(1)
+		})
+
+		It("Should not return error", func() {
+			Expect(err).To(BeNil())
+		})
+
+		It("Should return updated vcs connection", func() {
+			Expect(*updatedVcsConnection).To(Equal(mockVcsConnection))
+		})
+	})
+
+	Describe("Delete VcsConnection", func() {
+		var err error
+
+		BeforeEach(func() {
+			httpCall = mockHttpClient.EXPECT().Delete("/vcs/connections/"+mockVcsConnection.Id, nil)
+			err = apiClient.VcsConnectionDelete(mockVcsConnection.Id)
+		})
+
+		It("Should send DELETE request", func() {
+			httpCall.Times(1)
+		})
+
+		It("Should not return error", func() {
+			Expect(err).To(BeNil())
+		})
+	})
+
+	Describe("List VcsConnections", func() {
+		var returnedVcsConnections []VcsConnection
+		var err error
+		mockVcsConnections := []VcsConnection{mockVcsConnection}
+
+		BeforeEach(func() {
+			mockOrganizationIdCall()
+
+			httpCall = mockHttpClient.EXPECT().
+				Get("/vcs/connections", map[string]string{"organizationId": organizationId}, gomock.Any()).
+				Do(func(path string, request interface{}, response *[]VcsConnection) {
+					*response = mockVcsConnections
+				})
+			returnedVcsConnections, err = apiClient.VcsConnections()
+		})
+
+		It("Should get organization id", func() {
+			organizationIdCall.Times(1)
+		})
+
+		It("Should send GET request", func() {
+			httpCall.Times(1)
+		})
+
+		It("Should return vcs connections", func() {
+			Expect(returnedVcsConnections).To(Equal(mockVcsConnections))
+		})
+
+		It("Should not return error", func() {
+			Expect(err).To(BeNil())
+		})
+	})
+})

env0/provider.go

@@ -162,6 +162,7 @@ func Provider(version string) plugin.ProviderFunc {
 				"env0_variable_set_assignment":                   resourceVariableSetAssignment(),
 				"env0_environment_output_configuration_variable": resourceEnvironmentOutputConfigurationVariable(),
 				"env0_aws_cloud_configuration":                   resourceAwsCloudConfiguration(),
+				"env0_vcs_connection":                            resourceVcsConnection(),
 			},
 		}