fix: project-scoped credentials need to be unique (#775)

Signed-off-by: Blake Pettersson <[email protected]>

Author: blakepettersson

internal/provider/model_repository.go

@@ -66,6 +66,9 @@ func repositorySchemaAttributes() map[string]schema.Attribute {
 		"project": schema.StringAttribute{
 			MarkdownDescription: "The project name, in case the repository is project scoped.",
 			Optional:            true,
+			PlanModifiers: []planmodifier.String{
+				stringplanmodifier.RequiresReplace(),
+			},
 		},
 		"username": schema.StringAttribute{
 			MarkdownDescription: "Username used for authenticating at the remote repository.",
@@ -188,7 +191,13 @@ func (m *repositoryModel) toAPIModel() (*v1alpha1.Repository, error) {
 }
 
 func (m *repositoryModel) updateFromAPI(repo *v1alpha1.Repository) *repositoryModel {
-	m.ID = types.StringValue(repo.Repo)
+	// Generate ID using "|" separator for project-scoped repos
+	if repo.Project != "" {
+		m.ID = types.StringValue(repo.Repo + "|" + repo.Project)
+	} else {
+		m.ID = types.StringValue(repo.Repo)
+	}
+
 	m.Repo = types.StringValue(repo.Repo)
 	m.Type = types.StringValue(repo.Type)
 	m.EnableLFS = types.BoolValue(repo.EnableLFS)

internal/provider/resource_repository.go

@@ -130,7 +130,7 @@ func (r *repositoryResource) Create(ctx context.Context, req resource.CreateRequ
 	tflog.Trace(ctx, fmt.Sprintf("created repository %s", createdRepo.Repo))
 
 	// Save data into Terraform state
-	resp.Diagnostics.Append(resp.State.Set(ctx, data.updateFromAPI(repo))...)
+	resp.Diagnostics.Append(resp.State.Set(ctx, data.updateFromAPI(createdRepo))...)
 
 	// Perform a read to get the latest state with connection status
 	if !resp.Diagnostics.HasError() {
@@ -156,7 +156,7 @@ func (r *repositoryResource) Read(ctx context.Context, req resource.ReadRequest,
 	}
 
 	// Read repository from API
-	repo, diags := r.readRepository(ctx, data.ID.ValueString(), data.Project.ValueString())
+	repo, diags := r.readRepository(ctx, data.Repo.ValueString(), data.Project.ValueString())
 	resp.Diagnostics.Append(diags...)
 
 	if resp.Diagnostics.HasError() {
@@ -261,23 +261,36 @@ func (r *repositoryResource) Delete(ctx context.Context, req resource.DeleteRequ
 	_, err := r.si.RepositoryClient.DeleteRepository(
 		ctx,
 		&repository.RepoQuery{
-			Repo:       data.ID.ValueString(),
+			Repo:       data.Repo.ValueString(),
 			AppProject: data.Project.ValueString(),
 		},
 	)
 
 	if err != nil {
 		if !strings.Contains(err.Error(), "NotFound") {
-			resp.Diagnostics.Append(diagnostics.ArgoCDAPIError("delete", "repository", data.ID.ValueString(), err)...)
+			resp.Diagnostics.Append(diagnostics.ArgoCDAPIError("delete", "repository", data.Repo.ValueString(), err)...)
 			return
 		}
 	}
 
-	tflog.Trace(ctx, fmt.Sprintf("deleted repository %s", data.ID.ValueString()))
+	tflog.Trace(ctx, fmt.Sprintf("deleted repository %s", data.Repo.ValueString()))
 }
 
 func (r *repositoryResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+	// Import ID format can be:
+	// - "repo_url" for global repositories
+	// - "repo_url|project_name" for project-scoped repositories
+	idParts := strings.SplitN(req.ID, "|", 2)
+
+	repoURL := idParts[0]
+
+	// Set repo attribute
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("repo"), repoURL)...)
+
+	// Only set project if it was provided in the import ID
+	if len(idParts) == 2 && idParts[1] != "" {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project"), idParts[1])...)
+	}
 }
 
 func (r *repositoryResource) readRepository(ctx context.Context, repoURL, project string) (*v1alpha1.Repository, diag.Diagnostics) {
@@ -294,8 +307,11 @@ func (r *repositoryResource) readRepository(ctx context.Context, repoURL, projec
 
 	if repos != nil {
 		for _, repo := range repos.Items {
-			if repo.Repo == repoURL {
+			// Match both URL and project to handle cases where the same repo URL
+			// exists in multiple projects
+			if repo.Repo == repoURL && repo.Project == project {
 				finalRepo = repo
+				break
 			}
 		}
 	}