Merge branch 'main' into chore/ruff

awslabs · Mar 7, 2024 · e68e2f9 · e68e2f9
2 parents 3985966 + 7b7eea3
commit e68e2f9
Show file tree

Hide file tree

Showing 79 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### **Added**
 
-- added `sagemaker-templates` module with `multi_account_basic` project template
+- added `sagemaker-templates-service-catalog` module with `multi_account_basic` project template
 - bump cdk & ecr deployment version to fix deprecated custom resource runtimes issue in `mlflow-image`
 - added `sagemaker-jumpstart-fm-endpoint` module
 - added RDS persistence layer to MLFlow modules

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ All modules in this repository adhere to the module structure defined in the the
 |---------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [SageMaker Studio Module](modules/sagemaker/sagemaker-studio/README.md)               | Provisions secure SageMaker Studio Domain environment, creates example User Profiles for Data Scientist and Lead Data Scientist linked to IAM Roles, and adds lifecycle config |
 | [SageMaker Endpoint Module](modules/sagemaker/sagemaker-endpoint/README.md)           | Creates SageMaker real-time inference endpoint for the specified model package or latest approved model from the model package group                                           |
-| [SageMaker Project Templates Module](modules/sagemaker/sagemaker-templates/README.md) | Provisions SageMaker Project Templates for an organization. The templates are available using SageMaker Studio Classic or Service Catalog                                      |
+| [SageMaker Project Templates in Service Catalog Module](modules/sagemaker/sagemaker-templates-service-catalog/README.md) | Provisions SageMaker Project Templates for an organization. The templates are available using SageMaker Studio Classic or Service Catalog                                      |
 | [SageMaker Notebook Instance Module](modules/sagemaker/sagemaker-notebook/README.md)  | Creates secure SageMaker Notebook Instance for the Data Scientist, clones the source code to the workspace                                                                     |
 
 ### Mlflow Modules

diff --git a/manifests/sagemaker-templates-modules.yaml b/manifests/sagemaker-templates-modules.yaml
@@ -1,5 +1,5 @@
-name: templates
-path: modules/sagemaker/sagemaker-templates
+name: service-catalog
+path: modules/sagemaker/sagemaker-templates-service-catalog
 targetAccount: primary
 parameters:
   - name: portfolio-access-role-arn

