Update copyright statements and license info

**Why?**

The year is no longer required in our Copyright statements.
Additionally, some files were missing a Copyright / license statement, while
it is a best practice to add one.

**What?**

* Add/upodate copyright statement,
* Add Apache-2.0 license, except for Lambda Functions, these should have MIT-0
  instead. Since most of our code is in the initial-commit Lambda Function,
  these files are under the MIT-0 license. With the exception of CloudFormation
  templates.

Makefile

@@ -1,4 +1,4 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com Inc. or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
 
 # Makefile versions

Makefile.tox

@@ -1,4 +1,4 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com Inc. or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
 
 # Files to work with

NOTICE.md

@@ -2,4 +2,4 @@
 
 AWS Deployment Framework
 
-Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright Amazon.com Inc. or its affiliates.

resources/OrganizationAccountAccessRole.yaml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 AWSTemplateFormatVersion: "2010-09-09"
 Description: >-
   Organizational Account Access Role for Cross-Account automation

samples/sample-cdk-app/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-cdk-app/handler.py

@@ -1,2 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 def main(event, context):
     print("I'm running!")

samples/sample-cdk-app/index.ts

@@ -1,3 +1,6 @@
+// Copyright Amazon.com Inc. or its affiliates.
+// SPDX-License-Identifier: Apache-2.0
+
 import events = require('@aws-cdk/aws-events');
 import targets = require('@aws-cdk/aws-events-targets');
 import lambda = require('@aws-cdk/aws-lambda');

samples/sample-codebuild-vpc/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-codebuild-vpc/params/global.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Tags:
   Repository: sample-codebuild-vpc-repo
   App: Sample CodeBuild VPC application

samples/sample-codebuild-vpc/template.yml

@@ -1,5 +1,5 @@
-# // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
 Description: ADF CloudFormation Sample Template

samples/sample-codebuild-vpc/testspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-ec2-java-app-codedeploy/appspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.0
 os: linux
 

samples/sample-ec2-java-app-codedeploy/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-ec2-java-app-codedeploy/pom.xml

@@ -1,3 +1,6 @@
+<!-- Copyright Amazon.com Inc. or its affiliates. -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

samples/sample-ec2-java-app-codedeploy/scripts/start.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 cd /home/ec2-user/server
 sudo /usr/bin/java -jar -Dserver.port=80 \
   *.jar > /dev/null 2> /dev/null < /dev/null &

samples/sample-ec2-java-app-codedeploy/scripts/stop.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 sudo killall java
 exit 0

samples/sample-ec2-java-app-codedeploy/scripts/validate.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 echo "Waiting for 15 seconds before checking health.."
 sleep 15
 

samples/sample-ec2-java-app-codedeploy/src/main/java/hello/Application.java

@@ -1,3 +1,6 @@
+// Copyright Amazon.com Inc. or its affiliates.
+// SPDX-License-Identifier: Apache-2.0
+
 package hello;
 
 import org.springframework.boot.SpringApplication;

samples/sample-ec2-java-app-codedeploy/src/resources/application.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 server:
   port: 8080
 

samples/sample-ec2-with-codedeploy/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-ec2-with-codedeploy/params/global.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Parameters:
   Environment: testing
   ApplicationName: sample

samples/sample-ec2-with-codedeploy/scripts/install-codedeploy.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 set -xe
 
 ## Code Deploy Agent Bootstrap Script ##

samples/sample-ec2-with-codedeploy/scripts/install-deps.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 # install apache httpd
 sudo yum install httpd -y
 

samples/sample-ec2-with-codedeploy/template.yml

@@ -1,5 +1,5 @@
-# // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
 Description: ADF CloudFormation Sample Template (EC2 Application with CodeDeploy Components)

samples/sample-ecr-repository/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-ecr-repository/params/global.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Parameters:
   TestingAccountId: '11111111111'
   ProductionAccountId: '999999999999'

samples/sample-ecr-repository/template.yml

@@ -1,5 +1,5 @@
-# // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: "2010-09-09"
 Description: ADF CloudFormation Sample Template (Shared ECR Repository)

samples/sample-ecs-cluster/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-ecs-cluster/params/banking-production.yml

