diff --git a/.codecov.yml b/.codecov.yml index b2f95621..aea854d7 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 coverage: range: 50..80 round: down diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38b4c4ac..b8f22a2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,7 @@ jobs: ci: uses: xmidt-org/shared-go/.github/workflows/ci.yml@5bc4b83f25ff4c944cd6253ba189e50d1997ab3c # v4.1.0 with: - copyright-skip: true license-skip: true - style-skip: true release-type: program release-arch-arm64: false release-docker: true diff --git a/.github/workflows/dependabot-approver.yml b/.github/workflows/dependabot-approver.yml index 7781d8fe..00a3dcb5 100644 --- a/.github/workflows/dependabot-approver.yml +++ b/.github/workflows/dependabot-approver.yml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 --- name: 'Dependabot auto approval' diff --git a/.github/workflows/proj-xmidt-team.yml b/.github/workflows/proj-xmidt-team.yml index 941a028b..551fad49 100644 --- a/.github/workflows/proj-xmidt-team.yml +++ b/.github/workflows/proj-xmidt-team.yml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 --- name: 'PROJ: xmidt-team' diff --git a/.golangci.yaml b/.golangci.yaml index bbf39abb..b8c0cd61 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 --- linters-settings: misspell: diff --git a/.release/docker/entrypoint.sh b/.release/docker/entrypoint.sh index 1c263dcc..62fde94e 100755 --- a/.release/docker/entrypoint.sh +++ b/.release/docker/entrypoint.sh @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 #!/usr/bin/env sh set -e diff --git a/.release/docker/tr1d1um_spruce.yaml b/.release/docker/tr1d1um_spruce.yaml index eba9387a..ae5c04c7 100644 --- a/.release/docker/tr1d1um_spruce.yaml +++ b/.release/docker/tr1d1um_spruce.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 --- ######################################## diff --git a/.release/helm/tr1d1um/Chart.yaml b/.release/helm/tr1d1um/Chart.yaml index e7166ecd..c0b4ee08 100644 --- a/.release/helm/tr1d1um/Chart.yaml +++ b/.release/helm/tr1d1um/Chart.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 apiVersion: v2 name: tr1d1um description: A Helm chart to deploy tr1d1um to Kubernetes diff --git a/.release/helm/tr1d1um/templates/tr1d1um.yaml b/.release/helm/tr1d1um/templates/tr1d1um.yaml index 03744c97..f1ad418a 100644 --- a/.release/helm/tr1d1um/templates/tr1d1um.yaml +++ b/.release/helm/tr1d1um/templates/tr1d1um.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 apiVersion: v1 data: tr1d1um.yaml: | diff --git a/.release/helm/tr1d1um/values.yaml b/.release/helm/tr1d1um/values.yaml index a2d66e71..bb7a540b 100644 --- a/.release/helm/tr1d1um/values.yaml +++ b/.release/helm/tr1d1um/values.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 # Default values for xmitd-talaria. tr1d1um: diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 00000000..08fc2a39 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,53 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: tr1d1um +Upstream-Contact: John Bass +Source: https://github.com/xmidt-org/tr1d1um + +Files: NOTICE +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .gitignore +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .whitesource +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: CONTRIBUTING.md +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: MAINTAINERS.md +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: README.md +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: go.mod +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: go.sum +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: CHANGELOG.md +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .dockerignore +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .release/helm/tr1d1um/.helmignore +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: Makefile +Copyright: SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +License: Apache-2.0 + diff --git a/Dockerfile b/Dockerfile index 082e0006..882dd1b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 FROM docker.io/library/golang:1.19-alpine as builder WORKDIR /src diff --git a/Dockerfile.local b/Dockerfile.local index 4066a6ce..0810fd94 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 FROM docker.io/library/golang:1.19-alpine as builder ARG arm64 diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt new file mode 100644 index 00000000..137069b8 --- /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/auth.go b/auth.go index a67588d1..b8128a3b 100644 --- a/auth.go +++ b/auth.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/basculeLogging.go b/basculeLogging.go index 1cd413cf..57d4de96 100644 --- a/basculeLogging.go +++ b/basculeLogging.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/basculeLogging_test.go b/basculeLogging_test.go index 83cae615..91d75917 100644 --- a/basculeLogging_test.go +++ b/basculeLogging_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/go.mod b/go.mod index 36e1c6de..3086083d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/xmidt-org/tr1d1um -go 1.19 +go 1.21 require ( github.com/go-kit/kit v0.13.0 diff --git a/main.go b/main.go index e554c0af..5ed6b85e 100644 --- a/main.go +++ b/main.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/primaryHandler.go b/primaryHandler.go index f17eaf02..e5d3cbc6 100644 --- a/primaryHandler.go +++ b/primaryHandler.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/routes.go b/routes.go index aad05ca7..2b3f05c7 100644 --- a/routes.go +++ b/routes.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/setup.go b/setup.go index f6ef3df7..3025b7ea 100644 --- a/setup.go +++ b/setup.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main diff --git a/stat/endpoint.go b/stat/endpoint.go index 8f8e4ec6..bc7ebe39 100644 --- a/stat/endpoint.go +++ b/stat/endpoint.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/stat/endpoint_test.go b/stat/endpoint_test.go index c1c4c461..6cb93d12 100644 --- a/stat/endpoint_test.go +++ b/stat/endpoint_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/stat/mocks_test.go b/stat/mocks_test.go index 4ef8eec0..ebdbdaeb 100644 --- a/stat/mocks_test.go +++ b/stat/mocks_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/stat/service.go b/stat/service.go index 02de5595..5f9d3b0a 100644 --- a/stat/service.go +++ b/stat/service.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/stat/service_test.go b/stat/service_test.go index 6021850b..c194a846 100644 --- a/stat/service_test.go +++ b/stat/service_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/stat/transport.go b/stat/transport.go index 5cb8308e..fb77a768 100644 --- a/stat/transport.go +++ b/stat/transport.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/stat/transport_test.go b/stat/transport_test.go index 4017e676..04abbd85 100644 --- a/stat/transport_test.go +++ b/stat/transport_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package stat diff --git a/tr1d1um.yaml b/tr1d1um.yaml index 88d4f8e1..7026abcd 100644 --- a/tr1d1um.yaml +++ b/tr1d1um.yaml @@ -1,5 +1,6 @@ --- - +## SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 ######################################## # Labeling/Tracing via HTTP Headers Configuration ######################################## diff --git a/transaction/context.go b/transaction/context.go index c4980914..37218d07 100644 --- a/transaction/context.go +++ b/transaction/context.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package transaction diff --git a/transaction/errors.go b/transaction/errors.go index 10d44490..ed511681 100644 --- a/transaction/errors.go +++ b/transaction/errors.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package transaction diff --git a/transaction/errors_test.go b/transaction/errors_test.go index 52ba3433..e427dd7c 100644 --- a/transaction/errors_test.go +++ b/transaction/errors_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package transaction diff --git a/transaction/transactor.go b/transaction/transactor.go index 1683ae00..35d582c1 100644 --- a/transaction/transactor.go +++ b/transaction/transactor.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package transaction diff --git a/transaction/transactor_test.go b/transaction/transactor_test.go index 5373efcd..5d3c61da 100644 --- a/transaction/transactor_test.go +++ b/transaction/transactor_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package transaction diff --git a/translation/endpoint.go b/translation/endpoint.go index 52d8fe05..f3fc772a 100644 --- a/translation/endpoint.go +++ b/translation/endpoint.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/endpoint_test.go b/translation/endpoint_test.go index a8c623e7..ef5ebe29 100644 --- a/translation/endpoint_test.go +++ b/translation/endpoint_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/errors.go b/translation/errors.go index d156266e..7fd99122 100644 --- a/translation/errors.go +++ b/translation/errors.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/mocks_test.go b/translation/mocks_test.go index d9d2dac6..ad73749d 100644 --- a/translation/mocks_test.go +++ b/translation/mocks_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/service.go b/translation/service.go index 731ebce3..1462bb43 100644 --- a/translation/service.go +++ b/translation/service.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/service_test.go b/translation/service_test.go index dc70ee5c..22af2070 100644 --- a/translation/service_test.go +++ b/translation/service_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/transport.go b/translation/transport.go index a954efb6..9ebb1c74 100644 --- a/translation/transport.go +++ b/translation/transport.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/transport_test.go b/translation/transport_test.go index 45ebacfb..5e52e7f6 100644 --- a/translation/transport_test.go +++ b/translation/transport_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/transport_utils.go b/translation/transport_utils.go index 8bdbc277..7c3b75ff 100644 --- a/translation/transport_utils.go +++ b/translation/transport_utils.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/transport_utils_test.go b/translation/transport_utils_test.go index dec843d9..e6aa07ee 100644 --- a/translation/transport_utils_test.go +++ b/translation/transport_utils_test.go @@ -1,19 +1,5 @@ -/** - * Copyright 2021 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation diff --git a/translation/wdmp_type.go b/translation/wdmp_type.go index ca8187c2..6d9587d4 100644 --- a/translation/wdmp_type.go +++ b/translation/wdmp_type.go @@ -1,19 +1,5 @@ -/** - * Copyright 2022 Comcast Cable Communications Management, LLC - * - * 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. - * - */ +// SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package translation