Address git integration review feedback

Author: AdamCoulterOz

internal/services/git_integration/api_git_integration.go

@@ -709,7 +709,7 @@ func (c *client) EnableSolutionSourceControlIntegration(ctx context.Context, env
 
 	apiURL := helpers.BuildDataverseApiUrl(environmentHost, fmt.Sprintf("/api/data/v9.0/solutions(%s)", solutionID), nil)
 	resp, err := c.Api.Execute(ctx, nil, http.MethodPatch, apiURL, nil, updateSolutionSourceControlIntegrationDto{
-		EnabledForSourceControlIntegration: "true",
+		EnabledForSourceControlIntegration: true,
 	}, []int{http.StatusNoContent, http.StatusForbidden, http.StatusNotFound}, nil)
 	if err != nil {
 		return err
@@ -769,7 +769,6 @@ func (c *client) SetSourceControlIntegrationScope(ctx context.Context, environme
 
 	updatedOrgSettings := setOrgDbOrgSettingValue(orgSettings.OrgDbOrgSettings, "SourceControlIntegrationScope", sourceControlIntegrationScopeToOrgDbValue(scope))
 	updateDTO := organizationSettingsDto{
-		OrganizationID:   orgSettings.OrganizationID,
 		OrgDbOrgSettings: updatedOrgSettings,
 	}
 

internal/services/git_integration/dto.go

@@ -143,5 +143,5 @@ type preValidateGitComponentsResponseDto struct {
 }
 
 type updateSolutionSourceControlIntegrationDto struct {
-	EnabledForSourceControlIntegration string `json:"enabledforsourcecontrolintegration,omitempty"`
+	EnabledForSourceControlIntegration bool `json:"enabledforsourcecontrolintegration,omitempty"`
 }

internal/services/git_integration/models.go

@@ -57,13 +57,21 @@ type SolutionGitBranchResourceModel struct {
 }
 
 func gitProviderToInt(value string) int {
-	_ = strings.TrimSpace(value)
-	return 0
+	switch strings.TrimSpace(value) {
+	case "", gitProviderAzureDevOps:
+		return 0
+	default:
+		return -1
+	}
 }
 
 func gitProviderFromInt(value int) string {
-	_ = value
-	return gitProviderAzureDevOps
+	switch value {
+	case 0:
+		return gitProviderAzureDevOps
+	default:
+		return ""
+	}
 }
 
 func convertSourceControlConfigurationDtoToModel(environmentID, scope string, dto sourceControlConfigurationDto) EnvironmentGitIntegrationResourceModel {

internal/services/git_integration/resource_environment_git_integration_test.go

@@ -5,6 +5,7 @@ package git_integration_test
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"regexp"
 	"strings"
@@ -112,11 +113,30 @@ func TestUnitEnvironmentGitIntegrationResource_Validate_Create_And_Update(t *tes
 
 	httpmock.RegisterRegexpResponder("PATCH", regexp.MustCompile(`^https://00000000-0000-0000-0000-000000000001\.crm4\.dynamics\.com/api/data/v9\.0/organizations%28aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa%29$`),
 		func(req *http.Request) (*http.Response, error) {
+			body, err := io.ReadAll(req.Body)
+			if err != nil {
+				return nil, err
+			}
+			bodyText := string(body)
+			if strings.Contains(bodyText, "organizationid") {
+				return nil, fmt.Errorf("organization scope patch unexpectedly included organizationid: %s", bodyText)
+			}
+			if !strings.Contains(bodyText, "SourceControlIntegrationScope") {
+				return nil, fmt.Errorf("organization scope patch missing SourceControlIntegrationScope: %s", bodyText)
+			}
 			return httpmock.NewStringResponse(http.StatusNoContent, ""), nil
 		})
 
 	httpmock.RegisterRegexpResponder("PATCH", regexp.MustCompile(`^https://00000000-0000-0000-0000-000000000001\.crm4\.dynamics\.com/api/data/v9\.0/solutions(?:%28|\()(33333333-3333-3333-3333-333333333333|44444444-4444-4444-4444-444444444444)(?:%29|\))$`),
 		func(req *http.Request) (*http.Response, error) {
+			body, err := io.ReadAll(req.Body)
+			if err != nil {
+				return nil, err
+			}
+			bodyText := string(body)
+			if !strings.Contains(bodyText, `"enabledforsourcecontrolintegration":true`) {
+				return nil, fmt.Errorf("solution enablement patch did not send boolean true: %s", bodyText)
+			}
 			matched := false
 			for _, id := range []string{
 				"33333333-3333-3333-3333-333333333333",

internal/services/git_integration/validation.go

@@ -42,6 +42,7 @@ func (r *EnvironmentGitIntegrationResource) validateRemoteConfiguration(ctx cont
 			"Invalid project_name",
 			fmt.Sprintf("The Git project `%s` was not returned by the Dataverse `gitprojects` endpoint for organization `%s`.", data.ProjectName.ValueString(), data.OrganizationName.ValueString()),
 		)
+		return
 	}
 
 	repositories, err := r.GitIntegrationClient.ListGitRepositories(ctx, data.EnvironmentID.ValueString(), data.OrganizationName.ValueString(), data.ProjectName.ValueString())