diff --git a/.nightswatch/functional/conftest.py b/.nightswatch/functional/conftest.py index 9df97245..ed454d8f 100644 --- a/.nightswatch/functional/conftest.py +++ b/.nightswatch/functional/conftest.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/helpers/__init__.py b/.nightswatch/functional/helpers/__init__.py index d08267fc..3826abc9 100644 --- a/.nightswatch/functional/helpers/__init__.py +++ b/.nightswatch/functional/helpers/__init__.py @@ -1,12 +1,4 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/.nightswatch/functional/helpers/cfn_parameter_fetcher.py b/.nightswatch/functional/helpers/cfn_parameter_fetcher.py index 438a499b..82287387 100644 --- a/.nightswatch/functional/helpers/cfn_parameter_fetcher.py +++ b/.nightswatch/functional/helpers/cfn_parameter_fetcher.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from typing import Optional diff --git a/.nightswatch/functional/helpers/cloud_watch_client.py b/.nightswatch/functional/helpers/cloud_watch_client.py index 4fac7a5b..4becc0a4 100644 --- a/.nightswatch/functional/helpers/cloud_watch_client.py +++ b/.nightswatch/functional/helpers/cloud_watch_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### # A client that connects with AWS CloudWatch and returns logs from log groups from a specific time period diff --git a/.nightswatch/functional/helpers/cognito_client.py b/.nightswatch/functional/helpers/cognito_client.py index ecdb980a..5e1719b1 100644 --- a/.nightswatch/functional/helpers/cognito_client.py +++ b/.nightswatch/functional/helpers/cognito_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/.nightswatch/functional/helpers/iam_client.py b/.nightswatch/functional/helpers/iam_client.py index ea46d8ac..b99948cb 100644 --- a/.nightswatch/functional/helpers/iam_client.py +++ b/.nightswatch/functional/helpers/iam_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/.nightswatch/functional/helpers/kendra_client.py b/.nightswatch/functional/helpers/kendra_client.py index dfe35552..689a2743 100644 --- a/.nightswatch/functional/helpers/kendra_client.py +++ b/.nightswatch/functional/helpers/kendra_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/.nightswatch/functional/helpers/lex_client.py b/.nightswatch/functional/helpers/lex_client.py index fd7d2e64..a44e4d8c 100644 --- a/.nightswatch/functional/helpers/lex_client.py +++ b/.nightswatch/functional/helpers/lex_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/.nightswatch/functional/helpers/s3_client.py b/.nightswatch/functional/helpers/s3_client.py index 42d35da6..feaaa4a6 100644 --- a/.nightswatch/functional/helpers/s3_client.py +++ b/.nightswatch/functional/helpers/s3_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/.nightswatch/functional/helpers/translate_client.py b/.nightswatch/functional/helpers/translate_client.py index 9c97763e..0479b616 100644 --- a/.nightswatch/functional/helpers/translate_client.py +++ b/.nightswatch/functional/helpers/translate_client.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/.nightswatch/functional/helpers/utils/__init__.py b/.nightswatch/functional/helpers/utils/__init__.py index d08267fc..3826abc9 100644 --- a/.nightswatch/functional/helpers/utils/__init__.py +++ b/.nightswatch/functional/helpers/utils/__init__.py @@ -1,12 +1,4 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/.nightswatch/functional/helpers/utils/textbox.py b/.nightswatch/functional/helpers/utils/textbox.py index bf52a0af..7cf31d96 100644 --- a/.nightswatch/functional/helpers/utils/textbox.py +++ b/.nightswatch/functional/helpers/utils/textbox.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/helpers/website_model/__init__.py b/.nightswatch/functional/helpers/website_model/__init__.py index d08267fc..3826abc9 100644 --- a/.nightswatch/functional/helpers/website_model/__init__.py +++ b/.nightswatch/functional/helpers/website_model/__init__.py @@ -1,12 +1,4 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/.nightswatch/functional/helpers/website_model/chat_page.py b/.nightswatch/functional/helpers/website_model/chat_page.py index f1e6985f..85b70fb7 100644 --- a/.nightswatch/functional/helpers/website_model/chat_page.py +++ b/.nightswatch/functional/helpers/website_model/chat_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/helpers/website_model/custom_terminology_page.py b/.nightswatch/functional/helpers/website_model/custom_terminology_page.py index ead9a5ba..d03f1bae 100644 --- a/.nightswatch/functional/helpers/website_model/custom_terminology_page.py +++ b/.nightswatch/functional/helpers/website_model/custom_terminology_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from helpers.website_model.dom_operator import DomOperator diff --git a/.nightswatch/functional/helpers/website_model/dom_operator.py b/.nightswatch/functional/helpers/website_model/dom_operator.py index a83e3f34..33cc562c 100644 --- a/.nightswatch/functional/helpers/website_model/dom_operator.py +++ b/.nightswatch/functional/helpers/website_model/dom_operator.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/.nightswatch/functional/helpers/website_model/edit_page.py b/.nightswatch/functional/helpers/website_model/edit_page.py index ae53cd7f..0b5134df 100644 --- a/.nightswatch/functional/helpers/website_model/edit_page.py +++ b/.nightswatch/functional/helpers/website_model/edit_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/.nightswatch/functional/helpers/website_model/export_page.py b/.nightswatch/functional/helpers/website_model/export_page.py index cfd584ba..0c10c6f8 100644 --- a/.nightswatch/functional/helpers/website_model/export_page.py +++ b/.nightswatch/functional/helpers/website_model/export_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/helpers/website_model/import_page.py b/.nightswatch/functional/helpers/website_model/import_page.py index 7d148c44..775d1beb 100644 --- a/.nightswatch/functional/helpers/website_model/import_page.py +++ b/.nightswatch/functional/helpers/website_model/import_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from helpers.website_model.dom_operator import DomOperator diff --git a/.nightswatch/functional/helpers/website_model/kendra_page.py b/.nightswatch/functional/helpers/website_model/kendra_page.py index 3620d6f6..3f5e217b 100644 --- a/.nightswatch/functional/helpers/website_model/kendra_page.py +++ b/.nightswatch/functional/helpers/website_model/kendra_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/helpers/website_model/login_page.py b/.nightswatch/functional/helpers/website_model/login_page.py index 742893fa..88c3a716 100644 --- a/.nightswatch/functional/helpers/website_model/login_page.py +++ b/.nightswatch/functional/helpers/website_model/login_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/helpers/website_model/menu_nav.py b/.nightswatch/functional/helpers/website_model/menu_nav.py index 09720bf4..cc64545f 100644 --- a/.nightswatch/functional/helpers/website_model/menu_nav.py +++ b/.nightswatch/functional/helpers/website_model/menu_nav.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/helpers/website_model/settings_page.py b/.nightswatch/functional/helpers/website_model/settings_page.py index 6eac8126..d55186a6 100644 --- a/.nightswatch/functional/helpers/website_model/settings_page.py +++ b/.nightswatch/functional/helpers/website_model/settings_page.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import time diff --git a/.nightswatch/functional/test_1_login.py b/.nightswatch/functional/test_1_login.py index 3a153557..1783884f 100644 --- a/.nightswatch/functional/test_1_login.py +++ b/.nightswatch/functional/test_1_login.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_2_import.py b/.nightswatch/functional/test_2_import.py index d90a622d..29cd1584 100644 --- a/.nightswatch/functional/test_2_import.py +++ b/.nightswatch/functional/test_2_import.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_embeddings.py b/.nightswatch/functional/test_embeddings.py index af76af99..a09658e4 100644 --- a/.nightswatch/functional/test_embeddings.py +++ b/.nightswatch/functional/test_embeddings.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_export.py b/.nightswatch/functional/test_export.py index 900aa6e3..7c7b96a5 100644 --- a/.nightswatch/functional/test_export.py +++ b/.nightswatch/functional/test_export.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_kendra.py b/.nightswatch/functional/test_kendra.py index 75d88a1a..cc4bd877 100644 --- a/.nightswatch/functional/test_kendra.py +++ b/.nightswatch/functional/test_kendra.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_knowledge_base.py b/.nightswatch/functional/test_knowledge_base.py index 4a5bc976..2a950bf1 100644 --- a/.nightswatch/functional/test_knowledge_base.py +++ b/.nightswatch/functional/test_knowledge_base.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_lambda_hooks.py b/.nightswatch/functional/test_lambda_hooks.py index a4662746..57da9135 100644 --- a/.nightswatch/functional/test_lambda_hooks.py +++ b/.nightswatch/functional/test_lambda_hooks.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_llm.py b/.nightswatch/functional/test_llm.py index 60820065..2b743cc6 100644 --- a/.nightswatch/functional/test_llm.py +++ b/.nightswatch/functional/test_llm.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_question_designer.py b/.nightswatch/functional/test_question_designer.py index 7cda0529..09a133da 100644 --- a/.nightswatch/functional/test_question_designer.py +++ b/.nightswatch/functional/test_question_designer.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_routing.py b/.nightswatch/functional/test_routing.py index 7fbef08d..64c44bc3 100644 --- a/.nightswatch/functional/test_routing.py +++ b/.nightswatch/functional/test_routing.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_session_attribute.py b/.nightswatch/functional/test_session_attribute.py index 81cae225..8ed9761f 100644 --- a/.nightswatch/functional/test_session_attribute.py +++ b/.nightswatch/functional/test_session_attribute.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_settings.py b/.nightswatch/functional/test_settings.py index c80b8060..52903c38 100644 --- a/.nightswatch/functional/test_settings.py +++ b/.nightswatch/functional/test_settings.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_translate.py b/.nightswatch/functional/test_translate.py index ca27eaf9..53d9d27d 100644 --- a/.nightswatch/functional/test_translate.py +++ b/.nightswatch/functional/test_translate.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/.nightswatch/functional/test_tuning.py b/.nightswatch/functional/test_tuning.py index e61c811c..9ad766e2 100644 --- a/.nightswatch/functional/test_tuning.py +++ b/.nightswatch/functional/test_tuning.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf01663..81917073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [6.1.3] - 2024-10-17 + +### Security + +- Patched async and micromatch vulnerability + ## [6.1.2] - 2024-10-07 ### Fixed @@ -188,7 +194,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed issue where settings were being evaluated as strings instead of numbers. Settings that are saved as stings that represent positive, negative, whole, or decimal numbers will be parsed as numbers. - Fixed issue where kendra redirect does not use redirect query when users locale matches kendra index locale -## [5.4.5] - 2023-11-1 +## [5.4.5] - 2023-11-01 ### Changed - Security patch for browserify-sign @@ -700,7 +706,7 @@ More details in [README](https://github.com/aws-solutions/qnabot-on-aws/blob/v5. ### Fixed - Bug fixes for Kendra FAQ integration -- Fix for exception - "Cannot convert undefined or null to object" when Session Attributes are no provided during Lex input. https://github.com/aws-solutions/qnabot-on-aws/issues/229 +- Fix for exception - "Cannot convert undefined or null to object" when Session Attributes are no provided during Lex input. [Issue #229](https://github.com/aws-solutions/qnabot-on-aws/issues/229) - Package version updates to address current github dependabot alerts ## [4.3.0] - 2020-09-21 diff --git a/NOTICE.txt b/NOTICE.txt index 4075e260..f7142a46 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,15 +1,11 @@ qnabot-on-aws -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 License is located at - - http://www.apache.org/licenses/LICENSE-2.0 - -or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES -OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions -and limitations under the License. +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 License is located at http://www.apache.org/licenses/ +or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. See the License for the +specific language governing permissions and limitations under the License. ********************** THIRD PARTY COMPONENTS @@ -791,7 +787,7 @@ hash.js under the MIT license hasown under the MIT license he under the MIT license highlight.js under the BSD-3-Clause license -hint.css under the See LICENSE.md license +hint.css under the MIT license hmac-drbg under the MIT license hosted-git-info under the ISC license hpack.js under the MIT license @@ -1510,3 +1506,93 @@ trio-websocket under the Massachusetts Institute of Technology (MIT) license websocket-client under the Apache License Version 2.0 wsproto under the Massachusetts Institute of Technology (MIT) license xmltodict under the Massachusetts Institute of Technology (MIT) license +uuid under the MIT license. +@smithy/types under the Apache-2.0 license. +@smithy/core under the Apache-2.0 license. +@smithy/util-endpoints under the Apache-2.0 license. +eslint under the MIT license. +eslint-scope under the BSD-2-Clause license. +globals under the MIT license. +strip-json-comments under the MIT license. +once under the ISC license. +eslint-config-standard under the MIT license. +is-array-buffer under the MIT license. +json5 under the MIT license. +minimist under the MIT license. +strip-bom under the MIT license. +eslint-utils under the MIT license. +regexpp under the MIT license. +jsdom under the MIT license. +tough-cookie under the BSD-3-Clause license. +ws under the MIT license. +ieee754 under the BSD-3-Clause license. +jsonwebtoken under the MIT license. +util under the MIT license. +body-parser under the MIT license. +http-errors under the MIT license. +qs under the BSD-3-Clause license. +source-map under the BSD-3-Clause license. +express under the MIT license. +range-parser under the MIT license. +send under the MIT license. +mime under the MIT license. +serve-static under the MIT license. +@babel/types under the MIT license. +graceful-fs under the ISC license. +utf8 under the MIT license. +normalize-package-data under the BSD-2-Clause license. +parse-json under the MIT license. +yargs-parser under the ISC license. +utilx license unknown or missing +@babel/core under the MIT license. +@jest/core under the MIT license. +istanbul-lib-coverage under the BSD-3-Clause license. +istanbul-lib-report under the BSD-3-Clause license. +istanbul-reports under the BSD-3-Clause license. +@jest/types under the MIT license. +@sinonjs/fake-timers under the BSD-3-Clause license. +expect under the MIT license. +jest under the MIT license. +stack-utils under the MIT license. +yargs under the MIT license. +cliui under the ISC license. +word-wrap under the MIT license. +acorn-import-attributes under the MIT license. +@xtuc/ieee754 under the BSD-3-Clause license. +@jridgewell/source-map under the MIT license. +node-fetch under the MIT license. +prettier under the MIT license. +address under the MIT license. +html-minifier-terser under the MIT license. +connect-history-api-fallback under the MIT license. +http-proxy under the MIT license. +retry under the MIT license. +node-forge under the BSD-3-Clause license. +serve-index under the MIT license. +sockjs under the MIT license. +sinon under the BSD-3-Clause license. +abort-controller under the MIT license. +url under the MIT license. +sax under the ISC license. +@langchain/core under the MIT license. +openai under the Apache-2.0 license. + +******************** +OPEN SOURCE LICENSES +******************** + +0BSD - https://spdx.org/licenses/0BSD.html +Apache-2.0 - https://spdx.org/licenses/Apache-2.0.html +BSD-2-Clause - https://spdx.org/licenses/BSD-2-Clause.html +BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html +BlueOak-1.0.0 - https://spdx.org/licenses/BlueOak-1.0.0.html +CC-BY-3.0 - https://spdx.org/licenses/CC-BY-3.0.html +CC-BY-4.0 - https://spdx.org/licenses/CC-BY-4.0.html +CC0-1.0 - https://spdx.org/licenses/CC0-1.0.html +ISC - https://spdx.org/licenses/ISC.html +MIT - https://spdx.org/licenses/MIT.html +MPL-2.0 - https://spdx.org/licenses/MPL-2.0.html +OFL-1.1 - https://spdx.org/licenses/OFL-1.1.html +Python-2.0 - https://spdx.org/licenses/Python-2.0.html +Unlicense - https://spdx.org/licenses/Unlicense.html +Zlib - https://spdx.org/licenses/Zlib.html \ No newline at end of file diff --git a/README.md b/README.md index d67f2d09..54433b2a 100644 --- a/README.md +++ b/README.md @@ -336,6 +336,7 @@ As QnABot evolves over the years, it makes use of various services and functiona _Note: **Deployable solution versions** refers to the ability to deploy the version of QnABot in their AWS accounts. **Actively supported versions** for QnABot is only available for the latest version of QnABot._ ### Deployable Versions +- [v6.1.3](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.3) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.3/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.3/qnabot-on-aws-vpc.template) - [v6.1.2](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.2) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.2/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.2/qnabot-on-aws-vpc.template) - [v6.1.1](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.1) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.1/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.1/qnabot-on-aws-vpc.template) - [v6.1.0](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.0) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.0/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.0/qnabot-on-aws-vpc.template) diff --git a/SECURITY.md b/SECURITY.md index 73feb891..004e8495 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,6 +1,9 @@ -Reporting Security Issues ----------------------------------------------------------------------------------------------------------- -We take all security reports seriously. When we receive such reports, we will investigate and -subsequently address any potential vulnerabilities as quickly as possible. If you discover a potential -security issue in this project, please notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or -directly via email to [AWS Security](mailto:aws-security@amazon.com). Please do not create a public GitHub issue in this project. \ No newline at end of file +## Reporting Security Issues + +We take all security reports seriously. When we receive such reports, +we will investigate and subsequently address any potential vulnerabilities as +quickly as possible. If you discover a potential security issue in this project, +please notify AWS/Amazon Security via our [vulnerability reporting page] +(http://aws.amazon.com/security/vulnerability-reporting/) or directly via email +to [AWS Security](mailto:aws-security@amazon.com). +Please do *not* create a public GitHub issue in this project. \ No newline at end of file diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh index f3ac6eb4..81ab0cbd 100755 --- a/deployment/build-s3-dist.sh +++ b/deployment/build-s3-dist.sh @@ -1,15 +1,7 @@ #!/bin/bash ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### # This script should be run from the repo's deployment directory diff --git a/source/bin/build.js b/source/bin/build.js index c89840b1..8b7566b5 100755 --- a/source/bin/build.js +++ b/source/bin/build.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.env.AWS_PROFILE = require('../config.json').profile; process.env.AWS_DEFAULT_REGION = require('../config.json').region; diff --git a/source/bin/check.js b/source/bin/check.js index 72f45880..ad9c21ac 100755 --- a/source/bin/check.js +++ b/source/bin/check.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../config.json'); const fs = require('fs').promises; diff --git a/source/bin/check_bucket_ownership.js b/source/bin/check_bucket_ownership.js index 6b7a4040..7c1e6eb9 100755 --- a/source/bin/check_bucket_ownership.js +++ b/source/bin/check_bucket_ownership.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const commander = require('commander'); const { region } = require('../config.json'); diff --git a/source/bin/config.js b/source/bin/config.js index 17080e05..254f4b39 100644 --- a/source/bin/config.js +++ b/source/bin/config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { region: 'us-east-1', diff --git a/source/bin/exports.js b/source/bin/exports.js index 20842735..30c0dc03 100755 --- a/source/bin/exports.js +++ b/source/bin/exports.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../config.json'); process.env.AWS_PROFILE = config.profile; diff --git a/source/bin/launch.js b/source/bin/launch.js index cb949f6a..f17bf657 100755 --- a/source/bin/launch.js +++ b/source/bin/launch.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../config.json'); diff --git a/source/bin/license.js b/source/bin/license.js index 1c588039..c7c4fc04 100755 --- a/source/bin/license.js +++ b/source/bin/license.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs').promises; const util = require('util'); diff --git a/source/bin/name.js b/source/bin/name.js index a29242af..6d7dc33d 100755 --- a/source/bin/name.js +++ b/source/bin/name.js @@ -1,4 +1,8 @@ #! /usr/bin/env node +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); const config = require('../config.json'); diff --git a/source/bin/wait.js b/source/bin/wait.js index 22d2126a..464fe0a5 100755 --- a/source/bin/wait.js +++ b/source/bin/wait.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.env.AWS_PROFILE = require('../config.json').profile; process.env.AWS_DEFAULT_REGION = require('../config.json').region; diff --git a/source/cli/aws_solutions/core/__init__.py b/source/cli/aws_solutions/core/__init__.py index d3d7fd9f..1d669fea 100644 --- a/source/cli/aws_solutions/core/__init__.py +++ b/source/cli/aws_solutions/core/__init__.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from aws_solutions.core.config import Config diff --git a/source/cli/aws_solutions/core/config.py b/source/cli/aws_solutions/core/config.py index e54d7c9a..8c894d7d 100644 --- a/source/cli/aws_solutions/core/config.py +++ b/source/cli/aws_solutions/core/config.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/aws_solutions/core/helpers.py b/source/cli/aws_solutions/core/helpers.py index 4ce884e3..57535025 100644 --- a/source/cli/aws_solutions/core/helpers.py +++ b/source/cli/aws_solutions/core/helpers.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/aws_solutions/core/logging.py b/source/cli/aws_solutions/core/logging.py index f19546ba..0e7fcae0 100644 --- a/source/cli/aws_solutions/core/logging.py +++ b/source/cli/aws_solutions/core/logging.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import logging diff --git a/source/cli/aws_solutions/qnabot/cli/__init__.py b/source/cli/aws_solutions/qnabot/cli/__init__.py index d08267fc..3826abc9 100644 --- a/source/cli/aws_solutions/qnabot/cli/__init__.py +++ b/source/cli/aws_solutions/qnabot/cli/__init__.py @@ -1,12 +1,4 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py b/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py index b0bf5d2d..544c19da 100644 --- a/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py +++ b/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import sys @@ -23,7 +15,7 @@ @click.pass_context def cli(ctx) -> None: os.environ["SOLUTION_ID"] = "SO0189" - os.environ["SOLUTION_VERSION"] = "v6.1.2" + os.environ["SOLUTION_VERSION"] = "v6.1.3" @cli.command("import") diff --git a/source/cli/aws_solutions/qnabot/cli/qnabot_cli_helper.py b/source/cli/aws_solutions/qnabot/cli/qnabot_cli_helper.py index cffaa314..c1dcd758 100644 --- a/source/cli/aws_solutions/qnabot/cli/qnabot_cli_helper.py +++ b/source/cli/aws_solutions/qnabot/cli/qnabot_cli_helper.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/run-pytest.py b/source/cli/run-pytest.py index 188e4e02..c3154f01 100755 --- a/source/cli/run-pytest.py +++ b/source/cli/run-pytest.py @@ -1,15 +1,7 @@ #!/bin/bash ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import pytest diff --git a/source/cli/tests/__init__.py b/source/cli/tests/__init__.py index 15908856..39aeec3d 100644 --- a/source/cli/tests/__init__.py +++ b/source/cli/tests/__init__.py @@ -1,13 +1,5 @@ #!/usr/bin/env python3 ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/source/cli/tests/aws_solutions/core/__init__.py b/source/cli/tests/aws_solutions/core/__init__.py index d08267fc..3826abc9 100644 --- a/source/cli/tests/aws_solutions/core/__init__.py +++ b/source/cli/tests/aws_solutions/core/__init__.py @@ -1,12 +1,4 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/source/cli/tests/aws_solutions/core/test_helpers.py b/source/cli/tests/aws_solutions/core/test_helpers.py index 58f40282..dffbb040 100644 --- a/source/cli/tests/aws_solutions/core/test_helpers.py +++ b/source/cli/tests/aws_solutions/core/test_helpers.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/tests/aws_solutions/core/test_logging.py b/source/cli/tests/aws_solutions/core/test_logging.py index 7a656966..3ba0d969 100644 --- a/source/cli/tests/aws_solutions/core/test_logging.py +++ b/source/cli/tests/aws_solutions/core/test_logging.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import logging diff --git a/source/cli/tests/aws_solutions/core/test_solution_config.py b/source/cli/tests/aws_solutions/core/test_solution_config.py index 8df2bc14..012194f2 100644 --- a/source/cli/tests/aws_solutions/core/test_solution_config.py +++ b/source/cli/tests/aws_solutions/core/test_solution_config.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/tests/aws_solutions/qnabot/__init__.py b/source/cli/tests/aws_solutions/qnabot/__init__.py index d08267fc..3826abc9 100644 --- a/source/cli/tests/aws_solutions/qnabot/__init__.py +++ b/source/cli/tests/aws_solutions/qnabot/__init__.py @@ -1,12 +1,4 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### diff --git a/source/cli/tests/aws_solutions/qnabot/fixtures/cloudformation_fixtures.py b/source/cli/tests/aws_solutions/qnabot/fixtures/cloudformation_fixtures.py index a1d8079c..b6b90d50 100644 --- a/source/cli/tests/aws_solutions/qnabot/fixtures/cloudformation_fixtures.py +++ b/source/cli/tests/aws_solutions/qnabot/fixtures/cloudformation_fixtures.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/tests/aws_solutions/qnabot/fixtures/s3_fixtures.py b/source/cli/tests/aws_solutions/qnabot/fixtures/s3_fixtures.py index 4996bcfc..e9dc1bf4 100644 --- a/source/cli/tests/aws_solutions/qnabot/fixtures/s3_fixtures.py +++ b/source/cli/tests/aws_solutions/qnabot/fixtures/s3_fixtures.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/cli/tests/aws_solutions/qnabot/test_helpers.py b/source/cli/tests/aws_solutions/qnabot/test_helpers.py index 39d8e351..6f9f5ca2 100644 --- a/source/cli/tests/aws_solutions/qnabot/test_helpers.py +++ b/source/cli/tests/aws_solutions/qnabot/test_helpers.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/cli/tests/aws_solutions/qnabot/test_qnabot_cli.py b/source/cli/tests/aws_solutions/qnabot/test_qnabot_cli.py new file mode 100644 index 00000000..98fc0ec2 --- /dev/null +++ b/source/cli/tests/aws_solutions/qnabot/test_qnabot_cli.py @@ -0,0 +1,16 @@ +###################################################################################################################### +# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. # +# SPDX-License-Identifier: Apache-2.0 # +###################################################################################################################### + +from click.testing import CliRunner +from aws_solutions.qnabot.cli.qnabot_cli import ( + cli, + qna_import, + qna_export +) + +def test_cli(): + runner = CliRunner() + result = runner.invoke(cli) + assert result.exit_code == 0 diff --git a/source/cli/tests/conftest.py b/source/cli/tests/conftest.py index e3d05382..3aef505b 100644 --- a/source/cli/tests/conftest.py +++ b/source/cli/tests/conftest.py @@ -1,15 +1,7 @@ #!/usr/bin/env python3 ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/aws-sdk-layer/package-lock.json b/source/lambda/aws-sdk-layer/package-lock.json index 5aaf94cb..c7da64b6 100644 --- a/source/lambda/aws-sdk-layer/package-lock.json +++ b/source/lambda/aws-sdk-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "aws-layer", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aws-layer", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-comprehend": "^3.621.0", diff --git a/source/lambda/aws-sdk-layer/package.json b/source/lambda/aws-sdk-layer/package.json index f3abbc00..8d781aa8 100644 --- a/source/lambda/aws-sdk-layer/package.json +++ b/source/lambda/aws-sdk-layer/package.json @@ -1,6 +1,6 @@ { "name": "aws-layer", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Lambda aws-sdk-layer", "main": "index.js", "scripts": { diff --git a/source/lambda/aws-sdk-layer/sdk-config/customSdkConfig.js b/source/lambda/aws-sdk-layer/sdk-config/customSdkConfig.js index 046b97d2..122ae42e 100644 --- a/source/lambda/aws-sdk-layer/sdk-config/customSdkConfig.js +++ b/source/lambda/aws-sdk-layer/sdk-config/customSdkConfig.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = function (capability, customConfig) { const userAgent = [[`AWSSOLUTION/${process.env.SOLUTION_ID}/${process.env.SOLUTION_VERSION}`], diff --git a/source/lambda/cfn-lambda-layer/package-lock.json b/source/lambda/cfn-lambda-layer/package-lock.json index 2a90dabb..8ebc4adc 100644 --- a/source/lambda/cfn-lambda-layer/package-lock.json +++ b/source/lambda/cfn-lambda-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "cfn-lambda-layer", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cfn-lambda-layer", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "cfn-lambda": "^5.1.0" @@ -76,19 +76,15 @@ "safe-buffer": "~5.1.0" } }, - "node_modules/archiver/node_modules/async": { + "node_modules/async": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "license": "MIT", "dependencies": { "lodash": "^4.17.14" } }, - "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==" - }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -835,22 +831,12 @@ "integrity": "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==", "requires": { "archiver-utils": "^2.1.0", - "async": "^2.6.3", + "async": "^2.6.4", "buffer-crc32": "^0.2.1", "glob": "^7.1.4", "readable-stream": "^3.4.0", "tar-stream": "^2.1.0", "zip-stream": "^2.1.2" - }, - "dependencies": { - "async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "requires": { - "lodash": "^4.17.14" - } - } } }, "archiver-utils": { @@ -900,9 +886,12 @@ } }, "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==" + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "requires": { + "lodash": "^4.17.14" + } }, "available-typed-arrays": { "version": "1.0.5", @@ -996,7 +985,7 @@ "integrity": "sha512-kWSf43HeB27UsfMJ7pEJWJHCql/pR/qlg3m7rPZUwG4Hr+YWAcSHlW9/Bb7rtNv2BJ6unjmFJO9iBkAtCgUWhQ==", "requires": { "archiver": "^3.1.1", - "async": "^1.5.2", + "async": "^2.6.4", "aws-sdk": "^2.853.0", "jsonschema": "^1.4.0", "nano-argv": "^1.0.2", diff --git a/source/lambda/cfn-lambda-layer/package.json b/source/lambda/cfn-lambda-layer/package.json index 6db02ebe..1c931e1f 100644 --- a/source/lambda/cfn-lambda-layer/package.json +++ b/source/lambda/cfn-lambda-layer/package.json @@ -1,6 +1,6 @@ { "name": "cfn-lambda-layer", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Cfn Lambda Layer", "main": "index.js", "scripts": { @@ -15,6 +15,7 @@ "cfn-lambda": "^5.1.0" }, "overrides": { + "async": "^2.6.4", "minimatch@<3.0.5": "^3.0.5" } } diff --git a/source/lambda/cfn/index.js b/source/lambda/cfn/index.js index 3506e6e3..2f560eb2 100644 --- a/source/lambda/cfn/index.js +++ b/source/lambda/cfn/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const cfnLambda = require('cfn-lambda'); const _ = require('lodash'); diff --git a/source/lambda/cfn/jest.config.js b/source/lambda/cfn/jest.config.js index d0f8685c..afcfecef 100644 --- a/source/lambda/cfn/jest.config.js +++ b/source/lambda/cfn/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/cfn/lib/ApiDeployment.js b/source/lambda/cfn/lib/ApiDeployment.js index 6794fab3..888793ca 100644 --- a/source/lambda/cfn/lib/ApiDeployment.js +++ b/source/lambda/cfn/lib/ApiDeployment.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { APIGatewayClient, CreateDeploymentCommand, UpdateStageCommand, DeleteDeploymentCommand } = require('@aws-sdk/client-api-gateway'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/CognitoDomain.js b/source/lambda/cfn/lib/CognitoDomain.js index 675d4712..b26c3516 100644 --- a/source/lambda/cfn/lib/CognitoDomain.js +++ b/source/lambda/cfn/lib/CognitoDomain.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { CognitoIdentityProviderClient, CreateUserPoolDomainCommand, DeleteUserPoolDomainCommand } = require('@aws-sdk/client-cognito-identity-provider'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/CognitoLogin.js b/source/lambda/cfn/lib/CognitoLogin.js index 38848e83..2df108ee 100644 --- a/source/lambda/cfn/lib/CognitoLogin.js +++ b/source/lambda/cfn/lib/CognitoLogin.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { CognitoIdentityProviderClient, UpdateUserPoolClientCommand, SetUICustomizationCommand } = require('@aws-sdk/client-cognito-identity-provider'); const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/cfn/lib/CognitoRole.js b/source/lambda/cfn/lib/CognitoRole.js index 9269f17d..b4f41421 100644 --- a/source/lambda/cfn/lib/CognitoRole.js +++ b/source/lambda/cfn/lib/CognitoRole.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { CognitoIdentityClient, GetIdentityPoolRolesCommand, SetIdentityPoolRolesCommand } = require('@aws-sdk/client-cognito-identity'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/CognitoUrl.js b/source/lambda/cfn/lib/CognitoUrl.js index 31a82f63..091d90cb 100644 --- a/source/lambda/cfn/lib/CognitoUrl.js +++ b/source/lambda/cfn/lib/CognitoUrl.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = class CognitoUrl extends require('./base') { constructor() { diff --git a/source/lambda/cfn/lib/ESCognitoClient.js b/source/lambda/cfn/lib/ESCognitoClient.js index ff079a4b..a6e826ad 100644 --- a/source/lambda/cfn/lib/ESCognitoClient.js +++ b/source/lambda/cfn/lib/ESCognitoClient.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { CognitoIdentityProviderClient, ListUserPoolClientsCommand, DescribeUserPoolClientCommand } = require('@aws-sdk/client-cognito-identity-provider'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/LambdaVersion.js b/source/lambda/cfn/lib/LambdaVersion.js index cec4df5d..7df7bd68 100644 --- a/source/lambda/cfn/lib/LambdaVersion.js +++ b/source/lambda/cfn/lib/LambdaVersion.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, PublishVersionCommand } = require('@aws-sdk/client-lambda'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/OpenSearchUpdates.js b/source/lambda/cfn/lib/OpenSearchUpdates.js index 24c204bd..d0f319f7 100644 --- a/source/lambda/cfn/lib/OpenSearchUpdates.js +++ b/source/lambda/cfn/lib/OpenSearchUpdates.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { OpenSearchClient, UpdateDomainConfigCommand } = require('@aws-sdk/client-opensearch'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/PostUpgradeImport.js b/source/lambda/cfn/lib/PostUpgradeImport.js index 2825e918..f94488a3 100644 --- a/source/lambda/cfn/lib/PostUpgradeImport.js +++ b/source/lambda/cfn/lib/PostUpgradeImport.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/PreUpgradeExport.js b/source/lambda/cfn/lib/PreUpgradeExport.js index 1466af23..0570789e 100644 --- a/source/lambda/cfn/lib/PreUpgradeExport.js +++ b/source/lambda/cfn/lib/PreUpgradeExport.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/S3Lambda.js b/source/lambda/cfn/lib/S3Lambda.js index d964f249..2de2d040 100644 --- a/source/lambda/cfn/lib/S3Lambda.js +++ b/source/lambda/cfn/lib/S3Lambda.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, PutBucketNotificationConfigurationCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/S3Unzip.js b/source/lambda/cfn/lib/S3Unzip.js index 5236d5f8..23284a89 100644 --- a/source/lambda/cfn/lib/S3Unzip.js +++ b/source/lambda/cfn/lib/S3Unzip.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/S3Version.js b/source/lambda/cfn/lib/S3Version.js index 41a9d007..59275202 100644 --- a/source/lambda/cfn/lib/S3Version.js +++ b/source/lambda/cfn/lib/S3Version.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, HeadObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/Variable.js b/source/lambda/cfn/lib/Variable.js index a7378319..dbd002b6 100644 --- a/source/lambda/cfn/lib/Variable.js +++ b/source/lambda/cfn/lib/Variable.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const crypto = require('crypto'); const _ = require('lodash'); diff --git a/source/lambda/cfn/lib/base.js b/source/lambda/cfn/lib/base.js index 6aa7f893..971b4138 100644 --- a/source/lambda/cfn/lib/base.js +++ b/source/lambda/cfn/lib/base.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = class CognitoUser { Create(params, reply) { diff --git a/source/lambda/cfn/lib/lex.js b/source/lambda/cfn/lib/lex.js index 21ee894c..01feb081 100644 --- a/source/lambda/cfn/lib/lex.js +++ b/source/lambda/cfn/lib/lex.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const region = process.env.REGION; const customSdkConfig = require('./util/customSdkConfig'); diff --git a/source/lambda/cfn/lib/util/customSdkConfig.js b/source/lambda/cfn/lib/util/customSdkConfig.js index 049a335c..98dd5ddb 100644 --- a/source/lambda/cfn/lib/util/customSdkConfig.js +++ b/source/lambda/cfn/lib/util/customSdkConfig.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = function (customConfig) { const userAgent = [[`AWSSOLUTION/${process.env.SOLUTION_ID}/${process.env.SOLUTION_VERSION}`], diff --git a/source/lambda/cfn/lib/util/parseIntFromLexRequestObject.js b/source/lambda/cfn/lib/util/parseIntFromLexRequestObject.js index d3191a4f..fd47c4c5 100644 --- a/source/lambda/cfn/lib/util/parseIntFromLexRequestObject.js +++ b/source/lambda/cfn/lib/util/parseIntFromLexRequestObject.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // parseIntFromLexRequestObject is a custom parser intended to convert some properties back to integer as per input requirements of Lex modeling service commands const lexRequestProperties = ['maxAttempts', 'MaxRetries', 'Priority', 'priority', 'groupNumber', 'timeToLiveInSeconds', 'turnsToLive', 'idleSessionTTLInSeconds', 'nluIntentConfidenceThreshold'] diff --git a/source/lambda/cfn/lib/util/promise.js b/source/lambda/cfn/lib/util/promise.js index 3ed0bd85..94dc7b26 100644 --- a/source/lambda/cfn/lib/util/promise.js +++ b/source/lambda/cfn/lib/util/promise.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ class NativePromise extends Promise { static retry = function (fnc, retries = 10) { diff --git a/source/lambda/cfn/lib/util/response.js b/source/lambda/cfn/lib/util/response.js index bb7f91de..5bb22b0a 100644 --- a/source/lambda/cfn/lib/util/response.js +++ b/source/lambda/cfn/lib/util/response.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.SUCCESS = 'SUCCESS'; exports.FAILED = 'FAILED'; diff --git a/source/lambda/cfn/package-lock.json b/source/lambda/cfn/package-lock.json index b96bbbbb..757038dc 100644 --- a/source/lambda/cfn/package-lock.json +++ b/source/lambda/cfn/package-lock.json @@ -1,12 +1,12 @@ { "name": "cfn", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cfn", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-api-gateway": "^3.621.0", @@ -4262,14 +4262,6 @@ "safe-buffer": "~5.1.0" } }, - "node_modules/archiver/node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dependencies": { - "lodash": "^4.17.14" - } - }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -4280,9 +4272,13 @@ } }, "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==" + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } }, "node_modules/available-typed-arrays": { "version": "1.0.7", diff --git a/source/lambda/cfn/package.json b/source/lambda/cfn/package.json index a4b71ba1..e20656b3 100644 --- a/source/lambda/cfn/package.json +++ b/source/lambda/cfn/package.json @@ -1,6 +1,6 @@ { "name": "cfn", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Cfn Lambda", "main": "index.js", "scripts": { @@ -34,6 +34,7 @@ "lodash": "^4.17.21" }, "overrides": { + "async": "^2.6.4", "qs@<6.5.3": "^6.5.3", "sinon": "^19.0.2", "micromatch": "^4.0.8" diff --git a/source/lambda/cfn/test/index.fixtures.js b/source/lambda/cfn/test/index.fixtures.js index 338087e4..4d1ad258 100644 --- a/source/lambda/cfn/test/index.fixtures.js +++ b/source/lambda/cfn/test/index.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = function() { const response = { diff --git a/source/lambda/cfn/test/index.test.js b/source/lambda/cfn/test/index.test.js index a278f91a..e929607b 100644 --- a/source/lambda/cfn/test/index.test.js +++ b/source/lambda/cfn/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { EventEmitter } = require('events'); const httpsMock = require("https"); diff --git a/source/lambda/cfn/test/lib/ApiDeployment.fixtures.js b/source/lambda/cfn/test/lib/ApiDeployment.fixtures.js index 8d509558..0c940b17 100644 --- a/source/lambda/cfn/test/lib/ApiDeployment.fixtures.js +++ b/source/lambda/cfn/test/lib/ApiDeployment.fixtures.js @@ -1,16 +1,8 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createDeploymentCommandObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/ApiDeployment.test.js b/source/lambda/cfn/test/lib/ApiDeployment.test.js index eeaa24dc..ccba7881 100644 --- a/source/lambda/cfn/test/lib/ApiDeployment.test.js +++ b/source/lambda/cfn/test/lib/ApiDeployment.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { APIGatewayClient, CreateDeploymentCommand, UpdateStageCommand, DeleteDeploymentCommand } = require('@aws-sdk/client-api-gateway'); diff --git a/source/lambda/cfn/test/lib/CognitoDomain.fixtures.js b/source/lambda/cfn/test/lib/CognitoDomain.fixtures.js index a8377bd9..8b398edc 100644 --- a/source/lambda/cfn/test/lib/CognitoDomain.fixtures.js +++ b/source/lambda/cfn/test/lib/CognitoDomain.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.userPoolDomainCommandObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/CognitoDomain.test.js b/source/lambda/cfn/test/lib/CognitoDomain.test.js index b446aa28..30d53d47 100644 --- a/source/lambda/cfn/test/lib/CognitoDomain.test.js +++ b/source/lambda/cfn/test/lib/CognitoDomain.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { CognitoIdentityProviderClient, CreateUserPoolDomainCommand, DeleteUserPoolDomainCommand } = require('@aws-sdk/client-cognito-identity-provider'); diff --git a/source/lambda/cfn/test/lib/CognitoLogin.fixtures.js b/source/lambda/cfn/test/lib/CognitoLogin.fixtures.js index bab459ae..75ee0bf4 100644 --- a/source/lambda/cfn/test/lib/CognitoLogin.fixtures.js +++ b/source/lambda/cfn/test/lib/CognitoLogin.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.userPoolClientWithS3ParamsObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/CognitoLogin.test.js b/source/lambda/cfn/test/lib/CognitoLogin.test.js index fdca295a..41bf2351 100644 --- a/source/lambda/cfn/test/lib/CognitoLogin.test.js +++ b/source/lambda/cfn/test/lib/CognitoLogin.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/cfn/test/lib/CognitoRole.fixtures.js b/source/lambda/cfn/test/lib/CognitoRole.fixtures.js index 7ac81798..335ab1ba 100644 --- a/source/lambda/cfn/test/lib/CognitoRole.fixtures.js +++ b/source/lambda/cfn/test/lib/CognitoRole.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.cognitoIdpParamsObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/CognitoRole.test.js b/source/lambda/cfn/test/lib/CognitoRole.test.js index e3e04a67..f3c4ca60 100644 --- a/source/lambda/cfn/test/lib/CognitoRole.test.js +++ b/source/lambda/cfn/test/lib/CognitoRole.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { CognitoIdentityClient, GetIdentityPoolRolesCommand, SetIdentityPoolRolesCommand } = require('@aws-sdk/client-cognito-identity'); diff --git a/source/lambda/cfn/test/lib/CognitoUrl.fixtures.js b/source/lambda/cfn/test/lib/CognitoUrl.fixtures.js index 4596830d..0f47af59 100644 --- a/source/lambda/cfn/test/lib/CognitoUrl.fixtures.js +++ b/source/lambda/cfn/test/lib/CognitoUrl.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.cognitoUrlObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/CognitoUrl.test.js b/source/lambda/cfn/test/lib/CognitoUrl.test.js index 0404f677..a9fe23c4 100644 --- a/source/lambda/cfn/test/lib/CognitoUrl.test.js +++ b/source/lambda/cfn/test/lib/CognitoUrl.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const originalEnv = process.env; const cognitoUrl = require('../../lib/CognitoUrl'); diff --git a/source/lambda/cfn/test/lib/ESCognitoClient.fixtures.js b/source/lambda/cfn/test/lib/ESCognitoClient.fixtures.js index a0bc8ca9..e1afff90 100644 --- a/source/lambda/cfn/test/lib/ESCognitoClient.fixtures.js +++ b/source/lambda/cfn/test/lib/ESCognitoClient.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.esCognitoClientObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/ESCognitoClient.test.js b/source/lambda/cfn/test/lib/ESCognitoClient.test.js index 8f897622..75756dbe 100644 --- a/source/lambda/cfn/test/lib/ESCognitoClient.test.js +++ b/source/lambda/cfn/test/lib/ESCognitoClient.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { CognitoIdentityProviderClient, ListUserPoolClientsCommand, DescribeUserPoolClientCommand } = require('@aws-sdk/client-cognito-identity-provider'); diff --git a/source/lambda/cfn/test/lib/LambdaVersion.fixtures.js b/source/lambda/cfn/test/lib/LambdaVersion.fixtures.js index bcc715b1..c0dea417 100644 --- a/source/lambda/cfn/test/lib/LambdaVersion.fixtures.js +++ b/source/lambda/cfn/test/lib/LambdaVersion.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.publishVersionCommandObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/LambdaVersion.test.js b/source/lambda/cfn/test/lib/LambdaVersion.test.js index 74a2b323..694fab4a 100644 --- a/source/lambda/cfn/test/lib/LambdaVersion.test.js +++ b/source/lambda/cfn/test/lib/LambdaVersion.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { LambdaClient, PublishVersionCommand } = require('@aws-sdk/client-lambda'); diff --git a/source/lambda/cfn/test/lib/OpenSearchUpdates.fixtures.js b/source/lambda/cfn/test/lib/OpenSearchUpdates.fixtures.js index 1165f8da..85edea6f 100644 --- a/source/lambda/cfn/test/lib/OpenSearchUpdates.fixtures.js +++ b/source/lambda/cfn/test/lib/OpenSearchUpdates.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.openSearchUpdatesObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/OpenSearchUpdates.test.js b/source/lambda/cfn/test/lib/OpenSearchUpdates.test.js index 4963bdd7..c66adf43 100644 --- a/source/lambda/cfn/test/lib/OpenSearchUpdates.test.js +++ b/source/lambda/cfn/test/lib/OpenSearchUpdates.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { OpenSearchClient, UpdateDomainConfigCommand } = require('@aws-sdk/client-opensearch'); const { mockClient } = require('aws-sdk-client-mock'); diff --git a/source/lambda/cfn/test/lib/PostUpgradeImport.fixtures.js b/source/lambda/cfn/test/lib/PostUpgradeImport.fixtures.js index e02cf2dc..3281621f 100644 --- a/source/lambda/cfn/test/lib/PostUpgradeImport.fixtures.js +++ b/source/lambda/cfn/test/lib/PostUpgradeImport.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.postUpgradeImportObject = function() { const response = { diff --git a/source/lambda/cfn/test/lib/PostUpgradeImport.test.js b/source/lambda/cfn/test/lib/PostUpgradeImport.test.js index f546e7d4..d229935d 100644 --- a/source/lambda/cfn/test/lib/PostUpgradeImport.test.js +++ b/source/lambda/cfn/test/lib/PostUpgradeImport.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const originalEnv = process.env; diff --git a/source/lambda/cfn/test/lib/PreUpgradeExport.fixtures.js b/source/lambda/cfn/test/lib/PreUpgradeExport.fixtures.js index 5b450323..74bde6fe 100644 --- a/source/lambda/cfn/test/lib/PreUpgradeExport.fixtures.js +++ b/source/lambda/cfn/test/lib/PreUpgradeExport.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.preUpgradeExportObject = function() { const response = { diff --git a/source/lambda/cfn/test/lib/PreUpgradeExport.test.js b/source/lambda/cfn/test/lib/PreUpgradeExport.test.js index 3b549f74..92dc22a9 100644 --- a/source/lambda/cfn/test/lib/PreUpgradeExport.test.js +++ b/source/lambda/cfn/test/lib/PreUpgradeExport.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/cfn/test/lib/S3Lambda.fixtures.js b/source/lambda/cfn/test/lib/S3Lambda.fixtures.js index 0144ecfe..c919c149 100644 --- a/source/lambda/cfn/test/lib/S3Lambda.fixtures.js +++ b/source/lambda/cfn/test/lib/S3Lambda.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.s3BucketObject = function() { const response = { diff --git a/source/lambda/cfn/test/lib/S3Lambda.test.js b/source/lambda/cfn/test/lib/S3Lambda.test.js index 4fdebfd8..673d2235 100644 --- a/source/lambda/cfn/test/lib/S3Lambda.test.js +++ b/source/lambda/cfn/test/lib/S3Lambda.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, PutBucketNotificationConfigurationCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/cfn/test/lib/S3Unzip.fixtures.js b/source/lambda/cfn/test/lib/S3Unzip.fixtures.js index 81906cbf..6cac94c9 100644 --- a/source/lambda/cfn/test/lib/S3Unzip.fixtures.js +++ b/source/lambda/cfn/test/lib/S3Unzip.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.s3GetObjectCommand = function() { const response = { diff --git a/source/lambda/cfn/test/lib/S3Unzip.test.js b/source/lambda/cfn/test/lib/S3Unzip.test.js index 9c5b66b0..f3e12613 100644 --- a/source/lambda/cfn/test/lib/S3Unzip.test.js +++ b/source/lambda/cfn/test/lib/S3Unzip.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/cfn/test/lib/S3Version.fixtures.js b/source/lambda/cfn/test/lib/S3Version.fixtures.js index c1f63010..b11c7d15 100644 --- a/source/lambda/cfn/test/lib/S3Version.fixtures.js +++ b/source/lambda/cfn/test/lib/S3Version.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.s3BucketObject = function() { const response = { diff --git a/source/lambda/cfn/test/lib/S3Version.test.js b/source/lambda/cfn/test/lib/S3Version.test.js index d0c18f8b..32d2b8ea 100644 --- a/source/lambda/cfn/test/lib/S3Version.test.js +++ b/source/lambda/cfn/test/lib/S3Version.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, HeadObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/cfn/test/lib/Variable.fixtures.js b/source/lambda/cfn/test/lib/Variable.fixtures.js index c2fa8262..22ce6e8a 100644 --- a/source/lambda/cfn/test/lib/Variable.fixtures.js +++ b/source/lambda/cfn/test/lib/Variable.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.s3BucketObject = function() { const response = { diff --git a/source/lambda/cfn/test/lib/Variable.test.js b/source/lambda/cfn/test/lib/Variable.test.js index 40cafc0e..82040374 100644 --- a/source/lambda/cfn/test/lib/Variable.test.js +++ b/source/lambda/cfn/test/lib/Variable.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const originalEnv = process.env; const variableFixtures = require('./Variable.fixtures'); diff --git a/source/lambda/cfn/test/lib/base.test.js b/source/lambda/cfn/test/lib/base.test.js index 7f3ebf7a..ce34a632 100644 --- a/source/lambda/cfn/test/lib/base.test.js +++ b/source/lambda/cfn/test/lib/base.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const base = require('../../lib/base'); describe('test base class', () => { diff --git a/source/lambda/cfn/test/lib/lex.fixtures.js b/source/lambda/cfn/test/lib/lex.fixtures.js index 2d35878d..d238e8c6 100644 --- a/source/lambda/cfn/test/lib/lex.fixtures.js +++ b/source/lambda/cfn/test/lib/lex.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.slotTypeObject = function() { const response = { diff --git a/source/lambda/cfn/test/lib/lex.test.js b/source/lambda/cfn/test/lib/lex.test.js index 433e43bb..3bfe8a10 100644 --- a/source/lambda/cfn/test/lib/lex.test.js +++ b/source/lambda/cfn/test/lib/lex.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const originalEnv = process.env; const lex = require('../../lib/lex'); diff --git a/source/lambda/cfn/test/lib/util/customSdkConfig.test.js b/source/lambda/cfn/test/lib/util/customSdkConfig.test.js index 8429cb1b..86ce8867 100644 --- a/source/lambda/cfn/test/lib/util/customSdkConfig.test.js +++ b/source/lambda/cfn/test/lib/util/customSdkConfig.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const customSdkConfig = require('../../../lib/util/customSdkConfig'); const originalSolutionId = process.env.SOLUTION_ID; diff --git a/source/lambda/cfn/test/lib/util/parseIntFromLexRequestObject.test.js b/source/lambda/cfn/test/lib/util/parseIntFromLexRequestObject.test.js index 2a2a789d..0a36f570 100644 --- a/source/lambda/cfn/test/lib/util/parseIntFromLexRequestObject.test.js +++ b/source/lambda/cfn/test/lib/util/parseIntFromLexRequestObject.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { parseIntFromLexRequestObject } = require('../../../lib/util/parseIntFromLexRequestObject'); diff --git a/source/lambda/cfn/test/lib/util/promise.test.js b/source/lambda/cfn/test/lib/util/promise.test.js index 2c0fff9a..a5af2a86 100644 --- a/source/lambda/cfn/test/lib/util/promise.test.js +++ b/source/lambda/cfn/test/lib/util/promise.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const nativePromise = require('../../../lib/util/promise'); diff --git a/source/lambda/cfn/test/lib/util/response.fixtures.js b/source/lambda/cfn/test/lib/util/response.fixtures.js index 97bb9a64..5ca73cba 100644 --- a/source/lambda/cfn/test/lib/util/response.fixtures.js +++ b/source/lambda/cfn/test/lib/util/response.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.responseObject = function () { const response = { diff --git a/source/lambda/cfn/test/lib/util/response.test.js b/source/lambda/cfn/test/lib/util/response.test.js index 20a4b1d3..0418d1a7 100644 --- a/source/lambda/cfn/test/lib/util/response.test.js +++ b/source/lambda/cfn/test/lib/util/response.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { EventEmitter } = require('events'); const httpsMock = require("https"); diff --git a/source/lambda/common-modules-layer/opensearch-client/connection.js b/source/lambda/common-modules-layer/opensearch-client/connection.js index d81eb776..dfedc97a 100644 --- a/source/lambda/common-modules-layer/opensearch-client/connection.js +++ b/source/lambda/common-modules-layer/opensearch-client/connection.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { fromEnv } = require('@aws-sdk/credential-providers'); const { Client } = require('@opensearch-project/opensearch'); diff --git a/source/lambda/common-modules-layer/package-lock.json b/source/lambda/common-modules-layer/package-lock.json index 91aa6cfe..823f9fab 100644 --- a/source/lambda/common-modules-layer/package-lock.json +++ b/source/lambda/common-modules-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "common-modules-layer", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "common-modules-layer", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.511.0", diff --git a/source/lambda/common-modules-layer/package.json b/source/lambda/common-modules-layer/package.json index 391cde73..2e14fa85 100644 --- a/source/lambda/common-modules-layer/package.json +++ b/source/lambda/common-modules-layer/package.json @@ -1,6 +1,6 @@ { "name": "common-modules-layer", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Common-modules-layer lambda", "main": "index.js", "scripts": { diff --git a/source/lambda/connect/index.js b/source/lambda/connect/index.js index 374db998..57e156cd 100644 --- a/source/lambda/connect/index.js +++ b/source/lambda/connect/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const path = require('path'); const fs = require('fs'); diff --git a/source/lambda/connect/jest.config.js b/source/lambda/connect/jest.config.js index ed10a804..a84053a4 100644 --- a/source/lambda/connect/jest.config.js +++ b/source/lambda/connect/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/connect/package-lock.json b/source/lambda/connect/package-lock.json index 4ea2132b..cdd013e4 100644 --- a/source/lambda/connect/package-lock.json +++ b/source/lambda/connect/package-lock.json @@ -1,12 +1,12 @@ { "name": "connect", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "connect", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" @@ -2837,12 +2837,13 @@ "dev": true }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -4148,7 +4149,7 @@ "jest-util": "^29.7.0", "jest-validate": "^29.7.0", "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" @@ -4304,7 +4305,7 @@ "jest-haste-map": "^29.7.0", "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pirates": "^4.0.4", "slash": "^3.0.0", "write-file-atomic": "^4.0.2" @@ -5276,7 +5277,7 @@ "jest-runner": "^29.7.0", "jest-util": "^29.7.0", "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "parse-json": "^5.2.0", "pretty-format": "^29.7.0", "slash": "^3.0.0", @@ -5353,7 +5354,7 @@ "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "walker": "^1.0.8" } }, @@ -5390,7 +5391,7 @@ "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" @@ -5756,12 +5757,12 @@ "dev": true }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, diff --git a/source/lambda/connect/package.json b/source/lambda/connect/package.json index 31a16e45..ad1a3bfd 100644 --- a/source/lambda/connect/package.json +++ b/source/lambda/connect/package.json @@ -1,6 +1,6 @@ { "name": "connect", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda function used to support the Connect setup wizard", "repository": { "type": "git", @@ -22,5 +22,8 @@ "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" + }, + "overrides": { + "micromatch": "^4.0.8" } } diff --git a/source/lambda/connect/test/contactflow.fixtures.js b/source/lambda/connect/test/contactflow.fixtures.js index a4bb1f29..5284c711 100644 --- a/source/lambda/connect/test/contactflow.fixtures.js +++ b/source/lambda/connect/test/contactflow.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.mockCallFlow = { "modules": [ diff --git a/source/lambda/connect/test/index.test.js b/source/lambda/connect/test/index.test.js index ae0447e7..be406794 100644 --- a/source/lambda/connect/test/index.test.js +++ b/source/lambda/connect/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lambda = require('../index'); const fs = require("fs"); diff --git a/source/lambda/es-proxy-layer/jest.config.js b/source/lambda/es-proxy-layer/jest.config.js index 8842b05e..b4d0fcf0 100644 --- a/source/lambda/es-proxy-layer/jest.config.js +++ b/source/lambda/es-proxy-layer/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/es-proxy-layer/lib/bedrock/Ai21.js b/source/lambda/es-proxy-layer/lib/bedrock/Ai21.js index c690d343..029e59ce 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/Ai21.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/Ai21.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/AmazonEmbeddings.js b/source/lambda/es-proxy-layer/lib/bedrock/AmazonEmbeddings.js index a3072e99..02b1edc9 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/AmazonEmbeddings.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/AmazonEmbeddings.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/AmazonLlm.js b/source/lambda/es-proxy-layer/lib/bedrock/AmazonLlm.js index 22e587a8..4ff7609f 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/AmazonLlm.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/AmazonLlm.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/Anthropic.js b/source/lambda/es-proxy-layer/lib/bedrock/Anthropic.js index 43be6309..dd2dfa3a 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/Anthropic.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/Anthropic.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/BedrockModelProviderPrototype.js b/source/lambda/es-proxy-layer/lib/bedrock/BedrockModelProviderPrototype.js index 11b40283..51ae8683 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/BedrockModelProviderPrototype.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/BedrockModelProviderPrototype.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/CohereEmbeddings.js b/source/lambda/es-proxy-layer/lib/bedrock/CohereEmbeddings.js index 29757577..5c46b77b 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/CohereEmbeddings.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/CohereEmbeddings.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/CohereLlm.js b/source/lambda/es-proxy-layer/lib/bedrock/CohereLlm.js index 321591e0..eb49618f 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/CohereLlm.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/CohereLlm.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/Meta.js b/source/lambda/es-proxy-layer/lib/bedrock/Meta.js index fc7243b2..17e9a8c5 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/Meta.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/Meta.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockModelProviderPrototype } = require('./BedrockModelProviderPrototype'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/bedrockAgents.js b/source/lambda/es-proxy-layer/lib/bedrock/bedrockAgents.js index 286f6941..52c99842 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/bedrockAgents.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/bedrockAgents.js @@ -1,16 +1,8 @@ /* eslint-disable max-len */ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockAgentRuntimeClient, RetrieveAndGenerateCommand } = require('@aws-sdk/client-bedrock-agent-runtime'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/bedrockClient.js b/source/lambda/es-proxy-layer/lib/bedrock/bedrockClient.js index 31cf6793..1e297591 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/bedrockClient.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/bedrockClient.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockRuntimeClient, InvokeModelCommand } = require('@aws-sdk/client-bedrock-runtime'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/es-proxy-layer/lib/bedrock/bedrockModels.js b/source/lambda/es-proxy-layer/lib/bedrock/bedrockModels.js index f8bc8dae..da3d86ac 100644 --- a/source/lambda/es-proxy-layer/lib/bedrock/bedrockModels.js +++ b/source/lambda/es-proxy-layer/lib/bedrock/bedrockModels.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qnabot = require('qnabot/logging'); const { Ai21 } = require('./Ai21'); diff --git a/source/lambda/es-proxy-layer/lib/cfn.js b/source/lambda/es-proxy-layer/lib/cfn.js index 1b8f162e..bb0abbda 100644 --- a/source/lambda/es-proxy-layer/lib/cfn.js +++ b/source/lambda/es-proxy-layer/lib/cfn.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const Url = require('url'); const cfnLambda = require('cfn-lambda'); diff --git a/source/lambda/es-proxy-layer/lib/cleanmetrics.js b/source/lambda/es-proxy-layer/lib/cleanmetrics.js index 9d311291..afd8294b 100644 --- a/source/lambda/es-proxy-layer/lib/cleanmetrics.js +++ b/source/lambda/es-proxy-layer/lib/cleanmetrics.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // start connection const url = require('url'); diff --git a/source/lambda/es-proxy-layer/lib/dialog-event/processDialogEvent.js b/source/lambda/es-proxy-layer/lib/dialog-event/processDialogEvent.js index e0f5c7f4..ad91c3d1 100644 --- a/source/lambda/es-proxy-layer/lib/dialog-event/processDialogEvent.js +++ b/source/lambda/es-proxy-layer/lib/dialog-event/processDialogEvent.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/dialog-event/processSlots.js b/source/lambda/es-proxy-layer/lib/dialog-event/processSlots.js index a1ac560a..1513631e 100644 --- a/source/lambda/es-proxy-layer/lib/dialog-event/processSlots.js +++ b/source/lambda/es-proxy-layer/lib/dialog-event/processSlots.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/embeddings.js b/source/lambda/es-proxy-layer/lib/embeddings.js index 770eabd6..30747218 100644 --- a/source/lambda/es-proxy-layer/lib/embeddings.js +++ b/source/lambda/es-proxy-layer/lib/embeddings.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { Lambda } = require('@aws-sdk/client-lambda'); const { SageMakerRuntime } = require('@aws-sdk/client-sagemaker-runtime'); diff --git a/source/lambda/es-proxy-layer/lib/es-logging.js b/source/lambda/es-proxy-layer/lib/es-logging.js index 1550e23d..ca56fc27 100644 --- a/source/lambda/es-proxy-layer/lib/es-logging.js +++ b/source/lambda/es-proxy-layer/lib/es-logging.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // start connection const { FirehoseClient, PutRecordCommand } = require('@aws-sdk/client-firehose'); diff --git a/source/lambda/es-proxy-layer/lib/es_query.js b/source/lambda/es-proxy-layer/lib/es_query.js index 0a2533b8..785c0d6f 100644 --- a/source/lambda/es-proxy-layer/lib/es_query.js +++ b/source/lambda/es-proxy-layer/lib/es_query.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/esbodybuilder.js b/source/lambda/es-proxy-layer/lib/esbodybuilder.js index d08ead0c..90b4ce63 100644 --- a/source/lambda/es-proxy-layer/lib/esbodybuilder.js +++ b/source/lambda/es-proxy-layer/lib/esbodybuilder.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const bodybuilder = require('bodybuilder'); const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/encryptor.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/encryptor.js index f1fdccab..32f90d74 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/encryptor.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/encryptor.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js index 93fad708..ed2306ee 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/getHit.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/getHit.js index 8b6a5ea0..01ea2626 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/getHit.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/getHit.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/invokeLambda.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/invokeLambda.js index d188c80a..d92e396a 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/invokeLambda.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/invokeLambda.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Lambda } = require('@aws-sdk/client-lambda'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/mergeNext.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/mergeNext.js index 67dc94c6..54bb9a15 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/mergeNext.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/mergeNext.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/processFulfillmentEvent.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/processFulfillmentEvent.js index e1f32480..aae2133f 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/processFulfillmentEvent.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/processFulfillmentEvent.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* eslint-disable no-underscore-dangle */ const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/qid.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/qid.js index 9cc4d422..5f491c0e 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/qid.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/qid.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function utteranceIsQid(utterance) { return utterance.toLowerCase().startsWith('qid::'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/runKendraQuery.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/runKendraQuery.js index 84493cd6..d1407829 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/runKendraQuery.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/runKendraQuery.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/runLlmQa.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/runLlmQa.js index 4ea0dda3..4d332bf7 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/runLlmQa.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/runLlmQa.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qnabot = require('qnabot/logging'); const llm = require('../llm'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/updateResWithHit.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/updateResWithHit.js index fdeb2089..8dca7225 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/updateResWithHit.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/updateResWithHit.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/utterance.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/utterance.js index 63c406d1..0ac0ac9f 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/utterance.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/utterance.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function inIgnoreUtterances(utterance, ignoreUtterancesSetting) { const cleanedUtteranceList = ignoreUtterancesSetting.split(',').map((item) => item.replace(/[.!;-?]/g, '').trim().toLowerCase()); diff --git a/source/lambda/es-proxy-layer/lib/handlebars.js b/source/lambda/es-proxy-layer/lib/handlebars.js index 69cccf5f..d6fb4cf7 100644 --- a/source/lambda/es-proxy-layer/lib/handlebars.js +++ b/source/lambda/es-proxy-layer/lib/handlebars.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qnabot = require('qnabot/logging'); const { signUrls } = require('./signS3URL'); diff --git a/source/lambda/es-proxy-layer/lib/handler.js b/source/lambda/es-proxy-layer/lib/handler.js index 3520940d..364a0dae 100644 --- a/source/lambda/es-proxy-layer/lib/handler.js +++ b/source/lambda/es-proxy-layer/lib/handler.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const Url = require('url'); const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/hits_topic_tiebreaker.js b/source/lambda/es-proxy-layer/lib/hits_topic_tiebreaker.js index eeaddd3b..d6f644ce 100644 --- a/source/lambda/es-proxy-layer/lib/hits_topic_tiebreaker.js +++ b/source/lambda/es-proxy-layer/lib/hits_topic_tiebreaker.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // returns true if score is within tolerance of top_score function is_score_match(score, top_score) { diff --git a/source/lambda/es-proxy-layer/lib/kendra.js b/source/lambda/es-proxy-layer/lib/kendra.js index 3d675f93..00f2008a 100644 --- a/source/lambda/es-proxy-layer/lib/kendra.js +++ b/source/lambda/es-proxy-layer/lib/kendra.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* eslint-disable max-len */ const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/kendraClient.js b/source/lambda/es-proxy-layer/lib/kendraClient.js index 1818d9fb..b9a67ab6 100644 --- a/source/lambda/es-proxy-layer/lib/kendraClient.js +++ b/source/lambda/es-proxy-layer/lib/kendraClient.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { ConfiguredRetryStrategy } = require('@smithy/util-retry'); diff --git a/source/lambda/es-proxy-layer/lib/kendraQuery.js b/source/lambda/es-proxy-layer/lib/kendraQuery.js index b787e2d7..e398dc81 100644 --- a/source/lambda/es-proxy-layer/lib/kendraQuery.js +++ b/source/lambda/es-proxy-layer/lib/kendraQuery.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /** * optional environment variables - These are not used defined during setup of this function in QnABot but are diff --git a/source/lambda/es-proxy-layer/lib/kendraRetrieve.js b/source/lambda/es-proxy-layer/lib/kendraRetrieve.js index 4dc0192f..a0339380 100644 --- a/source/lambda/es-proxy-layer/lib/kendraRetrieve.js +++ b/source/lambda/es-proxy-layer/lib/kendraRetrieve.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/lib/keywords.js b/source/lambda/es-proxy-layer/lib/keywords.js index 030afa9c..e675a3fa 100644 --- a/source/lambda/es-proxy-layer/lib/keywords.js +++ b/source/lambda/es-proxy-layer/lib/keywords.js @@ -1,16 +1,8 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // start connection const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/llm.js b/source/lambda/es-proxy-layer/lib/llm.js index 52ceae1e..74292190 100644 --- a/source/lambda/es-proxy-layer/lib/llm.js +++ b/source/lambda/es-proxy-layer/lib/llm.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* eslint-disable max-len, no-underscore-dangle */ const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/qid.js b/source/lambda/es-proxy-layer/lib/qid.js index 775e0be6..538b070f 100644 --- a/source/lambda/es-proxy-layer/lib/qid.js +++ b/source/lambda/es-proxy-layer/lib/qid.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // start connection const url = require('url'); diff --git a/source/lambda/es-proxy-layer/lib/query.js b/source/lambda/es-proxy-layer/lib/query.js index fc182b45..10477e71 100755 --- a/source/lambda/es-proxy-layer/lib/query.js +++ b/source/lambda/es-proxy-layer/lib/query.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // start connection const _ = require('lodash'); diff --git a/source/lambda/es-proxy-layer/lib/request.js b/source/lambda/es-proxy-layer/lib/request.js index 6a589081..66d96288 100644 --- a/source/lambda/es-proxy-layer/lib/request.js +++ b/source/lambda/es-proxy-layer/lib/request.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const axios = require('axios'); const { fromEnv } = require('@aws-sdk/credential-providers'); diff --git a/source/lambda/es-proxy-layer/lib/sanitizeOutput.js b/source/lambda/es-proxy-layer/lib/sanitizeOutput.js index c881b5f7..1ce287c7 100644 --- a/source/lambda/es-proxy-layer/lib/sanitizeOutput.js +++ b/source/lambda/es-proxy-layer/lib/sanitizeOutput.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const sanitizeHtml = require('sanitize-html'); diff --git a/source/lambda/es-proxy-layer/lib/signS3URL.js b/source/lambda/es-proxy-layer/lib/signS3URL.js index f1d00ded..dbe722b0 100644 --- a/source/lambda/es-proxy-layer/lib/signS3URL.js +++ b/source/lambda/es-proxy-layer/lib/signS3URL.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { getSignedUrl } = require('@aws-sdk/s3-request-presigner'); const { GetObjectCommand, S3Client } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/es-proxy-layer/lib/supportedLanguages.js b/source/lambda/es-proxy-layer/lib/supportedLanguages.js index 8a8355b2..dcf35789 100644 --- a/source/lambda/es-proxy-layer/lib/supportedLanguages.js +++ b/source/lambda/es-proxy-layer/lib/supportedLanguages.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const supportedLanguages = { Afrikaans: 'af', diff --git a/source/lambda/es-proxy-layer/lib/translate.js b/source/lambda/es-proxy-layer/lib/translate.js index f3ad0c54..656e4542 100644 --- a/source/lambda/es-proxy-layer/lib/translate.js +++ b/source/lambda/es-proxy-layer/lib/translate.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Translate } = require('@aws-sdk/client-translate'); diff --git a/source/lambda/es-proxy-layer/lib/truncate.js b/source/lambda/es-proxy-layer/lib/truncate.js index 8f526ebf..3ea0c420 100644 --- a/source/lambda/es-proxy-layer/lib/truncate.js +++ b/source/lambda/es-proxy-layer/lib/truncate.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qnabot = require('qnabot/logging'); const { TokenTextSplitter } = require('langchain/text_splitter'); diff --git a/source/lambda/es-proxy-layer/lib/utterances.js b/source/lambda/es-proxy-layer/lib/utterances.js index c34fac76..af5b5546 100644 --- a/source/lambda/es-proxy-layer/lib/utterances.js +++ b/source/lambda/es-proxy-layer/lib/utterances.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const region = process.env.AWS_REGION || 'us-east-1'; const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/es-proxy-layer/package-lock.json b/source/lambda/es-proxy-layer/package-lock.json index 14a9e9a1..b917f53c 100644 --- a/source/lambda/es-proxy-layer/package-lock.json +++ b/source/lambda/es-proxy-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "proxy-es", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "proxy-es", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-bedrock-agent-runtime": "^3.616.0", @@ -7049,15 +7049,6 @@ "safe-buffer": "~5.1.0" } }, - "node_modules/archiver/node_modules/async": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", - "dev": true, - "dependencies": { - "lodash": "^4.17.14" - } - }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -7068,10 +7059,14 @@ } }, "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", - "dev": true + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.14" + } }, "node_modules/asynckit": { "version": "0.4.0", diff --git a/source/lambda/es-proxy-layer/package.json b/source/lambda/es-proxy-layer/package.json index d992d22b..bb7f2830 100644 --- a/source/lambda/es-proxy-layer/package.json +++ b/source/lambda/es-proxy-layer/package.json @@ -1,6 +1,6 @@ { "name": "proxy-es", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Lambda managing querying of data store", "main": "index.js", "scripts": { @@ -37,6 +37,7 @@ "jest": "^29.7.0" }, "overrides": { + "async": "2.6.4", "fast-xml-parser": "^4.4.1", "uglify-js": "^3.19.2", "micromatch": "^4.0.8", diff --git a/source/lambda/es-proxy-layer/test/bedrockAgents.test.js b/source/lambda/es-proxy-layer/test/bedrockAgents.test.js index c106ec3c..6bbe2a96 100644 --- a/source/lambda/es-proxy-layer/test/bedrockAgents.test.js +++ b/source/lambda/es-proxy-layer/test/bedrockAgents.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockAgentRuntimeClient, RetrieveAndGenerateCommand } = require("@aws-sdk/client-bedrock-agent-runtime"); const { mockClient } = require('aws-sdk-client-mock'); diff --git a/source/lambda/es-proxy-layer/test/bedrockModels.test.js b/source/lambda/es-proxy-layer/test/bedrockModels.test.js index 128c2ea6..3655bf79 100644 --- a/source/lambda/es-proxy-layer/test/bedrockModels.test.js +++ b/source/lambda/es-proxy-layer/test/bedrockModels.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { BedrockRuntimeClient, InvokeModelCommand } = require('@aws-sdk/client-bedrock-runtime'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/test/cfn.test.js b/source/lambda/es-proxy-layer/test/cfn.test.js index 7fc026c4..b18e8909 100644 --- a/source/lambda/es-proxy-layer/test/cfn.test.js +++ b/source/lambda/es-proxy-layer/test/cfn.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); const request = require('../lib/request'); diff --git a/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.fixtures.js b/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.fixtures.js index 5995e0eb..a0971983 100644 --- a/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.fixtures.js +++ b/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, qidExists) { const request = { diff --git a/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.test.js b/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.test.js index 38518989..4e9d461a 100644 --- a/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.test.js +++ b/source/lambda/es-proxy-layer/test/dialog-event/processDialogEvent.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { processSlots } = require('../../lib/dialog-event/processSlots'); const { processDialogEvent } = require('../../lib/dialog-event/processDialogEvent'); diff --git a/source/lambda/es-proxy-layer/test/dialog-event/processSlots.fixtures.js b/source/lambda/es-proxy-layer/test/dialog-event/processSlots.fixtures.js index 090fe16c..276b2f6f 100644 --- a/source/lambda/es-proxy-layer/test/dialog-event/processSlots.fixtures.js +++ b/source/lambda/es-proxy-layer/test/dialog-event/processSlots.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.returnHit = function (hasCacheValue) { const hit = { diff --git a/source/lambda/es-proxy-layer/test/dialog-event/processSlots.test.js b/source/lambda/es-proxy-layer/test/dialog-event/processSlots.test.js index 0741a163..22a28525 100644 --- a/source/lambda/es-proxy-layer/test/dialog-event/processSlots.test.js +++ b/source/lambda/es-proxy-layer/test/dialog-event/processSlots.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const processSlotsFixtures = require('./processSlots.fixtures') const { processSlots }= require('../../lib/dialog-event/processSlots'); diff --git a/source/lambda/es-proxy-layer/test/embeddings.test.js b/source/lambda/es-proxy-layer/test/embeddings.test.js index 4a344008..59ff85d6 100644 --- a/source/lambda/es-proxy-layer/test/embeddings.test.js +++ b/source/lambda/es-proxy-layer/test/embeddings.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Lambda } = require('@aws-sdk/client-lambda'); const { BedrockRuntimeClient, InvokeModelCommand } = require('@aws-sdk/client-bedrock-runtime'); diff --git a/source/lambda/es-proxy-layer/test/es_query.fixtures.js b/source/lambda/es-proxy-layer/test/es_query.fixtures.js index 2ef00176..534732d0 100644 --- a/source/lambda/es-proxy-layer/test/es_query.fixtures.js +++ b/source/lambda/es-proxy-layer/test/es_query.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.esQueryResponse = { "took": 1, diff --git a/source/lambda/es-proxy-layer/test/es_query.test.js b/source/lambda/es-proxy-layer/test/es_query.test.js index b2cb8c8c..3b17f518 100644 --- a/source/lambda/es-proxy-layer/test/es_query.test.js +++ b/source/lambda/es-proxy-layer/test/es_query.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); const request = require('../lib/request'); diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js b/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js index 057fb7a9..4b7ffcea 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { evaluateConditionalChaining } = require('../../lib/fulfillment-event/evaluateConditionalChaining'); const { encryptor } = require('../../lib/fulfillment-event/encryptor'); diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.fixtures.js b/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.fixtures.js index ad23a065..64ac3df9 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.fixtures.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { '_event': { diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.test.js b/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.test.js index 4737505b..c1a33a43 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.test.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/getHit.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const handlebars = require('../../lib/handlebars'); diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.fixtures.js b/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.fixtures.js index c1ad00e3..3bdc6dd8 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.fixtures.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { '_userInfo': { diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.test.js b/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.test.js index a87bcf33..fa88a669 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.test.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/processFulfillmentEvent.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/runLlmQa.test.js b/source/lambda/es-proxy-layer/test/fulfillment-event/runLlmQa.test.js index 20e24468..ff486144 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/runLlmQa.test.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/runLlmQa.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.fixtures.js b/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.fixtures.js index cdeb0923..624ff7ec 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.fixtures.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { '_event': { diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.test.js b/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.test.js index 679e0f05..fc3a11a7 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.test.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/updateResWithHit.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/es-proxy-layer/test/handlebars.fixtures.js b/source/lambda/es-proxy-layer/test/handlebars.fixtures.js index c5800bc2..6edde4b5 100644 --- a/source/lambda/es-proxy-layer/test/handlebars.fixtures.js +++ b/source/lambda/es-proxy-layer/test/handlebars.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { '_event': { diff --git a/source/lambda/es-proxy-layer/test/handlebars.test.js b/source/lambda/es-proxy-layer/test/handlebars.test.js index 9574f930..04ad4888 100644 --- a/source/lambda/es-proxy-layer/test/handlebars.test.js +++ b/source/lambda/es-proxy-layer/test/handlebars.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { signUrls } = require('../lib/signS3URL'); const handlebars = require('../lib/handlebars'); diff --git a/source/lambda/es-proxy-layer/test/kendra.fixtures.js b/source/lambda/es-proxy-layer/test/kendra.fixtures.js index 3452e319..731a0855 100644 --- a/source/lambda/es-proxy-layer/test/kendra.fixtures.js +++ b/source/lambda/es-proxy-layer/test/kendra.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { 'llm_generated_query': { diff --git a/source/lambda/es-proxy-layer/test/kendra.test.js b/source/lambda/es-proxy-layer/test/kendra.test.js index e6666ac5..1bf1d632 100644 --- a/source/lambda/es-proxy-layer/test/kendra.test.js +++ b/source/lambda/es-proxy-layer/test/kendra.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { queryKendra, determineKendraLanguage, shouldUseOriginalLanguageQuery, getKendraIndexToken } = require('../lib/kendraClient'); diff --git a/source/lambda/es-proxy-layer/test/kendraQuery.fixtures.js b/source/lambda/es-proxy-layer/test/kendraQuery.fixtures.js index cf69e0b7..511a22f5 100644 --- a/source/lambda/es-proxy-layer/test/kendraQuery.fixtures.js +++ b/source/lambda/es-proxy-layer/test/kendraQuery.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.params = { question: 'How do I publish on Kindle?', diff --git a/source/lambda/es-proxy-layer/test/kendraQuery.test.js b/source/lambda/es-proxy-layer/test/kendraQuery.test.js index 716b4bef..77588a0f 100644 --- a/source/lambda/es-proxy-layer/test/kendraQuery.test.js +++ b/source/lambda/es-proxy-layer/test/kendraQuery.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { queryKendra } = require('../lib/kendraClient'); diff --git a/source/lambda/es-proxy-layer/test/kendraRetrieve.fixtures.js b/source/lambda/es-proxy-layer/test/kendraRetrieve.fixtures.js index 1e0bcb87..a787ee41 100644 --- a/source/lambda/es-proxy-layer/test/kendraRetrieve.fixtures.js +++ b/source/lambda/es-proxy-layer/test/kendraRetrieve.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { 'llm_generated_query': { diff --git a/source/lambda/es-proxy-layer/test/kendraRetrieve.test.js b/source/lambda/es-proxy-layer/test/kendraRetrieve.test.js index b6900409..0211e596 100644 --- a/source/lambda/es-proxy-layer/test/kendraRetrieve.test.js +++ b/source/lambda/es-proxy-layer/test/kendraRetrieve.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { retrievalKendra, determineKendraLanguage } = require('../lib/kendraClient'); diff --git a/source/lambda/es-proxy-layer/test/keywords.test.js b/source/lambda/es-proxy-layer/test/keywords.test.js index 2ef11a49..0530b1e2 100644 --- a/source/lambda/es-proxy-layer/test/keywords.test.js +++ b/source/lambda/es-proxy-layer/test/keywords.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Comprehend } = require('@aws-sdk/client-comprehend'); diff --git a/source/lambda/es-proxy-layer/test/llm.fixtures.js b/source/lambda/es-proxy-layer/test/llm.fixtures.js index 526584f9..bcffe037 100644 --- a/source/lambda/es-proxy-layer/test/llm.fixtures.js +++ b/source/lambda/es-proxy-layer/test/llm.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { 'llm_generated_query': { diff --git a/source/lambda/es-proxy-layer/test/llm.test.js b/source/lambda/es-proxy-layer/test/llm.test.js index deb37a25..36fadd41 100644 --- a/source/lambda/es-proxy-layer/test/llm.test.js +++ b/source/lambda/es-proxy-layer/test/llm.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Lambda } = require('@aws-sdk/client-lambda'); diff --git a/source/lambda/es-proxy-layer/test/query.test.js b/source/lambda/es-proxy-layer/test/query.test.js index 32c6bc8d..a97e9356 100644 --- a/source/lambda/es-proxy-layer/test/query.test.js +++ b/source/lambda/es-proxy-layer/test/query.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const query = require('../lib/query'); const awsMock = require('aws-sdk-client-mock'); diff --git a/source/lambda/es-proxy-layer/test/sanitizeOutput.test.js b/source/lambda/es-proxy-layer/test/sanitizeOutput.test.js index 746f5f18..584575c3 100644 --- a/source/lambda/es-proxy-layer/test/sanitizeOutput.test.js +++ b/source/lambda/es-proxy-layer/test/sanitizeOutput.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { sanitize, escapeHashMarkdown } = require('../lib/sanitizeOutput'); diff --git a/source/lambda/es-proxy-layer/test/signS3Url.test.js b/source/lambda/es-proxy-layer/test/signS3Url.test.js index 4eb78a0d..8c0dd38f 100644 --- a/source/lambda/es-proxy-layer/test/signS3Url.test.js +++ b/source/lambda/es-proxy-layer/test/signS3Url.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const presigner = require('@aws-sdk/s3-request-presigner'); // eslint-disable-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-assignment const { GetObjectCommand, S3Client } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/es-proxy-layer/test/translate.fixtures.js b/source/lambda/es-proxy-layer/test/translate.fixtures.js index e14878ad..1c162ac4 100644 --- a/source/lambda/es-proxy-layer/test/translate.fixtures.js +++ b/source/lambda/es-proxy-layer/test/translate.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.req = { '_event': { diff --git a/source/lambda/es-proxy-layer/test/translate.test.js b/source/lambda/es-proxy-layer/test/translate.test.js index 4c359bb4..25a2d90b 100644 --- a/source/lambda/es-proxy-layer/test/translate.test.js +++ b/source/lambda/es-proxy-layer/test/translate.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Translate } = require('@aws-sdk/client-translate'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/export/createFAQ.js b/source/lambda/export/createFAQ.js index ed2fc8f1..8b0d6063 100644 --- a/source/lambda/export/createFAQ.js +++ b/source/lambda/export/createFAQ.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // createFAQ.js const sleep = require('util').promisify(setTimeout); diff --git a/source/lambda/export/index.js b/source/lambda/export/index.js index e1a075c1..43c6317d 100644 --- a/source/lambda/export/index.js +++ b/source/lambda/export/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand, waitUntilObjectExists } = require('@aws-sdk/client-s3'); const region = process.env.AWS_REGION; diff --git a/source/lambda/export/jest.config.js b/source/lambda/export/jest.config.js index 2a5c8ab9..b92880cd 100644 --- a/source/lambda/export/jest.config.js +++ b/source/lambda/export/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', testMatch: ['test/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'], diff --git a/source/lambda/export/kendraSync.js b/source/lambda/export/kendraSync.js index 2e096e43..03f0e2c2 100644 --- a/source/lambda/export/kendraSync.js +++ b/source/lambda/export/kendraSync.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand, waitUntilObjectExists } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/export/lib/clean.js b/source/lambda/export/lib/clean.js index d1c0388d..f6fa70c6 100644 --- a/source/lambda/export/lib/clean.js +++ b/source/lambda/export/lib/clean.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, DeleteObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/export/lib/join.js b/source/lambda/export/lib/join.js index e0c5d3ab..68672009 100644 --- a/source/lambda/export/lib/join.js +++ b/source/lambda/export/lib/join.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/export/lib/load.js b/source/lambda/export/lib/load.js index c3962968..bdab0a5c 100644 --- a/source/lambda/export/lib/load.js +++ b/source/lambda/export/lib/load.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/export/lib/start.js b/source/lambda/export/lib/start.js index 8b50366e..0bdfafae 100644 --- a/source/lambda/export/lib/start.js +++ b/source/lambda/export/lib/start.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const load = require('./load'); diff --git a/source/lambda/export/lib/step.js b/source/lambda/export/lib/step.js index 14546064..be06df4e 100644 --- a/source/lambda/export/lib/step.js +++ b/source/lambda/export/lib/step.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const load = require('./load'); diff --git a/source/lambda/export/package-lock.json b/source/lambda/export/package-lock.json index 4a1fa1cc..a64fec9d 100644 --- a/source/lambda/export/package-lock.json +++ b/source/lambda/export/package-lock.json @@ -1,12 +1,12 @@ { "name": "export", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "export", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" diff --git a/source/lambda/export/package.json b/source/lambda/export/package.json index a93c1cea..d360b929 100644 --- a/source/lambda/export/package.json +++ b/source/lambda/export/package.json @@ -1,6 +1,6 @@ { "name": "export", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Lambda handling export of QIDs", "main": "index.js", "scripts": { diff --git a/source/lambda/export/parseJSON.js b/source/lambda/export/parseJSON.js index 0979c2ea..f67e344e 100644 --- a/source/lambda/export/parseJSON.js +++ b/source/lambda/export/parseJSON.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // parseJSON.js diff --git a/source/lambda/export/test/createFAQ.test.js b/source/lambda/export/test/createFAQ.test.js index 9b23a84e..cc56370a 100644 --- a/source/lambda/export/test/createFAQ.test.js +++ b/source/lambda/export/test/createFAQ.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { KendraClient, CreateFaqCommand, DescribeFaqCommand, DeleteFaqCommand, ListFaqsCommand } = require('@aws-sdk/client-kendra'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); const { mockClient } = require('aws-sdk-client-mock'); diff --git a/source/lambda/export/test/index.fixtures.js b/source/lambda/export/test/index.fixtures.js index b3268dc3..7c135111 100644 --- a/source/lambda/export/test/index.fixtures.js +++ b/source/lambda/export/test/index.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { GetObjectCommand } = require('@aws-sdk/client-s3'); const { Readable } = require("stream"); diff --git a/source/lambda/export/test/index.test.js b/source/lambda/export/test/index.test.js index 64387eb0..60a66696 100644 --- a/source/lambda/export/test/index.test.js +++ b/source/lambda/export/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const { mockClient } = require('aws-sdk-client-mock'); const { mockStream } = require('../test/index.fixtures'); diff --git a/source/lambda/export/test/kendraSync.test.js b/source/lambda/export/test/kendraSync.test.js index d9fdf43c..a7828f81 100644 --- a/source/lambda/export/test/kendraSync.test.js +++ b/source/lambda/export/test/kendraSync.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const { performSync } = require('../kendraSync'); diff --git a/source/lambda/export/test/lib/clean.test.js b/source/lambda/export/test/lib/clean.test.js index 9f1af6d7..2a5575e5 100644 --- a/source/lambda/export/test/lib/clean.test.js +++ b/source/lambda/export/test/lib/clean.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const clean = require('../../lib/clean'); const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, DeleteObjectsCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/export/test/lib/join.test.js b/source/lambda/export/test/lib/join.test.js index 3a5b5bde..adbf80d0 100644 --- a/source/lambda/export/test/lib/join.test.js +++ b/source/lambda/export/test/lib/join.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const { mockStream } = require('../../test/index.fixtures'); const { mockClient } = require('aws-sdk-client-mock'); diff --git a/source/lambda/export/test/lib/load.test.js b/source/lambda/export/test/lib/load.test.js index 667ddccb..827ff0ad 100644 --- a/source/lambda/export/test/lib/load.test.js +++ b/source/lambda/export/test/lib/load.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/export/test/lib/start.test.js b/source/lambda/export/test/lib/start.test.js index c1cb9944..4fadeb6d 100644 --- a/source/lambda/export/test/lib/start.test.js +++ b/source/lambda/export/test/lib/start.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const start = require('../../lib/start'); const load = require('../../lib/load'); diff --git a/source/lambda/export/test/lib/step.test.js b/source/lambda/export/test/lib/step.test.js index 2e79afba..d2344fd7 100644 --- a/source/lambda/export/test/lib/step.test.js +++ b/source/lambda/export/test/lib/step.test.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const load = require('../../lib/load'); const step = require('../../lib/step'); jest.mock('../../lib/load'); diff --git a/source/lambda/export/test/parseJSON.test.js b/source/lambda/export/test/parseJSON.test.js index 06fea921..4566331f 100644 --- a/source/lambda/export/test/parseJSON.test.js +++ b/source/lambda/export/test/parseJSON.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const { handler } = require('../parseJSON'); diff --git a/source/lambda/fulfillment/index.js b/source/lambda/fulfillment/index.js index 464694a1..7476b44d 100644 --- a/source/lambda/fulfillment/index.js +++ b/source/lambda/fulfillment/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lib = './lib/middleware'; const router = new (require('./lib/router'))(); const fs = require('fs'); diff --git a/source/lambda/fulfillment/jest.config.js b/source/lambda/fulfillment/jest.config.js index f52b9ba5..19cc07f8 100644 --- a/source/lambda/fulfillment/jest.config.js +++ b/source/lambda/fulfillment/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/fulfillment/lib/middleware/1_parse.js b/source/lambda/fulfillment/lib/middleware/1_parse.js index 7ebdba83..5ac0ffa7 100644 --- a/source/lambda/fulfillment/lib/middleware/1_parse.js +++ b/source/lambda/fulfillment/lib/middleware/1_parse.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/lib/middleware/2_preprocess.js b/source/lambda/fulfillment/lib/middleware/2_preprocess.js index 978bf135..6ba500fe 100644 --- a/source/lambda/fulfillment/lib/middleware/2_preprocess.js +++ b/source/lambda/fulfillment/lib/middleware/2_preprocess.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { DynamoDBDocument } = require('@aws-sdk/lib-dynamodb'); diff --git a/source/lambda/fulfillment/lib/middleware/3_query.js b/source/lambda/fulfillment/lib/middleware/3_query.js index b803d0bd..7f493e7a 100644 --- a/source/lambda/fulfillment/lib/middleware/3_query.js +++ b/source/lambda/fulfillment/lib/middleware/3_query.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/lib/middleware/4_hook.js b/source/lambda/fulfillment/lib/middleware/4_hook.js index 5ae61990..9dcc8cac 100644 --- a/source/lambda/fulfillment/lib/middleware/4_hook.js +++ b/source/lambda/fulfillment/lib/middleware/4_hook.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/lib/middleware/5_assemble.js b/source/lambda/fulfillment/lib/middleware/5_assemble.js index e9b402f7..7caea147 100644 --- a/source/lambda/fulfillment/lib/middleware/5_assemble.js +++ b/source/lambda/fulfillment/lib/middleware/5_assemble.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/lib/middleware/6_cache.js b/source/lambda/fulfillment/lib/middleware/6_cache.js index 2a282cb2..f3f1b439 100644 --- a/source/lambda/fulfillment/lib/middleware/6_cache.js +++ b/source/lambda/fulfillment/lib/middleware/6_cache.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/lib/middleware/7_userInfo.js b/source/lambda/fulfillment/lib/middleware/7_userInfo.js index 2f26a5c9..505d21ad 100644 --- a/source/lambda/fulfillment/lib/middleware/7_userInfo.js +++ b/source/lambda/fulfillment/lib/middleware/7_userInfo.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { DynamoDBDocument} = require('@aws-sdk/lib-dynamodb'); diff --git a/source/lambda/fulfillment/lib/middleware/alexa.js b/source/lambda/fulfillment/lib/middleware/alexa.js index 37d43843..98af60a0 100644 --- a/source/lambda/fulfillment/lib/middleware/alexa.js +++ b/source/lambda/fulfillment/lib/middleware/alexa.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/lib/middleware/jwt.js b/source/lambda/fulfillment/lib/middleware/jwt.js index 70a18e47..1b7edded 100644 --- a/source/lambda/fulfillment/lib/middleware/jwt.js +++ b/source/lambda/fulfillment/lib/middleware/jwt.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const jwt = require('jsonwebtoken'); const jwksClient = require('jwks-rsa'); diff --git a/source/lambda/fulfillment/lib/middleware/lex.js b/source/lambda/fulfillment/lib/middleware/lex.js index bc68d02c..f3b3ccdf 100644 --- a/source/lambda/fulfillment/lib/middleware/lex.js +++ b/source/lambda/fulfillment/lib/middleware/lex.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const slackifyMarkdown = require('slackify-markdown'); diff --git a/source/lambda/fulfillment/lib/middleware/lexRouter.js b/source/lambda/fulfillment/lib/middleware/lexRouter.js index 19e1e80c..c6709652 100644 --- a/source/lambda/fulfillment/lib/middleware/lexRouter.js +++ b/source/lambda/fulfillment/lib/middleware/lexRouter.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /** * diff --git a/source/lambda/fulfillment/lib/middleware/multilanguage.js b/source/lambda/fulfillment/lib/middleware/multilanguage.js index 097f4d43..c21c93a5 100644 --- a/source/lambda/fulfillment/lib/middleware/multilanguage.js +++ b/source/lambda/fulfillment/lib/middleware/multilanguage.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Comprehend } = require('@aws-sdk/client-comprehend'); diff --git a/source/lambda/fulfillment/lib/middleware/sentiment.js b/source/lambda/fulfillment/lib/middleware/sentiment.js index 717896b2..ddcd45f9 100644 --- a/source/lambda/fulfillment/lib/middleware/sentiment.js +++ b/source/lambda/fulfillment/lib/middleware/sentiment.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // start connection const { Comprehend } = require('@aws-sdk/client-comprehend'); diff --git a/source/lambda/fulfillment/lib/middleware/specialtyBotRouter.js b/source/lambda/fulfillment/lib/middleware/specialtyBotRouter.js index 0e184b03..781a9e95 100644 --- a/source/lambda/fulfillment/lib/middleware/specialtyBotRouter.js +++ b/source/lambda/fulfillment/lib/middleware/specialtyBotRouter.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /** * diff --git a/source/lambda/fulfillment/lib/middleware/util.js b/source/lambda/fulfillment/lib/middleware/util.js index cbabb8dd..fff68039 100644 --- a/source/lambda/fulfillment/lib/middleware/util.js +++ b/source/lambda/fulfillment/lib/middleware/util.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { Lambda } = require('@aws-sdk/client-lambda'); diff --git a/source/lambda/fulfillment/lib/router/index.js b/source/lambda/fulfillment/lib/router/index.js index 2fa1656c..a7b33555 100644 --- a/source/lambda/fulfillment/lib/router/index.js +++ b/source/lambda/fulfillment/lib/router/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const qnabot = require('qnabot/logging'); diff --git a/source/lambda/fulfillment/package-lock.json b/source/lambda/fulfillment/package-lock.json index e5ade67d..b5a174ad 100644 --- a/source/lambda/fulfillment/package-lock.json +++ b/source/lambda/fulfillment/package-lock.json @@ -1,12 +1,12 @@ { "name": "fulfillment", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fulfillment", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-dynamodb": "^3.511.0", diff --git a/source/lambda/fulfillment/package.json b/source/lambda/fulfillment/package.json index 23213bff..19f36467 100644 --- a/source/lambda/fulfillment/package.json +++ b/source/lambda/fulfillment/package.json @@ -1,6 +1,6 @@ { "name": "fulfillment", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Lambda handling fulfillment of user requests", "main": "handler.js", "scripts": { diff --git a/source/lambda/fulfillment/test/index.fixtures.js b/source/lambda/fulfillment/test/index.fixtures.js index 3959cc6e..c9e69ae8 100644 --- a/source/lambda/fulfillment/test/index.fixtures.js +++ b/source/lambda/fulfillment/test/index.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.mockRequest = { "_type": 'LEX', diff --git a/source/lambda/fulfillment/test/index.test.js b/source/lambda/fulfillment/test/index.test.js index 6dfe089c..f2372cc2 100644 --- a/source/lambda/fulfillment/test/index.test.js +++ b/source/lambda/fulfillment/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fulfillment = require('../index'); const indexFixtures = require('./index.fixtures'); diff --git a/source/lambda/fulfillment/test/lex/index.js b/source/lambda/fulfillment/test/lex/index.js index 1a5a8e2b..099c8172 100644 --- a/source/lambda/fulfillment/test/lex/index.js +++ b/source/lambda/fulfillment/test/lex/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports={ "currentIntent": { diff --git a/source/lambda/fulfillment/test/lib/middleware/1_parse.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/1_parse.fixtures.js index efd79348..c71714cf 100644 --- a/source/lambda/fulfillment/test/lib/middleware/1_parse.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/1_parse.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, outputDialogMode, version, eventRequest) { const request = diff --git a/source/lambda/fulfillment/test/lib/middleware/1_parse.test.js b/source/lambda/fulfillment/test/lib/middleware/1_parse.test.js index 38e19773..867708d8 100644 --- a/source/lambda/fulfillment/test/lib/middleware/1_parse.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/1_parse.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const parse = require('../../../lib/middleware/1_parse'); diff --git a/source/lambda/fulfillment/test/lib/middleware/2_preprocess.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/2_preprocess.fixtures.js index 32f61bbc..24d071cd 100644 --- a/source/lambda/fulfillment/test/lib/middleware/2_preprocess.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/2_preprocess.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.jwtDecodeResponse = { "payload": { diff --git a/source/lambda/fulfillment/test/lib/middleware/2_preprocess.test.js b/source/lambda/fulfillment/test/lib/middleware/2_preprocess.test.js index b5fd8a11..829f420f 100644 --- a/source/lambda/fulfillment/test/lib/middleware/2_preprocess.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/2_preprocess.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const preprocess = require('../../../lib/middleware/2_preprocess'); const preprocessFixtures = require('./2_preprocess.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/3_query.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/3_query.fixtures.js index 664031b6..cbf0f6e2 100644 --- a/source/lambda/fulfillment/test/lib/middleware/3_query.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/3_query.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, requestType) { const request = { diff --git a/source/lambda/fulfillment/test/lib/middleware/3_query.test.js b/source/lambda/fulfillment/test/lib/middleware/3_query.test.js index f7928106..e3fd8842 100644 --- a/source/lambda/fulfillment/test/lib/middleware/3_query.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/3_query.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const query = require('../../../lib/middleware/3_query'); const queryFixtures = require('./3_query.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/4_hook.test.js b/source/lambda/fulfillment/test/lib/middleware/4_hook.test.js index 5d5901bb..b5424add 100644 --- a/source/lambda/fulfillment/test/lib/middleware/4_hook.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/4_hook.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const hook = require('../../../lib/middleware/4_hook'); const util = require('../../../lib/middleware/util'); diff --git a/source/lambda/fulfillment/test/lib/middleware/5_assemble.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/5_assemble.fixtures.js index f21c3401..c2951489 100644 --- a/source/lambda/fulfillment/test/lib/middleware/5_assemble.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/5_assemble.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, requestType, smsEnabled) { const request = { diff --git a/source/lambda/fulfillment/test/lib/middleware/5_assemble.test.js b/source/lambda/fulfillment/test/lib/middleware/5_assemble.test.js index 77107e89..9756ef7a 100644 --- a/source/lambda/fulfillment/test/lib/middleware/5_assemble.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/5_assemble.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const assemble = require('../../../lib/middleware/5_assemble'); const assembleFixtures = require('./5_assemble.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/6_cache.test.js b/source/lambda/fulfillment/test/lib/middleware/6_cache.test.js index 87d701c0..cee82c86 100644 --- a/source/lambda/fulfillment/test/lib/middleware/6_cache.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/6_cache.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const cache = require('../../../lib/middleware/6_cache'); diff --git a/source/lambda/fulfillment/test/lib/middleware/7_userInfo.test.js b/source/lambda/fulfillment/test/lib/middleware/7_userInfo.test.js index 5fd1f766..a4df0bdb 100644 --- a/source/lambda/fulfillment/test/lib/middleware/7_userInfo.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/7_userInfo.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const userInfo = require('../../../lib/middleware/7_userInfo'); const awsMock = require('aws-sdk-client-mock'); diff --git a/source/lambda/fulfillment/test/lib/middleware/__mocks__/esQueryMock.js b/source/lambda/fulfillment/test/lib/middleware/__mocks__/esQueryMock.js index 067eb54a..367907f1 100644 --- a/source/lambda/fulfillment/test/lib/middleware/__mocks__/esQueryMock.js +++ b/source/lambda/fulfillment/test/lib/middleware/__mocks__/esQueryMock.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = async function query(req, res) { //qna_settings.set_environment_variables(req._settings); diff --git a/source/lambda/fulfillment/test/lib/middleware/alexa.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/alexa.fixtures.js index e00cb86f..4c00f4f9 100644 --- a/source/lambda/fulfillment/test/lib/middleware/alexa.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/alexa.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, requestType, intentName) { const request = { diff --git a/source/lambda/fulfillment/test/lib/middleware/alexa.test.js b/source/lambda/fulfillment/test/lib/middleware/alexa.test.js index 4abe317b..4d99f1d4 100644 --- a/source/lambda/fulfillment/test/lib/middleware/alexa.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/alexa.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const alexa = require('../../../lib/middleware/alexa'); const alexaFixtures = require('./alexa.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/jwt.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/jwt.fixtures.js index 13c7affb..060339c6 100644 --- a/source/lambda/fulfillment/test/lib/middleware/jwt.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/jwt.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.jwtDecodeResponse = { "payload": "{ \"cognito:groups\": [\"Admins\"], \"email_verified\": true, \"cognito:username\": \"QnaAdmin\", \"token_use\": \"id\",\"auth_time\": 1696544694,\"exp\": 1696548294,\"email\": \"mock_email\"}", diff --git a/source/lambda/fulfillment/test/lib/middleware/jwt.test.js b/source/lambda/fulfillment/test/lib/middleware/jwt.test.js index 105ff0d4..f14e73bd 100644 --- a/source/lambda/fulfillment/test/lib/middleware/jwt.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/jwt.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const jwt = require('../../../lib/middleware/jwt'); const jwtFixtures = require('./jwt.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/lex.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/lex.fixtures.js index c06ef439..2a327ee8 100644 --- a/source/lambda/fulfillment/test/lib/middleware/lex.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/lex.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, clientType, lexVersion, currentIntent) { const request = { diff --git a/source/lambda/fulfillment/test/lib/middleware/lex.test.js b/source/lambda/fulfillment/test/lib/middleware/lex.test.js index 6b993231..0e5e15de 100644 --- a/source/lambda/fulfillment/test/lib/middleware/lex.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/lex.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lex = require('../../../lib/middleware/lex'); const lexFixtures = require('./lex.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/lexRouter.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/lexRouter.fixtures.js index beafa6dd..0d9befb7 100644 --- a/source/lambda/fulfillment/test/lib/middleware/lexRouter.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/lexRouter.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, preferredResponseType, NATIVE_LANGUAGE) { const request = { diff --git a/source/lambda/fulfillment/test/lib/middleware/lexRouter.test.js b/source/lambda/fulfillment/test/lib/middleware/lexRouter.test.js index 82329c15..0bd680e8 100644 --- a/source/lambda/fulfillment/test/lib/middleware/lexRouter.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/lexRouter.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lexRouter = require('../../../lib/middleware/lexRouter'); const _ = require('lodash'); const lexRouterFixtures = require('./lexRouter.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/multilanguage.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/multilanguage.fixtures.js index 102acbb2..94d5ba44 100644 --- a/source/lambda/fulfillment/test/lib/middleware/multilanguage.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/multilanguage.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.translateTextRequest = { SourceLanguageCode: 'en', diff --git a/source/lambda/fulfillment/test/lib/middleware/multilanguage.test.js b/source/lambda/fulfillment/test/lib/middleware/multilanguage.test.js index 73993b81..2d5ebd2c 100644 --- a/source/lambda/fulfillment/test/lib/middleware/multilanguage.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/multilanguage.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const multilanguage = require('../../../lib/middleware/multilanguage'); const awsMock = require('aws-sdk-client-mock'); diff --git a/source/lambda/fulfillment/test/lib/middleware/sentiment.test.js b/source/lambda/fulfillment/test/lib/middleware/sentiment.test.js index 009faeca..be27fdc7 100644 --- a/source/lambda/fulfillment/test/lib/middleware/sentiment.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/sentiment.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const sentimemt = require('../../../lib/middleware/sentiment'); const awsMock = require('aws-sdk-client-mock'); diff --git a/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.fixtures.js index 160e3a3f..11c1e93c 100644 --- a/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.createRequestObject = function (question, preferredResponseType, botName) { const request = { diff --git a/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.test.js b/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.test.js index f7151dcd..9cfe9c41 100644 --- a/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/specialtyBotRouter.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const specialtyBotRouter = require('../../../lib/middleware/specialtyBotRouter'); const _ = require('lodash'); const botRouterFixtures = require('./specialtyBotRouter.fixtures') diff --git a/source/lambda/fulfillment/test/lib/middleware/util.fixtures.js b/source/lambda/fulfillment/test/lib/middleware/util.fixtures.js index a0e1fac0..522a44b3 100644 --- a/source/lambda/fulfillment/test/lib/middleware/util.fixtures.js +++ b/source/lambda/fulfillment/test/lib/middleware/util.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.mockLambdaParams = { "FunctionName": "mock_lambda", diff --git a/source/lambda/fulfillment/test/lib/middleware/util.test.js b/source/lambda/fulfillment/test/lib/middleware/util.test.js index d5dc9e49..94d3d324 100644 --- a/source/lambda/fulfillment/test/lib/middleware/util.test.js +++ b/source/lambda/fulfillment/test/lib/middleware/util.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../../lib/middleware/util'); const awsMock = require('aws-sdk-client-mock'); diff --git a/source/lambda/genesys/flowsv2/QnABot-CallFlow.yaml b/source/lambda/genesys/flowsv2/QnABot-CallFlow.yaml index a4488165..2e24beda 100644 --- a/source/lambda/genesys/flowsv2/QnABot-CallFlow.yaml +++ b/source/lambda/genesys/flowsv2/QnABot-CallFlow.yaml @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### inboundCall: diff --git a/source/lambda/genesys/index.js b/source/lambda/genesys/index.js index dcb5325a..81ed3c3f 100644 --- a/source/lambda/genesys/index.js +++ b/source/lambda/genesys/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const path = require('path'); const fs = require('fs'); diff --git a/source/lambda/genesys/jest.config.js b/source/lambda/genesys/jest.config.js index ed10a804..a84053a4 100644 --- a/source/lambda/genesys/jest.config.js +++ b/source/lambda/genesys/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/genesys/package-lock.json b/source/lambda/genesys/package-lock.json index be92d05d..f567e61c 100644 --- a/source/lambda/genesys/package-lock.json +++ b/source/lambda/genesys/package-lock.json @@ -1,12 +1,12 @@ { "name": "genesys", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "genesys", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" @@ -2837,12 +2837,13 @@ "dev": true }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -4148,7 +4149,7 @@ "jest-util": "^29.7.0", "jest-validate": "^29.7.0", "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" @@ -4304,7 +4305,7 @@ "jest-haste-map": "^29.7.0", "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pirates": "^4.0.4", "slash": "^3.0.0", "write-file-atomic": "^4.0.2" @@ -5276,7 +5277,7 @@ "jest-runner": "^29.7.0", "jest-util": "^29.7.0", "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "parse-json": "^5.2.0", "pretty-format": "^29.7.0", "slash": "^3.0.0", @@ -5353,7 +5354,7 @@ "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "walker": "^1.0.8" } }, @@ -5390,7 +5391,7 @@ "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" @@ -5756,12 +5757,12 @@ "dev": true }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, diff --git a/source/lambda/genesys/package.json b/source/lambda/genesys/package.json index 0cb83e33..451d9bb0 100644 --- a/source/lambda/genesys/package.json +++ b/source/lambda/genesys/package.json @@ -1,6 +1,6 @@ { "name": "genesys", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda function used to support the Genesys setup wizard", "repository": { "type": "git", @@ -22,5 +22,8 @@ "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" + }, + "overrides": { + "micromatch": "^4.0.8" } } diff --git a/source/lambda/genesys/test/callflow.fixtures.yaml b/source/lambda/genesys/test/callflow.fixtures.yaml index d22af184..73ae7e0b 100644 --- a/source/lambda/genesys/test/callflow.fixtures.yaml +++ b/source/lambda/genesys/test/callflow.fixtures.yaml @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### inboundCall: diff --git a/source/lambda/genesys/test/index.test.js b/source/lambda/genesys/test/index.test.js index b875c0ce..9b308313 100644 --- a/source/lambda/genesys/test/index.test.js +++ b/source/lambda/genesys/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lambda = require('../index'); const fs = require("fs"); diff --git a/source/lambda/import/convert-xlsx.js b/source/lambda/import/convert-xlsx.js index 5ce1750e..9733f510 100644 --- a/source/lambda/import/convert-xlsx.js +++ b/source/lambda/import/convert-xlsx.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const XLSX = require('read-excel-file/node'); const _ = require('lodash'); diff --git a/source/lambda/import/delete_existing_content.js b/source/lambda/import/delete_existing_content.js index cd7a1ba4..a8cedd47 100644 --- a/source/lambda/import/delete_existing_content.js +++ b/source/lambda/import/delete_existing_content.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* function to delete existing {qids} from a opensearch index diff --git a/source/lambda/import/index.js b/source/lambda/import/index.js index d930604c..a4bfc54c 100644 --- a/source/lambda/import/index.js +++ b/source/lambda/import/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, waitUntilObjectExists, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/import/jest.config.js b/source/lambda/import/jest.config.js index 3ff4f4c2..b3385da1 100644 --- a/source/lambda/import/jest.config.js +++ b/source/lambda/import/jest.config.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', testMatch: ['test/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'], diff --git a/source/lambda/import/package-lock.json b/source/lambda/import/package-lock.json index 3cefdb5e..8d0082b4 100644 --- a/source/lambda/import/package-lock.json +++ b/source/lambda/import/package-lock.json @@ -1,12 +1,12 @@ { "name": "import", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "import", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "read-excel-file": "^5.8.5" diff --git a/source/lambda/import/package.json b/source/lambda/import/package.json index f9c8cd94..34c99087 100644 --- a/source/lambda/import/package.json +++ b/source/lambda/import/package.json @@ -1,6 +1,6 @@ { "name": "import", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Lambda handling import of QIDs", "main": "index.js", "scripts": { diff --git a/source/lambda/import/test/convert-xlsx.test.js b/source/lambda/import/test/convert-xlsx.test.js index 7857a946..5a3ae42f 100644 --- a/source/lambda/import/test/convert-xlsx.test.js +++ b/source/lambda/import/test/convert-xlsx.test.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const convertxlsx = require('../convert-xlsx'); const excelFile = './test/import-test.xlsx'; diff --git a/source/lambda/import/test/delete_existing_content.test.js b/source/lambda/import/test/delete_existing_content.test.js index 6d18490e..0f274e80 100644 --- a/source/lambda/import/test/delete_existing_content.test.js +++ b/source/lambda/import/test/delete_existing_content.test.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, waitUntilObjectExists, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/import/test/index.test.js b/source/lambda/import/test/index.test.js index 2130d0ff..63e063c0 100644 --- a/source/lambda/import/test/index.test.js +++ b/source/lambda/import/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'); const { start, step } = require('../index'); const { mockClient } = require('aws-sdk-client-mock'); diff --git a/source/lambda/import/test/lib/__mocks__/embeddingsMock.js b/source/lambda/import/test/lib/__mocks__/embeddingsMock.js index d7bc806b..4cae2fc3 100644 --- a/source/lambda/import/test/lib/__mocks__/embeddingsMock.js +++ b/source/lambda/import/test/lib/__mocks__/embeddingsMock.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = async function (type_q_or_a, input, settings) { return undefined; }; diff --git a/source/lambda/import/test/lib/__mocks__/requestMock.js b/source/lambda/import/test/lib/__mocks__/requestMock.js index 3ce1c81f..65521aac 100644 --- a/source/lambda/import/test/lib/__mocks__/requestMock.js +++ b/source/lambda/import/test/lib/__mocks__/requestMock.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = async function (params) { const response = { "_index": "qna-test_20231213_220637", diff --git a/source/lambda/js_lambda_hook_sdk/jest.config.js b/source/lambda/js_lambda_hook_sdk/jest.config.js index ed10a804..a84053a4 100644 --- a/source/lambda/js_lambda_hook_sdk/jest.config.js +++ b/source/lambda/js_lambda_hook_sdk/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/js_lambda_hook_sdk/lambda_hook_sdk/hooks.js b/source/lambda/js_lambda_hook_sdk/lambda_hook_sdk/hooks.js index e864139d..11204661 100644 --- a/source/lambda/js_lambda_hook_sdk/lambda_hook_sdk/hooks.js +++ b/source/lambda/js_lambda_hook_sdk/lambda_hook_sdk/hooks.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); diff --git a/source/lambda/js_lambda_hook_sdk/package-lock.json b/source/lambda/js_lambda_hook_sdk/package-lock.json index 1d22143a..e3860644 100644 --- a/source/lambda/js_lambda_hook_sdk/package-lock.json +++ b/source/lambda/js_lambda_hook_sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "js_lambda_hook_sdk", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "js_lambda_hook_sdk", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" @@ -2845,12 +2845,13 @@ "dev": true }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -4156,7 +4157,7 @@ "jest-util": "^29.7.0", "jest-validate": "^29.7.0", "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" @@ -4312,7 +4313,7 @@ "jest-haste-map": "^29.7.0", "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pirates": "^4.0.4", "slash": "^3.0.0", "write-file-atomic": "^4.0.2" @@ -5284,7 +5285,7 @@ "jest-runner": "^29.7.0", "jest-util": "^29.7.0", "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "parse-json": "^5.2.0", "pretty-format": "^29.7.0", "slash": "^3.0.0", @@ -5361,7 +5362,7 @@ "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "walker": "^1.0.8" } }, @@ -5398,7 +5399,7 @@ "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" @@ -5769,12 +5770,12 @@ "dev": true }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, diff --git a/source/lambda/js_lambda_hook_sdk/package.json b/source/lambda/js_lambda_hook_sdk/package.json index 651b0878..5cb12965 100644 --- a/source/lambda/js_lambda_hook_sdk/package.json +++ b/source/lambda/js_lambda_hook_sdk/package.json @@ -1,6 +1,6 @@ { "name": "js_lambda_hook_sdk", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot convenience layer, allowing users to create custom lambda hooks", "directories": { "lambda_hook_sdk": "lambda_hook_sdk", @@ -20,5 +20,8 @@ }, "devDependencies": { "jest": "^29.7.0" + }, + "overrides": { + "micromatch": "^4.0.8" } } diff --git a/source/lambda/js_lambda_hook_sdk/test/hooks.fixtures.js b/source/lambda/js_lambda_hook_sdk/test/hooks.fixtures.js index c556138b..e08a758c 100644 --- a/source/lambda/js_lambda_hook_sdk/test/hooks.fixtures.js +++ b/source/lambda/js_lambda_hook_sdk/test/hooks.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { "req": { diff --git a/source/lambda/js_lambda_hook_sdk/test/hooks.test.js b/source/lambda/js_lambda_hook_sdk/test/hooks.test.js index 815b3d2f..6e8eaaeb 100644 --- a/source/lambda/js_lambda_hook_sdk/test/hooks.test.js +++ b/source/lambda/js_lambda_hook_sdk/test/hooks.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const hooks = require("../lambda_hook_sdk/hooks") const _ = require("lodash"); diff --git a/source/lambda/kendra-webcrawler-schedule-updater/kendra_webcrawler_schedule_updater.py b/source/lambda/kendra-webcrawler-schedule-updater/kendra_webcrawler_schedule_updater.py index 8e924371..7329dfe4 100644 --- a/source/lambda/kendra-webcrawler-schedule-updater/kendra_webcrawler_schedule_updater.py +++ b/source/lambda/kendra-webcrawler-schedule-updater/kendra_webcrawler_schedule_updater.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/kendra-webcrawler-schedule-updater/test/conftest.py b/source/lambda/kendra-webcrawler-schedule-updater/test/conftest.py index 45429c71..47d4fcf6 100644 --- a/source/lambda/kendra-webcrawler-schedule-updater/test/conftest.py +++ b/source/lambda/kendra-webcrawler-schedule-updater/test/conftest.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/kendra-webcrawler-schedule-updater/test/test_lambda_function.py b/source/lambda/kendra-webcrawler-schedule-updater/test/test_lambda_function.py index 16e653d6..5c504ae9 100644 --- a/source/lambda/kendra-webcrawler-schedule-updater/test/test_lambda_function.py +++ b/source/lambda/kendra-webcrawler-schedule-updater/test/test_lambda_function.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os import unittest diff --git a/source/lambda/kendra-webcrawler-status/kendra_webcrawler_status.py b/source/lambda/kendra-webcrawler-status/kendra_webcrawler_status.py index 0af51328..c1d1db95 100644 --- a/source/lambda/kendra-webcrawler-status/kendra_webcrawler_status.py +++ b/source/lambda/kendra-webcrawler-status/kendra_webcrawler_status.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/kendra-webcrawler-status/test/conftest.py b/source/lambda/kendra-webcrawler-status/test/conftest.py index 28fd0331..f052d953 100644 --- a/source/lambda/kendra-webcrawler-status/test/conftest.py +++ b/source/lambda/kendra-webcrawler-status/test/conftest.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/kendra-webcrawler-status/test/test_lambda_function.py b/source/lambda/kendra-webcrawler-status/test/test_lambda_function.py index f6a2dc0d..dffd5755 100644 --- a/source/lambda/kendra-webcrawler-status/test/test_lambda_function.py +++ b/source/lambda/kendra-webcrawler-status/test/test_lambda_function.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os import unittest diff --git a/source/lambda/kendra-webcrawler/kendra_webcrawler.py b/source/lambda/kendra-webcrawler/kendra_webcrawler.py index 2e6ecdf6..9cea7b79 100644 --- a/source/lambda/kendra-webcrawler/kendra_webcrawler.py +++ b/source/lambda/kendra-webcrawler/kendra_webcrawler.py @@ -1,15 +1,7 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/kendra-webcrawler/test/conftest.py b/source/lambda/kendra-webcrawler/test/conftest.py index 8bd65882..aeac2e3b 100644 --- a/source/lambda/kendra-webcrawler/test/conftest.py +++ b/source/lambda/kendra-webcrawler/test/conftest.py @@ -1,15 +1,7 @@ #!/usr/bin/env python ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/kendra-webcrawler/test/test_lambda_function.py b/source/lambda/kendra-webcrawler/test/test_lambda_function.py index 7cf403b4..81c4e9fd 100644 --- a/source/lambda/kendra-webcrawler/test/test_lambda_function.py +++ b/source/lambda/kendra-webcrawler/test/test_lambda_function.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/lex-build/index.js b/source/lambda/lex-build/index.js index ffbf182f..872a9370 100644 --- a/source/lambda/lex-build/index.js +++ b/source/lambda/lex-build/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lib = require('./lib'); diff --git a/source/lambda/lex-build/jest.config.js b/source/lambda/lex-build/jest.config.js index 95989b98..bad2249c 100644 --- a/source/lambda/lex-build/jest.config.js +++ b/source/lambda/lex-build/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/lex-build/lib/index.js b/source/lambda/lex-build/lib/index.js index 83992b6b..ead71198 100644 --- a/source/lambda/lex-build/lib/index.js +++ b/source/lambda/lex-build/lib/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const getQidsandquestions = require('./qidsandquestions'); diff --git a/source/lambda/lex-build/lib/lexv2bot.js b/source/lambda/lex-build/lib/lexv2bot.js index 98cd36f3..b2a12806 100644 --- a/source/lambda/lex-build/lib/lexv2bot.js +++ b/source/lambda/lex-build/lib/lexv2bot.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const region = process.env.AWS_REGION || 'us-east-1'; const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); diff --git a/source/lambda/lex-build/lib/qidsandquestions.js b/source/lambda/lex-build/lib/qidsandquestions.js index 5dd7d371..5d725724 100644 --- a/source/lambda/lex-build/lib/qidsandquestions.js +++ b/source/lambda/lex-build/lib/qidsandquestions.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { con } = require('/opt/opensearch-client/connection'); const _ = require('lodash'); diff --git a/source/lambda/lex-build/lib/statusv2.js b/source/lambda/lex-build/lib/statusv2.js index 773bfe46..45672cb9 100644 --- a/source/lambda/lex-build/lib/statusv2.js +++ b/source/lambda/lex-build/lib/statusv2.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const region = process.env.AWS_REGION || 'us-east-1'; const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/lex-build/package-lock.json b/source/lambda/lex-build/package-lock.json index dd7c8f12..b0531413 100644 --- a/source/lambda/lex-build/package-lock.json +++ b/source/lambda/lex-build/package-lock.json @@ -1,12 +1,12 @@ { "name": "lex-build", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lex-build", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-lex-model-building-service": "^3.511.0" diff --git a/source/lambda/lex-build/package.json b/source/lambda/lex-build/package.json index da1173a2..b104c1a9 100644 --- a/source/lambda/lex-build/package.json +++ b/source/lambda/lex-build/package.json @@ -1,6 +1,6 @@ { "name": "lex-build", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot lambda for rebuilding Amazon Lex bots", "main": "handler.js", "scripts": { diff --git a/source/lambda/lex-build/test/lib/__mocks__/conMock.js b/source/lambda/lex-build/test/lib/__mocks__/conMock.js index 11d116e0..6a615dd0 100644 --- a/source/lambda/lex-build/test/lib/__mocks__/conMock.js +++ b/source/lambda/lex-build/test/lib/__mocks__/conMock.js @@ -1,15 +1,7 @@ - /********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + /** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.con = function (address) { return { search: jest.fn(() => { diff --git a/source/lambda/lex-build/test/lib/es.fixtures.js b/source/lambda/lex-build/test/lib/es.fixtures.js index de5f3b09..3bbb2890 100644 --- a/source/lambda/lex-build/test/lib/es.fixtures.js +++ b/source/lambda/lex-build/test/lib/es.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.returnEsMock = function (esType) { return { diff --git a/source/lambda/lex-build/test/lib/index.test.js b/source/lambda/lex-build/test/lib/index.test.js index 0c2c2101..0a7432b9 100644 --- a/source/lambda/lex-build/test/lib/index.test.js +++ b/source/lambda/lex-build/test/lib/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const index = require('../../lib/index'); diff --git a/source/lambda/lex-build/test/lib/intent.fixtures.js b/source/lambda/lex-build/test/lib/intent.fixtures.js index 54fa497c..c5f77a64 100644 --- a/source/lambda/lex-build/test/lib/intent.fixtures.js +++ b/source/lambda/lex-build/test/lib/intent.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.returnResult = function(isSlotName) { diff --git a/source/lambda/lex-build/test/lib/lexv2bot.test.js b/source/lambda/lex-build/test/lib/lexv2bot.test.js index 338c5e48..a8334e9f 100644 --- a/source/lambda/lex-build/test/lib/lexv2bot.test.js +++ b/source/lambda/lex-build/test/lib/lexv2bot.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { mockClient } = require('aws-sdk-client-mock'); diff --git a/source/lambda/lex-build/test/lib/qidsandquestions.test.js b/source/lambda/lex-build/test/lib/qidsandquestions.test.js index 06ce98f6..36b1d313 100644 --- a/source/lambda/lex-build/test/lib/qidsandquestions.test.js +++ b/source/lambda/lex-build/test/lib/qidsandquestions.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qidAndQuestions = require('../../lib/qidsandquestions'); const { con } = require('/opt/opensearch-client/connection'); diff --git a/source/lambda/lex-build/test/lib/statusv2.test.js b/source/lambda/lex-build/test/lib/statusv2.test.js index 340898b8..a18b15e2 100644 --- a/source/lambda/lex-build/test/lib/statusv2.test.js +++ b/source/lambda/lex-build/test/lib/statusv2.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/lexv2-build/handler.py b/source/lambda/lexv2-build/handler.py index 9d157ea1..f313cce4 100644 --- a/source/lambda/lexv2-build/handler.py +++ b/source/lambda/lexv2-build/handler.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### # Creates or updates a Lex V2 QnABot bot diff --git a/source/lambda/lexv2-build/test/conftest.py b/source/lambda/lexv2-build/test/conftest.py index 4d141f0b..1f6b4b7d 100644 --- a/source/lambda/lexv2-build/test/conftest.py +++ b/source/lambda/lexv2-build/test/conftest.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/lexv2-build/test/test_lambda_function.py b/source/lambda/lexv2-build/test/test_lambda_function.py index eed851cf..5781b51e 100644 --- a/source/lambda/lexv2-build/test/test_lambda_function.py +++ b/source/lambda/lexv2-build/test/test_lambda_function.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os import unittest diff --git a/source/lambda/proxy-es/index.js b/source/lambda/proxy-es/index.js index 60f1b12e..dbab37d1 100644 --- a/source/lambda/proxy-es/index.js +++ b/source/lambda/proxy-es/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const filter = (text) => { if (process.env.CLOUDWATCHLOGGINGDISABLED === 'true') { diff --git a/source/lambda/proxy-es/package-lock.json b/source/lambda/proxy-es/package-lock.json index 5f61dbde..70120d7b 100644 --- a/source/lambda/proxy-es/package-lock.json +++ b/source/lambda/proxy-es/package-lock.json @@ -1,12 +1,12 @@ { "name": "proxy-es", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "proxy-es", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0" } } diff --git a/source/lambda/proxy-es/package.json b/source/lambda/proxy-es/package.json index 33735ac7..3cd452dc 100644 --- a/source/lambda/proxy-es/package.json +++ b/source/lambda/proxy-es/package.json @@ -1,6 +1,6 @@ { "name": "proxy-es", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot Lambda function is used to proxy request from ApiGateway to OpenSearch", "main": "index.js", "author": { diff --git a/source/lambda/proxy-es/resource.js b/source/lambda/proxy-es/resource.js index 812ca1ef..ccefea9e 100644 --- a/source/lambda/proxy-es/resource.js +++ b/source/lambda/proxy-es/resource.js @@ -1,14 +1,6 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = require('../../../../../../../../opt/lib/cfn').resource; diff --git a/source/lambda/qnabot-common-layer/jest.config.js b/source/lambda/qnabot-common-layer/jest.config.js index 1760f65c..ec8a1823 100644 --- a/source/lambda/qnabot-common-layer/jest.config.js +++ b/source/lambda/qnabot-common-layer/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/qnabot-common-layer/package-lock.json b/source/lambda/qnabot-common-layer/package-lock.json index 8e3040df..9aa4ed73 100644 --- a/source/lambda/qnabot-common-layer/package-lock.json +++ b/source/lambda/qnabot-common-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "qnabot-common-layer", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qnabot-common-layer", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-ssm": "^3.511.0", diff --git a/source/lambda/qnabot-common-layer/package.json b/source/lambda/qnabot-common-layer/package.json index 16679af1..a1749945 100644 --- a/source/lambda/qnabot-common-layer/package.json +++ b/source/lambda/qnabot-common-layer/package.json @@ -1,6 +1,6 @@ { "name": "qnabot-common-layer", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda layers used to provide common logging and utility functions", "repository": { "type": "git", diff --git a/source/lambda/qnabot-common-layer/qnabot/logging.js b/source/lambda/qnabot-common-layer/qnabot/logging.js index 85455123..1a3b9508 100644 --- a/source/lambda/qnabot-common-layer/qnabot/logging.js +++ b/source/lambda/qnabot-common-layer/qnabot/logging.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { ComprehendClient, DetectPiiEntitiesCommand } = require('@aws-sdk/client-comprehend'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/qnabot-common-layer/qnabot/settings.js b/source/lambda/qnabot-common-layer/qnabot/settings.js index 02f8b0c3..39d04c68 100644 --- a/source/lambda/qnabot-common-layer/qnabot/settings.js +++ b/source/lambda/qnabot-common-layer/qnabot/settings.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { SSMClient, GetParameterCommand } = require('@aws-sdk/client-ssm'); diff --git a/source/lambda/qnabot-common-layer/test/logging.fixtures.js b/source/lambda/qnabot-common-layer/test/logging.fixtures.js index fc395801..3772f59f 100644 --- a/source/lambda/qnabot-common-layer/test/logging.fixtures.js +++ b/source/lambda/qnabot-common-layer/test/logging.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.objectToRedact = { accesstokenjwt: "fake-access-token", diff --git a/source/lambda/qnabot-common-layer/test/logging.test.js b/source/lambda/qnabot-common-layer/test/logging.test.js index e1162979..333f24ea 100644 --- a/source/lambda/qnabot-common-layer/test/logging.test.js +++ b/source/lambda/qnabot-common-layer/test/logging.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const logger = require('../qnabot/logging'); const loggingFixture = require('./logging.fixtures') diff --git a/source/lambda/qnabot-common-layer/test/settings.fixtures.js b/source/lambda/qnabot-common-layer/test/settings.fixtures.js index b56a9571..740dc7b7 100644 --- a/source/lambda/qnabot-common-layer/test/settings.fixtures.js +++ b/source/lambda/qnabot-common-layer/test/settings.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.defaultSettingsMock = JSON.stringify({ "ENABLE_DEBUG_RESPONSES": "false", diff --git a/source/lambda/qnabot-common-layer/test/settings.test.js b/source/lambda/qnabot-common-layer/test/settings.test.js index 8a3b4faa..80aed2c8 100644 --- a/source/lambda/qnabot-common-layer/test/settings.test.js +++ b/source/lambda/qnabot-common-layer/test/settings.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const awsMock = require('aws-sdk-client-mock'); const settings = require('../qnabot/settings'); diff --git a/source/lambda/s3-clean/lambda_function.py b/source/lambda/s3-clean/lambda_function.py index ad7888af..cba029d9 100644 --- a/source/lambda/s3-clean/lambda_function.py +++ b/source/lambda/s3-clean/lambda_function.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/s3-clean/test/conftest.py b/source/lambda/s3-clean/test/conftest.py index 4d141f0b..1f6b4b7d 100644 --- a/source/lambda/s3-clean/test/conftest.py +++ b/source/lambda/s3-clean/test/conftest.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/s3-clean/test/test_lambda_function.py b/source/lambda/s3-clean/test/test_lambda_function.py index da7af3e3..28c5371c 100644 --- a/source/lambda/s3-clean/test/test_lambda_function.py +++ b/source/lambda/s3-clean/test/test_lambda_function.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import unittest diff --git a/source/lambda/schema/index.js b/source/lambda/schema/index.js index 20713490..8f5453d5 100644 --- a/source/lambda/schema/index.js +++ b/source/lambda/schema/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = (event, context, callback) => { console.log('Received event:', JSON.stringify(event, null, 2)); diff --git a/source/lambda/schema/jest.config.js b/source/lambda/schema/jest.config.js index ed10a804..a84053a4 100644 --- a/source/lambda/schema/jest.config.js +++ b/source/lambda/schema/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/schema/package-lock.json b/source/lambda/schema/package-lock.json index 377ba2ca..8816d47e 100644 --- a/source/lambda/schema/package-lock.json +++ b/source/lambda/schema/package-lock.json @@ -1,12 +1,12 @@ { "name": "schema", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "schema", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" @@ -2837,12 +2837,13 @@ "dev": true }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -4148,7 +4149,7 @@ "jest-util": "^29.7.0", "jest-validate": "^29.7.0", "jest-watcher": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" @@ -4304,7 +4305,7 @@ "jest-haste-map": "^29.7.0", "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pirates": "^4.0.4", "slash": "^3.0.0", "write-file-atomic": "^4.0.2" @@ -5276,7 +5277,7 @@ "jest-runner": "^29.7.0", "jest-util": "^29.7.0", "jest-validate": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "parse-json": "^5.2.0", "pretty-format": "^29.7.0", "slash": "^3.0.0", @@ -5353,7 +5354,7 @@ "jest-regex-util": "^29.6.3", "jest-util": "^29.7.0", "jest-worker": "^29.7.0", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "walker": "^1.0.8" } }, @@ -5390,7 +5391,7 @@ "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", + "micromatch": "^4.0.8", "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" @@ -5756,12 +5757,12 @@ "dev": true }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, diff --git a/source/lambda/schema/package.json b/source/lambda/schema/package.json index 95975217..8ef108be 100644 --- a/source/lambda/schema/package.json +++ b/source/lambda/schema/package.json @@ -1,6 +1,6 @@ { "name": "schema", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda function used to provide the schemas for the various qid types", "repository": { "type": "git", @@ -22,5 +22,8 @@ "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" + }, + "overrides": { + "micromatch": "^4.0.8" } } diff --git a/source/lambda/schema/qna.js b/source/lambda/schema/qna.js index ec4dd5d3..7d63bcfe 100644 --- a/source/lambda/schema/qna.js +++ b/source/lambda/schema/qna.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { type: 'object', diff --git a/source/lambda/schema/quiz.js b/source/lambda/schema/quiz.js index 1620fd42..d8d49cf3 100644 --- a/source/lambda/schema/quiz.js +++ b/source/lambda/schema/quiz.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { type: 'object', diff --git a/source/lambda/schema/slottype.js b/source/lambda/schema/slottype.js index 22c9ce93..00bb2e61 100644 --- a/source/lambda/schema/slottype.js +++ b/source/lambda/schema/slottype.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { type: 'object', diff --git a/source/lambda/schema/test/index.test.js b/source/lambda/schema/test/index.test.js index 442ac75a..ccdf2b4b 100644 --- a/source/lambda/schema/test/index.test.js +++ b/source/lambda/schema/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lambda = require('../index'); const quiz = require('../quiz.js') diff --git a/source/lambda/schema/text.js b/source/lambda/schema/text.js index b9de9d78..5efab271 100644 --- a/source/lambda/schema/text.js +++ b/source/lambda/schema/text.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { type: 'object', diff --git a/source/lambda/solution-helper/test/conftest.py b/source/lambda/solution-helper/test/conftest.py index d6ca8381..9e2bb0c2 100644 --- a/source/lambda/solution-helper/test/conftest.py +++ b/source/lambda/solution-helper/test/conftest.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/lambda/test.js b/source/lambda/test.js index 561c01d3..3b8c9832 100644 --- a/source/lambda/test.js +++ b/source/lambda/test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/lambda/testall/index.js b/source/lambda/testall/index.js index 642340c7..83cf77a2 100644 --- a/source/lambda/testall/index.js +++ b/source/lambda/testall/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, waitUntilObjectExists, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/testall/lib/clean.js b/source/lambda/testall/lib/clean.js index 73534809..73d20944 100644 --- a/source/lambda/testall/lib/clean.js +++ b/source/lambda/testall/lib/clean.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, DeleteObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/testall/lib/lex.js b/source/lambda/testall/lib/lex.js index 7d9d98d5..683363c4 100644 --- a/source/lambda/testall/lib/lex.js +++ b/source/lambda/testall/lib/lex.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LexRuntimeV2Client, RecognizeTextCommand } = require('@aws-sdk/client-lex-runtime-v2'); const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/testall/lib/load.js b/source/lambda/testall/lib/load.js index f5e097b4..b01bd018 100644 --- a/source/lambda/testall/lib/load.js +++ b/source/lambda/testall/lib/load.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/testall/lib/start.js b/source/lambda/testall/lib/start.js index 1dffcac4..665c180d 100644 --- a/source/lambda/testall/lib/start.js +++ b/source/lambda/testall/lib/start.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const load = require('./load'); diff --git a/source/lambda/testall/lib/step.js b/source/lambda/testall/lib/step.js index e6dc8643..004d2b08 100644 --- a/source/lambda/testall/lib/step.js +++ b/source/lambda/testall/lib/step.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const load = require('./load'); diff --git a/source/lambda/testall/package-lock.json b/source/lambda/testall/package-lock.json index b7e85b86..4fa89617 100644 --- a/source/lambda/testall/package-lock.json +++ b/source/lambda/testall/package-lock.json @@ -1,12 +1,12 @@ { "name": "testall", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "testall", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-lex-runtime-v2": "^3.511.0" diff --git a/source/lambda/testall/package.json b/source/lambda/testall/package.json index 39071828..fff700ba 100644 --- a/source/lambda/testall/package.json +++ b/source/lambda/testall/package.json @@ -1,6 +1,6 @@ { "name": "testall", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda function that reads QnAs from opensearch and performs test validation against each question defined in qna against current Lex bot", "main": "index.js", "scripts": { diff --git a/source/lambda/testall/test/index.fixtures.js b/source/lambda/testall/test/index.fixtures.js index b3268dc3..7c135111 100644 --- a/source/lambda/testall/test/index.fixtures.js +++ b/source/lambda/testall/test/index.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { GetObjectCommand } = require('@aws-sdk/client-s3'); const { Readable } = require("stream"); diff --git a/source/lambda/testall/test/index.test.js b/source/lambda/testall/test/index.test.js index bd244d66..fb2c8812 100644 --- a/source/lambda/testall/test/index.test.js +++ b/source/lambda/testall/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, GetObjectCommand, PutObjectCommand } = require('@aws-sdk/client-s3'); const { mockClient } = require('aws-sdk-client-mock'); const { mockStream } = require('../test/index.fixtures'); diff --git a/source/lambda/testall/test/lib/clean.test.js b/source/lambda/testall/test/lib/clean.test.js index 3e881a82..2137e617 100644 --- a/source/lambda/testall/test/lib/clean.test.js +++ b/source/lambda/testall/test/lib/clean.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const clean = require('../../lib/clean'); const { mockClient } = require('aws-sdk-client-mock'); const { S3Client, DeleteObjectsCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/testall/test/lib/lex.fixtures.js b/source/lambda/testall/test/lib/lex.fixtures.js index e9226904..22097652 100644 --- a/source/lambda/testall/test/lib/lex.fixtures.js +++ b/source/lambda/testall/test/lib/lex.fixtures.js @@ -1,16 +1,8 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const response = { "a": "From the import page.", diff --git a/source/lambda/testall/test/lib/lex.test.js b/source/lambda/testall/test/lib/lex.test.js index 3ac5daff..16303ca3 100644 --- a/source/lambda/testall/test/lib/lex.test.js +++ b/source/lambda/testall/test/lib/lex.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LexRuntimeV2Client, RecognizeTextCommand } = require('@aws-sdk/client-lex-runtime-v2'); const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/testall/test/lib/load.test.js b/source/lambda/testall/test/lib/load.test.js index 6fb36963..9f676061 100644 --- a/source/lambda/testall/test/lib/load.test.js +++ b/source/lambda/testall/test/lib/load.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/lambda/testall/test/lib/start.test.js b/source/lambda/testall/test/lib/start.test.js index 06178fc6..b023c7c9 100644 --- a/source/lambda/testall/test/lib/start.test.js +++ b/source/lambda/testall/test/lib/start.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const start = require('../../lib/start'); const load = require('../../lib/load'); diff --git a/source/lambda/testall/test/lib/step.test.js b/source/lambda/testall/test/lib/step.test.js index 06c31cd5..cadda136 100644 --- a/source/lambda/testall/test/lib/step.test.js +++ b/source/lambda/testall/test/lib/step.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const load = require('../../lib/load'); const step = require('../../lib/step'); jest.mock('../../lib/load'); diff --git a/source/lambda/translate/index.js b/source/lambda/translate/index.js index 9c71cc32..37e4e848 100644 --- a/source/lambda/translate/index.js +++ b/source/lambda/translate/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { TranslateClient, ListTerminologiesCommand, ImportTerminologyCommand } = require('@aws-sdk/client-translate'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/lambda/translate/jest.config.js b/source/lambda/translate/jest.config.js index 1760f65c..ec8a1823 100644 --- a/source/lambda/translate/jest.config.js +++ b/source/lambda/translate/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/translate/package-lock.json b/source/lambda/translate/package-lock.json index 7eded835..2be8f168 100644 --- a/source/lambda/translate/package-lock.json +++ b/source/lambda/translate/package-lock.json @@ -1,12 +1,12 @@ { "name": "translate", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "translate", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "devDependencies": { "aws-sdk-client-mock": "^3.0.1", diff --git a/source/lambda/translate/package.json b/source/lambda/translate/package.json index 48f4622c..15f86321 100644 --- a/source/lambda/translate/package.json +++ b/source/lambda/translate/package.json @@ -1,6 +1,6 @@ { "name": "translate", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda function used to import custom terminologies into AWS Translate", "repository": { "type": "git", diff --git a/source/lambda/translate/test/index.test.js b/source/lambda/translate/test/index.test.js index 8ea48db9..f7f8a3de 100644 --- a/source/lambda/translate/test/index.test.js +++ b/source/lambda/translate/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lambda = require('../index'); const translateFixture = require('./translate.fixtures'); diff --git a/source/lambda/translate/test/translate.fixtures.js b/source/lambda/translate/test/translate.fixtures.js index e6ab36a7..4b3d844a 100644 --- a/source/lambda/translate/test/translate.fixtures.js +++ b/source/lambda/translate/test/translate.fixtures.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.listData = { //only mocking the partial response object as we want to test the transform diff --git a/source/lambda/warmer/index.js b/source/lambda/warmer/index.js index 28fb5a83..34d6603b 100644 --- a/source/lambda/warmer/index.js +++ b/source/lambda/warmer/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const osWarmer = new (require('./lib'))(); exports.warmer = async function (event, context, callback) { diff --git a/source/lambda/warmer/jest.config.js b/source/lambda/warmer/jest.config.js index dbb6b9c5..070a5b1f 100644 --- a/source/lambda/warmer/jest.config.js +++ b/source/lambda/warmer/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { testEnvironment: 'node', diff --git a/source/lambda/warmer/lib/index.js b/source/lambda/warmer/lib/index.js index 5631008a..bbdfa786 100644 --- a/source/lambda/warmer/lib/index.js +++ b/source/lambda/warmer/lib/index.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { URL } = require('url'); const { fromEnv } = require('@aws-sdk/credential-providers'); diff --git a/source/lambda/warmer/test/index.test.js b/source/lambda/warmer/test/index.test.js index c00cb250..e033b48a 100644 --- a/source/lambda/warmer/test/index.test.js +++ b/source/lambda/warmer/test/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const osWarmer = require('../index'); const warmer = new (require('../lib'))(); diff --git a/source/lambda/warmer/test/lib/index.test.js b/source/lambda/warmer/test/lib/index.test.js index 5ac98158..f794bc58 100644 --- a/source/lambda/warmer/test/lib/index.test.js +++ b/source/lambda/warmer/test/lib/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const osWarmer = new (require('../../lib'))(); const { NodeHttpHandler } = require('@smithy/node-http-handler'); diff --git a/source/package-lock.json b/source/package-lock.json index 4ef64db4..127a4593 100644 --- a/source/package-lock.json +++ b/source/package-lock.json @@ -1,12 +1,12 @@ { "name": "qnabot-on-aws", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qnabot-on-aws", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "os": [ "darwin", @@ -36,7 +36,7 @@ "aws-lex-web-ui": "git+https://github.com/aws-samples/aws-lex-web-ui.git#feature/qnabot-sdkv3", "aws4": "^1.7.0", "axios": "^1.7.4", - "body-parser": "^1.18.3", + "body-parser": "^1.20.3", "bowser": "^1.9.3", "cfn-response": "^1.0.1", "chalk": "^4.1.2", @@ -46,7 +46,7 @@ "commander": "^8.2.0", "eslint-plugin-vue": "^9.17.0", "exports-loader": "^0.6.4", - "express": "^4.21.0", + "express": "^4.21.1", "faker": "^4.1.0", "file-saver": "^1.3.8", "handlebars": "^4.7.8", @@ -74,7 +74,6 @@ "querystring": "^0.2.0", "querystring-browser": "^1.0.4", "quick-lru": "^1.1.0", - "range": "0.0.3", "raw-text": "^1.1.0", "read-excel-file": "^5.8.5", "recursive-readdir": "^2.2.2", @@ -93,7 +92,6 @@ "vue-hint.css": "^0.0.2", "vue-lorem-ipsum": "^0.0.1", "vue-router": "^4.2.5", - "vue-template-compiler": "^2.7.15", "vuetify": "~3.4.7", "vuex": "^4.1.0", "vuex-router-sync": "^5.0.0" @@ -12038,9 +12036,10 @@ "dev": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -12783,7 +12782,10 @@ "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==" + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "dev": true, + "optional": true, + "peer": true }, "node_modules/debug": { "version": "4.3.4", @@ -14693,9 +14695,9 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -14703,7 +14705,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -14750,15 +14752,6 @@ "node": ">= 0.8" } }, - "node_modules/express/node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/express/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -15752,6 +15745,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, "bin": { "he": "bin/he" } @@ -22620,14 +22614,6 @@ "safe-buffer": "^5.1.0" } }, - "node_modules/range": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/range/-/range-0.0.3.tgz", - "integrity": "sha1-tbjrJGOlFrYkpWO9MrGP6J5wFRs=", - "engines": { - "node": ">=0.8" - } - }, "node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -25801,6 +25787,9 @@ "version": "2.7.16", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz", "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==", + "dev": true, + "optional": true, + "peer": true, "dependencies": { "de-indent": "^1.0.2", "he": "^1.2.0" diff --git a/source/package.json b/source/package.json index c0b2b949..165f9a3e 100644 --- a/source/package.json +++ b/source/package.json @@ -1,6 +1,6 @@ { "name": "qnabot-on-aws", - "version": "6.1.2", + "version": "6.1.3", "engines": { "node": ">=18.0.0", "npm": ">=10.0.0" @@ -81,7 +81,7 @@ "aws-lex-web-ui": "git+https://github.com/aws-samples/aws-lex-web-ui.git#feature/qnabot-sdkv3", "aws4": "^1.7.0", "axios": "^1.7.4", - "body-parser": "^1.18.3", + "body-parser": "^1.20.3", "bowser": "^1.9.3", "cfn-response": "^1.0.1", "chalk": "^4.1.2", @@ -91,7 +91,7 @@ "commander": "^8.2.0", "eslint-plugin-vue": "^9.17.0", "exports-loader": "^0.6.4", - "express": "^4.21.0", + "express": "^4.21.1", "faker": "^4.1.0", "file-saver": "^1.3.8", "handlebars": "^4.7.8", @@ -119,7 +119,6 @@ "querystring": "^0.2.0", "querystring-browser": "^1.0.4", "quick-lru": "^1.1.0", - "range": "0.0.3", "raw-text": "^1.1.0", "read-excel-file": "^5.8.5", "recursive-readdir": "^2.2.2", @@ -138,7 +137,6 @@ "vue-hint.css": "^0.0.2", "vue-lorem-ipsum": "^0.0.1", "vue-router": "^4.2.5", - "vue-template-compiler": "^2.7.15", "vuetify": "~3.4.7", "vuex": "^4.1.0", "vuex-router-sync": "^5.0.0" diff --git a/source/templates/__tests__/setup.js b/source/templates/__tests__/setup.js index 0a719bb9..93c16a60 100644 --- a/source/templates/__tests__/setup.js +++ b/source/templates/__tests__/setup.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ global.console = { ...console, diff --git a/source/templates/dev/__tests__/bucket.test.js b/source/templates/dev/__tests__/bucket.test.js index 55a2976c..ccdf180a 100644 --- a/source/templates/dev/__tests__/bucket.test.js +++ b/source/templates/dev/__tests__/bucket.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mockConfigFull = require('./mockConfigFull.json'); const mockMaster = require('./mockMaster'); diff --git a/source/templates/dev/__tests__/dev.test.js b/source/templates/dev/__tests__/dev.test.js index f04770f2..2a8b6836 100644 --- a/source/templates/dev/__tests__/dev.test.js +++ b/source/templates/dev/__tests__/dev.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const templateFiles = ['api', 'cognito', 'lambda']; diff --git a/source/templates/dev/__tests__/masterConfig.test.js b/source/templates/dev/__tests__/masterConfig.test.js index 999f12d8..6f3a57bd 100644 --- a/source/templates/dev/__tests__/masterConfig.test.js +++ b/source/templates/dev/__tests__/masterConfig.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mockConfigFull = require('./mockConfigFull.json'); const mockMaster = require('./mockMaster.js') diff --git a/source/templates/dev/__tests__/masterNoConfig.test.js b/source/templates/dev/__tests__/masterNoConfig.test.js index 9a31cd5e..0bc46e1a 100644 --- a/source/templates/dev/__tests__/masterNoConfig.test.js +++ b/source/templates/dev/__tests__/masterNoConfig.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mockConfigEmpty = require('./mockConfigEmpty.json'); const mockMaster = require('./mockMaster.js') diff --git a/source/templates/dev/__tests__/mockMaster.js b/source/templates/dev/__tests__/mockMaster.js index b9fb3b92..698c011d 100644 --- a/source/templates/dev/__tests__/mockMaster.js +++ b/source/templates/dev/__tests__/mockMaster.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + module.exports = { Parameters: { BootstrapBucket: { diff --git a/source/templates/dev/api.js b/source/templates/dev/api.js index e836a1e0..9fb0f84a 100644 --- a/source/templates/dev/api.js +++ b/source/templates/dev/api.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/dev/bootstrap/__snapshots__/index.test.js.snap b/source/templates/dev/bootstrap/__snapshots__/index.test.js.snap index afc50ee4..d3397077 100644 --- a/source/templates/dev/bootstrap/__snapshots__/index.test.js.snap +++ b/source/templates/dev/bootstrap/__snapshots__/index.test.js.snap @@ -109,18 +109,10 @@ exports[`renders bootstrap template correctly 1`] = ` }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, DeleteObjectsCommand, ListObjectVersionsCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/dev/bootstrap/__tests__/handler.fixtures.js b/source/templates/dev/bootstrap/__tests__/handler.fixtures.js index 3a93b497..cbdd0b4d 100644 --- a/source/templates/dev/bootstrap/__tests__/handler.fixtures.js +++ b/source/templates/dev/bootstrap/__tests__/handler.fixtures.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { RequestType: 'Create', diff --git a/source/templates/dev/bootstrap/__tests__/handler.test.js b/source/templates/dev/bootstrap/__tests__/handler.test.js index ab97e938..e2ebca93 100644 --- a/source/templates/dev/bootstrap/__tests__/handler.test.js +++ b/source/templates/dev/bootstrap/__tests__/handler.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require("aws-sdk-client-mock-jest"); const { EventEmitter } = require('events'); diff --git a/source/templates/dev/bootstrap/handler.js b/source/templates/dev/bootstrap/handler.js index ef1dd934..4a278d8e 100644 --- a/source/templates/dev/bootstrap/handler.js +++ b/source/templates/dev/bootstrap/handler.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, DeleteObjectsCommand, ListObjectVersionsCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/dev/bootstrap/index.js b/source/templates/dev/bootstrap/index.js index ed842805..2e469752 100644 --- a/source/templates/dev/bootstrap/index.js +++ b/source/templates/dev/bootstrap/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const path = require('path'); diff --git a/source/templates/dev/bootstrap/index.test.js b/source/templates/dev/bootstrap/index.test.js index 3035b55c..31ebdb86 100644 --- a/source/templates/dev/bootstrap/index.test.js +++ b/source/templates/dev/bootstrap/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/dev/bucket.js b/source/templates/dev/bucket.js index 30b2c7ca..acd54825 100644 --- a/source/templates/dev/bucket.js +++ b/source/templates/dev/bucket.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const outputs = require('../../bin/exports'); const util = require('../util'); diff --git a/source/templates/dev/cognito.js b/source/templates/dev/cognito.js index 043b421c..935e9b49 100644 --- a/source/templates/dev/cognito.js +++ b/source/templates/dev/cognito.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/dev/lambda.js b/source/templates/dev/lambda.js index 8c6c3e9b..e0539b1c 100644 --- a/source/templates/dev/lambda.js +++ b/source/templates/dev/lambda.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/dev/master.js b/source/templates/dev/master.js index 8be18aac..d043b99c 100644 --- a/source/templates/dev/master.js +++ b/source/templates/dev/master.js @@ -1,16 +1,8 @@ /* eslint-disable max-len */ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../../config.json'); const outputs = require('../../bin/exports'); diff --git a/source/templates/examples/examples/__tests__/cfn.test.js b/source/templates/examples/examples/__tests__/cfn.test.js index 61be7b55..57594c82 100644 --- a/source/templates/examples/examples/__tests__/cfn.test.js +++ b/source/templates/examples/examples/__tests__/cfn.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require("aws-sdk-client-mock-jest"); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/examples/examples/cfn.js b/source/templates/examples/examples/cfn.js index 1ef47dc9..33d71b0e 100644 --- a/source/templates/examples/examples/cfn.js +++ b/source/templates/examples/examples/cfn.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const response = require('cfn-response'); diff --git a/source/templates/examples/examples/index.js b/source/templates/examples/examples/index.js index 3c3cf8c8..a2a3e867 100644 --- a/source/templates/examples/examples/index.js +++ b/source/templates/examples/examples/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/examples/examples/js/Quiz.js b/source/templates/examples/examples/js/Quiz.js index 1875172e..7f542ac8 100644 --- a/source/templates/examples/examples/js/Quiz.js +++ b/source/templates/examples/examples/js/Quiz.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const { KMSClient, DecryptCommand, EncryptCommand } = require('@aws-sdk/client-kms'); diff --git a/source/templates/examples/examples/js/__tests__/Quiz.fixtures.js b/source/templates/examples/examples/js/__tests__/Quiz.fixtures.js index 2e038518..7f30b90b 100644 --- a/source/templates/examples/examples/js/__tests__/Quiz.fixtures.js +++ b/source/templates/examples/examples/js/__tests__/Quiz.fixtures.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { req: { diff --git a/source/templates/examples/examples/js/__tests__/Quiz.test.js b/source/templates/examples/examples/js/__tests__/Quiz.test.js index 1a2d0fa9..9f31db31 100644 --- a/source/templates/examples/examples/js/__tests__/Quiz.test.js +++ b/source/templates/examples/examples/js/__tests__/Quiz.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { mockClient } = require('aws-sdk-client-mock'); const { KMSClient, DecryptCommand, EncryptCommand } = require('@aws-sdk/client-kms'); diff --git a/source/templates/examples/examples/js/__tests__/hook.test.js b/source/templates/examples/examples/js/__tests__/hook.test.js index 95728bc4..06a72c50 100644 --- a/source/templates/examples/examples/js/__tests__/hook.test.js +++ b/source/templates/examples/examples/js/__tests__/hook.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { handler } = require('../hook'); diff --git a/source/templates/examples/examples/js/hook.js b/source/templates/examples/examples/js/hook.js index ad107ce6..90f1c5e3 100644 --- a/source/templates/examples/examples/js/hook.js +++ b/source/templates/examples/examples/js/hook.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = function (event, context, cb) { const today = new Date(); diff --git a/source/templates/examples/examples/package-lock.json b/source/templates/examples/examples/package-lock.json index eee1dd32..3d1ab3d7 100644 --- a/source/templates/examples/examples/package-lock.json +++ b/source/templates/examples/examples/package-lock.json @@ -1,12 +1,12 @@ { "name": "examples", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "examples", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "cfn-response": "^1.0.1", diff --git a/source/templates/examples/examples/package.json b/source/templates/examples/examples/package.json index 083a1ea0..18d65b54 100644 --- a/source/templates/examples/examples/package.json +++ b/source/templates/examples/examples/package.json @@ -1,6 +1,6 @@ { "name": "examples", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda contains a collection of lambda hooks for QnABot and a custom resource to create the example documents", "main": "index.js", "scripts": { diff --git a/source/templates/examples/examples/py/BotBroker.py b/source/templates/examples/examples/py/BotBroker.py index c6a337cf..2c034100 100644 --- a/source/templates/examples/examples/py/BotBroker.py +++ b/source/templates/examples/examples/py/BotBroker.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from __future__ import print_function diff --git a/source/templates/examples/examples/py/ConnectCallback.py b/source/templates/examples/examples/py/ConnectCallback.py index 7076ba8e..e4cca296 100644 --- a/source/templates/examples/examples/py/ConnectCallback.py +++ b/source/templates/examples/examples/py/ConnectCallback.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/templates/examples/examples/py/Feedback.py b/source/templates/examples/examples/py/Feedback.py index d473b016..b354393f 100644 --- a/source/templates/examples/examples/py/Feedback.py +++ b/source/templates/examples/examples/py/Feedback.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/templates/examples/examples/py/Next.py b/source/templates/examples/examples/py/Next.py index 3db2d787..338aa24a 100644 --- a/source/templates/examples/examples/py/Next.py +++ b/source/templates/examples/examples/py/Next.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from __future__ import print_function diff --git a/source/templates/examples/examples/py/Previous.py b/source/templates/examples/examples/py/Previous.py index e7f3528d..2cda49de 100644 --- a/source/templates/examples/examples/py/Previous.py +++ b/source/templates/examples/examples/py/Previous.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### from __future__ import print_function diff --git a/source/templates/examples/examples/py/__tests__/conftest.py b/source/templates/examples/examples/py/__tests__/conftest.py index cb49870e..1cf4663c 100644 --- a/source/templates/examples/examples/py/__tests__/conftest.py +++ b/source/templates/examples/examples/py/__tests__/conftest.py @@ -1,15 +1,7 @@ #!/usr/bin/env python ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/templates/examples/examples/py/__tests__/test_ConnectCallback.py b/source/templates/examples/examples/py/__tests__/test_ConnectCallback.py index 981616d3..9d664ba1 100644 --- a/source/templates/examples/examples/py/__tests__/test_ConnectCallback.py +++ b/source/templates/examples/examples/py/__tests__/test_ConnectCallback.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/templates/examples/examples/py/__tests__/test_Feedback.py b/source/templates/examples/examples/py/__tests__/test_Feedback.py index f93c70fd..d02c7283 100644 --- a/source/templates/examples/examples/py/__tests__/test_Feedback.py +++ b/source/templates/examples/examples/py/__tests__/test_Feedback.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/templates/examples/examples/py/__tests__/test_Next.py b/source/templates/examples/examples/py/__tests__/test_Next.py index 6e7873fe..876a2503 100644 --- a/source/templates/examples/examples/py/__tests__/test_Next.py +++ b/source/templates/examples/examples/py/__tests__/test_Next.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/templates/examples/examples/py/__tests__/test_Previous.py b/source/templates/examples/examples/py/__tests__/test_Previous.py index 54856e4c..6f794987 100644 --- a/source/templates/examples/examples/py/__tests__/test_Previous.py +++ b/source/templates/examples/examples/py/__tests__/test_Previous.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import json diff --git a/source/templates/examples/examples/py/__tests__/test_hello.py b/source/templates/examples/examples/py/__tests__/test_hello.py index 76fdd54e..53419f20 100644 --- a/source/templates/examples/examples/py/__tests__/test_hello.py +++ b/source/templates/examples/examples/py/__tests__/test_hello.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import unittest import datetime diff --git a/source/templates/examples/examples/py/hello.py b/source/templates/examples/examples/py/hello.py index 74747474..9cb9f33f 100644 --- a/source/templates/examples/examples/py/hello.py +++ b/source/templates/examples/examples/py/hello.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import datetime diff --git a/source/templates/examples/examples/responsebots-lexv2.js b/source/templates/examples/examples/responsebots-lexv2.js index 00462f08..10e45fa4 100644 --- a/source/templates/examples/examples/responsebots-lexv2.js +++ b/source/templates/examples/examples/responsebots-lexv2.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /** * diff --git a/source/templates/examples/extensions/index.js b/source/templates/examples/extensions/index.js index 952474db..f94bb77e 100644 --- a/source/templates/examples/extensions/index.js +++ b/source/templates/examples/extensions/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/CreateRecentTopicsResponse.js b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/CreateRecentTopicsResponse.js index 669e51be..a12140ef 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/CreateRecentTopicsResponse.js +++ b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/CreateRecentTopicsResponse.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const hook = require('lambda_hook_sdk/hooks'); diff --git a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json index 825b891d..5a4abf98 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json @@ -1,12 +1,12 @@ { "name": "createrecenttopicsresponse", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "createrecenttopicsresponse", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" diff --git a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json index d274d376..d152a582 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json @@ -1,6 +1,6 @@ { "name": "createrecenttopicsresponse", - "version": "6.1.2", + "version": "6.1.3", "description": "Lambda hook that creates recent topic response", "main": "CreateRecentTopicResponse.js", "scripts": { diff --git a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/CustomJSHook.js b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/CustomJSHook.js index df0d9219..bd07321b 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/CustomJSHook.js +++ b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/CustomJSHook.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = function (event, context, cb) { console.log(JSON.stringify(event, null, 2)); diff --git a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/__tests__/CustomJSHook.test.js b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/__tests__/CustomJSHook.test.js index 36e91723..aebe8b42 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/__tests__/CustomJSHook.test.js +++ b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/__tests__/CustomJSHook.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { handler } = require('../CustomJSHook'); diff --git a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json index 9e646b78..b82fd4d9 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json @@ -1,12 +1,12 @@ { "name": "examples", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "examples", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "cfn-response": "^1.0.1", diff --git a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json index 4b7f48ed..e42c3cd7 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json @@ -1,6 +1,6 @@ { "name": "examples", - "version": "6.1.2", + "version": "6.1.3", "description": "Creates custom JS Lambda Hooks", "main": "index.js", "scripts": { diff --git a/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/CustomPYHook.py b/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/CustomPYHook.py index 0d5bde06..453ddb0b 100644 --- a/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/CustomPYHook.py +++ b/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/CustomPYHook.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### def handler(event, context): # NOSONAR Lambda Handler diff --git a/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/conftest.py b/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/conftest.py index 1545db1b..71682c6c 100644 --- a/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/conftest.py +++ b/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/conftest.py @@ -1,15 +1,7 @@ #!/usr/bin/env python ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import os diff --git a/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/test_CustomPYHook.py b/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/test_CustomPYHook.py index 84a7a4bf..70020643 100644 --- a/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/test_CustomPYHook.py +++ b/source/templates/examples/extensions/py_lambda_hooks/CustomPYHook/__tests__/test_CustomPYHook.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### class TestCustomPYHook(): diff --git a/source/templates/examples/extensions/ui_imports/package-lock.json b/source/templates/examples/extensions/ui_imports/package-lock.json index 22489551..c5f270e5 100644 --- a/source/templates/examples/extensions/ui_imports/package-lock.json +++ b/source/templates/examples/extensions/ui_imports/package-lock.json @@ -1,12 +1,12 @@ { "name": "ui_import", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ui_import", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "dependencies": { "cfn-response": "^1.0.1", diff --git a/source/templates/examples/extensions/ui_imports/package.json b/source/templates/examples/extensions/ui_imports/package.json index 97402511..0bf2dc37 100644 --- a/source/templates/examples/extensions/ui_imports/package.json +++ b/source/templates/examples/extensions/ui_imports/package.json @@ -1,6 +1,6 @@ { "name": "ui_import", - "version": "6.1.2", + "version": "6.1.3", "description": "Add new content packages for Content Designer Import Examples/Extensions listing", "main": "ui_import.js", "scripts": { diff --git a/source/templates/examples/extensions/ui_imports/ui_import.js b/source/templates/examples/extensions/ui_imports/ui_import.js index 4fde7ec2..e1c657da 100644 --- a/source/templates/examples/extensions/ui_imports/ui_import.js +++ b/source/templates/examples/extensions/ui_imports/ui_import.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const response = require('cfn-response'); diff --git a/source/templates/examples/index.js b/source/templates/examples/index.js index 52d9edb7..dd2c4086 100644 --- a/source/templates/examples/index.js +++ b/source/templates/examples/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const examples = require('./examples'); const extensions = require('./extensions'); diff --git a/source/templates/examples/index.test.js b/source/templates/examples/index.test.js index 4bfbe2c6..ce530ee7 100644 --- a/source/templates/examples/index.test.js +++ b/source/templates/examples/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/examples/outputs.js b/source/templates/examples/outputs.js index f576728b..0d5fd14f 100644 --- a/source/templates/examples/outputs.js +++ b/source/templates/examples/outputs.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/export/bucket.js b/source/templates/export/bucket.js index 48a7fbcc..b6dd90d1 100644 --- a/source/templates/export/bucket.js +++ b/source/templates/export/bucket.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { ExportTriggerFromS3: { diff --git a/source/templates/export/index.js b/source/templates/export/index.js index 113d193e..2fbb10f2 100644 --- a/source/templates/export/index.js +++ b/source/templates/export/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/export/index.test.js b/source/templates/export/index.test.js index 8a1500de..5c9e4d1c 100644 --- a/source/templates/export/index.test.js +++ b/source/templates/export/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/export/outputs.js b/source/templates/export/outputs.js index 0fa73431..723f6436 100644 --- a/source/templates/export/outputs.js +++ b/source/templates/export/outputs.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { diff --git a/source/templates/export/resources.js b/source/templates/export/resources.js index 4c3d10f5..831150e5 100644 --- a/source/templates/export/resources.js +++ b/source/templates/export/resources.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* eslint-disable indent */ /* eslint-disable quotes */ diff --git a/source/templates/import/UpgradeAutoImport.js b/source/templates/import/UpgradeAutoImport.js index c3357fbb..74899255 100644 --- a/source/templates/import/UpgradeAutoImport.js +++ b/source/templates/import/UpgradeAutoImport.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // Filenames must match across: // aws-ai-qna-bot/templates/import/UpgradeAutoImport.js diff --git a/source/templates/import/bucket.js b/source/templates/import/bucket.js index 5b23ef3c..bde33891 100644 --- a/source/templates/import/bucket.js +++ b/source/templates/import/bucket.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { ImportTriggerFromS3: { diff --git a/source/templates/import/index.js b/source/templates/import/index.js index 01fdc1e4..53998926 100644 --- a/source/templates/import/index.js +++ b/source/templates/import/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/import/index.test.js b/source/templates/import/index.test.js index 96e5ace6..e9ebd5aa 100644 --- a/source/templates/import/index.test.js +++ b/source/templates/import/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/import/outputs.js b/source/templates/import/outputs.js index add7e030..f5bdc90a 100644 --- a/source/templates/import/outputs.js +++ b/source/templates/import/outputs.js @@ -1,14 +1,6 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = {}; diff --git a/source/templates/import/resources.js b/source/templates/import/resources.js index 448d9147..96aff956 100644 --- a/source/templates/import/resources.js +++ b/source/templates/import/resources.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* eslint-disable indent */ /* eslint-disable quotes */ diff --git a/source/templates/jest.config.js b/source/templates/jest.config.js index 3b65e3ce..ca4c0fc4 100644 --- a/source/templates/jest.config.js +++ b/source/templates/jest.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.env.npm_package_version = "x.x.x" process.env.npm_package_config_lambdaRuntime = "nodejs" diff --git a/source/templates/master/UpgradeAutoExport.js b/source/templates/master/UpgradeAutoExport.js index 74b5a414..efa380ca 100644 --- a/source/templates/master/UpgradeAutoExport.js +++ b/source/templates/master/UpgradeAutoExport.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // Filenames must match across: // aws-ai-qna-bot/templates/import/UpgradeAutoImport.js diff --git a/source/templates/master/__snapshots__/index.test.js.snap b/source/templates/master/__snapshots__/index.test.js.snap index 3a613d82..e88f4136 100644 --- a/source/templates/master/__snapshots__/index.test.js.snap +++ b/source/templates/master/__snapshots__/index.test.js.snap @@ -4589,18 +4589,10 @@ exports[`Verify master template is correct renders master template correctly 1`] }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { OpenSearchClient, DescribeDomainCommand } = require('@aws-sdk/client-opensearch'); @@ -6953,18 +6945,10 @@ exports.handler = async function (event, context) { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); @@ -7164,18 +7148,10 @@ exports.documents = (event, context, callback) => { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); @@ -11425,18 +11401,10 @@ exports.documents = (event, context, callback) => { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { LexModelBuildingServiceClient, GetBotCommand } = require('@aws-sdk/client-lex-model-building-service'); @@ -12118,18 +12086,10 @@ exports.handler = async function (event, context, callback) { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); @@ -12310,18 +12270,10 @@ exports.handler = async function (event, context, callback) { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LexModelBuildingService } = require('@aws-sdk/client-lex-model-building-service'); const customSdkConfig = require('sdk-config/customSdkConfig'); @@ -12936,18 +12888,10 @@ exports.handler = (event, context, callback) => { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LexModelsV2Client, DescribeBotCommand } = require('@aws-sdk/client-lex-models-v2'); const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3'); @@ -14066,18 +14010,10 @@ exports.handler = async (event, context, callback) => { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = (event, context, callback) => { console.log('Received event:', JSON.stringify(event, null, 2)); @@ -17360,18 +17296,10 @@ function message(code, name) { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); @@ -18185,18 +18113,10 @@ exports.handler = (event, context, callback) => { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = (event, context, callback) => { console.log('Received event:', JSON.stringify(event, null, 2)); @@ -19932,18 +19852,10 @@ exports.handler = (event, context, callback) => { }, "Properties": { "Code": { - "ZipFile": "/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ + "ZipFile": "/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, HeadObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/master/appregistry.js b/source/templates/master/appregistry.js index e33d4506..e5437204 100644 --- a/source/templates/master/appregistry.js +++ b/source/templates/master/appregistry.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { Application: { diff --git a/source/templates/master/assets.js b/source/templates/master/assets.js index 4bcaa6cd..b12833cc 100644 --- a/source/templates/master/assets.js +++ b/source/templates/master/assets.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/master/bucket.js b/source/templates/master/bucket.js index 322f4256..ff3f193c 100644 --- a/source/templates/master/bucket.js +++ b/source/templates/master/bucket.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/master/cfn/__tests__/handler.fixtures.js b/source/templates/master/cfn/__tests__/handler.fixtures.js index bf04bd4a..0243028c 100644 --- a/source/templates/master/cfn/__tests__/handler.fixtures.js +++ b/source/templates/master/cfn/__tests__/handler.fixtures.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { RequestType: 'Create', diff --git a/source/templates/master/cfn/__tests__/handler.test.js b/source/templates/master/cfn/__tests__/handler.test.js index 875292b2..17b116d7 100644 --- a/source/templates/master/cfn/__tests__/handler.test.js +++ b/source/templates/master/cfn/__tests__/handler.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require("aws-sdk-client-mock-jest"); const { EventEmitter } = require('events'); diff --git a/source/templates/master/cfn/handler.js b/source/templates/master/cfn/handler.js index dfe2dd99..c8dbf73c 100644 --- a/source/templates/master/cfn/handler.js +++ b/source/templates/master/cfn/handler.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, HeadObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/master/cfn/index.js b/source/templates/master/cfn/index.js index bfd58c1b..764ff7ec 100644 --- a/source/templates/master/cfn/index.js +++ b/source/templates/master/cfn/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); diff --git a/source/templates/master/cognito/index.js b/source/templates/master/cognito/index.js index 8ea51657..9dc5a9fd 100644 --- a/source/templates/master/cognito/index.js +++ b/source/templates/master/cognito/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const util = require('../../util'); diff --git a/source/templates/master/cognito/style/index.js b/source/templates/master/cognito/style/index.js index cc27f991..e5fe9ea4 100755 --- a/source/templates/master/cognito/style/index.js +++ b/source/templates/master/cognito/style/index.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const sass = require('sass'); diff --git a/source/templates/master/config.js b/source/templates/master/config.js index e26f28f0..bddb347f 100644 --- a/source/templates/master/config.js +++ b/source/templates/master/config.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); diff --git a/source/templates/master/dashboard/body.js b/source/templates/master/dashboard/body.js index 4e03bfaf..8c3e8a59 100644 --- a/source/templates/master/dashboard/body.js +++ b/source/templates/master/dashboard/body.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const lambdas = require('./lambdas'); const opensearch = require('./opensearch'); diff --git a/source/templates/master/dashboard/index.js b/source/templates/master/dashboard/index.js index 975c6225..65c7a71d 100644 --- a/source/templates/master/dashboard/index.js +++ b/source/templates/master/dashboard/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { dashboard: { diff --git a/source/templates/master/dashboard/lambdas.js b/source/templates/master/dashboard/lambdas.js index 2386cf35..9f0a7f58 100644 --- a/source/templates/master/dashboard/lambdas.js +++ b/source/templates/master/dashboard/lambdas.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/master/dashboard/opensearch.js b/source/templates/master/dashboard/opensearch.js index ffb1e2f6..059c0051 100644 --- a/source/templates/master/dashboard/opensearch.js +++ b/source/templates/master/dashboard/opensearch.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + const _ = require('lodash'); const util = require('./util'); diff --git a/source/templates/master/dashboard/util.js b/source/templates/master/dashboard/util.js index 034e4132..7aab6fdb 100644 --- a/source/templates/master/dashboard/util.js +++ b/source/templates/master/dashboard/util.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.yOffset = function (widgets) { const start = Math.max(...widgets.map((x) => x.y)); diff --git a/source/templates/master/dynamodb/index.js b/source/templates/master/dynamodb/index.js index 2e00e620..d17343d8 100644 --- a/source/templates/master/dynamodb/index.js +++ b/source/templates/master/dynamodb/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); diff --git a/source/templates/master/examples.js b/source/templates/master/examples.js index bd2dd5a7..31aa31b0 100644 --- a/source/templates/master/examples.js +++ b/source/templates/master/examples.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { ExamplesStack: { diff --git a/source/templates/master/exportstack.js b/source/templates/master/exportstack.js index cbdedcf8..a41f3a54 100644 --- a/source/templates/master/exportstack.js +++ b/source/templates/master/exportstack.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { ExportStack: { diff --git a/source/templates/master/importstack.js b/source/templates/master/importstack.js index f099692f..22a8df40 100644 --- a/source/templates/master/importstack.js +++ b/source/templates/master/importstack.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { ImportStack: { diff --git a/source/templates/master/index.js b/source/templates/master/index.js index c37f3c72..05c2131d 100644 --- a/source/templates/master/index.js +++ b/source/templates/master/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/master/index.test.js b/source/templates/master/index.test.js index 60c685e4..ba8629b6 100644 --- a/source/templates/master/index.test.js +++ b/source/templates/master/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const indexModule = require('./index'); diff --git a/source/templates/master/lambda-layers.js b/source/templates/master/lambda-layers.js index 8b7cffc4..d192720e 100644 --- a/source/templates/master/lambda-layers.js +++ b/source/templates/master/lambda-layers.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { CommonModulesLayerCodeVersion: { diff --git a/source/templates/master/lambda.js b/source/templates/master/lambda.js index bb6c5e2a..64220061 100644 --- a/source/templates/master/lambda.js +++ b/source/templates/master/lambda.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/master/lex-build/__tests__/poll.test.js b/source/templates/master/lex-build/__tests__/poll.test.js index b5802980..3d495e52 100644 --- a/source/templates/master/lex-build/__tests__/poll.test.js +++ b/source/templates/master/lex-build/__tests__/poll.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require('aws-sdk-client-mock-jest'); const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); diff --git a/source/templates/master/lex-build/__tests__/start.test.js b/source/templates/master/lex-build/__tests__/start.test.js index 65e95be6..3b595ab9 100644 --- a/source/templates/master/lex-build/__tests__/start.test.js +++ b/source/templates/master/lex-build/__tests__/start.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require('aws-sdk-client-mock-jest'); const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); diff --git a/source/templates/master/lex-build/index.js b/source/templates/master/lex-build/index.js index 8ffeb729..bc55f095 100644 --- a/source/templates/master/lex-build/index.js +++ b/source/templates/master/lex-build/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const util = require('../../util'); diff --git a/source/templates/master/lex-build/poll.js b/source/templates/master/lex-build/poll.js index 896c2f92..6c888e49 100644 --- a/source/templates/master/lex-build/poll.js +++ b/source/templates/master/lex-build/poll.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { LexModelBuildingServiceClient, GetBotCommand } = require('@aws-sdk/client-lex-model-building-service'); diff --git a/source/templates/master/lex-build/start.js b/source/templates/master/lex-build/start.js index f038c585..4e7428af 100644 --- a/source/templates/master/lex-build/start.js +++ b/source/templates/master/lex-build/start.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LambdaClient, InvokeCommand } = require('@aws-sdk/client-lambda'); const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/master/lex/bot.js b/source/templates/master/lex/bot.js index ac5a38cd..1d0758ca 100644 --- a/source/templates/master/lex/bot.js +++ b/source/templates/master/lex/bot.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('./config'); diff --git a/source/templates/master/lex/config.js b/source/templates/master/lex/config.js index eeb9af6d..d406dda1 100644 --- a/source/templates/master/lex/config.js +++ b/source/templates/master/lex/config.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { voiceId: 'Joanna', diff --git a/source/templates/master/lex/fulfillment.js b/source/templates/master/lex/fulfillment.js index c1da1f7d..9d11184b 100644 --- a/source/templates/master/lex/fulfillment.js +++ b/source/templates/master/lex/fulfillment.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const util = require('../../util'); diff --git a/source/templates/master/lex/index.js b/source/templates/master/lex/index.js index adbf1e33..443a20dd 100644 --- a/source/templates/master/lex/index.js +++ b/source/templates/master/lex/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = Object.assign( require('./bot'), diff --git a/source/templates/master/lexv2-build/index.js b/source/templates/master/lexv2-build/index.js index cedfb9ae..0e1e8764 100644 --- a/source/templates/master/lexv2-build/index.js +++ b/source/templates/master/lexv2-build/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); diff --git a/source/templates/master/mappings/anonymized-data.js b/source/templates/master/mappings/anonymized-data.js index 2289f5bd..c897bf07 100644 --- a/source/templates/master/mappings/anonymized-data.js +++ b/source/templates/master/mappings/anonymized-data.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { SolutionHelperAnonymizedData: { diff --git a/source/templates/master/mappings/bedrock-defaults.js b/source/templates/master/mappings/bedrock-defaults.js index 0e9f612d..4992395f 100644 --- a/source/templates/master/mappings/bedrock-defaults.js +++ b/source/templates/master/mappings/bedrock-defaults.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const amazonQueryPromptTemplate = 'Given the following conversation and a follow up question, rephrase the follow up question to be a standalone question.
Chat History:
{history}
Follow up question: {input}
Standalone question:'; const amazonQAPromptTemplate = '

