Merge branch 'main' into feat-add-filter-for-teams-#982

Author: TomerHeber

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ env:
   ENV0_API_ENDPOINT: ${{ secrets.ENV0_API_ENDPOINT }}
   ENV0_API_KEY: ${{ secrets.TF_PROVIDER_INTEGRATION_TEST_API_KEY }} # API Key for organization 'TF-provider-integration-tests' @ dev
   ENV0_API_SECRET: ${{ secrets.TF_PROVIDER_INTEGRATION_TEST_API_SECRET }}
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.23"
   TERRAFORM_VERSION: 1.1.7
 
 jobs:
@@ -44,11 +44,11 @@ jobs:
   integration-tests:
     name: Integration Tests
     runs-on: ubuntu-20.04
-    container: golang:1.21-alpine3.18
+    container: golang:1.23-alpine
     timeout-minutes: 20
     steps:
-      - name: Install Terraform
-        run: apk add terraform
+      - name: Install Opentofu
+        run: apk add opentofu
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Run Harness tests

.github/workflows/docs.yml

@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.23"
 
 jobs:
   generate-docs:

.github/workflows/release.yml

@@ -16,7 +16,7 @@ on:
       - "v*.*.*"
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.23"
 
 jobs:
   goreleaser:

README.md

@@ -92,7 +92,7 @@ resource "env0_template" "example" {
 
 ## Development Setup
 
-> **Supported Go Version: 1.21**
+> **Supported Go Version: 1.23**
 
 ### Build
 
@@ -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/api_client_mock.go

@@ -5,7 +5,7 @@ import "strings"
 type AwsCredentialsType string
 type GcpCredentialsType string
 type AzureCredentialsType string
-type VaultCrednetialsType string
+type VaultCredentialsType string
 
 type Credentials struct {
 	Id             string `json:"id"`
@@ -92,7 +92,7 @@ type VaultCredentialsValuePayload struct {
 type VaultCredentialsCreatePayload struct {
 	Name           string                       `json:"name,omitempty"`
 	OrganizationId string                       `json:"organizationId,omitempty"`
-	Type           VaultCrednetialsType         `json:"type"`
+	Type           VaultCredentialsType         `json:"type"`
 	Value          VaultCredentialsValuePayload `json:"value"`
 }
 
@@ -127,7 +127,7 @@ const (
 	AzureCostCredentialsType             AzureCredentialsType = "AZURE_CREDENTIALS"
 	AzureServicePrincipalCredentialsType AzureCredentialsType = "AZURE_SERVICE_PRINCIPAL_FOR_DEPLOYMENT"
 	AzureOidcCredentialsType             AzureCredentialsType = "AZURE_OIDC"
-	VaultOidcCredentialsType             VaultCrednetialsType = "VAULT_OIDC"
+	VaultOidcCredentialsType             VaultCredentialsType = "VAULT_OIDC"
 )
 
 func (client *ApiClient) CloudCredentials(id string) (Credentials, error) {

client/cloud_credentials.go

@@ -15,7 +15,7 @@ var _ = Describe("Credentials Project Assignment", func() {
 
 	Describe("AssignCloudCredentialsToProject", func() {
 		expectedResponse := CloudCredentialsProjectAssignment{
-			Id:           "assigment id",
+			Id:           "assignment id",
 			CredentialId: "credentialId",
 			ProjectId:    projectId,
 		}

client/cloud_credentials_project_assignment_test.go

@@ -15,7 +15,7 @@ var _ = Describe(" Cost Credentials Project Assignment", func() {
 
 	Describe("AssignCostCredentialsToProject", func() {
 		expectedResponse := CostCredentialProjectAssignment{
-			ProjectId:       "assigment id",
+			ProjectId:       "assignment id",
 			CredentialsId:   "credentialId",
 			CredentialsType: "GCP_CREDENTIALS",
 		}
@@ -79,13 +79,13 @@ var _ = Describe(" Cost Credentials Project Assignment", func() {
 			var actualResult []CostCredentialProjectAssignment
 
 			firstResulteResponse := CostCredentialProjectAssignment{
-				ProjectId:       "assigment id",
+				ProjectId:       "assignment id",
 				CredentialsId:   "credentialId",
 				CredentialsType: "GCP_CREDENTIALS",
 			}
 
 			secondResulteResponse := CostCredentialProjectAssignment{
-				ProjectId:       "assigment id",
+				ProjectId:       "assignment id",
 				CredentialsId:   "credentialId-2",
 				CredentialsType: "GCP_CREDENTIALS",
 			}

client/cost_credentials_project_assignment_test.go

@@ -54,7 +54,7 @@ func (client *ApiClient) CustomFlowCreate(payload CustomFlowCreatePayload) (*Cus
 		return nil, err
 	}
 
-	payloadWithOrganzationId := struct {
+	payloadWithOrganizationId := struct {
 		OrganizationId string `json:"organizationId"`
 		CustomFlowCreatePayload
 	}{
@@ -63,7 +63,7 @@ func (client *ApiClient) CustomFlowCreate(payload CustomFlowCreatePayload) (*Cus
 	}
 
 	var result CustomFlow
-	if err := client.http.Post("/custom-flow", &payloadWithOrganzationId, &result); err != nil {
+	if err := client.http.Post("/custom-flow", &payloadWithOrganizationId, &result); err != nil {
 		return nil, err
 	}