diff --git a/...s/sagemaker/sagemaker-templates/README.md → ...maker-templates-service-catalog/README.md b/...s/sagemaker/sagemaker-templates/README.md → ...maker-templates-service-catalog/README.md
diff --git a/modules/sagemaker/sagemaker-templates/app.py → ...agemaker-templates-service-catalog/app.py b/modules/sagemaker/sagemaker-templates/app.py → ...agemaker-templates-service-catalog/app.py
diff --git a/...maker/sagemaker-templates/deployspec.yaml → ...templates-service-catalog/deployspec.yaml b/...maker/sagemaker-templates/deployspec.yaml → ...templates-service-catalog/deployspec.yaml
diff --git a/...ker-templates/images/zip-image/Dockerfile → ...rvice-catalog/images/zip-image/Dockerfile b/...ker-templates/images/zip-image/Dockerfile → ...rvice-catalog/images/zip-image/Dockerfile
diff --git a/...emaker/sagemaker-templates/pyproject.toml → ...-templates-service-catalog/pyproject.toml b/...emaker/sagemaker-templates/pyproject.toml → ...-templates-service-catalog/pyproject.toml
diff --git a/...maker/sagemaker-templates/requirements.in → ...templates-service-catalog/requirements.in b/...maker/sagemaker-templates/requirements.in → ...templates-service-catalog/requirements.in
diff --git a/...aker/sagemaker-templates/requirements.txt → ...emplates-service-catalog/requirements.txt b/...aker/sagemaker-templates/requirements.txt → ...emplates-service-catalog/requirements.txt
diff --git a/...es/sagemaker/sagemaker-templates/stack.py → ...emaker-templates-service-catalog/stack.py b/...es/sagemaker/sagemaker-templates/stack.py → ...emaker-templates-service-catalog/stack.py
diff --git a/...sagemaker-templates/templates/__init__.py → ...tes-service-catalog/templates/__init__.py b/...sagemaker-templates/templates/__init__.py → ...tes-service-catalog/templates/__init__.py
diff --git a/...templates/multi_account_basic/__init__.py → ...templates/multi_account_basic/__init__.py b/...templates/multi_account_basic/__init__.py → ...templates/multi_account_basic/__init__.py
diff --git a/...unt_basic/pipeline_constructs/__init__.py → ...unt_basic/pipeline_constructs/__init__.py b/...unt_basic/pipeline_constructs/__init__.py → ...unt_basic/pipeline_constructs/__init__.py
diff --git a/...ne_constructs/build_pipeline_construct.py → ...ne_constructs/build_pipeline_construct.py b/...ne_constructs/build_pipeline_construct.py → ...ne_constructs/build_pipeline_construct.py
diff --git a/...e_constructs/deploy_pipeline_construct.py → ...e_constructs/deploy_pipeline_construct.py b/...e_constructs/deploy_pipeline_construct.py → ...e_constructs/deploy_pipeline_construct.py
diff --git a/...ates/multi_account_basic/product_stack.py → ...ates/multi_account_basic/product_stack.py b/...ates/multi_account_basic/product_stack.py → ...ates/multi_account_basic/product_stack.py
diff --git a/...ed_code/build_app/.pre-commit-config.yaml → ...ed_code/build_app/.pre-commit-config.yaml b/...ed_code/build_app/.pre-commit-config.yaml → ...ed_code/build_app/.pre-commit-config.yaml
diff --git a/...ccount_basic/seed_code/build_app/Makefile → ...ccount_basic/seed_code/build_app/Makefile b/...ccount_basic/seed_code/build_app/Makefile → ...ccount_basic/seed_code/build_app/Makefile
diff --git a/...count_basic/seed_code/build_app/README.md → ...count_basic/seed_code/build_app/README.md b/...count_basic/seed_code/build_app/README.md → ...count_basic/seed_code/build_app/README.md
diff --git a/...t_basic/seed_code/build_app/buildspec.yml → ...t_basic/seed_code/build_app/buildspec.yml b/...t_basic/seed_code/build_app/buildspec.yml → ...t_basic/seed_code/build_app/buildspec.yml
diff --git a/...eed_code/build_app/ml_pipelines/README.md → ...eed_code/build_app/ml_pipelines/README.md b/...eed_code/build_app/ml_pipelines/README.md → ...eed_code/build_app/ml_pipelines/README.md
diff --git a/...d_code/build_app/ml_pipelines/__init__.py → ...d_code/build_app/ml_pipelines/__init__.py b/...d_code/build_app/ml_pipelines/__init__.py → ...d_code/build_app/ml_pipelines/__init__.py
diff --git a/...ode/build_app/ml_pipelines/__version__.py → ...ode/build_app/ml_pipelines/__version__.py b/...ode/build_app/ml_pipelines/__version__.py → ...ode/build_app/ml_pipelines/__version__.py
diff --git a/...eed_code/build_app/ml_pipelines/_utils.py → ...eed_code/build_app/ml_pipelines/_utils.py b/...eed_code/build_app/ml_pipelines/_utils.py → ...eed_code/build_app/ml_pipelines/_utils.py
diff --git a/...p/ml_pipelines/get_pipeline_definition.py → ...p/ml_pipelines/get_pipeline_definition.py b/...p/ml_pipelines/get_pipeline_definition.py → ...p/ml_pipelines/get_pipeline_definition.py
diff --git a/...de/build_app/ml_pipelines/run_pipeline.py → ...de/build_app/ml_pipelines/run_pipeline.py b/...de/build_app/ml_pipelines/run_pipeline.py → ...de/build_app/ml_pipelines/run_pipeline.py
diff --git a/...build_app/ml_pipelines/training/README.md → ...build_app/ml_pipelines/training/README.md b/...build_app/ml_pipelines/training/README.md → ...build_app/ml_pipelines/training/README.md
diff --git a/...ild_app/ml_pipelines/training/__init__.py → ...ild_app/ml_pipelines/training/__init__.py b/...ild_app/ml_pipelines/training/__init__.py → ...ild_app/ml_pipelines/training/__init__.py
diff --git a/...build_app/ml_pipelines/training/_utils.py → ...build_app/ml_pipelines/training/_utils.py b/...build_app/ml_pipelines/training/_utils.py → ...build_app/ml_pipelines/training/_utils.py
diff --git a/...ild_app/ml_pipelines/training/pipeline.py → ...ild_app/ml_pipelines/training/pipeline.py b/...ild_app/ml_pipelines/training/pipeline.py → ...ild_app/ml_pipelines/training/pipeline.py
diff --git a/...c/seed_code/build_app/notebooks/README.md → ...c/seed_code/build_app/notebooks/README.md b/...c/seed_code/build_app/notebooks/README.md → ...c/seed_code/build_app/notebooks/README.md
diff --git a/..._app/notebooks/sm_pipelines_runbook.ipynb → ..._app/notebooks/sm_pipelines_runbook.ipynb b/..._app/notebooks/sm_pipelines_runbook.ipynb → ..._app/notebooks/sm_pipelines_runbook.ipynb
diff --git a/...count_basic/seed_code/build_app/setup.cfg → ...count_basic/seed_code/build_app/setup.cfg b/...count_basic/seed_code/build_app/setup.cfg → ...count_basic/seed_code/build_app/setup.cfg
diff --git a/...ccount_basic/seed_code/build_app/setup.py → ...ccount_basic/seed_code/build_app/setup.py b/...ccount_basic/seed_code/build_app/setup.py → ...ccount_basic/seed_code/build_app/setup.py
diff --git a/...d_code/build_app/source_scripts/README.md → ...d_code/build_app/source_scripts/README.md b/...d_code/build_app/source_scripts/README.md → ...d_code/build_app/source_scripts/README.md
diff --git a/...ripts/evaluate/evaluate_xgboost/README.md → ...ripts/evaluate/evaluate_xgboost/README.md b/...ripts/evaluate/evaluate_xgboost/README.md → ...ripts/evaluate/evaluate_xgboost/README.md
diff --git a/...scripts/evaluate/evaluate_xgboost/main.py → ...scripts/evaluate/evaluate_xgboost/main.py b/...scripts/evaluate/evaluate_xgboost/main.py → ...scripts/evaluate/evaluate_xgboost/main.py
diff --git a/...valuate/evaluate_xgboost/requirements.txt → ...valuate/evaluate_xgboost/requirements.txt b/...valuate/evaluate_xgboost/requirements.txt → ...valuate/evaluate_xgboost/requirements.txt
diff --git a/...uild_app/source_scripts/helpers/README.md → ...uild_app/source_scripts/helpers/README.md b/...uild_app/source_scripts/helpers/README.md → ...uild_app/source_scripts/helpers/README.md
diff --git a/...uild_app/source_scripts/helpers/logger.py → ...uild_app/source_scripts/helpers/logger.py b/...uild_app/source_scripts/helpers/logger.py → ...uild_app/source_scripts/helpers/logger.py
diff --git a/...p/source_scripts/helpers/requirements.txt → ...p/source_scripts/helpers/requirements.txt b/...p/source_scripts/helpers/requirements.txt → ...p/source_scripts/helpers/requirements.txt
diff --git a/...d_app/source_scripts/helpers/s3_helper.py → ...d_app/source_scripts/helpers/s3_helper.py b/...d_app/source_scripts/helpers/s3_helper.py → ...d_app/source_scripts/helpers/s3_helper.py
diff --git a/...app/source_scripts/helpers/test/test_a.py → ...app/source_scripts/helpers/test/test_a.py b/...app/source_scripts/helpers/test/test_a.py → ...app/source_scripts/helpers/test/test_a.py
diff --git a/...processing/prepare_abalone_data/README.md → ...processing/prepare_abalone_data/README.md b/...processing/prepare_abalone_data/README.md → ...processing/prepare_abalone_data/README.md
diff --git a/...reprocessing/prepare_abalone_data/main.py → ...reprocessing/prepare_abalone_data/main.py b/...reprocessing/prepare_abalone_data/main.py → ...reprocessing/prepare_abalone_data/main.py
diff --git a/...ing/prepare_abalone_data/requirements.txt → ...ing/prepare_abalone_data/requirements.txt b/...ing/prepare_abalone_data/requirements.txt → ...ing/prepare_abalone_data/requirements.txt
diff --git a/...source_scripts/training/xgboost/README.md → ...source_scripts/training/xgboost/README.md b/...source_scripts/training/xgboost/README.md → ...source_scripts/training/xgboost/README.md
diff --git a/...urce_scripts/training/xgboost/__main__.py → ...urce_scripts/training/xgboost/__main__.py b/...urce_scripts/training/xgboost/__main__.py → ...urce_scripts/training/xgboost/__main__.py
diff --git a/...scripts/training/xgboost/requirements.txt → ...scripts/training/xgboost/requirements.txt b/...scripts/training/xgboost/requirements.txt → ...scripts/training/xgboost/requirements.txt
diff --git a/...e_scripts/training/xgboost/test/test_a.py → ...e_scripts/training/xgboost/test/test_a.py b/...e_scripts/training/xgboost/test/test_a.py → ...e_scripts/training/xgboost/test/test_a.py
diff --git a/...seed_code/deploy_app/.githooks/pre-commit → ...seed_code/deploy_app/.githooks/pre-commit b/...seed_code/deploy_app/.githooks/pre-commit → ...seed_code/deploy_app/.githooks/pre-commit
diff --git a/...d_code/deploy_app/.pre-commit-config.yaml → ...d_code/deploy_app/.pre-commit-config.yaml b/...d_code/deploy_app/.pre-commit-config.yaml → ...d_code/deploy_app/.pre-commit-config.yaml
diff --git a/...count_basic/seed_code/deploy_app/Makefile → ...count_basic/seed_code/deploy_app/Makefile b/...count_basic/seed_code/deploy_app/Makefile → ...count_basic/seed_code/deploy_app/Makefile
diff --git a/...ount_basic/seed_code/deploy_app/README.md → ...ount_basic/seed_code/deploy_app/README.md b/...ount_basic/seed_code/deploy_app/README.md → ...ount_basic/seed_code/deploy_app/README.md
diff --git a/...account_basic/seed_code/deploy_app/app.py → ...account_basic/seed_code/deploy_app/app.py b/...account_basic/seed_code/deploy_app/app.py → ...account_basic/seed_code/deploy_app/app.py
diff --git a/...seed_code/deploy_app/config/config_mux.py → ...seed_code/deploy_app/config/config_mux.py b/...seed_code/deploy_app/config/config_mux.py → ...seed_code/deploy_app/config/config_mux.py
diff --git a/.../seed_code/deploy_app/config/constants.py → .../seed_code/deploy_app/config/constants.py b/.../seed_code/deploy_app/config/constants.py → .../seed_code/deploy_app/config/constants.py
diff --git a/...d_code/deploy_app/config/dev/constants.py → ...d_code/deploy_app/config/dev/constants.py b/...d_code/deploy_app/config/dev/constants.py → ...d_code/deploy_app/config/dev/constants.py
diff --git a/...deploy_app/config/dev/endpoint-config.yml → ...deploy_app/config/dev/endpoint-config.yml b/...deploy_app/config/dev/endpoint-config.yml → ...deploy_app/config/dev/endpoint-config.yml
diff --git a/..._code/deploy_app/config/prod/constants.py → ..._code/deploy_app/config/prod/constants.py b/..._code/deploy_app/config/prod/constants.py → ..._code/deploy_app/config/prod/constants.py
diff --git a/...eploy_app/config/prod/endpoint-config.yml → ...eploy_app/config/prod/endpoint-config.yml b/...eploy_app/config/prod/endpoint-config.yml → ...eploy_app/config/prod/endpoint-config.yml
diff --git a/...de/deploy_app/config/staging/constants.py → ...de/deploy_app/config/staging/constants.py b/...de/deploy_app/config/staging/constants.py → ...de/deploy_app/config/staging/constants.py
diff --git a/...oy_app/config/staging/endpoint-config.yml → ...oy_app/config/staging/endpoint-config.yml b/...oy_app/config/staging/endpoint-config.yml → ...oy_app/config/staging/endpoint-config.yml
diff --git a/...de/deploy_app/deploy_endpoint/__init__.py → ...de/deploy_app/deploy_endpoint/__init__.py b/...de/deploy_app/deploy_endpoint/__init__.py → ...de/deploy_app/deploy_endpoint/__init__.py
diff --git a/.../deploy_endpoint/deploy_endpoint_stack.py → .../deploy_endpoint/deploy_endpoint_stack.py b/.../deploy_endpoint/deploy_endpoint_stack.py → .../deploy_endpoint/deploy_endpoint_stack.py
diff --git a/...p/deploy_endpoint/get_approved_package.py → ...p/deploy_endpoint/get_approved_package.py b/...p/deploy_endpoint/get_approved_package.py → ...p/deploy_endpoint/get_approved_package.py
diff --git a/...seed_code/deploy_app/requirements-dev.txt → ...seed_code/deploy_app/requirements-dev.txt b/...seed_code/deploy_app/requirements-dev.txt → ...seed_code/deploy_app/requirements-dev.txt
diff --git a/...sic/seed_code/deploy_app/requirements.txt → ...sic/seed_code/deploy_app/requirements.txt b/...sic/seed_code/deploy_app/requirements.txt → ...sic/seed_code/deploy_app/requirements.txt
diff --git a/...unt_basic/seed_code/deploy_app/source.bat → ...unt_basic/seed_code/deploy_app/source.bat b/...unt_basic/seed_code/deploy_app/source.bat → ...unt_basic/seed_code/deploy_app/source.bat
diff --git a/...asic/seed_code/deploy_app/tests/README.md → ...asic/seed_code/deploy_app/tests/README.md b/...asic/seed_code/deploy_app/tests/README.md → ...asic/seed_code/deploy_app/tests/README.md
diff --git a/...y_app/tests/integration_tests/__init__.py → ...y_app/tests/integration_tests/__init__.py b/...y_app/tests/integration_tests/__init__.py → ...y_app/tests/integration_tests/__init__.py
diff --git a/...app/tests/integration_tests/buildspec.yml → ...app/tests/integration_tests/buildspec.yml b/...app/tests/integration_tests/buildspec.yml → ...app/tests/integration_tests/buildspec.yml
diff --git a/.../tests/integration_tests/endpoint_test.py → .../tests/integration_tests/endpoint_test.py b/.../tests/integration_tests/endpoint_test.py → .../tests/integration_tests/endpoint_test.py
diff --git a/...de/deploy_app/tests/unittests/__init__.py → ...de/deploy_app/tests/unittests/__init__.py b/...de/deploy_app/tests/unittests/__init__.py → ...de/deploy_app/tests/unittests/__init__.py
diff --git a/.../tests/unittests/test_deploy_app_stack.py → .../tests/unittests/test_deploy_app_stack.py b/.../tests/unittests/test_deploy_app_stack.py → .../tests/unittests/test_deploy_app_stack.py
diff --git a/...ker/sagemaker-templates/tests/__init__.py → ...mplates-service-catalog/tests/__init__.py b/...ker/sagemaker-templates/tests/__init__.py → ...mplates-service-catalog/tests/__init__.py
diff --git a/...ker/sagemaker-templates/tests/test_app.py → ...mplates-service-catalog/tests/test_app.py b/...ker/sagemaker-templates/tests/test_app.py → ...mplates-service-catalog/tests/test_app.py
diff --git a/...r/sagemaker-templates/tests/test_stack.py → ...lates-service-catalog/tests/test_stack.py b/...r/sagemaker-templates/tests/test_stack.py → ...lates-service-catalog/tests/test_stack.py