From 7ba3f124ebc349533eb38624dadf6e101d3b053b Mon Sep 17 00:00:00 2001 From: Will Norris Date: Wed, 10 Mar 2021 12:24:13 -0800 Subject: [PATCH] cleanup license headers and contributing docs - switch to "project authors" style copyright. Instead of an AUTHORS file (https://opensource.google/docs/releasing/authors/), I just list Google as a major copyright holder in the README. - use SPDX style license headers in source files - remove CLA requirement from contributing docs --- README.md | 6 ++++-- cache.go | 15 ++------------- cache_test.go | 15 ++------------- cmd/imageproxy-sign/main.go | 3 +++ cmd/imageproxy-sign/main_test.go | 3 +++ cmd/imageproxy/main.go | 15 ++------------- data.go | 15 ++------------- data_test.go | 15 ++------------- docs/contributing.md | 13 ------------- imageproxy.go | 15 ++------------- imageproxy_test.go | 15 ++------------- internal/gcscache/gcscache.go | 3 +++ internal/s3cache/s3cache.go | 3 +++ metrics.go | 3 +++ transform.go | 15 ++------------- transform_test.go | 15 ++------------- 16 files changed, 37 insertions(+), 132 deletions(-) diff --git a/README.md b/README.md index 1c4fdc6..0d242b3 100644 --- a/README.md +++ b/README.md @@ -380,5 +380,7 @@ to alter the precedence order by setting: ## License ## -imageproxy is copyright Google, but is not an official Google product. It is -available under the [Apache 2.0 License](./LICENSE). +imageproxy is copyright its respective authors. All of my personal work on +imageproxy through 2020 (which accounts for the majority of the code) is +copyright Google, my employer at the time. It is available under the [Apache +2.0 License](./LICENSE). diff --git a/cache.go b/cache.go index d38d9ce..38ed267 100644 --- a/cache.go +++ b/cache.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy diff --git a/cache_test.go b/cache_test.go index 2d01d66..e6265fa 100644 --- a/cache_test.go +++ b/cache_test.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy diff --git a/cmd/imageproxy-sign/main.go b/cmd/imageproxy-sign/main.go index 63ce144..5024b20 100644 --- a/cmd/imageproxy-sign/main.go +++ b/cmd/imageproxy-sign/main.go @@ -1,3 +1,6 @@ +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 + // The imageproxy-sign tool creates signature values for a provided URL and // signing key. package main diff --git a/cmd/imageproxy-sign/main_test.go b/cmd/imageproxy-sign/main_test.go index d9a6df6..5c9fbe1 100644 --- a/cmd/imageproxy-sign/main_test.go +++ b/cmd/imageproxy-sign/main_test.go @@ -1,3 +1,6 @@ +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 + package main import ( diff --git a/cmd/imageproxy/main.go b/cmd/imageproxy/main.go index 25e6278..a6e63d6 100644 --- a/cmd/imageproxy/main.go +++ b/cmd/imageproxy/main.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 // imageproxy starts an HTTP server that proxies requests for remote images. package main diff --git a/data.go b/data.go index 83c8e5e..5df4a69 100644 --- a/data.go +++ b/data.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy diff --git a/data_test.go b/data_test.go index 7c75753..80d3c3d 100644 --- a/data_test.go +++ b/data_test.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy diff --git a/docs/contributing.md b/docs/contributing.md index c4240e7..bc7f7c5 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -27,16 +27,3 @@ Go code should follow general best practices, such as using go fmt, go lint, and go vet (this is enforced by our continuous integration setup). Tests should always be included where possible, especially for bug fixes in order to prevent regressions. - -## Contributor License Agreement - -Even though this is effectively a personal project of mine, it is still governed -by Google's Contributor License Agreement because of my employment there. You -(or your employer) retain the copyright to your contribution; the CLA simply -gives permission to use and redistribute your contributions as part of the -project. Head over to to see your current -agreements on file or to sign a new one. - -You generally only need to submit a CLA once, so if you've already submitted one -(even if it was for a different Google project), you probably don't need to do -it again. diff --git a/imageproxy.go b/imageproxy.go index 0a363b8..8a37a56 100644 --- a/imageproxy.go +++ b/imageproxy.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 // Package imageproxy provides an image proxy server. For typical use of // creating and using a Proxy, see cmd/imageproxy/main.go. diff --git a/imageproxy_test.go b/imageproxy_test.go index 7afc381..c2d4b82 100644 --- a/imageproxy_test.go +++ b/imageproxy_test.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy diff --git a/internal/gcscache/gcscache.go b/internal/gcscache/gcscache.go index 6e9eb25..6eda139 100644 --- a/internal/gcscache/gcscache.go +++ b/internal/gcscache/gcscache.go @@ -1,3 +1,6 @@ +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 + // Package gcscache provides an httpcache.Cache implementation that stores // cached values on Google Cloud Storage. package gcscache diff --git a/internal/s3cache/s3cache.go b/internal/s3cache/s3cache.go index 25213b2..abfd28a 100644 --- a/internal/s3cache/s3cache.go +++ b/internal/s3cache/s3cache.go @@ -1,3 +1,6 @@ +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 + // Package s3cache provides an httpcache.Cache implementation that stores // cached values on Amazon S3. package s3cache diff --git a/metrics.go b/metrics.go index e2d870a..0466ac0 100644 --- a/metrics.go +++ b/metrics.go @@ -1,3 +1,6 @@ +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 + package imageproxy import ( diff --git a/transform.go b/transform.go index ed772e0..103e20f 100644 --- a/transform.go +++ b/transform.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy diff --git a/transform_test.go b/transform_test.go index 260e4a6..b22afab 100644 --- a/transform_test.go +++ b/transform_test.go @@ -1,16 +1,5 @@ -// Copyright 2013 Google LLC. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright 2013 The imageproxy authors. +// SPDX-License-Identifier: Apache-2.0 package imageproxy