Rework package structure (#1)

Author: giograno

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - .github/workflows/test.yml
-      - localstack-sdk/**
+      - localstack-sdk-*
   push:
     branches:
       - main

LICENSE.txt

@@ -0,0 +1,14 @@
+Copyright (c) 2017+ LocalStack contributors
+Copyright (c) 2016 Atlassian Pty Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

Makefile

@@ -30,7 +30,7 @@ clean:         	## Clean up
 	rm -rf $(VENV_DIR)
 
 clean-generated:	## Cleanup generated code
-	rm -rf localstack-sdk-generated/localstack/generated
+	rm -rf localstack-sdk-generated/localstack/
 
 format:            		  ## Run ruff to format the whole codebase
 	($(VENV_RUN); python -m ruff format .; python -m ruff check --output-format=full --exclude localstack-sdk/localstack/generated --fix .)

bin/generate.sh

@@ -6,7 +6,7 @@ docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate \
     -g python \
     -o /local/localstack-sdk-generated \
     --global-property models,apis,supportingFiles \
-    -p packageName=localstack \
+    -p packageName=localstack.sdk \
     --template-dir /local/localstack-sdk-generated/templates \
     --global-property apiTests=false,modelTests=false \
     --global-property apiDocs=false,modelDocs=False

localstack-sdk-generated/.openapi-generator-ignore

@@ -7,8 +7,9 @@
 git_push.sh
 README.md
 tox.ini
+localstack/sdk/__init__.py
 localstack/__init__.py
 pyproject.toml
 setup.py
 setup.cfg
-test-requirements.txt
+test-requirements.txt

localstack-sdk-generated/.openapi-generator/FILES

@@ -1,66 +1,66 @@
 .gitignore
-localstack/api/__init__.py
-localstack/api/aws_api.py
-localstack/api/chaos_api.py
-localstack/api/default_api.py
-localstack/api/localstack_api.py
-localstack/api/pods_api.py
-localstack/api/pro_api.py
-localstack/api/state_api.py
-localstack/api_client.py
-localstack/api_response.py
-localstack/configuration.py
-localstack/exceptions.py
-localstack/models/__init__.py
-localstack/models/cloud_watch_metrics.py
-localstack/models/cloud_watch_metrics_metrics_inner.py
-localstack/models/cloud_watch_metrics_metrics_inner_d_inner.py
-localstack/models/cloud_watch_metrics_metrics_inner_d_inner_v.py
-localstack/models/cloud_watch_metrics_metrics_inner_t.py
-localstack/models/cloud_watch_metrics_metrics_inner_v.py
-localstack/models/create_remote_request.py
-localstack/models/delete_ddb_expired_items200_response.py
-localstack/models/fault_rule.py
-localstack/models/fault_rule_error.py
-localstack/models/get_diagnostics200_response.py
-localstack/models/get_diagnostics200_response_logs.py
-localstack/models/get_diagnostics200_response_version.py
-localstack/models/get_diagnostics200_response_version_host.py
-localstack/models/get_diagnostics200_response_version_image_version.py
-localstack/models/get_diagnostics200_response_version_localstack_version.py
-localstack/models/get_features_and_services200_response.py
-localstack/models/get_lambda_runtimes200_response.py
-localstack/models/get_remote200_response.py
-localstack/models/get_ses_messages200_response.py
-localstack/models/get_sns_messages200_response.py
-localstack/models/get_sns_sms_messages200_response.py
-localstack/models/get_sns_subscription_token200_response.py
-localstack/models/init_scripts.py
-localstack/models/init_scripts_completed.py
-localstack/models/init_scripts_scripts_inner.py
-localstack/models/init_scripts_stage.py
-localstack/models/init_scripts_stage_scripts_inner.py
-localstack/models/list_remotes200_response.py
-localstack/models/list_remotes200_response_remotes_inner.py
-localstack/models/localstack_pods_environment_get200_response.py
-localstack/models/localstack_stackinfo_get200_response.py
-localstack/models/manage_session_request.py
-localstack/models/network_effects_config.py
-localstack/models/pod_list.py
-localstack/models/pod_list_cloudpods_inner.py
-localstack/models/pod_save_request.py
-localstack/models/pod_versions.py
-localstack/models/pod_versions_versions_inner.py
-localstack/models/remote_config.py
-localstack/models/remote_config_one_of.py
-localstack/models/ses_sent_email.py
-localstack/models/ses_sent_email_body.py
-localstack/models/session_info.py
-localstack/models/sns_subscription_token_error.py
-localstack/models/state_result.py
-localstack/models/store_data200_response.py
-localstack/models/update_config_option200_response.py
-localstack/models/update_config_option_request.py
-localstack/py.typed
-localstack/rest.py
+localstack/sdk/api/__init__.py
+localstack/sdk/api/aws_api.py
+localstack/sdk/api/chaos_api.py
+localstack/sdk/api/default_api.py
+localstack/sdk/api/localstack_api.py
+localstack/sdk/api/pods_api.py
+localstack/sdk/api/pro_api.py
+localstack/sdk/api/state_api.py
+localstack/sdk/api_client.py
+localstack/sdk/api_response.py
+localstack/sdk/configuration.py
+localstack/sdk/exceptions.py
+localstack/sdk/models/__init__.py
+localstack/sdk/models/cloud_watch_metrics.py
+localstack/sdk/models/cloud_watch_metrics_metrics_inner.py
+localstack/sdk/models/cloud_watch_metrics_metrics_inner_d_inner.py
+localstack/sdk/models/cloud_watch_metrics_metrics_inner_d_inner_v.py
+localstack/sdk/models/cloud_watch_metrics_metrics_inner_t.py
+localstack/sdk/models/cloud_watch_metrics_metrics_inner_v.py
+localstack/sdk/models/create_remote_request.py
+localstack/sdk/models/delete_ddb_expired_items200_response.py
+localstack/sdk/models/fault_rule.py
+localstack/sdk/models/fault_rule_error.py
+localstack/sdk/models/get_diagnostics200_response.py
+localstack/sdk/models/get_diagnostics200_response_logs.py
+localstack/sdk/models/get_diagnostics200_response_version.py
+localstack/sdk/models/get_diagnostics200_response_version_host.py
+localstack/sdk/models/get_diagnostics200_response_version_image_version.py
+localstack/sdk/models/get_diagnostics200_response_version_localstack_version.py
+localstack/sdk/models/get_features_and_services200_response.py
+localstack/sdk/models/get_lambda_runtimes200_response.py
+localstack/sdk/models/get_remote200_response.py
+localstack/sdk/models/get_ses_messages200_response.py
+localstack/sdk/models/get_sns_messages200_response.py
+localstack/sdk/models/get_sns_sms_messages200_response.py
+localstack/sdk/models/get_sns_subscription_token200_response.py
+localstack/sdk/models/init_scripts.py
+localstack/sdk/models/init_scripts_completed.py
+localstack/sdk/models/init_scripts_scripts_inner.py
+localstack/sdk/models/init_scripts_stage.py
+localstack/sdk/models/init_scripts_stage_scripts_inner.py
+localstack/sdk/models/list_remotes200_response.py
+localstack/sdk/models/list_remotes200_response_remotes_inner.py
+localstack/sdk/models/localstack_pods_environment_get200_response.py
+localstack/sdk/models/localstack_stackinfo_get200_response.py
+localstack/sdk/models/manage_session_request.py
+localstack/sdk/models/network_effects_config.py
+localstack/sdk/models/pod_list.py
+localstack/sdk/models/pod_list_cloudpods_inner.py
+localstack/sdk/models/pod_save_request.py
+localstack/sdk/models/pod_versions.py
+localstack/sdk/models/pod_versions_versions_inner.py
+localstack/sdk/models/remote_config.py
+localstack/sdk/models/remote_config_one_of.py
+localstack/sdk/models/ses_sent_email.py
+localstack/sdk/models/ses_sent_email_body.py
+localstack/sdk/models/session_info.py
+localstack/sdk/models/sns_subscription_token_error.py
+localstack/sdk/models/state_result.py
+localstack/sdk/models/store_data200_response.py
+localstack/sdk/models/update_config_option200_response.py
+localstack/sdk/models/update_config_option_request.py
+localstack/sdk/py.typed
+localstack/sdk/rest.py
 requirements.txt

localstack-sdk-generated/localstack/api/__init__.py

@@ -0,0 +1,11 @@
+# flake8: noqa
+
+# import apis into api package
+from localstack.sdk.api.aws_api import AwsApi
+from localstack.sdk.api.chaos_api import ChaosApi
+from localstack.sdk.api.default_api import DefaultApi
+from localstack.sdk.api.localstack_api import LocalstackApi
+from localstack.sdk.api.pods_api import PodsApi
+from localstack.sdk.api.pro_api import ProApi
+from localstack.sdk.api.state_api import StateApi
+

localstack-sdk-generated/localstack/models/__init__.py

@@ -20,17 +20,17 @@
 from pydantic import Field, StrictStr, field_validator
 from typing import Optional
 from typing_extensions import Annotated
-from localstack.models.cloud_watch_metrics import CloudWatchMetrics
-from localstack.models.delete_ddb_expired_items200_response import DeleteDdbExpiredItems200Response
-from localstack.models.get_lambda_runtimes200_response import GetLambdaRuntimes200Response
-from localstack.models.get_ses_messages200_response import GetSesMessages200Response
-from localstack.models.get_sns_messages200_response import GetSnsMessages200Response
-from localstack.models.get_sns_sms_messages200_response import GetSnsSmsMessages200Response
-from localstack.models.get_sns_subscription_token200_response import GetSnsSubscriptionToken200Response
-
-from localstack.api_client import ApiClient, RequestSerialized
-from localstack.api_response import ApiResponse
-from localstack.rest import RESTResponseType
+from localstack.sdk.models.cloud_watch_metrics import CloudWatchMetrics
+from localstack.sdk.models.delete_ddb_expired_items200_response import DeleteDdbExpiredItems200Response
+from localstack.sdk.models.get_lambda_runtimes200_response import GetLambdaRuntimes200Response
+from localstack.sdk.models.get_ses_messages200_response import GetSesMessages200Response
+from localstack.sdk.models.get_sns_messages200_response import GetSnsMessages200Response
+from localstack.sdk.models.get_sns_sms_messages200_response import GetSnsSmsMessages200Response
+from localstack.sdk.models.get_sns_subscription_token200_response import GetSnsSubscriptionToken200Response
+
+from localstack.sdk.api_client import ApiClient, RequestSerialized
+from localstack.sdk.api_response import ApiResponse
+from localstack.sdk.rest import RESTResponseType
 
 
 class AwsApi: