Issue/37 (#41)

* fix: fixing issue when retrieving project settings

* fix: getting the provider from the slug of the recently created project

* fix: fixes creating and updating gh projects and its settings

* fix: removing the provider from the project resource

* fix: fixed failling test with context without restriction byb adding a new one in the circleci ui

* fix: removing provider attribute from project resource in documentation

Author: david-montano-circleci

README.md

@@ -23,7 +23,6 @@ Start defining Data Sources and Resources. For example:
 ```hcl
 resource "circleci_project" "test_project" {
   name 				= "Project_Name"
-  project_provider 	= "github"
   organization_id 	= "********-****-****-****-****************"
 }
 ```

docs/resources/project.md

@@ -19,7 +19,6 @@ description: |-
 
 - `name` (String) name of the circleci project
 - `organization_id` (String) organization_id of the circleci project
-- `project_provider` (String) provider of the circleci project (usually `circleci`)
 
 ### Read-Only
 

internal/provider/context_data_source_test.go

@@ -44,7 +44,7 @@ func TestAccContextDataSource(t *testing.T) {
 							[]knownvalue.Check{
 								knownvalue.MapPartial(
 									map[string]knownvalue.Check{
-										"id":         knownvalue.StringExact("6f6beec2-fc46-40b8-9b68-9a635adc16df"),
+										"id":         knownvalue.StringExact("94ab47c9-a9ee-4671-a176-49778ff578fd"),
 										"project_id": knownvalue.StringExact("e2e8ae23-57dc-4e95-bc67-633fdeb4ac33"),
 										"name":       knownvalue.StringExact("test-project"),
 										"type":       knownvalue.StringExact("project"),

internal/provider/project_resource.go

@@ -6,6 +6,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/CircleCI-Public/circleci-sdk-go/project"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
@@ -24,7 +25,6 @@ var (
 type projectResourceModel struct {
 	Id                         types.String `tfsdk:"id"`
 	Name                       types.String `tfsdk:"name"`
-	Provider                   types.String `tfsdk:"project_provider"`
 	Slug                       types.String `tfsdk:"slug"`
 	OrganizationName           types.String `tfsdk:"organization_name"`
 	OrganizationSlug           types.String `tfsdk:"organization_slug"`
@@ -70,10 +70,6 @@ func (r *projectResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 				MarkdownDescription: "name of the circleci project",
 				Required:            true,
 			},
-			"project_provider": schema.StringAttribute{
-				MarkdownDescription: "provider of the circleci project (usually `circleci`)",
-				Required:            true,
-			},
 			"slug": schema.StringAttribute{
 				MarkdownDescription: "slug of the circleci project ",
 				Computed:            true,
@@ -201,7 +197,6 @@ func (r *projectResource) Create(ctx context.Context, req resource.CreateRequest
 	// Map response body to schema and populate Computed attribute values
 	circleCiTerrformProjectResource.Id = types.StringValue(newCreatedProject.Id)
 	circleCiTerrformProjectResource.Name = types.StringValue(newCreatedProject.Name)
-	// provider is set in the state and is not brought by the API
 	circleCiTerrformProjectResource.Slug = types.StringValue(newCreatedProject.Slug)
 	circleCiTerrformProjectResource.OrganizationName = types.StringValue(newCreatedProject.OrganizationName)
 	circleCiTerrformProjectResource.OrganizationSlug = types.StringValue(newCreatedProject.OrganizationSlug)
@@ -210,55 +205,40 @@ func (r *projectResource) Create(ctx context.Context, req resource.CreateRequest
 	circleCiTerrformProjectResource.VcsInfoProvider = types.StringValue(newCreatedProject.VcsInfo.Provider)
 	circleCiTerrformProjectResource.VcsInfoDefaultBranch = types.StringValue(newCreatedProject.VcsInfo.DefaultBranch)
 
-	if circleCiTerrformProjectResource.Provider.ValueString() == "circleci" {
-		newProjectSettings, err := r.client.UpdateSettings(
-			project.ProjectSettings{Advanced: newAdvancedSettings},
-			circleCiTerrformProjectResource.Provider.ValueString(),
-			circleCiTerrformProjectResource.OrganizationId.ValueString(),
-			newCreatedProject.Id,
-		)
-		if err != nil {
-			resp.Diagnostics.AddError(
-				"Error updating CircleCI project settings",
-				fmt.Sprintf("Could not update CircleCI project settings:\n\nsettings: %+v\nprovider: %s\norg: %s\nproject_id: %s\nproject_name: %s\n\nUnexpected error: %s\n", newAdvancedSettings, circleCiTerrformProjectResource.Provider.ValueString(), circleCiTerrformProjectResource.OrganizationId.ValueString(), newCreatedProject.Id, newCreatedProject.Name, err.Error()),
-			)
-			return
-		}
+	slug := strings.Split(newCreatedProject.Slug, "/")
+	newProjectSettings, err := r.client.UpdateSettings(
+		project.ProjectSettings{Advanced: newAdvancedSettings},
+		slug[0],
+		slug[1],
+		slug[2],
+	)
 
-		circleCiTerrformProjectResource.AutoCancelBuilds = types.BoolPointerValue(newProjectSettings.Advanced.AutocancelBuilds)
-		circleCiTerrformProjectResource.BuildForkPrs = types.BoolPointerValue(newProjectSettings.Advanced.BuildForkPrs)
-		circleCiTerrformProjectResource.DisableSSH = types.BoolPointerValue(newProjectSettings.Advanced.DisableSSH)
-		circleCiTerrformProjectResource.ForksReceiveSecretEnvVars = types.BoolPointerValue(newProjectSettings.Advanced.ForksReceiveSecretEnvVars)
-		circleCiTerrformProjectResource.OSS = types.BoolPointerValue(newProjectSettings.Advanced.OSS)
-		circleCiTerrformProjectResource.SetGithubStatus = types.BoolPointerValue(newProjectSettings.Advanced.SetGithubStatus)
-		circleCiTerrformProjectResource.SetupWorkflows = types.BoolPointerValue(newProjectSettings.Advanced.SetupWorkflows)
-		circleCiTerrformProjectResource.WriteSettingsRequiresAdmin = types.BoolPointerValue(newProjectSettings.Advanced.WriteSettingsRequiresAdmin)
-
-		nBranchLength := len(newProjectSettings.Advanced.PROnlyBranchOverrides)
-		listStringValuesBanches := make([]attr.Value, nBranchLength)
-		for index, elem := range newProjectSettings.Advanced.PROnlyBranchOverrides {
-			listStringValuesBanches[index] = types.StringValue(elem)
-		}
-		circleCiTerrformProjectResource.PROnlyBranchOverrides, diags = types.ListValue(
-			types.StringType,
-			listStringValuesBanches,
-		)
-	} else {
-		circleCiTerrformProjectResource.AutoCancelBuilds = types.BoolValue(false)
-		circleCiTerrformProjectResource.BuildForkPrs = types.BoolValue(false)
-		circleCiTerrformProjectResource.DisableSSH = types.BoolValue(false)
-		circleCiTerrformProjectResource.ForksReceiveSecretEnvVars = types.BoolValue(false)
-		circleCiTerrformProjectResource.OSS = types.BoolValue(false)
-		circleCiTerrformProjectResource.SetGithubStatus = types.BoolValue(false)
-		circleCiTerrformProjectResource.SetupWorkflows = types.BoolValue(false)
-		circleCiTerrformProjectResource.WriteSettingsRequiresAdmin = types.BoolValue(false)
-		nBranchLength := 0
-		listStringValuesBanches := make([]attr.Value, nBranchLength)
-		circleCiTerrformProjectResource.PROnlyBranchOverrides, diags = types.ListValue(
-			types.StringType,
-			listStringValuesBanches,
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Error updating CircleCI project settings",
+			fmt.Sprintf("Could not update CircleCI project settings:\n\nsettings: %+v\norg: %s\nproject_id: %s\nproject_name: %s\nslug: %s\n\nUnexpected error: %s\n", newAdvancedSettings, circleCiTerrformProjectResource.OrganizationId.ValueString(), newCreatedProject.Id, newCreatedProject.Name, newCreatedProject.Slug, err.Error()),
 		)
+		return
+	}
+
+	circleCiTerrformProjectResource.AutoCancelBuilds = types.BoolPointerValue(newProjectSettings.Advanced.AutocancelBuilds)
+	circleCiTerrformProjectResource.BuildForkPrs = types.BoolPointerValue(newProjectSettings.Advanced.BuildForkPrs)
+	circleCiTerrformProjectResource.DisableSSH = types.BoolPointerValue(newProjectSettings.Advanced.DisableSSH)
+	circleCiTerrformProjectResource.ForksReceiveSecretEnvVars = types.BoolPointerValue(newProjectSettings.Advanced.ForksReceiveSecretEnvVars)
+	circleCiTerrformProjectResource.OSS = types.BoolPointerValue(newProjectSettings.Advanced.OSS)
+	circleCiTerrformProjectResource.SetGithubStatus = types.BoolPointerValue(newProjectSettings.Advanced.SetGithubStatus)
+	circleCiTerrformProjectResource.SetupWorkflows = types.BoolPointerValue(newProjectSettings.Advanced.SetupWorkflows)
+	circleCiTerrformProjectResource.WriteSettingsRequiresAdmin = types.BoolPointerValue(newProjectSettings.Advanced.WriteSettingsRequiresAdmin)
+
+	nBranchLength := len(newProjectSettings.Advanced.PROnlyBranchOverrides)
+	listStringValuesBanches := make([]attr.Value, nBranchLength)
+	for index, elem := range newProjectSettings.Advanced.PROnlyBranchOverrides {
+		listStringValuesBanches[index] = types.StringValue(elem)
 	}
+	circleCiTerrformProjectResource.PROnlyBranchOverrides, diags = types.ListValue(
+		types.StringType,
+		listStringValuesBanches,
+	)
 
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
@@ -299,7 +279,6 @@ func (r *projectResource) Read(ctx context.Context, req resource.ReadRequest, re
 	projectState = projectResourceModel{
 		Id:                   types.StringValue(apiProject.Id),
 		Name:                 types.StringValue(apiProject.Name),
-		Provider:             projectState.Provider,
 		Slug:                 projectState.Slug,
 		OrganizationName:     projectState.OrganizationName,
 		OrganizationSlug:     projectState.OrganizationSlug,
@@ -309,47 +288,35 @@ func (r *projectResource) Read(ctx context.Context, req resource.ReadRequest, re
 		VcsInfoDefaultBranch: projectState.VcsInfoDefaultBranch,
 	}
 
-	if apiProject.VcsInfo.Provider == "circleci" {
-		projectSettings, err := r.client.GetSettings(
-			projectState.Provider.ValueString(),
-			projectState.OrganizationId.ValueString(),
-			projectState.Id.ValueString(),
+	slug := strings.Split(projectState.Slug.ValueString(), "/")
+	projectSettings, err := r.client.GetSettings(
+		slug[0],
+		slug[1],
+		slug[2],
+	)
+
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Unable to Read CircleCI project settings",
+			err.Error(),
 		)
-		if err != nil {
-			resp.Diagnostics.AddError(
-				"Unable to Read CircleCI project settings",
-				err.Error(),
-			)
-			return
-		}
-		projectState.AutoCancelBuilds = types.BoolPointerValue(projectSettings.Advanced.AutocancelBuilds)
-		projectState.BuildForkPrs = types.BoolPointerValue(projectSettings.Advanced.BuildForkPrs)
-		projectState.DisableSSH = types.BoolPointerValue(projectSettings.Advanced.DisableSSH)
-		projectState.ForksReceiveSecretEnvVars = types.BoolPointerValue(projectSettings.Advanced.ForksReceiveSecretEnvVars)
-		projectState.OSS = types.BoolPointerValue(projectSettings.Advanced.OSS)
-		projectState.SetGithubStatus = types.BoolPointerValue(projectSettings.Advanced.SetGithubStatus)
-		projectState.SetupWorkflows = types.BoolPointerValue(projectSettings.Advanced.SetupWorkflows)
-		projectState.WriteSettingsRequiresAdmin = types.BoolPointerValue(projectSettings.Advanced.WriteSettingsRequiresAdmin)
-
-		pROnlyBranchOverridesAttributeValues := make([]attr.Value, len(projectSettings.Advanced.PROnlyBranchOverrides))
-		for index, elem := range projectSettings.Advanced.PROnlyBranchOverrides {
-			pROnlyBranchOverridesAttributeValues[index] = types.StringValue(elem)
-		}
-		PROnlyBranchOverridesListValue, _ := types.ListValue(types.StringType, pROnlyBranchOverridesAttributeValues)
-		projectState.PROnlyBranchOverrides = PROnlyBranchOverridesListValue
-	} else {
-		projectState.AutoCancelBuilds = types.BoolValue(false)
-		projectState.BuildForkPrs = types.BoolValue(false)
-		projectState.DisableSSH = types.BoolValue(false)
-		projectState.ForksReceiveSecretEnvVars = types.BoolValue(false)
-		projectState.OSS = types.BoolValue(false)
-		projectState.SetGithubStatus = types.BoolValue(false)
-		projectState.SetupWorkflows = types.BoolValue(false)
-		projectState.WriteSettingsRequiresAdmin = types.BoolValue(false)
-		pROnlyBranchOverridesAttributeValues := make([]attr.Value, 0)
-		PROnlyBranchOverridesListValue, _ := types.ListValue(types.StringType, pROnlyBranchOverridesAttributeValues)
-		projectState.PROnlyBranchOverrides = PROnlyBranchOverridesListValue
+		return
+	}
+	projectState.AutoCancelBuilds = types.BoolPointerValue(projectSettings.Advanced.AutocancelBuilds)
+	projectState.BuildForkPrs = types.BoolPointerValue(projectSettings.Advanced.BuildForkPrs)
+	projectState.DisableSSH = types.BoolPointerValue(projectSettings.Advanced.DisableSSH)
+	projectState.ForksReceiveSecretEnvVars = types.BoolPointerValue(projectSettings.Advanced.ForksReceiveSecretEnvVars)
+	projectState.OSS = types.BoolPointerValue(projectSettings.Advanced.OSS)
+	projectState.SetGithubStatus = types.BoolPointerValue(projectSettings.Advanced.SetGithubStatus)
+	projectState.SetupWorkflows = types.BoolPointerValue(projectSettings.Advanced.SetupWorkflows)
+	projectState.WriteSettingsRequiresAdmin = types.BoolPointerValue(projectSettings.Advanced.WriteSettingsRequiresAdmin)
+
+	pROnlyBranchOverridesAttributeValues := make([]attr.Value, len(projectSettings.Advanced.PROnlyBranchOverrides))
+	for index, elem := range projectSettings.Advanced.PROnlyBranchOverrides {
+		pROnlyBranchOverridesAttributeValues[index] = types.StringValue(elem)
 	}
+	PROnlyBranchOverridesListValue, _ := types.ListValue(types.StringType, pROnlyBranchOverridesAttributeValues)
+	projectState.PROnlyBranchOverrides = PROnlyBranchOverridesListValue
 
 	// Set state
 	diags := resp.State.Set(ctx, &projectState)

internal/provider/project_resource_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
 )
 
-func TestAccProjectResource1(t *testing.T) {
+func TestAccCircleCiProjectResource(t *testing.T) {
 	projectName := rand.Text()
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
@@ -24,7 +24,6 @@ func TestAccProjectResource1(t *testing.T) {
 			{
 				Config: testAccProjectResourceConfig(
 					projectName,
-					"circleci",
 					"3ddcf1d1-7f5f-4139-8cef-71ad0921a968",
 				),
 				ConfigStateChecks: []statecheck.StateCheck{
@@ -33,11 +32,6 @@ func TestAccProjectResource1(t *testing.T) {
 						tfjsonpath.New("name"),
 						knownvalue.StringExact(projectName),
 					),
-					statecheck.ExpectKnownValue(
-						"circleci_project.test_project",
-						tfjsonpath.New("project_provider"),
-						knownvalue.StringExact("circleci"),
-					),
 					statecheck.ExpectKnownValue(
 						"circleci_project.test_project",
 						tfjsonpath.New("organization_slug"),
@@ -55,39 +49,33 @@ func TestAccProjectResource1(t *testing.T) {
 	})
 }
 
-func TestAccProjectResource2(t *testing.T) {
-	projectName := rand.Text()
+func TestAccGithubProjectResource(t *testing.T) {
+	t.Skip()
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			// Create and Read testing
 			{
 				Config: testAccProjectResourceConfig(
-					projectName,
-					"github",
-					"3ddcf1d1-7f5f-4139-8cef-71ad0921a968",
+					"dummy",
+					"14e55f1b-17c4-485d-a4e5-cb493cee62b8",
 				),
 				ConfigStateChecks: []statecheck.StateCheck{
 					statecheck.ExpectKnownValue(
 						"circleci_project.test_project",
 						tfjsonpath.New("name"),
-						knownvalue.StringExact(projectName),
-					),
-					statecheck.ExpectKnownValue(
-						"circleci_project.test_project",
-						tfjsonpath.New("project_provider"),
-						knownvalue.StringExact("github"),
+						knownvalue.StringExact("dummy"),
 					),
 					statecheck.ExpectKnownValue(
 						"circleci_project.test_project",
 						tfjsonpath.New("organization_slug"),
-						knownvalue.StringExact("circleci/8e4z1Akd74woxagxnvLT5q"),
+						knownvalue.StringExact("gh/david-montano-circleci"),
 					),
 					statecheck.ExpectKnownValue(
 						"circleci_project.test_project",
 						tfjsonpath.New("organization_id"),
-						knownvalue.StringExact("3ddcf1d1-7f5f-4139-8cef-71ad0921a968"),
+						knownvalue.StringExact("14e55f1b-17c4-485d-a4e5-cb493cee62b8"),
 					),
 				},
 			},
@@ -96,12 +84,11 @@ func TestAccProjectResource2(t *testing.T) {
 	})
 }
 
-func testAccProjectResourceConfig(name, project_provider, organization_id string) string {
+func testAccProjectResourceConfig(name, organization_id string) string {
 	return fmt.Sprintf(`
 resource "circleci_project" "test_project" {
   name 				= %[1]q
-  project_provider 	= %[2]q
-  organization_id 	= %[3]q
+  organization_id 	= %[2]q
 }
-`, name, project_provider, organization_id)
+`, name, organization_id)
 }