Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix code that has the old Apache 2 license #44815

Merged
merged 1 commit into from
Jul 30, 2024
Merged

Fix code that has the old Apache 2 license #44815

merged 1 commit into from
Jul 30, 2024

Conversation

zmb3
Copy link
Collaborator

@zmb3 zmb3 commented Jul 30, 2024

Teleport OSS is licensed under AGPLv3 as of Teleport 15. See https://goteleport.com/blog/teleport-oss-switches-to-agpl-v3/

Discovered via:

$ ag --files-with-matches \
    --ignore=api --ignore=assets --ignore=integrations --ignore=e --ignore=examples \
    'under the Apache License'

@zmb3 zmb3 added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v15 backport/branch/v16 labels Jul 30, 2024
@zmb3 zmb3 force-pushed the zmb3/rust-agpl branch from f89e74c to dbc1b38 Compare July 30, 2024 15:05
@zmb3 zmb3 changed the title Fix Rust code that has the old Apache 2 license Fix code that has the old Apache 2 license Jul 30, 2024
@zmb3
Copy link
Collaborator Author

zmb3 commented Jul 30, 2024

cc @kimlisa, @gzdunek, @rosstimothy, @Tener, @tigrato, @capnspacehook, @rudream - could you all please double check and confirm that the code you added recently with the Apache license was not intentional?

Also FYI:

  • @codingllama - the device trust protos still contain an Apache license. I'm leaving this out of scope here. (edit: this is codegen from code under api/, so it is expected)
  • @hugoShaka nearly all of the integrations still contain the Apache license. Is this expected?

@zmb3 zmb3 force-pushed the zmb3/rust-agpl branch from dbc1b38 to de766b8 Compare July 30, 2024 15:08
@tigrato
Copy link
Contributor

tigrato commented Jul 30, 2024

thanks @zmb3
all good on my side

Copy link
Contributor

@gzdunek gzdunek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good on my side too.

@rosstimothy
Copy link
Contributor

Looks like the files in lib/utils/diagnostics/latency might have been missed during the license conversion process.

@zmb3 zmb3 force-pushed the zmb3/rust-agpl branch from de766b8 to e0cec67 Compare July 30, 2024 15:27
@rudream
Copy link
Contributor

rudream commented Jul 30, 2024

All good on my end

@capnspacehook
Copy link
Contributor

All good on my side as well

@zmb3 zmb3 added this pull request to the merge queue Jul 30, 2024
Merged via the queue into master with commit fc9172b Jul 30, 2024
42 checks passed
@zmb3 zmb3 deleted the zmb3/rust-agpl branch July 30, 2024 16:28
@public-teleport-github-review-bot

@zmb3 See the table below for backport results.

Branch Result
branch/v15 Failed
branch/v16 Failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants