From 946d6833fafeaf710e20fe300e95cca64dd8bce1 Mon Sep 17 00:00:00 2001 From: Jean du Plessis Date: Wed, 11 Oct 2023 15:56:25 +0200 Subject: [PATCH 1/5] Updates source code for ownership change --- .github/PULL_REQUEST_TEMPLATE.md | 6 + .github/workflows/backport.yml | 4 + .github/workflows/ci.yml | 4 + .github/workflows/commands.yml | 4 + .github/workflows/e2e.yaml | 4 + .github/workflows/tag.yaml | 4 + .gitignore | 4 + .gitmodules | 4 + .golangci.yml | 70 +++-- CODEOWNERS | 14 +- CODE_OF_CONDUCT.md | 10 +- LICENSE | 274 +++++------------- LICENSES/Apache-2.0.txt | 73 +++++ LICENSES/CC-BY-4.0.txt | 156 ++++++++++ LICENSES/CC0-1.0.txt | 121 ++++++++ Makefile | 8 +- OWNERS.md | 15 +- README.md | 16 +- apis/generate.go | 8 +- apis/null/v1alpha1/zz_generated.deepcopy.go | 8 +- apis/null/v1alpha1/zz_generated.managed.go | 7 +- .../null/v1alpha1/zz_generated.managedlist.go | 7 +- .../null/v1alpha1/zz_generated_terraformed.go | 4 - apis/null/v1alpha1/zz_groupversion_info.go | 8 +- apis/null/v1alpha1/zz_resource_types.go | 4 - apis/v1alpha1/doc.go | 8 +- apis/v1alpha1/register.go | 8 +- apis/v1alpha1/types.go | 6 +- apis/v1alpha1/zz_generated.deepcopy.go | 8 +- apis/v1beta1/doc.go | 8 +- apis/v1beta1/register.go | 8 +- apis/v1beta1/types.go | 6 +- apis/v1beta1/zz_generated.deepcopy.go | 9 +- apis/v1beta1/zz_generated.pc.go | 28 -- apis/v1beta1/zz_generated.pcu.go | 28 -- apis/v1beta1/zz_generated.pculist.go | 17 -- apis/zz_register.go | 10 +- .../images/upjet-provider-template/Dockerfile | 4 + .../images/upjet-provider-template/Makefile | 4 + .../upjet-provider-template/terraformrc.hcl | 4 + cluster/test/setup.sh | 13 +- cmd/generator/main.go | 8 +- cmd/provider/main.go | 18 +- config/external_name.go | 6 +- config/null/config.go | 6 +- config/provider-metadata.yaml | 4 + config/provider.go | 12 +- config/schema.json.license | 3 + examples/install.yaml | 6 +- examples/null/resource.yaml | 6 +- examples/providerconfig/.gitignore | 4 + examples/providerconfig/providerconfig.yaml | 6 +- examples/providerconfig/secret.yaml.tmpl | 4 + examples/storeconfig/vault.yaml | 6 +- go.mod | 8 +- go.sum | 1 + go.sum.license | 3 + hack/boilerplate.go.txt | 6 +- hack/prepare.sh | 15 +- internal/clients/template.go | 8 +- internal/controller/doc.go | 6 +- .../controller/null/resource/zz_controller.go | 8 +- internal/controller/providerconfig/config.go | 8 +- internal/controller/zz_setup.go | 4 +- internal/features/features.go | 6 +- ...ull.template.crossplane.io_resources.yaml} | 5 +- ...mplate.crossplane.io_providerconfigs.yaml} | 5 +- ...e.crossplane.io_providerconfigusages.yaml} | 5 +- ... template.crossplane.io_storeconfigs.yaml} | 5 +- package/crossplane.yaml | 4 + scripts/version_diff.py | 4 + 71 files changed, 750 insertions(+), 446 deletions(-) create mode 100644 LICENSES/Apache-2.0.txt create mode 100644 LICENSES/CC-BY-4.0.txt create mode 100644 LICENSES/CC0-1.0.txt delete mode 100644 apis/v1beta1/zz_generated.pc.go delete mode 100644 apis/v1beta1/zz_generated.pcu.go delete mode 100644 apis/v1beta1/zz_generated.pculist.go create mode 100644 config/schema.json.license create mode 100644 go.sum.license rename package/crds/{null.template.upbound.io_resources.yaml => null.template.crossplane.io_resources.yaml} (99%) rename package/crds/{template.upbound.io_providerconfigs.yaml => template.crossplane.io_providerconfigs.yaml} (97%) rename package/crds/{template.upbound.io_providerconfigusages.yaml => template.crossplane.io_providerconfigusages.yaml} (96%) rename package/crds/{template.upbound.io_storeconfigs.yaml => template.crossplane.io_storeconfigs.yaml} (98%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7627d1a..109e839 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,9 @@ + + + +# Community Code of Conduct + +This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). diff --git a/LICENSE b/LICENSE index 5695f4d..ca63523 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,73 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [YEAR] Upbound Inc. All rights reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Apache License +Version 2.0, January 2004 + + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt new file mode 100644 index 0000000..137069b --- /dev/null +++ b/LICENSES/Apache-2.0.txt @@ -0,0 +1,73 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSES/CC-BY-4.0.txt b/LICENSES/CC-BY-4.0.txt new file mode 100644 index 0000000..13ca539 --- /dev/null +++ b/LICENSES/CC-BY-4.0.txt @@ -0,0 +1,156 @@ +Creative Commons Attribution 4.0 International + + Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public. + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + + d. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + + g. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights under this Public License. + + i. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + + 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. Downstream recipients. + + A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + +b. Other rights. + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + + b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + + b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + c. For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + + d. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + + c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + + d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/Makefile b/Makefile index a9c9cdd..9a48a88 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,14 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + # ==================================================================================== # Setup Project PROJECT_NAME ?= upjet-provider-template -PROJECT_REPO ?= github.com/upbound/$(PROJECT_NAME) +PROJECT_REPO ?= github.com/crossplane/$(PROJECT_NAME) -export TERRAFORM_VERSION ?= 1.2.1 +export TERRAFORM_VERSION ?= 1.5.5 export TERRAFORM_PROVIDER_SOURCE ?= hashicorp/null export TERRAFORM_PROVIDER_REPO ?= https://github.com/hashicorp/terraform-provider-null diff --git a/OWNERS.md b/OWNERS.md index 599b40e..2745545 100644 --- a/OWNERS.md +++ b/OWNERS.md @@ -1,13 +1,20 @@ -# OWNERS + -This page lists all maintainers for **this** repository. Each repository in the [Upbound -organization](https://github.com/upbound/) will list their repository maintainers in their own -`OWNERS.md` file. +# OWNERS +This page lists all maintainers for **this** repository. Each repository in the +[Crossplane organization](https://github.com/crossplane/) will list their +repository maintainers in their own `OWNERS.md` file. ## Maintainers * Alper Ulucinar ([ulucinar](https://github.com/ulucinar)) * Sergen Yalcin ([sergenyalcin](https://github.com/sergenyalcin)) +* Jean du Plessis ([jeanduplessis](https://github.com/jeanduplessis)) See [CODEOWNERS](./CODEOWNERS) for automatic PR assignment. diff --git a/README.md b/README.md index e57c399..01a0f23 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # Provider Template `upjet-provider-template` is a [Crossplane](https://crossplane.io/) provider that @@ -8,9 +14,9 @@ Template API. ## Getting Started Install the provider by using the following command after changing the image tag -to the [latest release](https://marketplace.upbound.io/providers/upbound/upjet-provider-template): +to the [latest release](https://marketplace.upbound.io/providers/crossplane/upjet-provider-template): ``` -up ctp provider install upbound/upjet-provider-template:v0.1.0 +up ctp provider install crossplane/upjet-provider-template:v0.1.0 ``` Alternatively, you can use declarative installation: @@ -21,13 +27,13 @@ kind: Provider metadata: name: upjet-provider-template spec: - package: upbound/upjet-provider-template:v0.1.0 + package: crossplane/upjet-provider-template:v0.1.0 EOF ``` Notice that in this example Provider resource is referencing ControllerConfig with debug enabled. -You can see the API reference [here](https://doc.crds.dev/github.com/upbound/upjet-provider-template). +You can see the API reference [here](https://doc.crds.dev/github.com/crossplane/upjet-provider-template). ## Developing @@ -57,4 +63,4 @@ make build ## Report a Bug For filing bugs, suggesting improvements, or requesting new features, please -open an [issue](https://github.com/upbound/upjet-provider-template/issues). +open an [issue](https://github.com/crossplane/upjet-provider-template/issues). diff --git a/apis/generate.go b/apis/generate.go index 233d170..fbf70ce 100644 --- a/apis/generate.go +++ b/apis/generate.go @@ -1,10 +1,10 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + //go:build generate // +build generate -/* -Copyright 2021 Upbound Inc. -*/ - // NOTE: See the below link for details on what is happening here. // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module diff --git a/apis/null/v1alpha1/zz_generated.deepcopy.go b/apis/null/v1alpha1/zz_generated.deepcopy.go index 1af19ad..083e788 100644 --- a/apis/null/v1alpha1/zz_generated.deepcopy.go +++ b/apis/null/v1alpha1/zz_generated.deepcopy.go @@ -1,8 +1,8 @@ -//go:build !ignore_autogenerated +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ +//go:build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/apis/null/v1alpha1/zz_generated.managed.go b/apis/null/v1alpha1/zz_generated.managed.go index 74df9c5..3600665 100644 --- a/apis/null/v1alpha1/zz_generated.managed.go +++ b/apis/null/v1alpha1/zz_generated.managed.go @@ -1,6 +1,7 @@ -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + // Code generated by angryjet. DO NOT EDIT. package v1alpha1 diff --git a/apis/null/v1alpha1/zz_generated.managedlist.go b/apis/null/v1alpha1/zz_generated.managedlist.go index c589209..f0cd875 100644 --- a/apis/null/v1alpha1/zz_generated.managedlist.go +++ b/apis/null/v1alpha1/zz_generated.managedlist.go @@ -1,6 +1,7 @@ -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + // Code generated by angryjet. DO NOT EDIT. package v1alpha1 diff --git a/apis/null/v1alpha1/zz_generated_terraformed.go b/apis/null/v1alpha1/zz_generated_terraformed.go index 3c32037..f4aea42 100755 --- a/apis/null/v1alpha1/zz_generated_terraformed.go +++ b/apis/null/v1alpha1/zz_generated_terraformed.go @@ -2,10 +2,6 @@ // // SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ - // Code generated by upjet. DO NOT EDIT. package v1alpha1 diff --git a/apis/null/v1alpha1/zz_groupversion_info.go b/apis/null/v1alpha1/zz_groupversion_info.go index 3b570c9..e35d0b9 100755 --- a/apis/null/v1alpha1/zz_groupversion_info.go +++ b/apis/null/v1alpha1/zz_groupversion_info.go @@ -2,14 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ - // Code generated by upjet. DO NOT EDIT. // +kubebuilder:object:generate=true -// +groupName=null.template.upbound.io +// +groupName=null.template.crossplane.io // +versionName=v1alpha1 package v1alpha1 @@ -20,7 +16,7 @@ import ( // Package type metadata. const ( - CRDGroup = "null.template.upbound.io" + CRDGroup = "null.template.crossplane.io" CRDVersion = "v1alpha1" ) diff --git a/apis/null/v1alpha1/zz_resource_types.go b/apis/null/v1alpha1/zz_resource_types.go index 7801a3b..603518c 100755 --- a/apis/null/v1alpha1/zz_resource_types.go +++ b/apis/null/v1alpha1/zz_resource_types.go @@ -2,10 +2,6 @@ // // SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ - // Code generated by upjet. DO NOT EDIT. package v1alpha1 diff --git a/apis/v1alpha1/doc.go b/apis/v1alpha1/doc.go index 468ffa7..6355302 100644 --- a/apis/v1alpha1/doc.go +++ b/apis/v1alpha1/doc.go @@ -1,9 +1,9 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 // Package v1alpha1 contains the core resources of the template jet provider. // +kubebuilder:object:generate=true -// +groupName=template.upbound.io +// +groupName=template.crossplane.io // +versionName=v1alpha1 package v1alpha1 diff --git a/apis/v1alpha1/register.go b/apis/v1alpha1/register.go index 038d8b3..b402212 100644 --- a/apis/v1alpha1/register.go +++ b/apis/v1alpha1/register.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 @@ -13,7 +13,7 @@ import ( // Package type metadata. const ( - Group = "template.upbound.io" + Group = "template.crossplane.io" Version = "v1alpha1" ) diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go index 3f8f25a..26d3cae 100644 --- a/apis/v1alpha1/types.go +++ b/apis/v1alpha1/types.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index 86f2d29..60a812e 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,8 +1,8 @@ -//go:build !ignore_autogenerated +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ +//go:build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/apis/v1beta1/doc.go b/apis/v1beta1/doc.go index 71a80b6..85fd6c2 100644 --- a/apis/v1beta1/doc.go +++ b/apis/v1beta1/doc.go @@ -1,9 +1,9 @@ -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 // Package v1beta1 contains the core resources of the template upjet provider. // +kubebuilder:object:generate=true -// +groupName=template.upbound.io +// +groupName=template.crossplane.io // +versionName=v1beta1 package v1beta1 diff --git a/apis/v1beta1/register.go b/apis/v1beta1/register.go index a99c36e..b4db272 100644 --- a/apis/v1beta1/register.go +++ b/apis/v1beta1/register.go @@ -1,6 +1,6 @@ -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package v1beta1 @@ -13,7 +13,7 @@ import ( // Package type metadata. const ( - Group = "template.upbound.io" + Group = "template.crossplane.io" Version = "v1beta1" ) diff --git a/apis/v1beta1/types.go b/apis/v1beta1/types.go index 110474a..6c58a39 100644 --- a/apis/v1beta1/types.go +++ b/apis/v1beta1/types.go @@ -1,6 +1,6 @@ -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package v1beta1 diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go index 09df2c1..bb7eef2 100644 --- a/apis/v1beta1/zz_generated.deepcopy.go +++ b/apis/v1beta1/zz_generated.deepcopy.go @@ -1,8 +1,9 @@ -//go:build !ignore_autogenerated -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + +//go:build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/apis/v1beta1/zz_generated.pc.go b/apis/v1beta1/zz_generated.pc.go deleted file mode 100644 index c597006..0000000 --- a/apis/v1beta1/zz_generated.pc.go +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2022 Upbound Inc. -*/ -// Code generated by angryjet. DO NOT EDIT. - -package v1beta1 - -import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - -// GetCondition of this ProviderConfig. -func (p *ProviderConfig) GetCondition(ct xpv1.ConditionType) xpv1.Condition { - return p.Status.GetCondition(ct) -} - -// GetUsers of this ProviderConfig. -func (p *ProviderConfig) GetUsers() int64 { - return p.Status.Users -} - -// SetConditions of this ProviderConfig. -func (p *ProviderConfig) SetConditions(c ...xpv1.Condition) { - p.Status.SetConditions(c...) -} - -// SetUsers of this ProviderConfig. -func (p *ProviderConfig) SetUsers(i int64) { - p.Status.Users = i -} diff --git a/apis/v1beta1/zz_generated.pcu.go b/apis/v1beta1/zz_generated.pcu.go deleted file mode 100644 index a4f4986..0000000 --- a/apis/v1beta1/zz_generated.pcu.go +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2022 Upbound Inc. -*/ -// Code generated by angryjet. DO NOT EDIT. - -package v1beta1 - -import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - -// GetProviderConfigReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) GetProviderConfigReference() xpv1.Reference { - return p.ProviderConfigReference -} - -// GetResourceReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) GetResourceReference() xpv1.TypedReference { - return p.ResourceReference -} - -// SetProviderConfigReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) SetProviderConfigReference(r xpv1.Reference) { - p.ProviderConfigReference = r -} - -// SetResourceReference of this ProviderConfigUsage. -func (p *ProviderConfigUsage) SetResourceReference(r xpv1.TypedReference) { - p.ResourceReference = r -} diff --git a/apis/v1beta1/zz_generated.pculist.go b/apis/v1beta1/zz_generated.pculist.go deleted file mode 100644 index b3ae1b4..0000000 --- a/apis/v1beta1/zz_generated.pculist.go +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 Upbound Inc. -*/ -// Code generated by angryjet. DO NOT EDIT. - -package v1beta1 - -import resource "github.com/crossplane/crossplane-runtime/pkg/resource" - -// GetItems of this ProviderConfigUsageList. -func (p *ProviderConfigUsageList) GetItems() []resource.ProviderConfigUsage { - items := make([]resource.ProviderConfigUsage, len(p.Items)) - for i := range p.Items { - items[i] = &p.Items[i] - } - return items -} diff --git a/apis/zz_register.go b/apis/zz_register.go index 9a6d212..03061a6 100755 --- a/apis/zz_register.go +++ b/apis/zz_register.go @@ -2,10 +2,6 @@ // // SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ - // Code generated by upjet. DO NOT EDIT. // Package apis contains Kubernetes API for the provider. @@ -14,9 +10,9 @@ package apis import ( "k8s.io/apimachinery/pkg/runtime" - v1alpha1 "github.com/upbound/upjet-provider-template/apis/null/v1alpha1" - v1alpha1apis "github.com/upbound/upjet-provider-template/apis/v1alpha1" - v1beta1 "github.com/upbound/upjet-provider-template/apis/v1beta1" + v1alpha1 "github.com/crossplane/upjet-provider-template/apis/null/v1alpha1" + v1alpha1apis "github.com/crossplane/upjet-provider-template/apis/v1alpha1" + v1beta1 "github.com/crossplane/upjet-provider-template/apis/v1beta1" ) func init() { diff --git a/cluster/images/upjet-provider-template/Dockerfile b/cluster/images/upjet-provider-template/Dockerfile index 61193f6..4084c7a 100644 --- a/cluster/images/upjet-provider-template/Dockerfile +++ b/cluster/images/upjet-provider-template/Dockerfile @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + FROM alpine:3.17.1 RUN apk --no-cache add ca-certificates bash diff --git a/cluster/images/upjet-provider-template/Makefile b/cluster/images/upjet-provider-template/Makefile index 083bec1..7e38f2c 100755 --- a/cluster/images/upjet-provider-template/Makefile +++ b/cluster/images/upjet-provider-template/Makefile @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + # ==================================================================================== # Setup Project diff --git a/cluster/images/upjet-provider-template/terraformrc.hcl b/cluster/images/upjet-provider-template/terraformrc.hcl index 022203c..eb3c082 100644 --- a/cluster/images/upjet-provider-template/terraformrc.hcl +++ b/cluster/images/upjet-provider-template/terraformrc.hcl @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + provider_installation { filesystem_mirror { path = "/terraform/provider-mirror" diff --git a/cluster/test/setup.sh b/cluster/test/setup.sh index f1138cc..250a2a2 100755 --- a/cluster/test/setup.sh +++ b/cluster/test/setup.sh @@ -1,19 +1,24 @@ #!/usr/bin/env bash + +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + set -aeuo pipefail echo "Running setup.sh" echo "Creating cloud credential secret..." -${KUBECTL} -n upbound-system create secret generic provider-secret --from-literal=credentials="${UPTEST_CLOUD_CREDENTIALS}" --dry-run=client -o yaml | ${KUBECTL} apply -f - +${KUBECTL} -n crossplane-system create secret generic provider-secret --from-literal=credentials="${UPTEST_CLOUD_CREDENTIALS}" --dry-run=client -o yaml | ${KUBECTL} apply -f - echo "Waiting until provider is healthy..." ${KUBECTL} wait provider.pkg --all --for condition=Healthy --timeout 5m echo "Waiting for all pods to come online..." -${KUBECTL} -n upbound-system wait --for=condition=Available deployment --all --timeout=5m +${KUBECTL} -n crossplane-system wait --for=condition=Available deployment --all --timeout=5m echo "Creating a default provider config..." cat < +// +// SPDX-License-Identifier: Apache-2.0 package main @@ -11,7 +11,7 @@ import ( "github.com/crossplane/upjet/pkg/pipeline" - "github.com/upbound/upjet-provider-template/config" + "github.com/crossplane/upjet-provider-template/config" ) func main() { diff --git a/cmd/provider/main.go b/cmd/provider/main.go index 30b96c8..2b254ff 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package main @@ -26,12 +26,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/upbound/upjet-provider-template/apis" - "github.com/upbound/upjet-provider-template/apis/v1alpha1" - "github.com/upbound/upjet-provider-template/config" - "github.com/upbound/upjet-provider-template/internal/clients" - "github.com/upbound/upjet-provider-template/internal/controller" - "github.com/upbound/upjet-provider-template/internal/features" + "github.com/crossplane/upjet-provider-template/apis" + "github.com/crossplane/upjet-provider-template/apis/v1alpha1" + "github.com/crossplane/upjet-provider-template/config" + "github.com/crossplane/upjet-provider-template/internal/clients" + "github.com/crossplane/upjet-provider-template/internal/controller" + "github.com/crossplane/upjet-provider-template/internal/features" ) func main() { diff --git a/config/external_name.go b/config/external_name.go index 1fcc559..4ba29fb 100644 --- a/config/external_name.go +++ b/config/external_name.go @@ -1,6 +1,6 @@ -/* -Copyright 2022 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package config diff --git a/config/null/config.go b/config/null/config.go index a0af24f..51394b6 100644 --- a/config/null/config.go +++ b/config/null/config.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package null diff --git a/config/provider-metadata.yaml b/config/provider-metadata.yaml index 34ba35f..59ffe75 100644 --- a/config/provider-metadata.yaml +++ b/config/provider-metadata.yaml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + name: hashicorp/null resources: null_resource: diff --git a/config/provider.go b/config/provider.go index 7f53564..c4844ea 100644 --- a/config/provider.go +++ b/config/provider.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package config @@ -10,12 +10,12 @@ import ( ujconfig "github.com/crossplane/upjet/pkg/config" - "github.com/upbound/upjet-provider-template/config/null" + "github.com/crossplane/upjet-provider-template/config/null" ) const ( resourcePrefix = "template" - modulePath = "github.com/upbound/upjet-provider-template" + modulePath = "github.com/crossplane/upjet-provider-template" ) //go:embed schema.json @@ -27,7 +27,7 @@ var providerMetadata string // GetProvider returns provider configuration func GetProvider() *ujconfig.Provider { pc := ujconfig.NewProvider([]byte(providerSchema), resourcePrefix, modulePath, []byte(providerMetadata), - ujconfig.WithRootGroup("template.upbound.io"), + ujconfig.WithRootGroup("template.crossplane.io"), ujconfig.WithIncludeList(ExternalNameConfigured()), ujconfig.WithFeaturesPackage("internal/features"), ujconfig.WithDefaultResourceOptions( diff --git a/config/schema.json.license b/config/schema.json.license new file mode 100644 index 0000000..9fb2a51 --- /dev/null +++ b/config/schema.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/examples/install.yaml b/examples/install.yaml index d03f1cc..354b10b 100644 --- a/examples/install.yaml +++ b/examples/install.yaml @@ -1,6 +1,10 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + apiVersion: pkg.crossplane.io/v1 kind: Provider metadata: name: upjet-provider-template spec: - package: upbound/upjet-provider-template:v0.1.0 + package: crossplane/upjet-provider-template:v0.1.0 diff --git a/examples/null/resource.yaml b/examples/null/resource.yaml index fa5f479..279a249 100644 --- a/examples/null/resource.yaml +++ b/examples/null/resource.yaml @@ -1,4 +1,8 @@ -apiVersion: null.template.upbound.io/v1alpha1 +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: null.template.crossplane.io/v1alpha1 kind: Resource metadata: name: example diff --git a/examples/providerconfig/.gitignore b/examples/providerconfig/.gitignore index 4a424df..3d19706 100644 --- a/examples/providerconfig/.gitignore +++ b/examples/providerconfig/.gitignore @@ -1 +1,5 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + secret.yaml diff --git a/examples/providerconfig/providerconfig.yaml b/examples/providerconfig/providerconfig.yaml index e7106ac..ca8c5a7 100644 --- a/examples/providerconfig/providerconfig.yaml +++ b/examples/providerconfig/providerconfig.yaml @@ -1,4 +1,8 @@ -apiVersion: template.upbound.io/v1beta1 +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: template.crossplane.io/v1beta1 kind: ProviderConfig metadata: name: default diff --git a/examples/providerconfig/secret.yaml.tmpl b/examples/providerconfig/secret.yaml.tmpl index 6dfa5c8..f02d6c6 100644 --- a/examples/providerconfig/secret.yaml.tmpl +++ b/examples/providerconfig/secret.yaml.tmpl @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + apiVersion: v1 kind: Secret metadata: diff --git a/examples/storeconfig/vault.yaml b/examples/storeconfig/vault.yaml index e19a9a5..54e6fb7 100644 --- a/examples/storeconfig/vault.yaml +++ b/examples/storeconfig/vault.yaml @@ -1,4 +1,8 @@ -apiVersion: template.upbound.io/v1alpha1 +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: template.crossplane.io/v1alpha1 kind: StoreConfig metadata: name: vault diff --git a/go.mod b/go.mod index 2f3a492..d6feca3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,10 @@ -module github.com/upbound/upjet-provider-template +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 -go 1.19 +module github.com/crossplane/upjet-provider-template + +go 1.20 require ( github.com/crossplane/crossplane-runtime v1.14.0-rc.0.0.20231011070344-cc691421c2e5 diff --git a/go.sum b/go.sum index 0fff85b..7bd4cc3 100644 --- a/go.sum +++ b/go.sum @@ -378,6 +378,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= diff --git a/go.sum.license b/go.sum.license new file mode 100644 index 0000000..9fb2a51 --- /dev/null +++ b/go.sum.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 The Crossplane Authors + +SPDX-License-Identifier: Apache-2.0 diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt index 7a5ad45..01d2d3e 100644 --- a/hack/boilerplate.go.txt +++ b/hack/boilerplate.go.txt @@ -1,3 +1,3 @@ -/* -Copyright 2022 Upbound Inc. -*/ \ No newline at end of file +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 \ No newline at end of file diff --git a/hack/prepare.sh b/hack/prepare.sh index c7a649b..3d4db36 100755 --- a/hack/prepare.sh +++ b/hack/prepare.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash + +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + set -euox pipefail read -r -p "Lower case provider name (ex. github): " PROVIDER_NAME_LOWER @@ -12,18 +17,18 @@ git grep -l 'template' -- ${REPLACE_FILES} | xargs sed -i.bak "s/upjet-provider- # shellcheck disable=SC2086 git grep -l 'template' -- ${REPLACE_FILES} | xargs sed -i.bak "s/template/${PROVIDER_NAME_LOWER}/g" # shellcheck disable=SC2086 -git grep -l "upbound/provider-${PROVIDER_NAME_LOWER}" -- ${REPLACE_FILES} | xargs sed -i.bak "s|upbound/provider-${PROVIDER_NAME_LOWER}|${ORGANIZATION_NAME}/provider-${PROVIDER_NAME_LOWER}|g" +git grep -l "crossplane/provider-${PROVIDER_NAME_LOWER}" -- ${REPLACE_FILES} | xargs sed -i.bak "s|crossplane/provider-${PROVIDER_NAME_LOWER}|${ORGANIZATION_NAME}/provider-${PROVIDER_NAME_LOWER}|g" # shellcheck disable=SC2086 git grep -l 'Template' -- ${REPLACE_FILES} | xargs sed -i.bak "s/Template/${PROVIDER_NAME_NORMAL}/g" # shellcheck disable=SC2086 -git grep -l "upbound.io" -- "apis/v1*" | xargs sed -i.bak "s|upbound.io|${CRD_ROOT_GROUP}|g" +git grep -l "crossplane.io" -- "apis/v1*" | xargs sed -i.bak "s|crossplane.io|${CRD_ROOT_GROUP}|g" # shellcheck disable=SC2086 -git grep -l "ujconfig\.WithRootGroup(\"${PROVIDER_NAME_LOWER}.upbound\.io\")" -- "config/provider.go" | xargs sed -i.bak "s|ujconfig.WithRootGroup(\"${PROVIDER_NAME_LOWER}.upbound.io\")|ujconfig.WithRootGroup(\"${CRD_ROOT_GROUP}\")|g" +git grep -l "ujconfig\.WithRootGroup(\"${PROVIDER_NAME_LOWER}.crossplane\.io\")" -- "config/provider.go" | xargs sed -i.bak "s|ujconfig.WithRootGroup(\"${PROVIDER_NAME_LOWER}.crossplane.io\")|ujconfig.WithRootGroup(\"${CRD_ROOT_GROUP}\")|g" # We need to be careful while replacing "template" keyword in go.mod as it could tamper # some imported packages under require section. -sed -i.bak "s|upbound/upjet-provider-template|${ORGANIZATION_NAME}/provider-${PROVIDER_NAME_LOWER}|g" go.mod -sed -i.bak "s|PROJECT_REPO ?= github.com/upbound/|PROJECT_REPO ?= github.com/${ORGANIZATION_NAME}/|g" Makefile +sed -i.bak "s|crossplane/upjet-provider-template|${ORGANIZATION_NAME}/provider-${PROVIDER_NAME_LOWER}|g" go.mod +sed -i.bak "s|PROJECT_REPO ?= github.com/crossplane/|PROJECT_REPO ?= github.com/${ORGANIZATION_NAME}/|g" Makefile sed -i.bak "s/\[YEAR\]/$(date +%Y)/g" LICENSE # Clean up the .bak files created by sed diff --git a/internal/clients/template.go b/internal/clients/template.go index 078f7ec..6c0d317 100644 --- a/internal/clients/template.go +++ b/internal/clients/template.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package clients @@ -15,7 +15,7 @@ import ( "github.com/crossplane/upjet/pkg/terraform" - "github.com/upbound/upjet-provider-template/apis/v1beta1" + "github.com/crossplane/upjet-provider-template/apis/v1beta1" ) const ( diff --git a/internal/controller/doc.go b/internal/controller/doc.go index a4c8097..dcf27ab 100644 --- a/internal/controller/doc.go +++ b/internal/controller/doc.go @@ -1,5 +1,5 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package controller diff --git a/internal/controller/null/resource/zz_controller.go b/internal/controller/null/resource/zz_controller.go index 8dedab8..526e7fb 100755 --- a/internal/controller/null/resource/zz_controller.go +++ b/internal/controller/null/resource/zz_controller.go @@ -2,10 +2,6 @@ // // SPDX-License-Identifier: Apache-2.0 -/* -Copyright 2022 Upbound Inc. -*/ - // Code generated by upjet. DO NOT EDIT. package resource @@ -23,8 +19,8 @@ import ( "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" - v1alpha1 "github.com/upbound/upjet-provider-template/apis/null/v1alpha1" - features "github.com/upbound/upjet-provider-template/internal/features" + v1alpha1 "github.com/crossplane/upjet-provider-template/apis/null/v1alpha1" + features "github.com/crossplane/upjet-provider-template/internal/features" ) // Setup adds a controller that reconciles Resource managed resources. diff --git a/internal/controller/providerconfig/config.go b/internal/controller/providerconfig/config.go index 73c10b4..9e7be3a 100644 --- a/internal/controller/providerconfig/config.go +++ b/internal/controller/providerconfig/config.go @@ -1,6 +1,6 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package providerconfig @@ -11,7 +11,7 @@ import ( "github.com/crossplane/upjet/pkg/controller" ctrl "sigs.k8s.io/controller-runtime" - "github.com/upbound/upjet-provider-template/apis/v1beta1" + "github.com/crossplane/upjet-provider-template/apis/v1beta1" ) // Setup adds a controller that reconciles ProviderConfigs by accounting for diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go index 80f7342..6256d78 100755 --- a/internal/controller/zz_setup.go +++ b/internal/controller/zz_setup.go @@ -9,8 +9,8 @@ import ( "github.com/crossplane/upjet/pkg/controller" - resource "github.com/upbound/upjet-provider-template/internal/controller/null/resource" - providerconfig "github.com/upbound/upjet-provider-template/internal/controller/providerconfig" + resource "github.com/crossplane/upjet-provider-template/internal/controller/null/resource" + providerconfig "github.com/crossplane/upjet-provider-template/internal/controller/providerconfig" ) // Setup creates all controllers with the supplied logger and adds them to diff --git a/internal/features/features.go b/internal/features/features.go index 96fd480..3720ce8 100644 --- a/internal/features/features.go +++ b/internal/features/features.go @@ -1,6 +1,6 @@ -/* - Copyright 2022 Upbound Inc -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package features diff --git a/package/crds/null.template.upbound.io_resources.yaml b/package/crds/null.template.crossplane.io_resources.yaml similarity index 99% rename from package/crds/null.template.upbound.io_resources.yaml rename to package/crds/null.template.crossplane.io_resources.yaml index 04973c1..617447d 100644 --- a/package/crds/null.template.upbound.io_resources.yaml +++ b/package/crds/null.template.crossplane.io_resources.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -6,7 +9,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.13.0 name: resources.null.template.upbound.io spec: - group: null.template.upbound.io + group: null.template.crossplane.io names: categories: - crossplane diff --git a/package/crds/template.upbound.io_providerconfigs.yaml b/package/crds/template.crossplane.io_providerconfigs.yaml similarity index 97% rename from package/crds/template.upbound.io_providerconfigs.yaml rename to package/crds/template.crossplane.io_providerconfigs.yaml index 595fa90..0495c6e 100644 --- a/package/crds/template.upbound.io_providerconfigs.yaml +++ b/package/crds/template.crossplane.io_providerconfigs.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -6,7 +9,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.13.0 name: providerconfigs.template.upbound.io spec: - group: template.upbound.io + group: template.crossplane.io names: categories: - crossplane diff --git a/package/crds/template.upbound.io_providerconfigusages.yaml b/package/crds/template.crossplane.io_providerconfigusages.yaml similarity index 96% rename from package/crds/template.upbound.io_providerconfigusages.yaml rename to package/crds/template.crossplane.io_providerconfigusages.yaml index 5a2bc1d..b13e5ba 100644 --- a/package/crds/template.upbound.io_providerconfigusages.yaml +++ b/package/crds/template.crossplane.io_providerconfigusages.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -6,7 +9,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.13.0 name: providerconfigusages.template.upbound.io spec: - group: template.upbound.io + group: template.crossplane.io names: categories: - crossplane diff --git a/package/crds/template.upbound.io_storeconfigs.yaml b/package/crds/template.crossplane.io_storeconfigs.yaml similarity index 98% rename from package/crds/template.upbound.io_storeconfigs.yaml rename to package/crds/template.crossplane.io_storeconfigs.yaml index 4300dad..eda284d 100644 --- a/package/crds/template.upbound.io_storeconfigs.yaml +++ b/package/crds/template.crossplane.io_storeconfigs.yaml @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -6,7 +9,7 @@ metadata: controller-gen.kubebuilder.io/version: v0.13.0 name: storeconfigs.template.upbound.io spec: - group: template.upbound.io + group: template.crossplane.io names: categories: - crossplane diff --git a/package/crossplane.yaml b/package/crossplane.yaml index 8e70739..217aafc 100644 --- a/package/crossplane.yaml +++ b/package/crossplane.yaml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + apiVersion: meta.pkg.crossplane.io/v1 kind: Provider metadata: diff --git a/scripts/version_diff.py b/scripts/version_diff.py index b373830..aac6377 100644 --- a/scripts/version_diff.py +++ b/scripts/version_diff.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + import json import sys From d6c80840bb1474caf27a9034bab518170914dc35 Mon Sep 17 00:00:00 2001 From: Jean du Plessis Date: Fri, 20 Oct 2023 12:57:00 +0200 Subject: [PATCH 2/5] Update generated files Signed-off-by: Jean du Plessis --- Makefile | 28 +++++++++++-------- apis/null/v1alpha1/zz_generated.deepcopy.go | 4 +-- apis/null/v1alpha1/zz_generated.managed.go | 1 - .../null/v1alpha1/zz_generated.managedlist.go | 1 - apis/v1alpha1/zz_generated.deepcopy.go | 4 +-- apis/v1beta1/zz_generated.deepcopy.go | 3 +- apis/v1beta1/zz_generated.pc.go | 28 +++++++++++++++++++ apis/v1beta1/zz_generated.pcu.go | 28 +++++++++++++++++++ apis/v1beta1/zz_generated.pculist.go | 17 +++++++++++ cmd/generator/main.go | 3 +- cmd/provider/main.go | 24 ++++++++-------- config/provider.go | 7 ++--- examples-generated/null/resource.yaml | 6 +++- go.sum | 1 - internal/clients/template.go | 7 ++--- internal/controller/providerconfig/config.go | 8 +++--- internal/controller/zz_setup.go | 6 ++-- ...null.template.crossplane.io_resources.yaml | 2 +- ...emplate.crossplane.io_providerconfigs.yaml | 2 +- ...te.crossplane.io_providerconfigusages.yaml | 2 +- .../template.crossplane.io_storeconfigs.yaml | 2 +- 21 files changed, 128 insertions(+), 56 deletions(-) create mode 100644 apis/v1beta1/zz_generated.pc.go create mode 100644 apis/v1beta1/zz_generated.pcu.go create mode 100644 apis/v1beta1/zz_generated.pculist.go mode change 100755 => 100644 internal/controller/zz_setup.go diff --git a/Makefile b/Makefile index 9a48a88..de8799b 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,17 @@ # ==================================================================================== # Setup Project -PROJECT_NAME ?= upjet-provider-template -PROJECT_REPO ?= github.com/crossplane/$(PROJECT_NAME) +PROJECT_NAME := upjet-provider-template +PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME) -export TERRAFORM_VERSION ?= 1.5.5 +export TERRAFORM_VERSION := 1.5.5 -export TERRAFORM_PROVIDER_SOURCE ?= hashicorp/null +export TERRAFORM_PROVIDER_SOURCE := hashicorp/null export TERRAFORM_PROVIDER_REPO ?= https://github.com/hashicorp/terraform-provider-null -export TERRAFORM_PROVIDER_VERSION ?= 3.1.0 -export TERRAFORM_PROVIDER_DOWNLOAD_NAME ?= terraform-provider-null -export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX ?= https://releases.hashicorp.com/$(TERRAFORM_PROVIDER_DOWNLOAD_NAME)/$(TERRAFORM_PROVIDER_VERSION) -export TERRAFORM_NATIVE_PROVIDER_BINARY ?= terraform-provider-null_v3.1.0_x5 +export TERRAFORM_PROVIDER_VERSION := 3.1.0 +export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-null +export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://releases.hashicorp.com/$(TERRAFORM_PROVIDER_DOWNLOAD_NAME)/$(TERRAFORM_PROVIDER_VERSION) +export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-null_v3.1.0_x5 export TERRAFORM_DOCS_PATH ?= docs/resources @@ -44,8 +44,12 @@ NPROCS ?= 1 # to half the number of CPU cores. GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 ))) -GO_REQUIRED_VERSION ?= 1.19 -GOLANGCILINT_VERSION ?= 1.50.0 +GO_REQUIRED_VERSION ?= 1.20 + +# GOLANGCILINT_VERSION is inherited from build submodule by default. +# Uncomment below if you need to override the version. +# GOLANGCILINT_VERSION ?= 1.54.0 + GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider $(GO_PROJECT)/cmd/generator GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION) GO_SUBDIRS += cmd internal apis @@ -55,9 +59,9 @@ GO_SUBDIRS += cmd internal apis # Setup Kubernetes tools KIND_VERSION = v0.15.0 -UP_VERSION = v0.18.0 +UP_VERSION = v0.19.2 UP_CHANNEL = stable -UPTEST_VERSION = v0.5.0 +UPTEST_VERSION = v0.6.1 -include build/makelib/k8s_tools.mk # ==================================================================================== diff --git a/apis/null/v1alpha1/zz_generated.deepcopy.go b/apis/null/v1alpha1/zz_generated.deepcopy.go index 083e788..00d4e70 100644 --- a/apis/null/v1alpha1/zz_generated.deepcopy.go +++ b/apis/null/v1alpha1/zz_generated.deepcopy.go @@ -1,9 +1,9 @@ +//go:build !ignore_autogenerated + // SPDX-FileCopyrightText: 2023 The Crossplane Authors // // SPDX-License-Identifier: Apache-2.0 -//go:build !ignore_autogenerated - // Code generated by controller-gen. DO NOT EDIT. package v1alpha1 diff --git a/apis/null/v1alpha1/zz_generated.managed.go b/apis/null/v1alpha1/zz_generated.managed.go index 3600665..b7389b5 100644 --- a/apis/null/v1alpha1/zz_generated.managed.go +++ b/apis/null/v1alpha1/zz_generated.managed.go @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2023 The Crossplane Authors // // SPDX-License-Identifier: Apache-2.0 - // Code generated by angryjet. DO NOT EDIT. package v1alpha1 diff --git a/apis/null/v1alpha1/zz_generated.managedlist.go b/apis/null/v1alpha1/zz_generated.managedlist.go index f0cd875..a30d41a 100644 --- a/apis/null/v1alpha1/zz_generated.managedlist.go +++ b/apis/null/v1alpha1/zz_generated.managedlist.go @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2023 The Crossplane Authors // // SPDX-License-Identifier: Apache-2.0 - // Code generated by angryjet. DO NOT EDIT. package v1alpha1 diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index 60a812e..70a2dfa 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,9 +1,9 @@ +//go:build !ignore_autogenerated + // SPDX-FileCopyrightText: 2023 The Crossplane Authors // // SPDX-License-Identifier: Apache-2.0 -//go:build !ignore_autogenerated - // Code generated by controller-gen. DO NOT EDIT. package v1alpha1 diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go index bb7eef2..e47e93f 100644 --- a/apis/v1beta1/zz_generated.deepcopy.go +++ b/apis/v1beta1/zz_generated.deepcopy.go @@ -1,10 +1,9 @@ +//go:build !ignore_autogenerated // SPDX-FileCopyrightText: 2023 The Crossplane Authors // // SPDX-License-Identifier: Apache-2.0 -//go:build !ignore_autogenerated - // Code generated by controller-gen. DO NOT EDIT. package v1beta1 diff --git a/apis/v1beta1/zz_generated.pc.go b/apis/v1beta1/zz_generated.pc.go new file mode 100644 index 0000000..b17d674 --- /dev/null +++ b/apis/v1beta1/zz_generated.pc.go @@ -0,0 +1,28 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 +// Code generated by angryjet. DO NOT EDIT. + +package v1beta1 + +import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" + +// GetCondition of this ProviderConfig. +func (p *ProviderConfig) GetCondition(ct xpv1.ConditionType) xpv1.Condition { + return p.Status.GetCondition(ct) +} + +// GetUsers of this ProviderConfig. +func (p *ProviderConfig) GetUsers() int64 { + return p.Status.Users +} + +// SetConditions of this ProviderConfig. +func (p *ProviderConfig) SetConditions(c ...xpv1.Condition) { + p.Status.SetConditions(c...) +} + +// SetUsers of this ProviderConfig. +func (p *ProviderConfig) SetUsers(i int64) { + p.Status.Users = i +} diff --git a/apis/v1beta1/zz_generated.pcu.go b/apis/v1beta1/zz_generated.pcu.go new file mode 100644 index 0000000..a406887 --- /dev/null +++ b/apis/v1beta1/zz_generated.pcu.go @@ -0,0 +1,28 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 +// Code generated by angryjet. DO NOT EDIT. + +package v1beta1 + +import xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" + +// GetProviderConfigReference of this ProviderConfigUsage. +func (p *ProviderConfigUsage) GetProviderConfigReference() xpv1.Reference { + return p.ProviderConfigReference +} + +// GetResourceReference of this ProviderConfigUsage. +func (p *ProviderConfigUsage) GetResourceReference() xpv1.TypedReference { + return p.ResourceReference +} + +// SetProviderConfigReference of this ProviderConfigUsage. +func (p *ProviderConfigUsage) SetProviderConfigReference(r xpv1.Reference) { + p.ProviderConfigReference = r +} + +// SetResourceReference of this ProviderConfigUsage. +func (p *ProviderConfigUsage) SetResourceReference(r xpv1.TypedReference) { + p.ResourceReference = r +} diff --git a/apis/v1beta1/zz_generated.pculist.go b/apis/v1beta1/zz_generated.pculist.go new file mode 100644 index 0000000..e300578 --- /dev/null +++ b/apis/v1beta1/zz_generated.pculist.go @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 +// Code generated by angryjet. DO NOT EDIT. + +package v1beta1 + +import resource "github.com/crossplane/crossplane-runtime/pkg/resource" + +// GetItems of this ProviderConfigUsageList. +func (p *ProviderConfigUsageList) GetItems() []resource.ProviderConfigUsage { + items := make([]resource.ProviderConfigUsage, len(p.Items)) + for i := range p.Items { + items[i] = &p.Items[i] + } + return items +} diff --git a/cmd/generator/main.go b/cmd/generator/main.go index fb7ae1e..fcf1d1e 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -9,9 +9,8 @@ import ( "os" "path/filepath" - "github.com/crossplane/upjet/pkg/pipeline" - "github.com/crossplane/upjet-provider-template/config" + "github.com/crossplane/upjet/pkg/pipeline" ) func main() { diff --git a/cmd/provider/main.go b/cmd/provider/main.go index 2b254ff..e0f2eb5 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -10,12 +10,12 @@ import ( "path/filepath" "time" - xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - xpcontroller "github.com/crossplane/crossplane-runtime/pkg/controller" - "github.com/crossplane/crossplane-runtime/pkg/feature" - "github.com/crossplane/crossplane-runtime/pkg/logging" - "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" - "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/upjet-provider-template/apis" + "github.com/crossplane/upjet-provider-template/apis/v1alpha1" + "github.com/crossplane/upjet-provider-template/config" + "github.com/crossplane/upjet-provider-template/internal/clients" + "github.com/crossplane/upjet-provider-template/internal/controller" + "github.com/crossplane/upjet-provider-template/internal/features" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/terraform" "gopkg.in/alecthomas/kingpin.v2" @@ -26,12 +26,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/crossplane/upjet-provider-template/apis" - "github.com/crossplane/upjet-provider-template/apis/v1alpha1" - "github.com/crossplane/upjet-provider-template/config" - "github.com/crossplane/upjet-provider-template/internal/clients" - "github.com/crossplane/upjet-provider-template/internal/controller" - "github.com/crossplane/upjet-provider-template/internal/features" + xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" + xpcontroller "github.com/crossplane/crossplane-runtime/pkg/controller" + "github.com/crossplane/crossplane-runtime/pkg/feature" + "github.com/crossplane/crossplane-runtime/pkg/logging" + "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" + "github.com/crossplane/crossplane-runtime/pkg/resource" ) func main() { diff --git a/config/provider.go b/config/provider.go index c4844ea..34d8a6e 100644 --- a/config/provider.go +++ b/config/provider.go @@ -5,12 +5,11 @@ package config import ( - // Note(turkenh): we are importing this to embed provider schema document - _ "embed" - + "github.com/crossplane/upjet-provider-template/config/null" ujconfig "github.com/crossplane/upjet/pkg/config" - "github.com/crossplane/upjet-provider-template/config/null" + // Note(turkenh): we are importing this to embed provider schema document + _ "embed" ) const ( diff --git a/examples-generated/null/resource.yaml b/examples-generated/null/resource.yaml index 59f7545..9f1b06f 100644 --- a/examples-generated/null/resource.yaml +++ b/examples-generated/null/resource.yaml @@ -1,4 +1,8 @@ -apiVersion: null.template.upbound.io/v1alpha1 +# SPDX-FileCopyrightText: 2023 The Crossplane Authors +# +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: null.template.crossplane.io/v1alpha1 kind: Resource metadata: annotations: diff --git a/go.sum b/go.sum index 7bd4cc3..0fff85b 100644 --- a/go.sum +++ b/go.sum @@ -378,7 +378,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= diff --git a/internal/clients/template.go b/internal/clients/template.go index 6c0d317..9e8fb89 100644 --- a/internal/clients/template.go +++ b/internal/clients/template.go @@ -8,14 +8,13 @@ import ( "context" "encoding/json" - "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/upjet-provider-template/apis/v1beta1" + "github.com/crossplane/upjet/pkg/terraform" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/crossplane/upjet/pkg/terraform" - - "github.com/crossplane/upjet-provider-template/apis/v1beta1" + "github.com/crossplane/crossplane-runtime/pkg/resource" ) const ( diff --git a/internal/controller/providerconfig/config.go b/internal/controller/providerconfig/config.go index 9e7be3a..3272907 100644 --- a/internal/controller/providerconfig/config.go +++ b/internal/controller/providerconfig/config.go @@ -5,13 +5,13 @@ package providerconfig import ( - "github.com/crossplane/crossplane-runtime/pkg/event" - "github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig" - "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/upjet-provider-template/apis/v1beta1" "github.com/crossplane/upjet/pkg/controller" ctrl "sigs.k8s.io/controller-runtime" - "github.com/crossplane/upjet-provider-template/apis/v1beta1" + "github.com/crossplane/crossplane-runtime/pkg/event" + "github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig" + "github.com/crossplane/crossplane-runtime/pkg/resource" ) // Setup adds a controller that reconciles ProviderConfigs by accounting for diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go old mode 100755 new mode 100644 index 6256d78..25e1a06 --- a/internal/controller/zz_setup.go +++ b/internal/controller/zz_setup.go @@ -5,12 +5,10 @@ package controller import ( - ctrl "sigs.k8s.io/controller-runtime" - - "github.com/crossplane/upjet/pkg/controller" - resource "github.com/crossplane/upjet-provider-template/internal/controller/null/resource" providerconfig "github.com/crossplane/upjet-provider-template/internal/controller/providerconfig" + "github.com/crossplane/upjet/pkg/controller" + ctrl "sigs.k8s.io/controller-runtime" ) // Setup creates all controllers with the supplied logger and adds them to diff --git a/package/crds/null.template.crossplane.io_resources.yaml b/package/crds/null.template.crossplane.io_resources.yaml index 617447d..74a6ddd 100644 --- a/package/crds/null.template.crossplane.io_resources.yaml +++ b/package/crds/null.template.crossplane.io_resources.yaml @@ -7,7 +7,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - name: resources.null.template.upbound.io + name: resources.null.template.crossplane.io spec: group: null.template.crossplane.io names: diff --git a/package/crds/template.crossplane.io_providerconfigs.yaml b/package/crds/template.crossplane.io_providerconfigs.yaml index 0495c6e..62f3f10 100644 --- a/package/crds/template.crossplane.io_providerconfigs.yaml +++ b/package/crds/template.crossplane.io_providerconfigs.yaml @@ -7,7 +7,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - name: providerconfigs.template.upbound.io + name: providerconfigs.template.crossplane.io spec: group: template.crossplane.io names: diff --git a/package/crds/template.crossplane.io_providerconfigusages.yaml b/package/crds/template.crossplane.io_providerconfigusages.yaml index b13e5ba..e743b4f 100644 --- a/package/crds/template.crossplane.io_providerconfigusages.yaml +++ b/package/crds/template.crossplane.io_providerconfigusages.yaml @@ -7,7 +7,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - name: providerconfigusages.template.upbound.io + name: providerconfigusages.template.crossplane.io spec: group: template.crossplane.io names: diff --git a/package/crds/template.crossplane.io_storeconfigs.yaml b/package/crds/template.crossplane.io_storeconfigs.yaml index eda284d..6bd925d 100644 --- a/package/crds/template.crossplane.io_storeconfigs.yaml +++ b/package/crds/template.crossplane.io_storeconfigs.yaml @@ -7,7 +7,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - name: storeconfigs.template.upbound.io + name: storeconfigs.template.crossplane.io spec: group: template.crossplane.io names: From 46b03ac929ced987b518f16b87bc85a28f6bbbcd Mon Sep 17 00:00:00 2001 From: Jean du Plessis Date: Mon, 13 Nov 2023 18:21:37 +0200 Subject: [PATCH 3/5] Cleanup README file --- README.md | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 01a0f23..a2b49b7 100644 --- a/README.md +++ b/README.md @@ -6,34 +6,14 @@ SPDX-License-Identifier: CC-BY-4.0 # Provider Template -`upjet-provider-template` is a [Crossplane](https://crossplane.io/) provider that -is built using [Upjet](https://github.com/crossplane/upjet) code +`upjet-provider-template` is a [Crossplane](https://crossplane.io/) provider +template for use with the [Upjet](https://github.com/crossplane/upjet) code generation tools and exposes XRM-conformant managed resources for the Template API. ## Getting Started -Install the provider by using the following command after changing the image tag -to the [latest release](https://marketplace.upbound.io/providers/crossplane/upjet-provider-template): -``` -up ctp provider install crossplane/upjet-provider-template:v0.1.0 -``` - -Alternatively, you can use declarative installation: -``` -cat < Date: Mon, 13 Nov 2023 18:28:20 +0200 Subject: [PATCH 4/5] Add REUSE GitHub workflow --- .github/workflows/reuse-license-linter.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/reuse-license-linter.yml diff --git a/.github/workflows/reuse-license-linter.yml b/.github/workflows/reuse-license-linter.yml new file mode 100644 index 0000000..21ef81f --- /dev/null +++ b/.github/workflows/reuse-license-linter.yml @@ -0,0 +1,19 @@ +# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. +# +# SPDX-License-Identifier: CC0-1.0 + +name: REUSE Compliance Check + +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v2 + - name: REUSE SPDX SBOM + uses: fsfe/reuse-action@v2 + with: + args: spdx \ No newline at end of file From 02061c6de7fd015c676675349199424696585de3 Mon Sep 17 00:00:00 2001 From: Jean du Plessis Date: Mon, 13 Nov 2023 18:42:48 +0200 Subject: [PATCH 5/5] Update CI actions --- .github/workflows/ci.yml | 116 +++++---------------------------------- 1 file changed, 13 insertions(+), 103 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a09e423..8d0e7c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ on: env: # Common versions - GO_VERSION: '1.19' - GOLANGCI_VERSION: 'v1.50.0' + GO_VERSION: '1.20' + GOLANGCI_VERSION: 'v1.55.2' DOCKER_BUILDX_VERSION: 'v0.8.2' # Common users. We can't run a step 'if secrets.XXX != ""' but we can run a @@ -43,7 +43,7 @@ jobs: if: needs.detect-noop.outputs.noop != 'true' steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@v4 with: submodules: true @@ -71,33 +71,15 @@ jobs: steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@v4 with: submodules: true - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} - - name: Find the Go Build Cache - id: go - run: echo "cache=$(make go.cachedir)" >> $GITHUB_OUTPUT - - - name: Cache the Go Build Cache - uses: actions/cache@v3 - with: - path: ${{ steps.go.outputs.cache }} - key: ${{ runner.os }}-build-lint-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-lint- - - - name: Cache Go Dependencies - uses: actions/cache@v3 - with: - path: .work/pkg - key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies run: make vendor vendor.check @@ -115,36 +97,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@v4 with: submodules: true - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} - name: Install goimports run: go install golang.org/x/tools/cmd/goimports - - name: Find the Go Build Cache - id: go - run: echo "cache=$(make go.cachedir)" >> $GITHUB_OUTPUT - - - name: Cache the Go Build Cache - uses: actions/cache@v3 - with: - path: ${{ steps.go.outputs.cache }} - key: ${{ runner.os }}-build-check-diff-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-check-diff- - - - name: Cache Go Dependencies - uses: actions/cache@v3 - with: - path: .work/pkg - key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies run: make vendor vendor.check @@ -158,7 +122,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@v4 with: submodules: true @@ -166,28 +130,10 @@ jobs: run: git fetch --prune --unshallow - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} - - name: Find the Go Build Cache - id: go - run: echo "cache=$(make go.cachedir)" >> $GITHUB_OUTPUT - - - name: Cache the Go Build Cache - uses: actions/cache@v3 - with: - path: ${{ steps.go.outputs.cache }} - key: ${{ runner.os }}-build-unit-tests-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-unit-tests- - - - name: Cache Go Dependencies - uses: actions/cache@v3 - with: - path: .work/pkg - key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies run: make vendor vendor.check @@ -207,7 +153,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@v4 with: submodules: true @@ -215,28 +161,10 @@ jobs: run: git fetch --prune --unshallow - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} - - name: Find the Go Build Cache - id: go - run: echo "cache=$(make go.cachedir)" >> $GITHUB_OUTPUT - - - name: Cache the Go Build Cache - uses: actions/cache@v3 - with: - path: ${{ steps.go.outputs.cache }} - key: ${{ runner.os }}-build-unit-tests-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-unit-tests- - - - name: Cache Go Dependencies - uses: actions/cache@v3 - with: - path: .work/pkg - key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies run: make vendor vendor.check @@ -269,7 +197,7 @@ jobs: password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }} - name: Checkout - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3 + uses: actions/checkout@v4 with: submodules: true @@ -277,28 +205,10 @@ jobs: run: git fetch --prune --unshallow - name: Setup Go - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} - - name: Find the Go Build Cache - id: go - run: echo "cache=$(make go.cachedir)" >> $GITHUB_OUTPUT - - - name: Cache the Go Build Cache - uses: actions/cache@v3 - with: - path: ${{ steps.go.outputs.cache }} - key: ${{ runner.os }}-build-publish-artifacts-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build-publish-artifacts- - - - name: Cache Go Dependencies - uses: actions/cache@v3 - with: - path: .work/pkg - key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-pkg- - - name: Vendor Dependencies run: make vendor vendor.check