Ensure that all file paths are escaped for resource ID

deiga · deiga · commit 65ea3b497513 · 2026-05-10T21:51:29.000+03:00
Signed-off-by: Timo Sand &lt;timo.sand@f-secure.com&gt;
diff --git a/github/resource_github_repository_file.go b/github/resource_github_repository_file.go
@@ -242,7 +242,7 @@ func resourceGithubRepositoryFileCreate(ctx context.Context, d *schema.ResourceD
 		return diag.FromErr(err)
 	}
 
-	newResourceID, err := buildID(repo, file, branch)
+	newResourceID, err := buildID(repo, escapeIDPart(file), branch)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -392,7 +392,7 @@ func resourceGithubRepositoryFileUpdate(ctx context.Context, d *schema.ResourceD
 	}
 
 	if d.HasChanges("repository", "file", "branch") {
-		newResourceID, err := buildID(repo, file, branch)
+		newResourceID, err := buildID(repo, escapeIDPart(file), branch)
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -468,7 +468,7 @@ func resourceGithubRepositoryFileImport(ctx context.Context, d *schema.ResourceD
 		return nil, err
 	}
 
-	newResourceID, err := buildID(repo, filePath, branch)
+	newResourceID, err := buildID(repo, escapeIDPart(filePath), branch)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ func resourceGithubRepositoryFileCreate(ctx context.Context, d *schema.ResourceD`
`242`	`242`	`return diag.FromErr(err)`
`243`	`243`	`}`
`244`	`244`
`245`		`- newResourceID, err := buildID(repo, file, branch)`
	`245`	`+ newResourceID, err := buildID(repo, escapeIDPart(file), branch)`
`246`	`246`	`if err != nil {`
`247`	`247`	`return diag.FromErr(err)`
`248`	`248`	`}`
`@@ -392,7 +392,7 @@ func resourceGithubRepositoryFileUpdate(ctx context.Context, d *schema.ResourceD`
`392`	`392`	`}`
`393`	`393`
`394`	`394`	`if d.HasChanges("repository", "file", "branch") {`
`395`		`- newResourceID, err := buildID(repo, file, branch)`
	`395`	`+ newResourceID, err := buildID(repo, escapeIDPart(file), branch)`
`396`	`396`	`if err != nil {`
`397`	`397`	`return diag.FromErr(err)`
`398`	`398`	`}`
`@@ -468,7 +468,7 @@ func resourceGithubRepositoryFileImport(ctx context.Context, d *schema.ResourceD`
`468`	`468`	`return nil, err`
`469`	`469`	`}`
`470`	`470`
`471`		`- newResourceID, err := buildID(repo, filePath, branch)`
	`471`	`+ newResourceID, err := buildID(repo, escapeIDPart(filePath), branch)`
`472`	`472`	`if err != nil {`
`473`	`473`	`return nil, err`
`474`	`474`	`}`