diff --git a/.codecov.yml b/.codecov.yml index 0a852e8..6e5dd8d 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2017 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 559dbf3..825d6ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: ci: uses: xmidt-org/shared-go/.github/workflows/ci.yml@5bc4b83f25ff4c944cd6253ba189e50d1997ab3c # v4.1.0 with: - copyright-skip: true release-type: program release-docker: true release-docker-latest: true diff --git a/.github/workflows/dependabot-approver.yml b/.github/workflows/dependabot-approver.yml index 7781d8f..073a930 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 941a028..1ccd4ed 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 7b0ca66..5a2eba2 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 --- linters: enable: diff --git a/.release/docker/entrypoint.sh b/.release/docker/entrypoint.sh index 47be98e..991a1fc 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/themis_spruce.yaml b/.release/docker/themis_spruce.yaml index 1920b6b..8a17afc 100644 --- a/.release/docker/themis_spruce.yaml +++ b/.release/docker/themis_spruce.yaml @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +# SPDX-License-Identifier: Apache-2.0 --- # The unique fully-qualified-domain-name of the server. It is provided to # the X-Scytale-Server header for showing what server fulfilled the request diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..8d2b7f9 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,60 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: themis +Upstream-Contact: John Bass +Source: https://github.com/xmidt-org/themis + +Files: NOTICE +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .gitignore +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .whitesource +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: CONTRIBUTING.md +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: MAINTAINERS.md +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: README.md +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: go.mod +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: go.sum +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: CHANGELOG.md +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .dockerignore +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: cpuprofile +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: .release/helm/themis/.helmignore +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: key/test.pkcs1.pem +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 + +Files: key/test.pkcs8.pem +Copyright: SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +License: Apache-2.0 diff --git a/Dockerfile b/Dockerfile index 6e816cd..158dad7 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/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/Makefile b/Makefile index 94f278a..6ca0079 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2022 Comcast Cable Communications Management, LLC +# SPDX-License-Identifier: Apache-2.0 .PHONY: default build test style docker binaries clean diff --git a/client.go b/client.go index 462fefb..2b698f7 100644 --- a/client.go +++ b/client.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main import ( diff --git a/config/commandLine.go b/config/commandLine.go index 9551c11..7d5d0e6 100644 --- a/config/commandLine.go +++ b/config/commandLine.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package config import ( diff --git a/config/doc.go b/config/doc.go index a98d535..f22a1fe 100644 --- a/config/doc.go +++ b/config/doc.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 // Package config supplies a simple workflow for initializing an uber/fx App instance with spf13/pflag, spf13/viper, and any // other components that need to be initialized prior to any uber/fx providers running. Additionally, this package provides // simpler providers for use by applications that do not need this more complex workflow. diff --git a/config/unmarshaller.go b/config/unmarshaller.go index 6b6473d..ada08fe 100644 --- a/config/unmarshaller.go +++ b/config/unmarshaller.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package config import ( diff --git a/config/viper.go b/config/viper.go index e6ee98c..50d34bd 100644 --- a/config/viper.go +++ b/config/viper.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package config import ( diff --git a/devMode.go b/devMode.go index 8230221..36abd2a 100644 --- a/devMode.go +++ b/devMode.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main const ( diff --git a/go.mod b/go.mod index 59491ad..642e3ca 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/xmidt-org/themis -go 1.19 +go 1.21 require ( github.com/InVisionApp/go-health v2.1.0+incompatible diff --git a/key/endpoint.go b/key/endpoint.go index c4c38c6..44c6302 100644 --- a/key/endpoint.go +++ b/key/endpoint.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/endpoint_test.go b/key/endpoint_test.go index 040eb15..7f7faa1 100644 --- a/key/endpoint_test.go +++ b/key/endpoint_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/handler.go b/key/handler.go index 2794f25..a71b883 100644 --- a/key/handler.go +++ b/key/handler.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/handler_test.go b/key/handler_test.go index 04633b4..e405596 100644 --- a/key/handler_test.go +++ b/key/handler_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/pair.go b/key/pair.go index f16869b..32b4c1a 100644 --- a/key/pair.go +++ b/key/pair.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/pair_test.go b/key/pair_test.go index a937c39..a9fbb8f 100644 --- a/key/pair_test.go +++ b/key/pair_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/provide.go b/key/provide.go index e34df6c..ff1b1fa 100644 --- a/key/provide.go +++ b/key/provide.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/provide_test.go b/key/provide_test.go index 806661d..9dcda28 100644 --- a/key/provide_test.go +++ b/key/provide_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/registry.go b/key/registry.go index 9098eb2..aacc5a9 100644 --- a/key/registry.go +++ b/key/registry.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( diff --git a/key/registry_test.go b/key/registry_test.go index 654c757..f50d585 100644 --- a/key/registry_test.go +++ b/key/registry_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package key import ( @@ -74,12 +76,12 @@ func TestRegistry(t *testing.T) { t.Run("Register", func(t *testing.T) { t.Run("ValidDescriptor", func(t *testing.T) { testData := []Descriptor{ - Descriptor{Kid: "test"}, - Descriptor{Kid: "test", Type: "rsa"}, - Descriptor{Kid: "test", Type: "rsa", File: "test.pkcs1.pem"}, - Descriptor{Kid: "test", Type: "rsa", File: "test.pkcs8.pem"}, - Descriptor{Kid: "test", Type: "ecdsa"}, - Descriptor{Kid: "test", Type: "secret"}, + {Kid: "test"}, + {Kid: "test", Type: "rsa"}, + {Kid: "test", Type: "rsa", File: "test.pkcs1.pem"}, + {Kid: "test", Type: "rsa", File: "test.pkcs8.pem"}, + {Kid: "test", Type: "ecdsa"}, + {Kid: "test", Type: "secret"}, } for i, d := range testData { @@ -91,8 +93,8 @@ func TestRegistry(t *testing.T) { t.Run("InvalidDescriptor", func(t *testing.T) { testData := []Descriptor{ - Descriptor{File: "nosuch"}, - Descriptor{Type: "not a valid key type"}, + {File: "nosuch"}, + {Type: "not a valid key type"}, } for i, d := range testData { diff --git a/main.go b/main.go index efcf099..bceb234 100644 --- a/main.go +++ b/main.go @@ -1,17 +1,5 @@ -// Copyright 2019 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: 2019 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main import ( diff --git a/metrics.go b/metrics.go index babaec5..841384b 100644 --- a/metrics.go +++ b/metrics.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main import ( diff --git a/random/noncer.go b/random/noncer.go index 4ce739c..3c0bccb 100644 --- a/random/noncer.go +++ b/random/noncer.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package random import ( diff --git a/random/noncer_test.go b/random/noncer_test.go index 80c327f..4c0615c 100644 --- a/random/noncer_test.go +++ b/random/noncer_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package random import ( diff --git a/random/provide.go b/random/provide.go index 75bfbbb..a7c5937 100644 --- a/random/provide.go +++ b/random/provide.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package random import ( diff --git a/random/provide_test.go b/random/provide_test.go index 8b09d63..8c62ac8 100644 --- a/random/provide_test.go +++ b/random/provide_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package random import ( diff --git a/random/randomtest/noncer.go b/random/randomtest/noncer.go index e907c8f..23c1973 100644 --- a/random/randomtest/noncer.go +++ b/random/randomtest/noncer.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package randomtest import ( diff --git a/routes.go b/routes.go index b21009a..788bd2c 100644 --- a/routes.go +++ b/routes.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main import ( diff --git a/routes_test.go b/routes_test.go index 54a5b86..c774d78 100644 --- a/routes_test.go +++ b/routes_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package main import ( diff --git a/themis.yaml b/themis.yaml index b6366b4..254e88d 100644 --- a/themis.yaml +++ b/themis.yaml @@ -1,3 +1,5 @@ +## SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +## SPDX-License-Identifier: Apache-2.0 servers: key: address: :6500 diff --git a/token/claimBuilder.go b/token/claimBuilder.go index 5d9ab4d..e7beb58 100644 --- a/token/claimBuilder.go +++ b/token/claimBuilder.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/claimBuilder_test.go b/token/claimBuilder_test.go index cb23342..eb363b8 100644 --- a/token/claimBuilder_test.go +++ b/token/claimBuilder_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/endpoint.go b/token/endpoint.go index 450219d..06895ad 100644 --- a/token/endpoint.go +++ b/token/endpoint.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/endpoint_test.go b/token/endpoint_test.go index 1bcd3cc..d21164f 100644 --- a/token/endpoint_test.go +++ b/token/endpoint_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/errors.go b/token/errors.go index 99bb3d8..a32818a 100644 --- a/token/errors.go +++ b/token/errors.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: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token type httpError struct { diff --git a/token/factory.go b/token/factory.go index ffcdd57..6d7c47d 100644 --- a/token/factory.go +++ b/token/factory.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/factory_test.go b/token/factory_test.go index 44df2d6..56b6851 100644 --- a/token/factory_test.go +++ b/token/factory_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/handler.go b/token/handler.go index 39df6b5..cf4b14b 100644 --- a/token/handler.go +++ b/token/handler.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/handler_test.go b/token/handler_test.go index b161c85..5f452c4 100644 --- a/token/handler_test.go +++ b/token/handler_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/mocks_test.go b/token/mocks_test.go index 0e97f86..0968ad2 100644 --- a/token/mocks_test.go +++ b/token/mocks_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/options.go b/token/options.go index 0922e06..01ac2d0 100644 --- a/token/options.go +++ b/token/options.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/transport.go b/token/transport.go index 8f78def..7e0a944 100644 --- a/token/transport.go +++ b/token/transport.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/transport_test.go b/token/transport_test.go index 7c76ddc..8083ec1 100644 --- a/token/transport_test.go +++ b/token/transport_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/unmarshal.go b/token/unmarshal.go index 42ab25a..93b622f 100644 --- a/token/unmarshal.go +++ b/token/unmarshal.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/token/unmarshal_test.go b/token/unmarshal_test.go index edc67a1..9a66dc2 100644 --- a/token/unmarshal_test.go +++ b/token/unmarshal_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package token import ( diff --git a/xhealth/checks.go b/xhealth/checks.go index f77e548..364d993 100644 --- a/xhealth/checks.go +++ b/xhealth/checks.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhealth import ( diff --git a/xhealth/handler.go b/xhealth/handler.go index ac7c8de..3ba0244 100644 --- a/xhealth/handler.go +++ b/xhealth/handler.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhealth import ( diff --git a/xhealth/health.go b/xhealth/health.go index e2901f3..2497735 100644 --- a/xhealth/health.go +++ b/xhealth/health.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhealth import ( diff --git a/xhealth/log.go b/xhealth/log.go index 3991a63..225b76b 100644 --- a/xhealth/log.go +++ b/xhealth/log.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhealth import ( diff --git a/xhealth/unmarshal.go b/xhealth/unmarshal.go index b7f96ad..8e45e49 100644 --- a/xhealth/unmarshal.go +++ b/xhealth/unmarshal.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhealth import ( diff --git a/xhttp/headers.go b/xhttp/headers.go index 6951057..75f6174 100644 --- a/xhttp/headers.go +++ b/xhttp/headers.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttp import "net/http" diff --git a/xhttp/headers_test.go b/xhttp/headers_test.go index 9cb7258..f04bdeb 100644 --- a/xhttp/headers_test.go +++ b/xhttp/headers_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttp import ( diff --git a/xhttp/xhttpclient/client.go b/xhttp/xhttpclient/client.go index 1353497..641286e 100644 --- a/xhttp/xhttpclient/client.go +++ b/xhttp/xhttpclient/client.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/client_test.go b/xhttp/xhttpclient/client_test.go index b5e1555..4539a30 100644 --- a/xhttp/xhttpclient/client_test.go +++ b/xhttp/xhttpclient/client_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/constructor.go b/xhttp/xhttpclient/constructor.go index 49a087b..b8044fb 100644 --- a/xhttp/xhttpclient/constructor.go +++ b/xhttp/xhttpclient/constructor.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/constructor_test.go b/xhttp/xhttpclient/constructor_test.go index d9021cd..d55d2b2 100644 --- a/xhttp/xhttpclient/constructor_test.go +++ b/xhttp/xhttpclient/constructor_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/mocks_test.go b/xhttp/xhttpclient/mocks_test.go index 9f0b77c..d22faa6 100644 --- a/xhttp/xhttpclient/mocks_test.go +++ b/xhttp/xhttpclient/mocks_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/requestHeaders.go b/xhttp/xhttpclient/requestHeaders.go index 33ffd33..b8ed0c2 100644 --- a/xhttp/xhttpclient/requestHeaders.go +++ b/xhttp/xhttpclient/requestHeaders.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/requestHeaders_test.go b/xhttp/xhttpclient/requestHeaders_test.go index aa2c8e4..147ed5e 100644 --- a/xhttp/xhttpclient/requestHeaders_test.go +++ b/xhttp/xhttpclient/requestHeaders_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( @@ -73,14 +75,14 @@ func testRequestHeadersThenFunc(t *testing.T, requestHeaders RequestHeaders) { func TestRequestHeaders(t *testing.T) { testData := []RequestHeaders{ - RequestHeaders{}, - RequestHeaders{ + {}, + { Header: http.Header{}, }, - RequestHeaders{Header: http.Header{ + {Header: http.Header{ "x-test": []string{"value"}, }}, - RequestHeaders{Header: http.Header{ + {Header: http.Header{ "X-Single": []string{"value"}, "x-douBLe": []string{"value1", "value2"}, }}, diff --git a/xhttp/xhttpclient/unmarshal.go b/xhttp/xhttpclient/unmarshal.go index e4e026c..bf1cdec 100644 --- a/xhttp/xhttpclient/unmarshal.go +++ b/xhttp/xhttpclient/unmarshal.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpclient/unmarshal_test.go b/xhttp/xhttpclient/unmarshal_test.go index 6ceca9b..eade4ba 100644 --- a/xhttp/xhttpclient/unmarshal_test.go +++ b/xhttp/xhttpclient/unmarshal_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpclient import ( diff --git a/xhttp/xhttpserver/busy.go b/xhttp/xhttpserver/busy.go index 5623ba7..c6b4189 100644 --- a/xhttp/xhttpserver/busy.go +++ b/xhttp/xhttpserver/busy.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/busy_test.go b/xhttp/xhttpserver/busy_test.go index 1d97e4f..d11a5b6 100644 --- a/xhttp/xhttpserver/busy_test.go +++ b/xhttp/xhttpserver/busy_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/cert_test.go b/xhttp/xhttpserver/cert_test.go index c1d1308..e5cd5d3 100644 --- a/xhttp/xhttpserver/cert_test.go +++ b/xhttp/xhttpserver/cert_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/constant.go b/xhttp/xhttpserver/constant.go index 1e12e1c..6fee6f3 100644 --- a/xhttp/xhttpserver/constant.go +++ b/xhttp/xhttpserver/constant.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/constant_test.go b/xhttp/xhttpserver/constant_test.go index 86ef8b1..9b3b910 100644 --- a/xhttp/xhttpserver/constant_test.go +++ b/xhttp/xhttpserver/constant_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/errors.go b/xhttp/xhttpserver/errors.go index 85e0945..efa62d3 100644 --- a/xhttp/xhttpserver/errors.go +++ b/xhttp/xhttpserver/errors.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/errors_test.go b/xhttp/xhttpserver/errors_test.go index 405ffcb..b33f74b 100644 --- a/xhttp/xhttpserver/errors_test.go +++ b/xhttp/xhttpserver/errors_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/lifecycle.go b/xhttp/xhttpserver/lifecycle.go index 41edd95..19f245e 100644 --- a/xhttp/xhttpserver/lifecycle.go +++ b/xhttp/xhttpserver/lifecycle.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/lifecycle_test.go b/xhttp/xhttpserver/lifecycle_test.go index 18e72e5..7f8319d 100644 --- a/xhttp/xhttpserver/lifecycle_test.go +++ b/xhttp/xhttpserver/lifecycle_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/listener.go b/xhttp/xhttpserver/listener.go index 91f1589..a753420 100644 --- a/xhttp/xhttpserver/listener.go +++ b/xhttp/xhttpserver/listener.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/listener_test.go b/xhttp/xhttpserver/listener_test.go index a0b9eca..57d4ce2 100644 --- a/xhttp/xhttpserver/listener_test.go +++ b/xhttp/xhttpserver/listener_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/log.go b/xhttp/xhttpserver/log.go index 67ed229..24008be 100644 --- a/xhttp/xhttpserver/log.go +++ b/xhttp/xhttpserver/log.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver const ( diff --git a/xhttp/xhttpserver/log_test.go b/xhttp/xhttpserver/log_test.go index 2d6ec73..629454e 100644 --- a/xhttp/xhttpserver/log_test.go +++ b/xhttp/xhttpserver/log_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/mocks_test.go b/xhttp/xhttpserver/mocks_test.go index 1fb93a4..d967035 100644 --- a/xhttp/xhttpserver/mocks_test.go +++ b/xhttp/xhttpserver/mocks_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/pprof/doc.go b/xhttp/xhttpserver/pprof/doc.go index 982b559..35bb78f 100644 --- a/xhttp/xhttpserver/pprof/doc.go +++ b/xhttp/xhttpserver/pprof/doc.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 // Package pprof exposes simple integrations between net/http/pprof, gorilla/mux, and uber/fx. // This has to be in its own package to avoid side effects from importing net/http/pprof in the // cases where a client does not want pprof. diff --git a/xhttp/xhttpserver/pprof/pprof.go b/xhttp/xhttpserver/pprof/pprof.go index 312fbfe..080c60e 100644 --- a/xhttp/xhttpserver/pprof/pprof.go +++ b/xhttp/xhttpserver/pprof/pprof.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package pprof import ( diff --git a/xhttp/xhttpserver/responseHeaders.go b/xhttp/xhttpserver/responseHeaders.go index a5dac46..694abae 100644 --- a/xhttp/xhttpserver/responseHeaders.go +++ b/xhttp/xhttpserver/responseHeaders.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/responseHeaders_test.go b/xhttp/xhttpserver/responseHeaders_test.go index 531a647..92ea672 100644 --- a/xhttp/xhttpserver/responseHeaders_test.go +++ b/xhttp/xhttpserver/responseHeaders_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( @@ -64,14 +66,14 @@ func testResponseHeadersThenFunc(t *testing.T, responseHeaders ResponseHeaders) func TestResponseHeaders(t *testing.T) { testData := []ResponseHeaders{ - ResponseHeaders{}, - ResponseHeaders{ + {}, + { Header: http.Header{}, }, - ResponseHeaders{Header: http.Header{ + {Header: http.Header{ "x-test": []string{"value"}, }}, - ResponseHeaders{Header: http.Header{ + {Header: http.Header{ "X-Single": []string{"value"}, "x-douBLe": []string{"value1", "value2"}, }}, diff --git a/xhttp/xhttpserver/server.go b/xhttp/xhttpserver/server.go index 86dde90..ca5a3aa 100644 --- a/xhttp/xhttpserver/server.go +++ b/xhttp/xhttpserver/server.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/server_test.go b/xhttp/xhttpserver/server_test.go index 9176bd6..f893e72 100644 --- a/xhttp/xhttpserver/server_test.go +++ b/xhttp/xhttpserver/server_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/tls.go b/xhttp/xhttpserver/tls.go index c9327ba..7c022c3 100644 --- a/xhttp/xhttpserver/tls.go +++ b/xhttp/xhttpserver/tls.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/tls_test.go b/xhttp/xhttpserver/tls_test.go index 0150468..051cc5d 100644 --- a/xhttp/xhttpserver/tls_test.go +++ b/xhttp/xhttpserver/tls_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/trackingWriter.go b/xhttp/xhttpserver/trackingWriter.go index e8cfc87..a4688cc 100644 --- a/xhttp/xhttpserver/trackingWriter.go +++ b/xhttp/xhttpserver/trackingWriter.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/trackingWriter_test.go b/xhttp/xhttpserver/trackingWriter_test.go index a2c6901..1fadc00 100644 --- a/xhttp/xhttpserver/trackingWriter_test.go +++ b/xhttp/xhttpserver/trackingWriter_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/unmarshal.go b/xhttp/xhttpserver/unmarshal.go index e6d278d..c22287e 100644 --- a/xhttp/xhttpserver/unmarshal.go +++ b/xhttp/xhttpserver/unmarshal.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xhttp/xhttpserver/unmarshal_test.go b/xhttp/xhttpserver/unmarshal_test.go index c5b0d98..0ec6c86 100644 --- a/xhttp/xhttpserver/unmarshal_test.go +++ b/xhttp/xhttpserver/unmarshal_test.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xhttpserver import ( diff --git a/xmetrics/labels.go b/xmetrics/labels.go index aca4037..dc3a359 100644 --- a/xmetrics/labels.go +++ b/xmetrics/labels.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetrics import ( diff --git a/xmetrics/provide.go b/xmetrics/provide.go index 4235489..fb46a3e 100644 --- a/xmetrics/provide.go +++ b/xmetrics/provide.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetrics import ( diff --git a/xmetrics/registry.go b/xmetrics/registry.go index 7a550c6..3a86a77 100644 --- a/xmetrics/registry.go +++ b/xmetrics/registry.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetrics import ( diff --git a/xmetrics/unmarshal.go b/xmetrics/unmarshal.go index 02d4183..cd8a4b1 100644 --- a/xmetrics/unmarshal.go +++ b/xmetrics/unmarshal.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetrics import ( diff --git a/xmetrics/xmetricshttp/handler.go b/xmetrics/xmetricshttp/handler.go index 7b2b5b6..ddf24b0 100644 --- a/xmetrics/xmetricshttp/handler.go +++ b/xmetrics/xmetricshttp/handler.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetricshttp import ( diff --git a/xmetrics/xmetricshttp/instrument.go b/xmetrics/xmetricshttp/instrument.go index c5eeb70..09f68f2 100644 --- a/xmetrics/xmetricshttp/instrument.go +++ b/xmetrics/xmetricshttp/instrument.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetricshttp import ( diff --git a/xmetrics/xmetricshttp/labeller.go b/xmetrics/xmetricshttp/labeller.go index 372252f..3a446f4 100644 --- a/xmetrics/xmetricshttp/labeller.go +++ b/xmetrics/xmetricshttp/labeller.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetricshttp import ( diff --git a/xmetrics/xmetricshttp/provide.go b/xmetrics/xmetricshttp/provide.go index 9ffe78d..0e4990e 100644 --- a/xmetrics/xmetricshttp/provide.go +++ b/xmetrics/xmetricshttp/provide.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetricshttp import ( diff --git a/xmetrics/xmetricshttp/unmarshal.go b/xmetrics/xmetricshttp/unmarshal.go index bc46443..cfd05a3 100644 --- a/xmetrics/xmetricshttp/unmarshal.go +++ b/xmetrics/xmetricshttp/unmarshal.go @@ -1,3 +1,5 @@ +// SPDX-FileCopyrightText: 2017 Comcast Cable Communications Management, LLC +// SPDX-License-Identifier: Apache-2.0 package xmetricshttp import (