Skip to content

Commit 390017d

Browse files
authored
Merge pull request #23 from MarkAtwood/master
relicense to MIT-0
2 parents e8bccbd + d7b00ee commit 390017d

5 files changed

Lines changed: 26 additions & 58 deletions

File tree

LICENSE.txt

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,16 @@
1-
Amazon Software License
2-
3-
This Amazon Software License (“License”) governs your use, reproduction, and distribution of the accompanying software as specified below.
4-
5-
1. Definitions
6-
“Licensor” means any person or entity that distributes its Work.
7-
8-
“Software” means the original work of authorship made available under this License.
9-
10-
“Work” means the Software and any additions to or derivative works of the Software that are made available under this License.
11-
12-
The terms “reproduce,” “reproduction,” “derivative works,” and “distribution” have the meaning as provided under U.S. copyright law; provided, however, that 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.
13-
14-
Works, including the Software, are “made available” under this License by including in or with the Work either (a) a copyright notice referencing the applicability of this License to the Work, or (b) a copy of this License.
15-
16-
2. License Grants
17-
2.1 Copyright Grant. Subject to the terms and conditions of this License, each Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free, copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense and distribute its Work and any resulting derivative works in any form.
18-
2.2 Patent Grant. Subject to the terms and conditions of this License, each Licensor grants to you a perpetual, worldwide, non-exclusive, royalty-free patent license to make, have made, use, sell, offer for sale, import, and otherwise transfer its Work, in whole or in part. The foregoing license applies only to the patent claims licensable by Licensor that would be infringed by Licensor’s Work (or portion thereof) individually and excluding any combinations with any other materials or technology.
19-
20-
3. Limitations
21-
3.1 Redistribution. You may reproduce or distribute the Work only if (a) you do so under this License, (b) you include a complete copy of this License with your distribution, and (c) you retain without modification any copyright, patent, trademark, or attribution notices that are present in the Work.
22-
3.2 Derivative Works. You may specify that additional or different terms apply to the use, reproduction, and distribution of your derivative works of the Work (“Your Terms”) only if (a) Your Terms provide that the use limitation in Section 3.3 applies to your derivative works, and (b) you identify the specific derivative works that are subject to Your Terms. Notwithstanding Your Terms, this License (including the redistribution requirements in Section 3.1) will continue to apply to the Work itself.
23-
3.3 Use Limitation. The Work and any derivative works thereof only may be used or intended for use with the web services, computing platforms or applications provided by Amazon.com, Inc. or its affiliates, including Amazon Web Services, Inc.
24-
3.4 Patent Claims. If you bring or threaten to bring a patent claim against any Licensor (including any claim, cross-claim or counterclaim in a lawsuit) to enforce any patents that you allege are infringed by any Work, then your rights under this License from such Licensor (including the grants in Sections 2.1 and 2.2) will terminate immediately.
25-
3.5 Trademarks. This License does not grant any rights to use any Licensor’s or its affiliates’ names, logos, or trademarks, except as necessary to reproduce the notices described in this License.
26-
3.6 Termination. If you violate any term of this License, then your rights under this License (including the grants in Sections 2.1 and 2.2) will terminate immediately.
27-
28-
4. Disclaimer of Warranty.
29-
THE WORK IS PROVIDED “AS IS” WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WARRANTIES OR CONDITIONS OF M ERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT. YOU BEAR THE RISK OF UNDERTAKING ANY ACTIVITIES UNDER THIS LICENSE. SOME STATES’ CONSUMER LAWS DO NOT ALLOW EXCLUSION OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO YOU.
30-
31-
5. Limitation of Liability.
32-
EXCEPT AS PROHIBITED BY APPLICABLE LAW, IN NO EVENT AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE SHALL ANY LICENSOR BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATED TO THIS LICENSE, THE USE OR INABILITY TO USE THE WORK (INCLUDING BUT NOT LIMITED TO LOSS OF GOODWILL, BUSINESS INTERRUPTION, LOST PROFITS OR DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY OTHER COMM ERCIAL DAMAGES OR LOSSES), EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
33-
Effective Date – April 18, 2008 © 2008 Amazon.com, Inc. or its affiliates. All rights reserved.
1+
MIT No Attribution
2+
3+
Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this
6+
software and associated documentation files (the "Software"), to deal in the Software
7+
without restriction, including without limitation the rights to use, copy, modify,
8+
merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so.
10+
11+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
12+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
13+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
14+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
15+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
16+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

NOTICE.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Streaming Data to Amazon Elasticsearch Service
22
## Using AWS Lambda: Sample Node.js Code
3-
### Package amazon-elasticsearch-lambda-samples
4-
5-
Copyright 2015- Amazon.com, Inc. or its affiliates. All Rights Reserved.
63

74
### Introduction
85
It is often useful to stream data, as it gets generated, for indexing in an
@@ -166,3 +163,9 @@ Please keep in mind the following notes and configuration overrides:
166163
If not, the AWS CLI could be used to push a JSON document to Lambda.
167164

168165
aws kinesis put-record --stream-name <lambda name> --data "<JSON document>" --region <region> --partition-key shardId-000000000000
166+
167+
## Copyright
168+
169+
Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
170+
171+
SPDX-License-Identifier: MIT-0

src/kinesis_lambda_es.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22
* Sample node.js code for AWS Lambda to upload the JSON documents
33
* pushed from Kinesis to Amazon Elasticsearch.
44
*
5-
*
6-
* Copyright 2015- Amazon.com, Inc. or its affiliates. All Rights Reserved.
7-
*
8-
* Licensed under the Amazon Software License (the "License").
9-
* You may not use this file except in compliance with the License.
10-
* A copy of the License is located at http://aws.amazon.com/asl/
11-
* or in the "license" file accompanying this file. This file is distributed
12-
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13-
* express or implied. See the License for the specific language governing
14-
* permissions and limitations under the License.
5+
* Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
6+
* SPDX-License-Identifier: MIT-0
157
*/
168

179
/* == Imports == */

src/s3_lambda_es.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22
* Sample node.js code for AWS Lambda to get Apache log files from S3, parse
33
* and add them to an Amazon Elasticsearch Service domain.
44
*
5-
*
6-
* Copyright 2015- Amazon.com, Inc. or its affiliates. All Rights Reserved.
7-
*
8-
* Licensed under the Amazon Software License (the "License").
9-
* You may not use this file except in compliance with the License.
10-
* A copy of the License is located at http://aws.amazon.com/asl/
11-
* or in the "license" file accompanying this file. This file is distributed
12-
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13-
* express or implied. See the License for the specific language governing
14-
* permissions and limitations under the License.
5+
* Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
6+
* SPDX-License-Identifier: MIT-0
157
*/
168

179
/* Imports */

0 commit comments

Comments
 (0)