#55: Updated SLC-CI to 1.3.0 (#56)

exasol · Jul 5, 2023 · 20009a9 · 20009a9
1 parent 94c2d74
commit 20009a9
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 293 deletions.
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
 # Changes
 
+* [1.2.0](changes_1.2.0.md)
 * [1.1.0](changes_1.1.0.md)
 * [1.0.0](changes_1.0.0.md)
 * [0.8.0](changes_0.8.0.md)

diff --git a/doc/changes/changes_1.2.0.md b/doc/changes/changes_1.2.0.md
@@ -0,0 +1,23 @@
+# script-languages-container-ci-setup 1.2.0, released 2023-07-05
+
+Code name: Updated SLC-CI to 1.3.0
+
+## Summary
+
+Updated SLC-CI to 1.3.0 and moved the Config definition to SLC-CI.
+
+## Bug Fixes
+
+n/a
+
+## Features / Enhancements
+
+n/a
+
+## Documentation
+
+n/a
+
+## Refactoring
+
+ - #55: Updated SLC-CI to 1.3.0 and moved the Config definition to SLC-CI.
diff --git a/exasol_script_languages_container_ci_setup/lib/ci_build.py b/exasol_script_languages_container_ci_setup/lib/ci_build.py
@@ -24,7 +24,7 @@ def run_deploy_ci_build(aws_access: AwsAccess, project: str, github_url: str):
     logging.info(f"run_deploy_ci_build for aws profile {aws_access.aws_profile} for project {project} at {github_url}")
     dockerhub_secret_arn = aws_access.read_dockerhub_secret_arn()
     yml = render_template(CI_CODE_BUILD_TEMPLATE, project=project,
-                          dockerhub_secret_arn=dockerhub_secret_arn, github_url=github_url,
+                          dockerhub_secret_arn=dockerhub_secret_arn.aws_arn, github_url=github_url,
                           webhook_filter_pattern=CI_BUILD_WEBHOOK_FILTER_PATTERN)
     aws_access.upload_cloudformation_stack(yml, ci_stack_name(project))
 

diff --git a/exasol_script_languages_container_ci_setup/lib/config/__init__.py b/exasol_script_languages_container_ci_setup/lib/config/__init__.py
diff --git a/exasol_script_languages_container_ci_setup/lib/config/config_data_model.py b/exasol_script_languages_container_ci_setup/lib/config/config_data_model.py
diff --git a/exasol_script_languages_container_ci_setup/lib/config/data_model_generator.py b/exasol_script_languages_container_ci_setup/lib/config/data_model_generator.py
diff --git a/exasol_script_languages_container_ci_setup/lib/generate_buildspec_common.py b/exasol_script_languages_container_ci_setup/lib/generate_buildspec_common.py
@@ -1,12 +1,11 @@
-import json
+
 import logging
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Optional, Tuple, List
 
-import jsonschema
+from exasol_script_languages_container_ci.lib.config.config_data_model import Config
 
-from exasol_script_languages_container_ci_setup.lib.config.config_data_model import Config
 from exasol_script_languages_container_ci_setup.lib.render_template import render_template
 
 
@@ -46,7 +45,7 @@ def get_config_file_parameter(config_file: Optional[str]):
 
 
 def _find_flavors(flavor_root_paths: Tuple[str, ...]) -> List[Flavor]:
-    """"
+    """
     Find flavors under the given path(s) and return them in ordered list.
     """
     flavors = set()

diff --git a/exasol_script_languages_container_ci_setup/lib/run_start_build.py b/exasol_script_languages_container_ci_setup/lib/run_start_build.py
@@ -2,10 +2,11 @@
 import re
 from typing import Tuple, Dict, List, Optional
 
+from exasol_script_languages_container_ci.lib.config.config_data_model import Config
+
 from exasol_script_languages_container_ci_setup.lib.aws.aws_access import AwsAccess
 from exasol_script_languages_container_ci_setup.lib.aws.wrapper.datamodels.cloudformation import StackResourceSummary
 from exasol_script_languages_container_ci_setup.lib.ci_build import ci_stack_name
-from exasol_script_languages_container_ci_setup.lib.config.config_data_model import Config
 from exasol_script_languages_container_ci_setup.lib.github_draft_release_creator import GithubDraftReleaseCreator
 from exasol_script_languages_container_ci_setup.lib.release_build import release_stack_name