Human: You are a friendly AI assistant. Answer the question in tags only based on the provided reference passages. Here are reference passages in tags:

{context}

If the references contain the information needed to respond, then write a confident response in under 50 words, quoting the relevant references.
Otherwise, if you can make an informed guess based on the reference passages, then write a less confident response in under 50 words, stating your assumptions.
Finally, if the references do not have any relevant information, then respond saying \\"Sorry, I don\'t know\\".

{query}


Assistant: According to the reference passages, in under 50 words:'; diff --git a/source/templates/master/mappings/solution.js b/source/templates/master/mappings/solution.js index dbe0a941..3743802b 100644 --- a/source/templates/master/mappings/solution.js +++ b/source/templates/master/mappings/solution.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { Solution: { diff --git a/source/templates/master/opensearch/__tests__/handler.fixtures.js b/source/templates/master/opensearch/__tests__/handler.fixtures.js index dc1d1bf7..722253a7 100644 --- a/source/templates/master/opensearch/__tests__/handler.fixtures.js +++ b/source/templates/master/opensearch/__tests__/handler.fixtures.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { RequestType: 'Create', diff --git a/source/templates/master/opensearch/__tests__/handler.test.js b/source/templates/master/opensearch/__tests__/handler.test.js index aacdffa8..eb5900e7 100644 --- a/source/templates/master/opensearch/__tests__/handler.test.js +++ b/source/templates/master/opensearch/__tests__/handler.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require("aws-sdk-client-mock-jest"); const { EventEmitter } = require('events'); diff --git a/source/templates/master/opensearch/es.js b/source/templates/master/opensearch/es.js index 22acaaeb..c576403b 100644 --- a/source/templates/master/opensearch/es.js +++ b/source/templates/master/opensearch/es.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); diff --git a/source/templates/master/opensearch/firehose.js b/source/templates/master/opensearch/firehose.js index 91f9919b..1892f299 100644 --- a/source/templates/master/opensearch/firehose.js +++ b/source/templates/master/opensearch/firehose.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); diff --git a/source/templates/master/opensearch/handler.js b/source/templates/master/opensearch/handler.js index 0ce0c718..b97d030e 100644 --- a/source/templates/master/opensearch/handler.js +++ b/source/templates/master/opensearch/handler.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { OpenSearchClient, DescribeDomainCommand } = require('@aws-sdk/client-opensearch'); diff --git a/source/templates/master/opensearch/index.js b/source/templates/master/opensearch/index.js index a6f31f9c..d0a3e136 100644 --- a/source/templates/master/opensearch/index.js +++ b/source/templates/master/opensearch/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = Object.assign( require('./es'), diff --git a/source/templates/master/opensearch/index_mappings.js b/source/templates/master/opensearch/index_mappings.js index 9c7ea7a5..a6513057 100644 --- a/source/templates/master/opensearch/index_mappings.js +++ b/source/templates/master/opensearch/index_mappings.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { properties: { diff --git a/source/templates/master/opensearch/index_settings.js b/source/templates/master/opensearch/index_settings.js index 10860204..74f06eaf 100644 --- a/source/templates/master/opensearch/index_settings.js +++ b/source/templates/master/opensearch/index_settings.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { number_of_shards: '1', diff --git a/source/templates/master/opensearch/info.js b/source/templates/master/opensearch/info.js index 200ad5ec..e1d76c4c 100644 --- a/source/templates/master/opensearch/info.js +++ b/source/templates/master/opensearch/info.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); diff --git a/source/templates/master/opensearch/proxy.js b/source/templates/master/opensearch/proxy.js index dca9bf63..88caa308 100644 --- a/source/templates/master/opensearch/proxy.js +++ b/source/templates/master/opensearch/proxy.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); diff --git a/source/templates/master/opensearch/updates.js b/source/templates/master/opensearch/updates.js index bc3d706c..feafc301 100644 --- a/source/templates/master/opensearch/updates.js +++ b/source/templates/master/opensearch/updates.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); module.exports = { diff --git a/source/templates/master/proxy-es.js b/source/templates/master/proxy-es.js index 8bbc67f6..4eca829f 100644 --- a/source/templates/master/proxy-es.js +++ b/source/templates/master/proxy-es.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const util = require('../util'); diff --git a/source/templates/master/proxy-lex/handler.js b/source/templates/master/proxy-lex/handler.js index b2101d05..90454d86 100644 --- a/source/templates/master/proxy-lex/handler.js +++ b/source/templates/master/proxy-lex/handler.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LexModelBuildingService } = require('@aws-sdk/client-lex-model-building-service'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/templates/master/proxy-lex/index.js b/source/templates/master/proxy-lex/index.js index 4335ad28..586614cd 100644 --- a/source/templates/master/proxy-lex/index.js +++ b/source/templates/master/proxy-lex/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const util = require('../../util'); diff --git a/source/templates/master/proxy-lex/status.js b/source/templates/master/proxy-lex/status.js index 54095c4d..2350ab99 100644 --- a/source/templates/master/proxy-lex/status.js +++ b/source/templates/master/proxy-lex/status.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { LexModelsV2Client, DescribeBotCommand } = require('@aws-sdk/client-lex-models-v2'); const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/master/proxy-lex/test.js b/source/templates/master/proxy-lex/test.js index 31675fdc..f3727cbb 100644 --- a/source/templates/master/proxy-lex/test.js +++ b/source/templates/master/proxy-lex/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.env.AWS_PROFILE = require('../../../config.json').profile; process.env.AWS_DEFAULT_REGION = require('../../../config.json').region; diff --git a/source/templates/master/routes/bot/index.js b/source/templates/master/routes/bot/index.js index 6b500f7c..b8a6bebd 100644 --- a/source/templates/master/routes/bot/index.js +++ b/source/templates/master/routes/bot/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const resource = require('../util/resource'); diff --git a/source/templates/master/routes/bot/test.js b/source/templates/master/routes/bot/test.js index d97ef3a2..1eef800d 100644 --- a/source/templates/master/routes/bot/test.js +++ b/source/templates/master/routes/bot/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); diff --git a/source/templates/master/routes/error/test.js b/source/templates/master/routes/error/test.js index 4bb5e040..1db096c5 100644 --- a/source/templates/master/routes/error/test.js +++ b/source/templates/master/routes/error/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.argv.push('--debug'); const { run } = require('../util/temp-test'); diff --git a/source/templates/master/routes/examples/handler.js b/source/templates/master/routes/examples/handler.js index c044930c..50efcf61 100644 --- a/source/templates/master/routes/examples/handler.js +++ b/source/templates/master/routes/examples/handler.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/templates/master/routes/examples/index.js b/source/templates/master/routes/examples/index.js index f1364e42..a55d071b 100644 --- a/source/templates/master/routes/examples/index.js +++ b/source/templates/master/routes/examples/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/master/routes/examples/test.js b/source/templates/master/routes/examples/test.js index 1193fee9..a6d6e5a2 100644 --- a/source/templates/master/routes/examples/test.js +++ b/source/templates/master/routes/examples/test.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + process.argv.push('--debug'); const { run } = require('../util/temp-test'); const { input } = require('../util/temp-test'); diff --git a/source/templates/master/routes/health/index.js b/source/templates/master/routes/health/index.js index 2a376406..9d81b551 100644 --- a/source/templates/master/routes/health/index.js +++ b/source/templates/master/routes/health/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const resource = require('../util/resource'); diff --git a/source/templates/master/routes/health/test.js b/source/templates/master/routes/health/test.js index cd3a7778..2e253d91 100644 --- a/source/templates/master/routes/health/test.js +++ b/source/templates/master/routes/health/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.argv.push('--debug'); const { run } = require('../util/temp-test'); diff --git a/source/templates/master/routes/images.js b/source/templates/master/routes/images.js index 8c28e779..25c5fb09 100644 --- a/source/templates/master/routes/images.js +++ b/source/templates/master/routes/images.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const resource = require('./util/resource'); diff --git a/source/templates/master/routes/index.js b/source/templates/master/routes/index.js index 34b67a2d..801f0d58 100644 --- a/source/templates/master/routes/index.js +++ b/source/templates/master/routes/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = Object.assign( require('./bot'), diff --git a/source/templates/master/routes/jobs/__tests__/handler.test.js b/source/templates/master/routes/jobs/__tests__/handler.test.js index 3fbedfea..d1562424 100644 --- a/source/templates/master/routes/jobs/__tests__/handler.test.js +++ b/source/templates/master/routes/jobs/__tests__/handler.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require('aws-sdk-client-mock-jest'); const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3'); diff --git a/source/templates/master/routes/jobs/handler.js b/source/templates/master/routes/jobs/handler.js index 60addc70..7a3d8aba 100644 --- a/source/templates/master/routes/jobs/handler.js +++ b/source/templates/master/routes/jobs/handler.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3'); const customSdkConfig = require('sdk-config/customSdkConfig'); diff --git a/source/templates/master/routes/jobs/index.js b/source/templates/master/routes/jobs/index.js index 66c8d4f3..7d3cf8ff 100644 --- a/source/templates/master/routes/jobs/index.js +++ b/source/templates/master/routes/jobs/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/master/routes/jobs/test.js b/source/templates/master/routes/jobs/test.js index 3b6217e5..f11e1a43 100644 --- a/source/templates/master/routes/jobs/test.js +++ b/source/templates/master/routes/jobs/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.argv.push('--debug'); diff --git a/source/templates/master/routes/login.js b/source/templates/master/routes/login.js index bb17a167..b8c1753c 100644 --- a/source/templates/master/routes/login.js +++ b/source/templates/master/routes/login.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const resource = require('./util/resource'); const redirect = require('./util/redirect'); diff --git a/source/templates/master/routes/proxy.js b/source/templates/master/routes/proxy.js index 5cb85926..26fc4023 100644 --- a/source/templates/master/routes/proxy.js +++ b/source/templates/master/routes/proxy.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); const resource = require('./util/resource'); diff --git a/source/templates/master/routes/qa/index.js b/source/templates/master/routes/qa/index.js index 3621bd73..4ecce194 100644 --- a/source/templates/master/routes/qa/index.js +++ b/source/templates/master/routes/qa/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const resource = require('../util/resource'); diff --git a/source/templates/master/routes/qa/test.js b/source/templates/master/routes/qa/test.js index 503fb253..918e66ce 100644 --- a/source/templates/master/routes/qa/test.js +++ b/source/templates/master/routes/qa/test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.argv.push('--debug'); const run = require('../util/temp-test').run; diff --git a/source/templates/master/routes/root/index.js b/source/templates/master/routes/root/index.js index 8d3df5ab..867f7c14 100644 --- a/source/templates/master/routes/root/index.js +++ b/source/templates/master/routes/root/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mock = require('../util/mock'); diff --git a/source/templates/master/routes/root/test.js b/source/templates/master/routes/root/test.js index 236ddeac..cba56bf2 100644 --- a/source/templates/master/routes/root/test.js +++ b/source/templates/master/routes/root/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.argv.push('--debug'); const { run } = require('../util/temp-test'); diff --git a/source/templates/master/routes/services/index.js b/source/templates/master/routes/services/index.js index 6820a0bb..ec1944e7 100644 --- a/source/templates/master/routes/services/index.js +++ b/source/templates/master/routes/services/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const resource = require('../util/resource'); const mock = require('../util/mock'); diff --git a/source/templates/master/routes/services/test.js b/source/templates/master/routes/services/test.js index 236ddeac..cba56bf2 100644 --- a/source/templates/master/routes/services/test.js +++ b/source/templates/master/routes/services/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ process.argv.push('--debug'); const { run } = require('../util/temp-test'); diff --git a/source/templates/master/routes/test.js b/source/templates/master/routes/test.js index dd6ba3ce..5e50f51e 100644 --- a/source/templates/master/routes/test.js +++ b/source/templates/master/routes/test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { bot: require('./bot/test'), diff --git a/source/templates/master/routes/util/context.js b/source/templates/master/routes/util/context.js index d49f3880..a4149521 100644 --- a/source/templates/master/routes/util/context.js +++ b/source/templates/master/routes/util/context.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { stageVariables: { diff --git a/source/templates/master/routes/util/lambda.js b/source/templates/master/routes/util/lambda.js index f7df9537..1efd86b2 100644 --- a/source/templates/master/routes/util/lambda.js +++ b/source/templates/master/routes/util/lambda.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const clean = require('clean-deep'); diff --git a/source/templates/master/routes/util/mock.js b/source/templates/master/routes/util/mock.js index 1dd357e2..865e4ea1 100644 --- a/source/templates/master/routes/util/mock.js +++ b/source/templates/master/routes/util/mock.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const util = require('../../../util'); diff --git a/source/templates/master/routes/util/options.js b/source/templates/master/routes/util/options.js index bc2b6749..ce92a125 100644 --- a/source/templates/master/routes/util/options.js +++ b/source/templates/master/routes/util/options.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = function (resource) { return { diff --git a/source/templates/master/routes/util/redirect.js b/source/templates/master/routes/util/redirect.js index f15363f4..677ed475 100644 --- a/source/templates/master/routes/util/redirect.js +++ b/source/templates/master/routes/util/redirect.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../../util'); diff --git a/source/templates/master/routes/util/resource.js b/source/templates/master/routes/util/resource.js index c1ed5c5c..03276d50 100644 --- a/source/templates/master/routes/util/resource.js +++ b/source/templates/master/routes/util/resource.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = function (path, parent = { 'Fn::GetAtt': ['API', 'RootResourceId'] }) { return { diff --git a/source/templates/master/routes/util/temp-test.js b/source/templates/master/routes/util/temp-test.js index 043a6d5d..7f2a9ea9 100644 --- a/source/templates/master/routes/util/temp-test.js +++ b/source/templates/master/routes/util/temp-test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const Velocity = require('velocity'); const jsonpath = require('jsonpath'); diff --git a/source/templates/master/s3-clean/index.js b/source/templates/master/s3-clean/index.js index c06cbac0..85e6ea8a 100644 --- a/source/templates/master/s3-clean/index.js +++ b/source/templates/master/s3-clean/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); module.exports = { diff --git a/source/templates/master/s3.js b/source/templates/master/s3.js index adc5b7bf..5dbc8e6b 100644 --- a/source/templates/master/s3.js +++ b/source/templates/master/s3.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/master/sagemaker-embeddings-stack.js b/source/templates/master/sagemaker-embeddings-stack.js index 10866cc6..be03126e 100644 --- a/source/templates/master/sagemaker-embeddings-stack.js +++ b/source/templates/master/sagemaker-embeddings-stack.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { SagemakerEmbeddingsStack: { diff --git a/source/templates/master/sagemaker-qa-summarize-llm-stack.js b/source/templates/master/sagemaker-qa-summarize-llm-stack.js index e77a0b59..9fa0d0d4 100644 --- a/source/templates/master/sagemaker-qa-summarize-llm-stack.js +++ b/source/templates/master/sagemaker-qa-summarize-llm-stack.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { SageMakerQASummarizeLLMStack: { diff --git a/source/templates/master/schemaLambda.js b/source/templates/master/schemaLambda.js index bf79f1c9..d70c406c 100644 --- a/source/templates/master/schemaLambda.js +++ b/source/templates/master/schemaLambda.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/master/settings.js b/source/templates/master/settings.js index 8aececd6..52685d85 100644 --- a/source/templates/master/settings.js +++ b/source/templates/master/settings.js @@ -1,16 +1,8 @@ /* eslint-disable max-len */ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const defaultSettings = { ENABLE_DEBUG_RESPONSES: 'false', // Appends a debugging message in the aws-lex-web-ui client for each QnABot response. diff --git a/source/templates/master/signup/__tests__/message.fixtures.js b/source/templates/master/signup/__tests__/message.fixtures.js index d59f63fe..78995483 100644 --- a/source/templates/master/signup/__tests__/message.fixtures.js +++ b/source/templates/master/signup/__tests__/message.fixtures.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { request: { diff --git a/source/templates/master/signup/__tests__/message.test.js b/source/templates/master/signup/__tests__/message.test.js index 4ce2415c..36092992 100644 --- a/source/templates/master/signup/__tests__/message.test.js +++ b/source/templates/master/signup/__tests__/message.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { handler } = require('../message'); const { event } = require('./message.fixtures'); diff --git a/source/templates/master/signup/__tests__/signup.fixtures.js b/source/templates/master/signup/__tests__/signup.fixtures.js index a8bfab2a..7158446a 100644 --- a/source/templates/master/signup/__tests__/signup.fixtures.js +++ b/source/templates/master/signup/__tests__/signup.fixtures.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.event = { request: { diff --git a/source/templates/master/signup/__tests__/signup.test.js b/source/templates/master/signup/__tests__/signup.test.js index 7ed73f3a..5aedae90 100644 --- a/source/templates/master/signup/__tests__/signup.test.js +++ b/source/templates/master/signup/__tests__/signup.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const { handler } = require('../signup'); const { event } = require('./signup.fixtures'); diff --git a/source/templates/master/signup/index.js b/source/templates/master/signup/index.js index 448d4267..227958ff 100644 --- a/source/templates/master/signup/index.js +++ b/source/templates/master/signup/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const util = require('../../util'); diff --git a/source/templates/master/signup/message.js b/source/templates/master/signup/message.js index bf26bae0..af84b3b0 100644 --- a/source/templates/master/signup/message.js +++ b/source/templates/master/signup/message.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = (event, context, callback) => { console.log('Received event:', JSON.stringify(event, null, 2)); diff --git a/source/templates/master/signup/signup.js b/source/templates/master/signup/signup.js index f4212a93..1c5c0f00 100644 --- a/source/templates/master/signup/signup.js +++ b/source/templates/master/signup/signup.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.handler = (event, context, callback) => { console.log('Received event:', JSON.stringify(event, null, 2)); diff --git a/source/templates/master/solution-helper/index.js b/source/templates/master/solution-helper/index.js index c88ef585..5f8bde53 100644 --- a/source/templates/master/solution-helper/index.js +++ b/source/templates/master/solution-helper/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../util'); diff --git a/source/templates/master/tstallstack.js b/source/templates/master/tstallstack.js index e0c560b9..d24724ef 100644 --- a/source/templates/master/tstallstack.js +++ b/source/templates/master/tstallstack.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { TestAllStack: { diff --git a/source/templates/master/var.js b/source/templates/master/var.js index d6a48b20..362dd528 100644 --- a/source/templates/master/var.js +++ b/source/templates/master/var.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const date = new Date(); module.exports = { diff --git a/source/templates/package-lock.json b/source/templates/package-lock.json index e6f55b30..f4a44c76 100644 --- a/source/templates/package-lock.json +++ b/source/templates/package-lock.json @@ -1,12 +1,12 @@ { "name": "qnabot-on-aws-infrastructure", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qnabot-on-aws-infrastructure", - "version": "6.1.2", + "version": "6.1.3", "license": "Apache-2.0", "devDependencies": { "@aws-sdk/client-s3": "^3.621.0", diff --git a/source/templates/package.json b/source/templates/package.json index 64c77d04..c9039d48 100644 --- a/source/templates/package.json +++ b/source/templates/package.json @@ -1,6 +1,6 @@ { "name": "qnabot-on-aws-infrastructure", - "version": "6.1.2", + "version": "6.1.3", "description": "QnABot infrastructure", "scripts": { "clean": "rm -rf node_modules", diff --git a/source/templates/public-vpc-support/__tests__/expectedResult.js b/source/templates/public-vpc-support/__tests__/expectedResult.js index 3faa30e9..e2aa3c79 100644 --- a/source/templates/public-vpc-support/__tests__/expectedResult.js +++ b/source/templates/public-vpc-support/__tests__/expectedResult.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + module.exports = { Conditions: { AdminSignUp: { diff --git a/source/templates/public-vpc-support/__tests__/indexConfig.test.js b/source/templates/public-vpc-support/__tests__/indexConfig.test.js index db85e559..329ca27a 100644 --- a/source/templates/public-vpc-support/__tests__/indexConfig.test.js +++ b/source/templates/public-vpc-support/__tests__/indexConfig.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mockConfig = require('./mockConfig.json'); const mockMaster = require('./mockMaster'); diff --git a/source/templates/public-vpc-support/__tests__/indexNoConfig.test.js b/source/templates/public-vpc-support/__tests__/indexNoConfig.test.js index 93c520d9..84437a77 100644 --- a/source/templates/public-vpc-support/__tests__/indexNoConfig.test.js +++ b/source/templates/public-vpc-support/__tests__/indexNoConfig.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const expectedResult = require('./expectedResult'); const mockMaster = require('./mockMaster'); diff --git a/source/templates/public-vpc-support/__tests__/mockMaster.js b/source/templates/public-vpc-support/__tests__/mockMaster.js index 3b7417aa..e1738892 100644 --- a/source/templates/public-vpc-support/__tests__/mockMaster.js +++ b/source/templates/public-vpc-support/__tests__/mockMaster.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + module.exports = { Parameters: { VPCSubnetIdList: {}, diff --git a/source/templates/public-vpc-support/index.js b/source/templates/public-vpc-support/index.js index 8f49b663..daa72dca 100644 --- a/source/templates/public-vpc-support/index.js +++ b/source/templates/public-vpc-support/index.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); diff --git a/source/templates/public/__tests__/expectedResult.js b/source/templates/public/__tests__/expectedResult.js index 402699cb..d3913f4f 100644 --- a/source/templates/public/__tests__/expectedResult.js +++ b/source/templates/public/__tests__/expectedResult.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + module.exports = { Conditions: { AdminSignUp: { diff --git a/source/templates/public/__tests__/indexConfig.test.js b/source/templates/public/__tests__/indexConfig.test.js index 4e79c6ae..2034cd8d 100644 --- a/source/templates/public/__tests__/indexConfig.test.js +++ b/source/templates/public/__tests__/indexConfig.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mockConfig = require('./mockConfig.json'); const mockMaster = require('./mockMaster'); diff --git a/source/templates/public/__tests__/indexNoConfig.test.js b/source/templates/public/__tests__/indexNoConfig.test.js index 93c1cdfc..3a5a5eb8 100644 --- a/source/templates/public/__tests__/indexNoConfig.test.js +++ b/source/templates/public/__tests__/indexNoConfig.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const expectedResult = require('./expectedResult'); const mockMaster = require('./mockMaster'); diff --git a/source/templates/public/__tests__/mockMaster.js b/source/templates/public/__tests__/mockMaster.js index 615e11a9..dd2bb893 100644 --- a/source/templates/public/__tests__/mockMaster.js +++ b/source/templates/public/__tests__/mockMaster.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + module.exports = { Parameters: { }, diff --git a/source/templates/public/index.js b/source/templates/public/index.js index f567a0e6..481643a5 100644 --- a/source/templates/public/index.js +++ b/source/templates/public/index.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const _ = require('lodash'); diff --git a/source/templates/sagemaker-embeddings/index.js b/source/templates/sagemaker-embeddings/index.js index cbc47024..8bceb9b6 100644 --- a/source/templates/sagemaker-embeddings/index.js +++ b/source/templates/sagemaker-embeddings/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/sagemaker-embeddings/index.test.js b/source/templates/sagemaker-embeddings/index.test.js index 4547fe6a..c57385ea 100644 --- a/source/templates/sagemaker-embeddings/index.test.js +++ b/source/templates/sagemaker-embeddings/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/sagemaker-qa-summarize-llm/index.js b/source/templates/sagemaker-qa-summarize-llm/index.js index 1b6bd630..c21e3ca6 100644 --- a/source/templates/sagemaker-qa-summarize-llm/index.js +++ b/source/templates/sagemaker-qa-summarize-llm/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../util'); diff --git a/source/templates/sagemaker-qa-summarize-llm/index.test.js b/source/templates/sagemaker-qa-summarize-llm/index.test.js index 52efa984..971ca9f9 100644 --- a/source/templates/sagemaker-qa-summarize-llm/index.test.js +++ b/source/templates/sagemaker-qa-summarize-llm/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/testall/bucket.js b/source/templates/testall/bucket.js index 577faf7e..dd8cbd94 100644 --- a/source/templates/testall/bucket.js +++ b/source/templates/testall/bucket.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { TestAllTrigger: { diff --git a/source/templates/testall/index.js b/source/templates/testall/index.js index 4a005199..6707575c 100644 --- a/source/templates/testall/index.js +++ b/source/templates/testall/index.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const fs = require('fs'); const _ = require('lodash'); diff --git a/source/templates/testall/index.test.js b/source/templates/testall/index.test.js index b3565019..b927b1dd 100644 --- a/source/templates/testall/index.test.js +++ b/source/templates/testall/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ function create() { const file = `${__dirname}/`; diff --git a/source/templates/testall/outputs.js b/source/templates/testall/outputs.js index 0fa73431..723f6436 100644 --- a/source/templates/testall/outputs.js +++ b/source/templates/testall/outputs.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = { diff --git a/source/templates/testall/resources.js b/source/templates/testall/resources.js index cce16932..ff6e31a2 100644 --- a/source/templates/testall/resources.js +++ b/source/templates/testall/resources.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ /* eslint-disable quotes */ /* eslint-disable indent */ diff --git a/source/templates/util.js b/source/templates/util.js index edf29741..3ceb8242 100644 --- a/source/templates/util.js +++ b/source/templates/util.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ exports.httpsOnlyBucketPolicy = function (bucketName = 'Bucket') { return { diff --git a/source/utility_scripts/configureAlerts.py b/source/utility_scripts/configureAlerts.py index 1b2105c9..4263df78 100644 --- a/source/utility_scripts/configureAlerts.py +++ b/source/utility_scripts/configureAlerts.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/source/utility_scripts/configureCMK.py b/source/utility_scripts/configureCMK.py index 731fd168..9e8bb8d5 100644 --- a/source/utility_scripts/configureCMK.py +++ b/source/utility_scripts/configureCMK.py @@ -1,14 +1,6 @@ ###################################################################################################################### # 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 License is located at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES # -# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions # -# and limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 # ###################################################################################################################### import boto3 diff --git a/source/utility_scripts/count_user_interactions.js b/source/utility_scripts/count_user_interactions.js index 69e29ed0..0107e729 100755 --- a/source/utility_scripts/count_user_interactions.js +++ b/source/utility_scripts/count_user_interactions.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ (async () => { process.env.AWS_SDK_LOAD_CONFIG = true; diff --git a/source/utility_scripts/create_kendra_faq_resources.js b/source/utility_scripts/create_kendra_faq_resources.js index 8a4c67bc..93fe8284 100755 --- a/source/utility_scripts/create_kendra_faq_resources.js +++ b/source/utility_scripts/create_kendra_faq_resources.js @@ -1,16 +1,8 @@ #! /usr/bin/env node -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ (async () => { process.env.AWS_SDK_LOAD_CONFIG = true; diff --git a/source/utility_scripts/csv2json_converter/js/qnabot_csv2json_converter.js b/source/utility_scripts/csv2json_converter/js/qnabot_csv2json_converter.js index 5f45588e..81fb0109 100644 --- a/source/utility_scripts/csv2json_converter/js/qnabot_csv2json_converter.js +++ b/source/utility_scripts/csv2json_converter/js/qnabot_csv2json_converter.js @@ -1,3 +1,8 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + // AWS QnA Bot -- CSV to JSON converter // more details on AWS QnA Bot project is available by following: https://www.amazon.com/qnabot // this javascript file contains functions to create a JSON file according to the JSON schema of QnA Bot diff --git a/source/website/__tests__/admin.spec.js b/source/website/__tests__/admin.spec.js index 194bebb1..02917bfa 100644 --- a/source/website/__tests__/admin.spec.js +++ b/source/website/__tests__/admin.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import adminModule from '../js/admin.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/admin.test.js b/source/website/__tests__/admin.test.js index eca41899..3207f54d 100644 --- a/source/website/__tests__/admin.test.js +++ b/source/website/__tests__/admin.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require('../js/admin'); const vueRouter = require('vue-router'); diff --git a/source/website/__tests__/client.spec.js b/source/website/__tests__/client.spec.js index 2e3c4935..ddc8d27b 100644 --- a/source/website/__tests__/client.spec.js +++ b/source/website/__tests__/client.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import clientModule from '../js/client.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/client.test.js b/source/website/__tests__/client.test.js index 55f37648..e4827174 100644 --- a/source/website/__tests__/client.test.js +++ b/source/website/__tests__/client.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ require('../js/client'); jest.mock('vuetify/iconsets/md', () => ({ diff --git a/source/website/__tests__/components/alexa/index.spec.js b/source/website/__tests__/components/alexa/index.spec.js index 9e19ed7b..c30331d8 100644 --- a/source/website/__tests__/components/alexa/index.spec.js +++ b/source/website/__tests__/components/alexa/index.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import alexaModule from '../../../js/components/alexa/index.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/connect/index.spec.js b/source/website/__tests__/components/connect/index.spec.js index f0486dfa..fcb7485f 100644 --- a/source/website/__tests__/components/connect/index.spec.js +++ b/source/website/__tests__/components/connect/index.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import connectModule from '../../../js/components/connect/index.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/customTranslate.spec.js b/source/website/__tests__/components/customTranslate.spec.js index 95f4268e..cb684225 100644 --- a/source/website/__tests__/components/customTranslate.spec.js +++ b/source/website/__tests__/components/customTranslate.spec.js @@ -1,18 +1,12 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + /** * @jest-environment jsdom */ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ + import customTranslateModule from '../../js/components/customTranslate.vue' import { shallowMount } from '@vue/test-utils' diff --git a/source/website/__tests__/components/designer/add.spec.js b/source/website/__tests__/components/designer/add.spec.js index 1eed0147..fbf8d09f 100644 --- a/source/website/__tests__/components/designer/add.spec.js +++ b/source/website/__tests__/components/designer/add.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import add from '../../../js/components/designer/add.vue'; import { mount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/addSetting.spec.js b/source/website/__tests__/components/designer/addSetting.spec.js index 1122a493..a56c02d6 100644 --- a/source/website/__tests__/components/designer/addSetting.spec.js +++ b/source/website/__tests__/components/designer/addSetting.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import addSettingModule from '../../../js/components/designer/addSetting.vue'; import { mount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/alexa.spec.js b/source/website/__tests__/components/designer/alexa.spec.js index da012c28..1e317973 100644 --- a/source/website/__tests__/components/designer/alexa.spec.js +++ b/source/website/__tests__/components/designer/alexa.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import alexaModule from '../../../js/components/designer/alexa.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/delete.spec.js b/source/website/__tests__/components/designer/delete.spec.js index 51ef1dcd..c13dfb07 100644 --- a/source/website/__tests__/components/designer/delete.spec.js +++ b/source/website/__tests__/components/designer/delete.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import deleteModule from '../../../js/components/designer/delete.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/display.spec.js b/source/website/__tests__/components/designer/display.spec.js index 53a1e266..838e9553 100644 --- a/source/website/__tests__/components/designer/display.spec.js +++ b/source/website/__tests__/components/designer/display.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import displayModule from '../../../js/components/designer/display.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/edit.spec.js b/source/website/__tests__/components/designer/edit.spec.js index c92fef4d..536733f8 100644 --- a/source/website/__tests__/components/designer/edit.spec.js +++ b/source/website/__tests__/components/designer/edit.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import editModule from '../../../js/components/designer/edit.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/empty.test.js b/source/website/__tests__/components/designer/empty.test.js index cffb50b7..19754a7f 100644 --- a/source/website/__tests__/components/designer/empty.test.js +++ b/source/website/__tests__/components/designer/empty.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const empty = require('../../../js/components/designer/empty'); describe('designer empty helper function', () => { diff --git a/source/website/__tests__/components/designer/event-bus.test.js b/source/website/__tests__/components/designer/event-bus.test.js index 8bece4a9..d54e0579 100644 --- a/source/website/__tests__/components/designer/event-bus.test.js +++ b/source/website/__tests__/components/designer/event-bus.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const eventBus = require('../../../js/components/designer/event-bus'); describe('designer event bus', () => { diff --git a/source/website/__tests__/components/designer/index.spec.js b/source/website/__tests__/components/designer/index.spec.js index 837274d6..7440d7aa 100644 --- a/source/website/__tests__/components/designer/index.spec.js +++ b/source/website/__tests__/components/designer/index.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const indexModule = require('../../../js/components/designer/index.vue'); import { shallowMount } from '@vue/test-utils' diff --git a/source/website/__tests__/components/designer/input.spec.js b/source/website/__tests__/components/designer/input.spec.js index bddcb530..56ce40c9 100644 --- a/source/website/__tests__/components/designer/input.spec.js +++ b/source/website/__tests__/components/designer/input.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const inputModule = require('../../../js/components/designer/input.vue'); import { shallowMount } from '@vue/test-utils' diff --git a/source/website/__tests__/components/designer/menu-questions.spec.js b/source/website/__tests__/components/designer/menu-questions.spec.js index f5ebd7f6..a0f655d5 100644 --- a/source/website/__tests__/components/designer/menu-questions.spec.js +++ b/source/website/__tests__/components/designer/menu-questions.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const menuQuestionsModule = require('../../../js/components/designer/menu-questions.vue'); import { shallowMount } from '@vue/test-utils' diff --git a/source/website/__tests__/components/designer/menu-test.spec.js b/source/website/__tests__/components/designer/menu-test.spec.js index bf736a5e..b91a1719 100644 --- a/source/website/__tests__/components/designer/menu-test.spec.js +++ b/source/website/__tests__/components/designer/menu-test.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const menuTestModule = require('../../../js/components/designer/menu-test.vue'); import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/qa.spec.js b/source/website/__tests__/components/designer/qa.spec.js index 933adc17..4dd88158 100644 --- a/source/website/__tests__/components/designer/qa.spec.js +++ b/source/website/__tests__/components/designer/qa.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const qaModule = require('../../../js/components/designer/qa.vue'); import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/rebuild.spec.js b/source/website/__tests__/components/designer/rebuild.spec.js index d5500e60..75a7e52e 100644 --- a/source/website/__tests__/components/designer/rebuild.spec.js +++ b/source/website/__tests__/components/designer/rebuild.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const rebuildModule = require('../../../js/components/designer/rebuild.vue'); import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/designer/synckendra.spec.js b/source/website/__tests__/components/designer/synckendra.spec.js index f2897d00..4550e0bd 100644 --- a/source/website/__tests__/components/designer/synckendra.spec.js +++ b/source/website/__tests__/components/designer/synckendra.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const synckendraModule = require('../../../js/components/designer/synckendra.vue'); import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/export.spec.js b/source/website/__tests__/components/export.spec.js index 91961c9e..25c837b9 100644 --- a/source/website/__tests__/components/export.spec.js +++ b/source/website/__tests__/components/export.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import exportModule from '../../js/components/export.vue'; import { shallowMount } from '@vue/test-utils' diff --git a/source/website/__tests__/components/genesys/index.spec.js b/source/website/__tests__/components/genesys/index.spec.js index e8b994d4..f7560129 100644 --- a/source/website/__tests__/components/genesys/index.spec.js +++ b/source/website/__tests__/components/genesys/index.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import indexModule from '../../../js/components/genesys/index.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/hooks/index.spec.js b/source/website/__tests__/components/hooks/index.spec.js index 95d45801..d5e787d6 100644 --- a/source/website/__tests__/components/hooks/index.spec.js +++ b/source/website/__tests__/components/hooks/index.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import indexComponent from '../../../js/components/hooks/index.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/import.spec.js b/source/website/__tests__/components/import.spec.js index 8fa0adce..66ad0a37 100644 --- a/source/website/__tests__/components/import.spec.js +++ b/source/website/__tests__/components/import.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import importModule from '../../js/components/import.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/kendraIndex.spec.js b/source/website/__tests__/components/kendraIndex.spec.js index abd38761..3bdb4fb1 100644 --- a/source/website/__tests__/components/kendraIndex.spec.js +++ b/source/website/__tests__/components/kendraIndex.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import kendraIndexModule from '../../js/components/kendraIndex.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/components/settings.spec.js b/source/website/__tests__/components/settings.spec.js index a6691e5a..8199edd9 100644 --- a/source/website/__tests__/components/settings.spec.js +++ b/source/website/__tests__/components/settings.spec.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import settingsModule from '../../js/components/settings.vue'; import { shallowMount } from '@vue/test-utils'; diff --git a/source/website/__tests__/lib/client-auth.test.js b/source/website/__tests__/lib/client-auth.test.js index a4de38b0..cb8cb1bd 100644 --- a/source/website/__tests__/lib/client-auth.test.js +++ b/source/website/__tests__/lib/client-auth.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const axios = require('axios'); const jwt = require('jsonwebtoken'); const queryString = require('query-string'); diff --git a/source/website/__tests__/lib/index.test.js b/source/website/__tests__/lib/index.test.js index bafc6bec..d2a3902b 100644 --- a/source/website/__tests__/lib/index.test.js +++ b/source/website/__tests__/lib/index.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const indexModule = require('../../js/lib/index'); jest.mock('../../js/lib/router', () => {}); diff --git a/source/website/__tests__/lib/router.test.js b/source/website/__tests__/lib/router.test.js index cacf11eb..41d5de90 100644 --- a/source/website/__tests__/lib/router.test.js +++ b/source/website/__tests__/lib/router.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import routerModule from '../../js/lib/router'; jest.mock('vue-router', () => ({ diff --git a/source/website/__tests__/lib/store/api/actions/connect.test.js b/source/website/__tests__/lib/store/api/actions/connect.test.js index 9742b734..41fe4059 100644 --- a/source/website/__tests__/lib/store/api/actions/connect.test.js +++ b/source/website/__tests__/lib/store/api/actions/connect.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import mockedContext from './mockedContext'; const connect = require('../../../../../js/lib/store/api/actions/connect'); diff --git a/source/website/__tests__/lib/store/api/actions/export.test.js b/source/website/__tests__/lib/store/api/actions/export.test.js index 3615748b..62b27507 100644 --- a/source/website/__tests__/lib/store/api/actions/export.test.js +++ b/source/website/__tests__/lib/store/api/actions/export.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import mockedContext from './mockedContext'; const exportModule = require('../../../../../js/lib/store/api/actions/export'); diff --git a/source/website/__tests__/lib/store/api/actions/genesys.test.js b/source/website/__tests__/lib/store/api/actions/genesys.test.js index 493cced1..1394293f 100644 --- a/source/website/__tests__/lib/store/api/actions/genesys.test.js +++ b/source/website/__tests__/lib/store/api/actions/genesys.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import mockedContext from './mockedContext'; const genesysModule = require('../../../../../js/lib/store/api/actions/genesys'); diff --git a/source/website/__tests__/lib/store/api/actions/import.test.js b/source/website/__tests__/lib/store/api/actions/import.test.js index 17e9e3f3..e438cd0b 100644 --- a/source/website/__tests__/lib/store/api/actions/import.test.js +++ b/source/website/__tests__/lib/store/api/actions/import.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import mockedContext from './mockedContext'; const importModule = require('../../../../../js/lib/store/api/actions/import'); diff --git a/source/website/__tests__/lib/store/api/actions/index.test.js b/source/website/__tests__/lib/store/api/actions/index.test.js index c024475a..b0d6caa8 100644 --- a/source/website/__tests__/lib/store/api/actions/index.test.js +++ b/source/website/__tests__/lib/store/api/actions/index.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import exp from 'constants'; import mockedContext from './mockedContext'; diff --git a/source/website/__tests__/lib/store/api/actions/kendraIndex.test.js b/source/website/__tests__/lib/store/api/actions/kendraIndex.test.js index 499e0776..b4f59ed1 100644 --- a/source/website/__tests__/lib/store/api/actions/kendraIndex.test.js +++ b/source/website/__tests__/lib/store/api/actions/kendraIndex.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import mockedContext from "./mockedContext"; const kendraIndexModule = require('../../../../../js/lib/store/api/actions/kendraIndex'); diff --git a/source/website/__tests__/lib/store/api/actions/mockedContext.js b/source/website/__tests__/lib/store/api/actions/mockedContext.js index f297159d..35fc8c79 100644 --- a/source/website/__tests__/lib/store/api/actions/mockedContext.js +++ b/source/website/__tests__/lib/store/api/actions/mockedContext.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mockedContext = { commit: jest.fn(), dispatch: jest.fn(), diff --git a/source/website/__tests__/lib/store/api/actions/settings.test.js b/source/website/__tests__/lib/store/api/actions/settings.test.js index 635b186d..bd309cf9 100644 --- a/source/website/__tests__/lib/store/api/actions/settings.test.js +++ b/source/website/__tests__/lib/store/api/actions/settings.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import settingsModule from '../../../../../js/lib/store/api/actions/settings'; const awsMock = require('aws-sdk-client-mock'); diff --git a/source/website/__tests__/lib/store/api/actions/testall.test.js b/source/website/__tests__/lib/store/api/actions/testall.test.js index 7e01332d..0d41bb20 100644 --- a/source/website/__tests__/lib/store/api/actions/testall.test.js +++ b/source/website/__tests__/lib/store/api/actions/testall.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import mockedContext from './mockedContext'; const testallModule = require('../../../../../js/lib/store/api/actions/testall'); diff --git a/source/website/__tests__/lib/store/api/actions/util.test.js b/source/website/__tests__/lib/store/api/actions/util.test.js index 018c08bf..2b85ec8a 100644 --- a/source/website/__tests__/lib/store/api/actions/util.test.js +++ b/source/website/__tests__/lib/store/api/actions/util.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import { getUserAgentString } from "../../../../../js/capability/util"; describe("getUserAgentString", () => { diff --git a/source/website/__tests__/lib/store/data/actions/add.test.js b/source/website/__tests__/lib/store/data/actions/add.test.js index 2c91ed4c..a90b04a7 100644 --- a/source/website/__tests__/lib/store/data/actions/add.test.js +++ b/source/website/__tests__/lib/store/data/actions/add.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const addModule = require('../../../../../js/lib/store/data/actions/add'); const util = require('../../../../../js/lib/store/data/actions/util'); diff --git a/source/website/__tests__/lib/store/data/actions/delete.test.js b/source/website/__tests__/lib/store/data/actions/delete.test.js index f26ac242..79b8958d 100644 --- a/source/website/__tests__/lib/store/data/actions/delete.test.js +++ b/source/website/__tests__/lib/store/data/actions/delete.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const deleteModule = require('../../../../../js/lib/store/data/actions/delete'); const util = require('../../../../../js/lib/store/data/actions//util'); diff --git a/source/website/__tests__/lib/store/data/actions/get.test.js b/source/website/__tests__/lib/store/data/actions/get.test.js index 9057a0bb..4d4a54ed 100644 --- a/source/website/__tests__/lib/store/data/actions/get.test.js +++ b/source/website/__tests__/lib/store/data/actions/get.test.js @@ -1,16 +1,8 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const getModule = require('../../../../../js/lib/store/data/actions/get'); const util = require('../../../../../js/lib/store/data/actions/util'); diff --git a/source/website/__tests__/lib/store/data/actions/up-download.test.js b/source/website/__tests__/lib/store/data/actions/up-download.test.js index f402bb50..c6563710 100644 --- a/source/website/__tests__/lib/store/data/actions/up-download.test.js +++ b/source/website/__tests__/lib/store/data/actions/up-download.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const upDownloadModule = require('../../../../../js/lib/store/data/actions/up-download'); const axios = require('axios'); const util = require('../../../../../js/lib/store/data/actions/util'); diff --git a/source/website/__tests__/lib/store/data/actions/util.test.js b/source/website/__tests__/lib/store/data/actions/util.test.js index b548bbd0..e92ffa20 100644 --- a/source/website/__tests__/lib/store/data/actions/util.test.js +++ b/source/website/__tests__/lib/store/data/actions/util.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const util = require('../../../../../js/lib/store/data/actions/util'); describe('util data action', () => { diff --git a/source/website/__tests__/lib/store/data/getters.test.js b/source/website/__tests__/lib/store/data/getters.test.js index 0f5b77ba..5af68c15 100644 --- a/source/website/__tests__/lib/store/data/getters.test.js +++ b/source/website/__tests__/lib/store/data/getters.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const gettersModule = require('../../../../js/lib/store/data/getters'); describe('getters data', () => { diff --git a/source/website/__tests__/lib/store/data/mutations.test.js b/source/website/__tests__/lib/store/data/mutations.test.js index c4f49fcb..05dee7bc 100644 --- a/source/website/__tests__/lib/store/data/mutations.test.js +++ b/source/website/__tests__/lib/store/data/mutations.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mutationsModule = require('../../../../js/lib/store/data/mutations'); describe('mutations data', () => { diff --git a/source/website/__tests__/lib/store/page/actions.test.js b/source/website/__tests__/lib/store/page/actions.test.js index e4d7d211..407e8826 100644 --- a/source/website/__tests__/lib/store/page/actions.test.js +++ b/source/website/__tests__/lib/store/page/actions.test.js @@ -1,16 +1,8 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const actionsModule = require('../../../../js/lib/store/page/actions'); describe('actions page test', () => { diff --git a/source/website/__tests__/lib/store/page/getters.test.js b/source/website/__tests__/lib/store/page/getters.test.js index 0485b0a0..314a9575 100644 --- a/source/website/__tests__/lib/store/page/getters.test.js +++ b/source/website/__tests__/lib/store/page/getters.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const gettersModule = require('../../../../js/lib/store/page/getters'); describe('getters page test', () => { diff --git a/source/website/__tests__/lib/store/page/mutations.test.js b/source/website/__tests__/lib/store/page/mutations.test.js index e94e024f..ef306130 100644 --- a/source/website/__tests__/lib/store/page/mutations.test.js +++ b/source/website/__tests__/lib/store/page/mutations.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mutations = require('../../../../js/lib/store/page/mutations'); describe('mutations page test', () => { diff --git a/source/website/__tests__/lib/store/page/util.test.js b/source/website/__tests__/lib/store/page/util.test.js index c3814241..cc774d4c 100644 --- a/source/website/__tests__/lib/store/page/util.test.js +++ b/source/website/__tests__/lib/store/page/util.test.js @@ -1,16 +1,8 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const utilModule = require('../../../../js/lib/store/page/util'); describe('util page', () => { diff --git a/source/website/__tests__/lib/store/user/actions.test.js b/source/website/__tests__/lib/store/user/actions.test.js index f3a419ce..e2b9852b 100644 --- a/source/website/__tests__/lib/store/user/actions.test.js +++ b/source/website/__tests__/lib/store/user/actions.test.js @@ -1,18 +1,11 @@ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ + /** * @jest-environment jsdom */ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ const { fromCognitoIdentityPool } = require('@aws-sdk/credential-providers'); const actionsModule = require('../../../../js/lib/store/user/actions'); diff --git a/source/website/__tests__/lib/store/user/getters.test.js b/source/website/__tests__/lib/store/user/getters.test.js index 541496e7..abd88f92 100644 --- a/source/website/__tests__/lib/store/user/getters.test.js +++ b/source/website/__tests__/lib/store/user/getters.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const gettersModule = require('../../../../js/lib/store/user/getters'); describe('user getters', () => { diff --git a/source/website/__tests__/lib/store/user/index.test.js b/source/website/__tests__/lib/store/user/index.test.js index 3d2622cd..8e498f14 100644 --- a/source/website/__tests__/lib/store/user/index.test.js +++ b/source/website/__tests__/lib/store/user/index.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const indexModule = require('../../../../js/lib/store/user/index'); describe('user index module', () => { diff --git a/source/website/__tests__/lib/store/user/mutations.test.js b/source/website/__tests__/lib/store/user/mutations.test.js index d5a2f983..df8dbd20 100644 --- a/source/website/__tests__/lib/store/user/mutations.test.js +++ b/source/website/__tests__/lib/store/user/mutations.test.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const mutationsModule = require('../../../../js/lib/store/user/mutations'); const { set } = require('vue'); diff --git a/source/website/__tests__/resolver.js b/source/website/__tests__/resolver.js index 99a06d3c..4aad8fea 100644 --- a/source/website/__tests__/resolver.js +++ b/source/website/__tests__/resolver.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ // Call the defaultResolver, so we leverage its cache, error handling, etc. module.exports = (path, options) => options.defaultResolver(path, { ...options, diff --git a/source/website/__tests__/styleMock.js b/source/website/__tests__/styleMock.js index fc3efafe..8988e049 100644 --- a/source/website/__tests__/styleMock.js +++ b/source/website/__tests__/styleMock.js @@ -1,13 +1,5 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ module.exports = {}; diff --git a/source/website/__tests__/test.test.js b/source/website/__tests__/test.test.js index 4670fa43..3e676d44 100644 --- a/source/website/__tests__/test.test.js +++ b/source/website/__tests__/test.test.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import gremlins from '../assets/gremlins.min'; const testModule = require('../js/test'); diff --git a/source/website/assets/gremlins.min.js b/source/website/assets/gremlins.min.js index 0f24ef8b..b48d5fcd 100644 --- a/source/website/assets/gremlins.min.js +++ b/source/website/assets/gremlins.min.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ !(function (e, n) { if (typeof exports === 'object' && typeof module === 'object')module.exports = n(); else if (typeof define === 'function' && define.amd)define(n); else { const t = n(); for (const a in t)(typeof exports === 'object' ? exports : e)[a] = t[a]; } }(this, () => (function (e) { function n(a) { if (t[a]) return t[a].exports; const r = t[a] = { exports: {}, id: a, loaded: !1 }; return e[a].call(r.exports, r, r.exports, n), r.loaded = !0, r.exports; } var t = {}; return n.m = e, n.c = t, n.p = 'http://localhost:8080/', n(0); }([function (e, n, t) { e.exports = t(6); }, function (e, n, t) { let a; a = function (e) { diff --git a/source/website/config/base.config.js b/source/website/config/base.config.js index d59b98a8..e51c29ea 100644 --- a/source/website/config/base.config.js +++ b/source/website/config/base.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const path = require('path'); const {VueLoaderPlugin} = require('vue-loader'); const CopyWebpackPlugin = require('copy-webpack-plugin'); diff --git a/source/website/config/dev.config.js b/source/website/config/dev.config.js index 94c2325f..b7e2394f 100644 --- a/source/website/config/dev.config.js +++ b/source/website/config/dev.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../../config.json'); const path = require('path'); const S3Plugin = require('webpack-s3-plugin'); diff --git a/source/website/config/prod.config.js b/source/website/config/prod.config.js index efe32c09..a1049ff9 100644 --- a/source/website/config/prod.config.js +++ b/source/website/config/prod.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const ZipPlugin = require('zip-webpack-plugin'); module.exports = { mode: 'production', diff --git a/source/website/config/test.config.js b/source/website/config/test.config.js index b88298c8..57cabb23 100644 --- a/source/website/config/test.config.js +++ b/source/website/config/test.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../../config.json'); const path = require('path'); const CopyWebpackPlugin = require('copy-webpack-plugin'); diff --git a/source/website/config/webpack.config.js b/source/website/config/webpack.config.js index 8441d2bc..8c9c4bce 100644 --- a/source/website/config/webpack.config.js +++ b/source/website/config/webpack.config.js @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ const config = require('../../config.json'); process.env.AWS_PROFILE = config.profile; process.env.AWS_DEFAULT_REGION = config.region; diff --git a/source/website/entry.js b/source/website/entry.js index 435408ae..0869beab 100644 --- a/source/website/entry.js +++ b/source/website/entry.js @@ -1,15 +1,7 @@ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import '@fontsource/roboto/300.css'; import '@fontsource/roboto/400.css'; import '@fontsource/roboto/500.css'; diff --git a/source/website/js/admin.js b/source/website/js/admin.js index 26941cab..4b5d7137 100644 --- a/source/website/js/admin.js +++ b/source/website/js/admin.js @@ -1,16 +1,8 @@ /* eslint-disable max-len */ -/** ******************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - ******************************************************************************************************************** */ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */ import app from './admin.vue'; const Idle = require('idle-js'); diff --git a/source/website/js/admin.vue b/source/website/js/admin.vue index a83a0524..fe83b1ff 100644 --- a/source/website/js/admin.vue +++ b/source/website/js/admin.vue @@ -1,15 +1,7 @@ -/********************************************************************************************************************* - * 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 License is located at * - * * - * http://www.apache.org/licenses/ * - * * - * or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES * - * OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions * - * and limitations under the License. * - *********************************************************************************************************************/ +/** ************************************************************************************************ +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * +* SPDX-License-Identifier: Apache-2.0 * + ************************************************************************************************ */