Skip to content

Commit 54470d2

Browse files
authored
chore!: Replace Apache-2.0 with the MIT license (#74)
1 parent 395b8b1 commit 54470d2

File tree

7 files changed

+33
-234
lines changed

7 files changed

+33
-234
lines changed

LICENSE.md

Lines changed: 21 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,21 @@
1-
# Apache License, Version 2.0
2-
3-
[Version 2.0, January 2004](https://www.apache.org/licenses/LICENSE-2.0)
4-
5-
## Terms and Conditions for use, reproduction, and distribution
6-
7-
### 1. Definitions
8-
9-
“License” shall mean the terms and conditions for use, reproduction, and
10-
distribution as defined by Sections 1 through 9 of this document.
11-
12-
“Licensor” shall mean the copyright owner or entity authorized by the copyright
13-
owner that is granting the License.
14-
15-
“Legal Entity” shall mean the union of the acting entity and all other entities
16-
that control, are controlled by, or are under common control with that entity.
17-
For the purposes of this definition, “control” means **(i)** the power, direct or
18-
indirect, to cause the direction or management of such entity, whether by
19-
contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
20-
outstanding shares, or **(iii)** beneficial ownership of such entity.
21-
22-
“You” (or “Your”) shall mean an individual or Legal Entity exercising
23-
permissions granted by this License.
24-
25-
“Source” form shall mean the preferred form for making modifications, including
26-
but not limited to software source code, documentation source, and configuration
27-
files.
28-
29-
“Object” form shall mean any form resulting from mechanical transformation or
30-
translation of a Source form, including but not limited to compiled object code,
31-
generated documentation, and conversions to other media types.
32-
33-
“Work” shall mean the work of authorship, whether in Source or Object form, made
34-
available under the License, as indicated by a copyright notice that is included
35-
in or attached to the work (an example is provided in the Appendix below).
36-
37-
“Derivative Works” shall mean any work, whether in Source or Object form, that
38-
is based on (or derived from) the Work and for which the editorial revisions,
39-
annotations, elaborations, or other modifications represent, as a whole, an
40-
original work of authorship. For the purposes of this License, Derivative Works
41-
shall not include works that remain separable from, or merely link (or bind by
42-
name) to the interfaces of, the Work and Derivative Works thereof.
43-
44-
“Contribution” shall mean any work of authorship, including the original version
45-
of the Work and any modifications or additions to that Work or Derivative Works
46-
thereof, that is intentionally submitted to Licensor for inclusion in the Work
47-
by the copyright owner or by an individual or Legal Entity authorized to submit
48-
on behalf of the copyright owner. For the purposes of this definition,
49-
“submitted” means any form of electronic, verbal, or written communication sent
50-
to the Licensor or its representatives, including but not limited to
51-
communication on electronic mailing lists, source code control systems, and
52-
issue tracking systems that are managed by, or on behalf of, the Licensor for
53-
the purpose of discussing and improving the Work, but excluding communication
54-
that is conspicuously marked or otherwise designated in writing by the copyright
55-
owner as “Not a Contribution.”
56-
57-
“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
58-
of whom a Contribution has been received by Licensor and subsequently
59-
incorporated within the Work.
60-
61-
### 2. Grant of Copyright License
62-
63-
Subject to the terms and conditions of this License, each Contributor hereby
64-
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
65-
irrevocable copyright license to reproduce, prepare Derivative Works of,
66-
publicly display, publicly perform, sublicense, and distribute the Work and such
67-
Derivative Works in Source or Object form.
68-
69-
### 3. Grant of Patent License
70-
71-
Subject to the terms and conditions of this License, each Contributor hereby
72-
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
73-
irrevocable (except as stated in this section) patent license to make, have
74-
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
75-
such license applies only to those patent claims licensable by such Contributor
76-
that are necessarily infringed by their Contribution(s) alone or by combination
77-
of their Contribution(s) with the Work to which such Contribution(s) was
78-
submitted. If You institute patent litigation against any entity (including a
79-
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
80-
Contribution incorporated within the Work constitutes direct or contributory
81-
patent infringement, then any patent licenses granted to You under this License
82-
for that Work shall terminate as of the date such litigation is filed.
83-
84-
### 4. Redistribution
85-
86-
You may reproduce and distribute copies of the Work or Derivative Works thereof
87-
in any medium, with or without modifications, and in Source or Object form,
88-
provided that You meet the following conditions:
89-
90-
- **(a)** You must give any other recipients of the Work or Derivative Works a copy of
91-
this License; and
92-
- **(b)** You must cause any modified files to carry prominent notices stating that You
93-
changed the files; and
94-
- **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
95-
all copyright, patent, trademark, and attribution notices from the Source form
96-
of the Work, excluding those notices that do not pertain to any part of the
97-
Derivative Works; and
98-
- **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
99-
Derivative Works that You distribute must include a readable copy of the
100-
attribution notices contained within such NOTICE file, excluding those notices
101-
that do not pertain to any part of the Derivative Works, in at least one of the
102-
following places: within a NOTICE text file distributed as part of the
103-
Derivative Works; within the Source form or documentation, if provided along
104-
with the Derivative Works; or, within a display generated by the Derivative
105-
Works, if and wherever such third-party notices normally appear. The contents of
106-
the NOTICE file are for informational purposes only and do not modify the
107-
License. You may add Your own attribution notices within Derivative Works that
108-
You distribute, alongside or as an addendum to the NOTICE text from the Work,
109-
provided that such additional attribution notices cannot be construed as
110-
modifying the License.
111-
112-
You may add Your own copyright statement to Your modifications and may provide
113-
additional or different license terms and conditions for use, reproduction, or
114-
distribution of Your modifications, or for any such Derivative Works as a whole,
115-
provided Your use, reproduction, and distribution of the Work otherwise complies
116-
with the conditions stated in this License.
117-
118-
### 5. Submission of Contributions
119-
120-
Unless You explicitly state otherwise, any Contribution intentionally submitted
121-
for inclusion in the Work by You to the Licensor shall be under the terms and
122-
conditions of this License, without any additional terms or conditions.
123-
Notwithstanding the above, nothing herein shall supersede or modify the terms of
124-
any separate license agreement you may have executed with Licensor regarding
125-
such Contributions.
126-
127-
### 6. Trademarks
128-
129-
This License does not grant permission to use the trade names, trademarks,
130-
service marks, or product names of the Licensor, except as required for
131-
reasonable and customary use in describing the origin of the Work and
132-
reproducing the content of the NOTICE file.
133-
134-
### 7. Disclaimer of Warranty
135-
136-
Unless required by applicable law or agreed to in writing, Licensor provides the
137-
Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
138-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
139-
including, without limitation, any warranties or conditions of TITLE,
140-
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
141-
solely responsible for determining the appropriateness of using or
142-
redistributing the Work and assume any risks associated with Your exercise of
143-
permissions under this License.
144-
145-
### 8. Limitation of Liability
146-
147-
In no event and under no legal theory, whether in tort (including negligence),
148-
contract, or otherwise, unless required by applicable law (such as deliberate
149-
and grossly negligent acts) or agreed to in writing, shall any Contributor be
150-
liable to You for damages, including any direct, indirect, special, incidental,
151-
or consequential damages of any character arising as a result of this License or
152-
out of the use or inability to use the Work (including but not limited to
153-
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
154-
any and all other commercial damages or losses), even if such Contributor has
155-
been advised of the possibility of such damages.
156-
157-
### 9. Accepting Warranty or Additional Liability
158-
159-
While redistributing the Work or Derivative Works thereof, You may choose to
160-
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
161-
other liability obligations and/or rights consistent with this License. However,
162-
in accepting such obligations, You may act only on Your own behalf and on Your
163-
sole responsibility, not on behalf of any other Contributor, and only if You
164-
agree to indemnify, defend, and hold each Contributor harmless for any liability
165-
incurred by, or claims asserted against, such Contributor by reason of your
166-
accepting any such warranty or additional liability.
1+
# MIT License
2+
3+
Copyright © 2024 [Daniel Morris](https://unfun.co)
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# OpenID Connect for AWS and GitHub Actions
22

33
[![CI](https://github.com/unfunco/terraform-aws-oidc-github/actions/workflows/ci.yaml/badge.svg)](https://github.com/unfunco/terraform-aws-oidc-github/actions/workflows/ci.yaml)
4-
[![Cron / Verify](https://github.com/unfunco/terraform-aws-oidc-github/actions/workflows/cron.yaml/badge.svg)](https://github.com/unfunco/terraform-aws-oidc-github/actions/workflows/cron.yaml)
54
[![Security](https://github.com/unfunco/terraform-aws-oidc-github/actions/workflows/security.yaml/badge.svg)](https://github.com/unfunco/terraform-aws-oidc-github/actions/workflows/security.yaml)
65
[![License: Apache 2.0](https://img.shields.io/badge/License-Apache_2.0-purple.svg)](https://opensource.org/licenses/Apache-2.0)
76

@@ -122,14 +121,14 @@ applied, the JWT will contain an updated `iss` claim.
122121
## License
123122

124123
© 2021 [Daniel Morris](https://unfun.co)
125-
Made available under the terms of the [Apache License 2.0].
124+
Made available under the terms of the [MIT License].
126125

127-
[apache license 2.0]: LICENSE.md
128126
[aws provider]: https://registry.terraform.io/providers/hashicorp/aws/latest/docs
129127
[complete example]: examples/complete
130128
[configuring openid connect in amazon web services]: https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services
131129
[creating openid connect (oidc) identity providers]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html
132130
[make]: https://www.gnu.org/software/make/
131+
[mit license]: LICENSE.md
133132
[obtaining the thumbprint for an openid connect identity provider]: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc_verify-thumbprint.html
134133
[terraform]: https://www.terraform.io
135134
[tls provider]: https://registry.terraform.io/providers/hashicorp/tls/latest/docs

data.tf

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright © 2021 Daniel Morris
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at:
6-
//
7-
// https://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// SPDX-FileCopyrightText: 2024 Daniel Morris <[email protected]>
2+
// SPDX-License-Identifier: MIT
143

154
data "aws_partition" "current" {}
165

main.tf

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright © 2021 Daniel Morris
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at:
6-
//
7-
// https://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// SPDX-FileCopyrightText: 2024 Daniel Morris <[email protected]>
2+
// SPDX-License-Identifier: MIT
143

154
locals {
165
audience = format("sts.%v", local.dns_suffix)

outputs.tf

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright © 2021 Daniel Morris
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at:
6-
//
7-
// https://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// SPDX-FileCopyrightText: 2024 Daniel Morris <[email protected]>
2+
// SPDX-License-Identifier: MIT
143

154
output "iam_role_arn" {
165
depends_on = [aws_iam_role.github]

variables.tf

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright © 2021 Daniel Morris
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at:
6-
//
7-
// https://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// SPDX-FileCopyrightText: 2024 Daniel Morris <[email protected]>
2+
// SPDX-License-Identifier: MIT
143

154
variable "additional_audiences" {
165
default = null

versions.tf

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright © 2021 Daniel Morris
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at:
6-
//
7-
// https://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// SPDX-FileCopyrightText: 2024 Daniel Morris <[email protected]>
2+
// SPDX-License-Identifier: MIT
143

154
terraform {
165
required_providers {

0 commit comments

Comments
 (0)