From 8f7ea14e79645326bba931393258a86d56cb0652 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Fri, 3 May 2024 17:16:07 +0000 Subject: [PATCH] Use set and forget copyrights This change updates the Amazon developed open source code to switch to dateless copyrights. This removes the time and headache for updating the dates each year as the relevant code changes. Signed-off-by: Austin Vazquez --- Dockerfile | 2 +- Makefile | 2 +- NOTICE | 2 +- docs/docker-credential-ecr-login.1 | 4 ++-- ecr-login/api/client.go | 2 +- ecr-login/api/client_test.go | 4 ++-- ecr-login/api/factory.go | 2 +- ecr-login/api/mocks/api_mocks.go | 2 +- ecr-login/cache/build.go | 2 +- ecr-login/cache/build_test.go | 2 +- ecr-login/cache/credentials.go | 2 +- ecr-login/cache/credentials_test.go | 2 +- ecr-login/cache/file.go | 2 +- ecr-login/cache/file_test.go | 2 +- ecr-login/cache/mocks/cache_mocks.go | 2 +- ecr-login/cache/null.go | 2 +- ecr-login/cache/null_test.go | 2 +- ecr-login/cli/docker-credential-ecr-login/main.go | 2 +- ecr-login/config/cache_dir.go | 2 +- ecr-login/config/log.go | 2 +- ecr-login/ecr.go | 2 +- ecr-login/ecr_test.go | 2 +- ecr-login/mocks/ecr_mocks.go | 2 +- scripts/build_binary.sh | 2 +- scripts/build_variant.sh | 2 +- scripts/container_init.sh | 2 +- scripts/gogenerate | 2 +- scripts/hack/codepipeline-git-commit.sh | 2 +- scripts/hack/codepipeline-source-archive.sh | 2 +- scripts/hack/symlink-gopath-codebuild.sh | 2 +- scripts/hack/version-changelog.sh | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd0d4f67..87795ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of diff --git a/Makefile b/Makefile index fac7fb3a..860a3502 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of diff --git a/NOTICE b/NOTICE index 69b73161..a417cd80 100644 --- a/NOTICE +++ b/NOTICE @@ -1,2 +1,2 @@ Amazon ECR Credential Helper -Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. \ No newline at end of file +Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/docs/docker-credential-ecr-login.1 b/docs/docker-credential-ecr-login.1 index 16547e97..be2c8f3a 100644 --- a/docs/docker-credential-ecr-login.1 +++ b/docs/docker-credential-ecr-login.1 @@ -1,4 +1,4 @@ -.\" Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. +.\" Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. .\" .\" Licensed under the Apache License, Version 2.0 (the .\" "License"). You may not use this file except in compliance @@ -111,7 +111,7 @@ user may encounter permission issues described here: https://github.com/kubernetes-sigs/external-dns/pull/1185. You may be able to work around this bug by adjusting the Kubernetes \fIsecurityContext\fP. .SH COPYRIGHT -Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All rights reserved. +Copyright Amazon.com, Inc. or its affiliates. All rights reserved. .SH LICENSE Licensed under the Apache License, version 2.0. diff --git a/ecr-login/api/client.go b/ecr-login/api/client.go index eb49fc87..bdf65ccd 100644 --- a/ecr-login/api/client.go +++ b/ecr-login/api/client.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/api/client_test.go b/ecr-login/api/client_test.go index 6e8c4a04..dec5db54 100644 --- a/ecr-login/api/client_test.go +++ b/ecr-login/api/client_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the @@ -69,7 +69,7 @@ func TestExtractRegistry(t *testing.T) { Service: ServiceECR, }, hasError: false, - }, { + }, { serverURL: "210987654321.dkr.ecr.us-iso-east-1.c2s.ic.gov", registry: &Registry{ ID: "210987654321", diff --git a/ecr-login/api/factory.go b/ecr-login/api/factory.go index 110a6c3b..58626d4e 100644 --- a/ecr-login/api/factory.go +++ b/ecr-login/api/factory.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/api/mocks/api_mocks.go b/ecr-login/api/mocks/api_mocks.go index 832dc90f..5162b75b 100644 --- a/ecr-login/api/mocks/api_mocks.go +++ b/ecr-login/api/mocks/api_mocks.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/build.go b/ecr-login/cache/build.go index 8aa21287..8647378c 100644 --- a/ecr-login/cache/build.go +++ b/ecr-login/cache/build.go @@ -1,4 +1,4 @@ -// Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/build_test.go b/ecr-login/cache/build_test.go index bcdcd1ab..276f5ec2 100644 --- a/ecr-login/cache/build_test.go +++ b/ecr-login/cache/build_test.go @@ -1,4 +1,4 @@ -// Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/credentials.go b/ecr-login/cache/credentials.go index 0b74c0f3..90568777 100644 --- a/ecr-login/cache/credentials.go +++ b/ecr-login/cache/credentials.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/credentials_test.go b/ecr-login/cache/credentials_test.go index 02336cbb..adf422de 100644 --- a/ecr-login/cache/credentials_test.go +++ b/ecr-login/cache/credentials_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/file.go b/ecr-login/cache/file.go index 19dc33bb..81fcf0f2 100644 --- a/ecr-login/cache/file.go +++ b/ecr-login/cache/file.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/file_test.go b/ecr-login/cache/file_test.go index 7b7d8b7f..5cf8f5c1 100644 --- a/ecr-login/cache/file_test.go +++ b/ecr-login/cache/file_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/mocks/cache_mocks.go b/ecr-login/cache/mocks/cache_mocks.go index 744a150a..6ee44a38 100644 --- a/ecr-login/cache/mocks/cache_mocks.go +++ b/ecr-login/cache/mocks/cache_mocks.go @@ -1,4 +1,4 @@ -// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/null.go b/ecr-login/cache/null.go index 64a7212b..7ea633bc 100644 --- a/ecr-login/cache/null.go +++ b/ecr-login/cache/null.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cache/null_test.go b/ecr-login/cache/null_test.go index 80ef405a..c6e7ed2c 100644 --- a/ecr-login/cache/null_test.go +++ b/ecr-login/cache/null_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/cli/docker-credential-ecr-login/main.go b/ecr-login/cli/docker-credential-ecr-login/main.go index e4c7861a..8b3f2dbf 100644 --- a/ecr-login/cli/docker-credential-ecr-login/main.go +++ b/ecr-login/cli/docker-credential-ecr-login/main.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/config/cache_dir.go b/ecr-login/config/cache_dir.go index d7c2ee64..8bad1845 100644 --- a/ecr-login/config/cache_dir.go +++ b/ecr-login/config/cache_dir.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/config/log.go b/ecr-login/config/log.go index 771611ba..e4c0b5b2 100644 --- a/ecr-login/config/log.go +++ b/ecr-login/config/log.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/ecr.go b/ecr-login/ecr.go index 461e3090..987713e9 100644 --- a/ecr-login/ecr.go +++ b/ecr-login/ecr.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/ecr_test.go b/ecr-login/ecr_test.go index e7365065..d9bb9223 100644 --- a/ecr-login/ecr_test.go +++ b/ecr-login/ecr_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/ecr-login/mocks/ecr_mocks.go b/ecr-login/mocks/ecr_mocks.go index ea074a69..f1014728 100644 --- a/ecr-login/mocks/ecr_mocks.go +++ b/ecr-login/mocks/ecr_mocks.go @@ -1,4 +1,4 @@ -// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/scripts/build_binary.sh b/scripts/build_binary.sh index a62eec00..d72d5312 100755 --- a/scripts/build_binary.sh +++ b/scripts/build_binary.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of diff --git a/scripts/build_variant.sh b/scripts/build_variant.sh index 42b527d3..e83ef0e8 100755 --- a/scripts/build_variant.sh +++ b/scripts/build_variant.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of diff --git a/scripts/container_init.sh b/scripts/container_init.sh index f5843ca5..15e35e44 100755 --- a/scripts/container_init.sh +++ b/scripts/container_init.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of diff --git a/scripts/gogenerate b/scripts/gogenerate index 1721c393..a486a8f5 100755 --- a/scripts/gogenerate +++ b/scripts/gogenerate @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/scripts/hack/codepipeline-git-commit.sh b/scripts/hack/codepipeline-git-commit.sh index e03a11bb..a6a97057 100755 --- a/scripts/hack/codepipeline-git-commit.sh +++ b/scripts/hack/codepipeline-git-commit.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/scripts/hack/codepipeline-source-archive.sh b/scripts/hack/codepipeline-source-archive.sh index b0115571..20d92aa9 100755 --- a/scripts/hack/codepipeline-source-archive.sh +++ b/scripts/hack/codepipeline-source-archive.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/scripts/hack/symlink-gopath-codebuild.sh b/scripts/hack/symlink-gopath-codebuild.sh index 4dd0a0ec..914211a8 100755 --- a/scripts/hack/symlink-gopath-codebuild.sh +++ b/scripts/hack/symlink-gopath-codebuild.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the diff --git a/scripts/hack/version-changelog.sh b/scripts/hack/version-changelog.sh index 46536d68..a7067a4d 100755 --- a/scripts/hack/version-changelog.sh +++ b/scripts/hack/version-changelog.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# Copyright Amazon.com, Inc. or its affiliates. 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. A copy of the