@@ -1,2 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Parameters:
   Environment: production

samples/sample-ecs-cluster/params/global.yml

@@ -1,2 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Parameters:
   Environment: testing

samples/sample-ecs-cluster/template.yml

@@ -1,5 +1,5 @@
-# // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 # This Template builds on top of the great work of Nathan Pec
 # => https://github.com/nathanpeck/aws-cloudformation-fargate

samples/sample-etl-pipeline/scripts/some_etl_script.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 set -e
 
 echo "Doing some ETL tasks... This could also be done with a custom CodeBuild Image..."

samples/sample-expunge-vpc/build-lambda.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 set -e
 
 cd src/lambda_vpc

samples/sample-expunge-vpc/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-expunge-vpc/src/lambda_vpc/lambda_function.py

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: MIT-0
+
 from crhelper import CfnResource
 import logging
 import boto3

samples/sample-expunge-vpc/template.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 AWSTemplateFormatVersion: "2010-09-09"
 Transform: AWS::Serverless-2016-10-31
 Description: Deploys the Custom Resource for deleting the default VPC in all regions

samples/sample-fargate-node-app/Dockerfile

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 FROM node:current-alpine
 WORKDIR /app
 COPY . .

samples/sample-fargate-node-app/build/docker.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 set -e
 
 $(aws ecr get-login --region $AWS_REGION --no-include-email)

samples/sample-fargate-node-app/build/generate_parameters.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 set -e
 
 aws s3 cp s3://$S3_BUCKET_NAME/adf-build/ adf-build/ --recursive --quiet

samples/sample-fargate-node-app/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-fargate-node-app/index.js

@@ -1,3 +1,6 @@
+// Copyright Amazon.com Inc. or its affiliates.
+// SPDX-License-Identifier: Apache-2.0
+
 const express = require('express')
 
 const app = express()

samples/sample-fargate-node-app/package.json

@@ -8,7 +8,7 @@
     "start": "node index.js"
   },
   "author": "",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "dependencies": {
     "ejs": "^3.1.7",
     "express": "^4.16.3"

samples/sample-fargate-node-app/params/banking-production.yml

@@ -1,2 +1,5 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Parameters:
   Environment: production

samples/sample-fargate-node-app/params/global.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Parameters:
   Environment: testing
   ServiceName: sample-node-app

samples/sample-fargate-node-app/public/main.css

@@ -1,3 +1,6 @@
+/* Copyright Amazon.com Inc. or its affiliates. */
+/* SPDX-License-Identifier: Apache-2.0 */
+
 @import url(https://fonts.googleapis.com/css?family=Signika:700,300,600);
 
 html, body {

samples/sample-fargate-node-app/template.yml

@@ -1,5 +1,5 @@
-# // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
 Description: ADF CloudFormation Sample Template (NodeJS Application)

samples/sample-fargate-node-app/views/index.ejs

@@ -1,6 +1,9 @@
 <!doctype html>
 <html lang="en">
 
+    <!-- Copyright Amazon.com Inc. or its affiliates. -->
+    <!-- SPDX-License-Identifier: Apache-2.0 -->
+
     <head>
         <meta charset="utf-8">
         <title>Sample App</title>

samples/sample-iam/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 phases:

samples/sample-iam/params/global.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Tags:
   TagKey: my_tag
   MyKey: new_value

samples/sample-iam/template.yml

@@ -1,5 +1,5 @@
-# // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: "2010-09-09"
 Description: ADF CloudFormation Sample Template (IAM)

samples/sample-mono-repo/apps/alpha/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 env:

samples/sample-mono-repo/apps/alpha/params/global.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 Tags:
   Repository: sample-mono-repo
   App: Sample Mono Repo Alpha

samples/sample-mono-repo/apps/alpha/template.yml

@@ -1,5 +1,5 @@
-# // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# // SPDX-License-Identifier: Apache-2.0
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
 Description: ADF CloudFormation Sample Template (Mono Repo/App A)

samples/sample-mono-repo/apps/beta/buildspec.yml

@@ -1,3 +1,6 @@
+# Copyright Amazon.com Inc. or its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
 version: 0.2
 
 env: