fix oss (#15)

griffin · web-flow · commit d9d48ec742d8 · 2022-05-12T14:28:41.000-04:00
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2022 DataDog
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/cmd/ocitool/appendlayer_cmd.go b/cmd/ocitool/appendlayer_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/createlayer_cmd.go b/cmd/ocitool/createlayer_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/desc_helpers.go b/cmd/ocitool/desc_helpers.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/digest_cmd.go b/cmd/ocitool/digest_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/gen_cmd.go b/cmd/ocitool/gen_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/index_cmd.go b/cmd/ocitool/index_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/main.go b/cmd/ocitool/main.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/manifest_cmd.go b/cmd/ocitool/manifest_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/pull_cmd.go b/cmd/ocitool/pull_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/push_cmd.go b/cmd/ocitool/push_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/cmd/ocitool/pushblob_cmd.go b/cmd/ocitool/pushblob_cmd.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 import (
diff --git a/internal/flagutil/kv.go b/internal/flagutil/kv.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package flagutil
 
 import (
diff --git a/internal/set/string.go b/internal/set/string.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package set
 
 // String is a set of strings, used to check the existance of strings,
diff --git a/internal/tarutil/tarappend.go b/internal/tarutil/tarappend.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package tarutil
 
 import (
diff --git a/pkg/blob/blobindex.go b/pkg/blob/blobindex.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package blob
 
 import (
diff --git a/pkg/credhelper/docker.go b/pkg/credhelper/docker.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package credhelper
 
 import (
diff --git a/pkg/deb2layer/deb.go b/pkg/deb2layer/deb.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package deb2layer
 
 import (
diff --git a/pkg/deb2layer/deb_test.go b/pkg/deb2layer/deb_test.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package deb2layer
 
 import (
diff --git a/pkg/layer/append.go b/pkg/layer/append.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package layer
 
 import (
diff --git a/pkg/layer/appendlayeringester.go b/pkg/layer/appendlayeringester.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package layer
 
 import (
diff --git a/pkg/ociutil/bazel.go b/pkg/ociutil/bazel.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/desc.go b/pkg/ociutil/desc.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/diff.go b/pkg/ociutil/diff.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/fetch.go b/pkg/ociutil/fetch.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/fs.go b/pkg/ociutil/fs.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/handler.go b/pkg/ociutil/handler.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/image.go b/pkg/ociutil/image.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/json.go b/pkg/ociutil/json.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/layers.go b/pkg/ociutil/layers.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 // TODO use upstream defs when a new release is cut
diff --git a/pkg/ociutil/manifest.go b/pkg/ociutil/manifest.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/multiprovider.go b/pkg/ociutil/multiprovider.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/platforms.go b/pkg/ociutil/platforms.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/provider.go b/pkg/ociutil/provider.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 // This is copied from https://github.com/oras-project/oras-go/blob/v0.5.0/pkg/oras/provider.go
diff --git a/pkg/ociutil/push.go b/pkg/ociutil/push.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/repoing.go b/pkg/ociutil/repoing.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/split.go b/pkg/ociutil/split.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/tar.go b/pkg/ociutil/tar.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/pkg/ociutil/writer.go b/pkg/ociutil/writer.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package ociutil
 
 import (
diff --git a/release/doc_gen.go b/release/doc_gen.go
@@ -1,6 +1,14 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
+// XXX Copied from
+// https://github.com/bazelbuild/bazel-skylib/blob/main/gazelle/bzl/gazelle.go
+
+// Package bzl generates a `bzl_library` target for every `.bzl` file in
+// each package.
 //
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
+// The `bzl_library` rule is provided by
+// https://github.com/bazelbuild/bazel-skylib.
+//
+// This extension is experimental and subject to change. It is not included
+// in the default Gazelle binary.
 
 /* Copyright 2020 The Bazel Authors. All rights reserved.
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,17 +22,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// XXX Copied from
-// https://github.com/bazelbuild/bazel-skylib/blob/main/gazelle/bzl/gazelle.go
-
-// Package bzl generates a `bzl_library` target for every `.bzl` file in
-// each package.
-//
-// The `bzl_library` rule is provided by
-// https://github.com/bazelbuild/bazel-skylib.
-//
-// This extension is experimental and subject to change. It is not included
-// in the default Gazelle binary.
 package bzl
 
 import (
diff --git a/tests/go-multiarch-image/main.go b/tests/go-multiarch-image/main.go
@@ -1,7 +1,3 @@
-// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
-//
-// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
-
 package main
 
 func main() {
