Skip to content

Rewrite internal imports from hectane/go-acl to DataDog/go-acl#3

Merged
chouetz merged 1 commit intomasterfrom
fix/internal-imports
Apr 28, 2026
Merged

Rewrite internal imports from hectane/go-acl to DataDog/go-acl#3
chouetz merged 1 commit intomasterfrom
fix/internal-imports

Conversation

@chouetz
Copy link
Copy Markdown
Member

@chouetz chouetz commented Apr 28, 2026

Spotted by Codex on the consumer-side migration PR (datadog-agent#49932).

Problem

The fork's go.mod declares module github.com/DataDog/go-acl, but the source files apply.go and util.go still import github.com/hectane/go-acl/api (the api subpackage). As a result, any consumer importing github.com/DataDog/go-acl transitively pulls github.com/hectane/go-acl/api from upstream, defeating the supply-chain goal of the fork.

Verified on the consumer side:

$ go mod why github.com/hectane/go-acl/api
# github.com/hectane/go-acl/api
github.com/DataDog/datadog-agent/pkg/util/filesystem
github.com/DataDog/go-acl
github.com/hectane/go-acl/api    ← still upstream!

Change

  • apply.go, util.go: github.com/hectane/go-acl/apigithub.com/DataDog/go-acl/api
  • README.md: GoDoc badge + import examples updated for consistency

appveyor.yml still references the upstream clone path; left untouched since it's dead CI config (the badge points at upstream's AppVeyor build, which we don't run).

After merge

  • Delete the existing v1.0.0 tag and GitHub release.
  • Re-tag v1.0.0 at the new merge commit.
  • Refresh datadog-agent#49932: dda inv tidy will drop the hectane/go-acl // indirect entry from pkg/util/filesystem/go.mod and other non-OTel modules.

Updates apply.go and util.go to import the api subpackage from this
fork's path instead of upstream's. Without this, consumers importing
github.com/DataDog/go-acl still transitively pull
github.com/hectane/go-acl/api from upstream, defeating the
supply-chain goal of the fork (a self-contained, tagged release).

Also updates README examples and the GoDoc badge to reference the
fork.
@chouetz chouetz merged commit ff63db7 into master Apr 28, 2026
1 check passed
@chouetz chouetz deleted the fix/internal-imports branch April 28, 2026 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants