From 6d1a2f0dd4d40f66437d494a47d6cea0d9c36023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20L=C3=B6sche?= Date: Mon, 2 Oct 2023 14:16:33 +0200 Subject: [PATCH 1/2] [aws|gcp][fix] Revert __init__.py changes --- .../tools/awspolicygen/awspolicygen/__init__.py | 9 +++++++++ .../tools/gcppolicygen/gcppolicygen/__init__.py | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py b/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py index 3aa701a198..ea4b4dffbb 100644 --- a/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py +++ b/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py @@ -7,8 +7,17 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This script generates the required AWS access policy and uploads it to the CDN. :copyright: © 2022 Some Engineering Inc. +:license: Apache 2.0, see LICENSE for more details. """ +__title__ = "awspolicygen" +__description__ = "Resoto AWS policy generator and uploader." +__author__ = "Some Engineering Inc." +__license__ = "Apache 2.0" +__copyright__ = "Copyright © 2023 Some Engineering Inc." +__version__ = "0.0.1" + + logging.basicConfig( level=logging.INFO, format="%(levelname)s - %(message)s", diff --git a/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py b/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py index b87b6efed3..34f1ae8251 100644 --- a/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py +++ b/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py @@ -2,6 +2,21 @@ import logging from argparse import ArgumentParser, Namespace +""" +Resoto GCP policy generator and uploader +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +This script generates the required GCP access policy and uploads it to the CDN. +:copyright: © 2023 Some Engineering Inc. +:license: Apache 2.0, see LICENSE for more details. +""" + +__title__ = "gcppolicygen" +__description__ = "Resoto GCP policy generator and uploader." +__author__ = "Some Engineering Inc." +__license__ = "Apache 2.0" +__copyright__ = "Copyright © 2023 Some Engineering Inc." +__version__ = "0.0.1" + logging.basicConfig( level=logging.INFO, From 77b145fea61e484f5eb9d2d52c58242aff336197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20L=C3=B6sche?= Date: Mon, 2 Oct 2023 14:18:50 +0200 Subject: [PATCH 2/2] Update license --- plugins/aws/tools/awspolicygen/awspolicygen/__init__.py | 6 +++--- plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py b/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py index ea4b4dffbb..b80792120f 100644 --- a/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py +++ b/plugins/aws/tools/awspolicygen/awspolicygen/__init__.py @@ -6,14 +6,14 @@ Resoto AWS policy generator and uploader ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This script generates the required AWS access policy and uploads it to the CDN. -:copyright: © 2022 Some Engineering Inc. -:license: Apache 2.0, see LICENSE for more details. +:copyright: © 2023 Some Engineering Inc. +:license: AGPL-3.0, see LICENSE for more details. """ __title__ = "awspolicygen" __description__ = "Resoto AWS policy generator and uploader." __author__ = "Some Engineering Inc." -__license__ = "Apache 2.0" +__license__ = "AGPL-3.0" __copyright__ = "Copyright © 2023 Some Engineering Inc." __version__ = "0.0.1" diff --git a/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py b/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py index 34f1ae8251..b3eaa78e71 100644 --- a/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py +++ b/plugins/gcp/tools/gcppolicygen/gcppolicygen/__init__.py @@ -7,13 +7,13 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This script generates the required GCP access policy and uploads it to the CDN. :copyright: © 2023 Some Engineering Inc. -:license: Apache 2.0, see LICENSE for more details. +:license: AGPL-3.0, see LICENSE for more details. """ __title__ = "gcppolicygen" __description__ = "Resoto GCP policy generator and uploader." __author__ = "Some Engineering Inc." -__license__ = "Apache 2.0" +__license__ = "AGPL-3.0" __copyright__ = "Copyright © 2023 Some Engineering Inc." __version__ = "0.0.1"