opencontainers / runtime-tools

OCI Runtime Tools
https://www.opencontainers.org/
Apache License 2.0
434 stars 141 forks source link

dependency: integrate github.com/mndrix/tap-go as internal package #767

Open fmuyassarov opened 1 year ago

fmuyassarov commented 1 year ago

Migrate the code of github.com/mndrix/tap-go as internal package with commit history as discussed in https://github.com/opencontainers/runtime-tools/pull/766#issuecomment-1498355392 Fixes subset of the dependency issues described in https://github.com/opencontainers/runtime-tools/issues/758.

I followed @thaJeztah suggestion of using git-filter-repo tool not to loose the git commit history while migrating the code and took the following steps.

git clone https://github.com/mndrix/tap-go.git
cd tap-go

git filter-repo 
      --path tap.go \
      --path yaml_yaml.go \
      --path yaml_json.go

git filter-repo \
     --path-rename yaml_json.go:util/yaml_json.go \
     --path-rename  yaml_yaml.go:util/yaml_yaml.go \
     --path-rename  tap.go:util/tap.go

# switch to the runtime-tools project
cd ../runtime-tools
git checkout -b integrate_tap_go
git remote add tap-go ../tap-go
git fetch tap-go
git merge --allow-unrelated-histories --signoff -S tap-go/master

As the next step, I will replace function calls of the tap-go and remove imports of github.com/mndrix/tap-go as an external package.

fmuyassarov commented 1 year ago

@thaJeztah shall I perhaps do the function call replacement on the same PR or would you prefer it to be on a separate PR?

thaJeztah commented 1 year ago

Thanks!

I see this PR does not include the

shall I perhaps do the function call replacement on the same PR or would you prefer it to be on a separate PR?

I think it's good to add those commits here;

- package tap // import "github.com/mndrix/tap-go"
+ package tap

Other enhancements after that could be done in a follow-up

For the failing DCO sign-off, I think in the past we got an exemption from the legal team at CNCF, but it's probably worth checking if that's needed.

fmuyassarov commented 1 year ago

For the failing DCO sign-off, I think in the past we got an exemption from the legal team at CNCF, but it's probably worth checking if that's needed.

Thanks for the suggestions @thaJeztah. I have addressed above comments. Regarding DCO, would you mind to share who should I contact from the CNCF team?

fmuyassarov commented 1 year ago

ping @thaJeztah

fmuyassarov commented 1 year ago

Hi @thaJeztah . Please take a look when you have some time. Thanks