Merge pull request #61 from boozallen/59-fix-downsteam-helm-template-…

…calls #59 🐛 fix helm template references in downstream builds so they w…
boozallen · May 10, 2024 · 96f1035 · 96f1035
2 parents e1260d7 + 04d9ea5
commit 96f1035
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 12 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -121,6 +121,7 @@
         <dockerImageVersion>${project.version}</dockerImageVersion>
 
         <!-- Helm chart repository -->
+        <aissemble.helm.repo.protocol>oci</aissemble.helm.repo.protocol>
         <aissemble.helm.repo>ghcr.io/boozallen</aissemble.helm.repo>
         <aissemble.helm.repo.name>ghcr.io</aissemble.helm.repo.name>
 

diff --git a/extensions/aissemble-extensions-model-training-api-sagemaker/pyproject.toml b/extensions/aissemble-extensions-model-training-api-sagemaker/pyproject.toml
@@ -25,6 +25,7 @@ behave = ">=1.2.6"
 nose = ">=1.3.7"
 setuptools = "^69.0.3"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/...sions/extensions-data-delivery/aissemble-extensions-data-delivery-spark-py/pyproject.toml b/...sions/extensions-data-delivery/aissemble-extensions-data-delivery-spark-py/pyproject.toml
@@ -19,6 +19,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/pyproject.toml b/extensions/extensions-encryption/aissemble-extensions-encryption-vault-python/pyproject.toml
@@ -22,6 +22,7 @@ nose = ">=1.3.7"
 testcontainers = ">=3.7.1"
 setuptools = "^69.0.3"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/extensions/extensions-helm/pom.xml b/extensions/extensions-helm/pom.xml
@@ -141,7 +141,7 @@
                         <!-- For OCI, we need push versus upload: -->
                         <skipUpload>true</skipUpload>
                         <overwriteLocalDependencies>${overwrite.dependencies}</overwriteLocalDependencies>
-                        <overwriteDependencyRepository>oci://${aissemble.helm.repo}</overwriteDependencyRepository>
+                        <overwriteDependencyRepository>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}</overwriteDependencyRepository>
                         <overwriteDependencyVersion>${project.version}</overwriteDependencyVersion>
                         <uploadVerification>true</uploadVerification>
                         <uploadVerificationTimeout>120</uploadVerificationTimeout>

diff --git a/extensions/extensions-transform/aissemble-extensions-transform-spark-python/pyproject.toml b/extensions/extensions-transform/aissemble-extensions-transform-spark-python/pyproject.toml
@@ -24,6 +24,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/foundation/aissemble-foundation-core-python/pyproject.toml b/foundation/aissemble-foundation-core-python/pyproject.toml
@@ -33,6 +33,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/foundation/aissemble-foundation-model-training-api/pyproject.toml b/foundation/aissemble-foundation-model-training-api/pyproject.toml
@@ -23,6 +23,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/foundation/aissemble-foundation-versioning-service/pyproject.toml b/foundation/aissemble-foundation-versioning-service/pyproject.toml
@@ -27,6 +27,7 @@ behave = ">=1.2.6"
 nose = ">=1.3.7"
 setuptools = "^69.0.3"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/...ndation-drift-detection/aissemble-foundation-drift-detection-client-python/pyproject.toml b/...ndation-drift-detection/aissemble-foundation-drift-detection-client-python/pyproject.toml
@@ -21,6 +21,7 @@ urllib3 = "^1.26.18"
 black = ">=22.1.0"
 behave = ">=1.2.6"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/...dation/foundation-encryption/aissemble-foundation-encryption-policy-python/pyproject.toml b/...dation/foundation-encryption/aissemble-foundation-encryption-policy-python/pyproject.toml
@@ -21,6 +21,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/foundation/foundation-lineage/aissemble-foundation-model-lineage/pyproject.toml b/foundation/foundation-lineage/aissemble-foundation-model-lineage/pyproject.toml
@@ -20,6 +20,7 @@ black = "^24.1.1"
 behave = "^1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 

diff --git a/...n-lineage/foundation-data-lineage/aissemble-foundation-data-lineage-python/pyproject.toml b/...n-lineage/foundation-data-lineage/aissemble-foundation-data-lineage-python/pyproject.toml
@@ -28,6 +28,7 @@ testcontainers = ">=3.4.0"
 callee = "0.3.1"
 confluent-kafka = { version = "2.1.1", optional = true }
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/...mda/src/main/resources/templates/data-delivery-common/pipeline.chart.pom.configuration.vm b/...mda/src/main/resources/templates/data-delivery-common/pipeline.chart.pom.configuration.vm
@@ -13,9 +13,7 @@
                 <executable>helm</executable>
                 <arguments>
                     <argument>template</argument>
-                    <argument>aissemble-spark-application-chart</argument>
-                    <argument>--repo</argument>
-                    <argument>${aissemble.helm.repo}</argument>
+                    <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument>
                     <argument>--version</argument>
                     <argument>${version.aissemble}</argument>
                     <argument>--values</argument>
@@ -36,9 +34,7 @@
                 <executable>helm</executable>
                 <arguments>
                     <argument>template</argument>
-                    <argument>aissemble-spark-application-chart</argument>
-                    <argument>--repo</argument>
-                    <argument>${aissemble.helm.repo}</argument>
+                    <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument>
                     <argument>--version</argument>
                     <argument>${version.aissemble}</argument>
                     <argument>--values</argument>
@@ -59,9 +55,7 @@
                 <executable>helm</executable>
                 <arguments>
                     <argument>template</argument>
-                    <argument>aissemble-spark-application-chart</argument>
-                    <argument>--repo</argument>
-                    <argument>${aissemble.helm.repo}</argument>
+                    <argument>${aissemble.helm.repo.protocol}://${aissemble.helm.repo}/aissemble-spark-application-chart</argument>
                     <argument>--version</argument>
                     <argument>${version.aissemble}</argument>
                     <argument>--values</argument>

diff --git a/...undation-mda/src/main/resources/templates/notifications/notification.spark.worker.tilt.vm b/...undation-mda/src/main/resources/templates/notifications/notification.spark.worker.tilt.vm
@@ -3,6 +3,6 @@
 #set($path = "/src/main/resources/apps/")
 #end
 
-yaml = local('helm template aissemble-spark-application-chart --version %s --values ${parentArtifactId}/${pipelineArtifactId}${path}${pipelineArtifactId}-base-values.yaml,${parentArtifactId}/${pipelineArtifactId}${path}${pipelineArtifactId}-dev-values.yaml --repo oci://ghcr.io/boozallen' % aissemble_version)
+yaml = local('helm template oci://ghcr.io/boozallen/aissemble-spark-application-chart --version %s --values ${parentArtifactId}/${pipelineArtifactId}${path}${pipelineArtifactId}-base-values.yaml,${parentArtifactId}/${pipelineArtifactId}${path}${pipelineArtifactId}-dev-values.yaml' % aissemble_version)
 k8s_yaml(yaml)
 k8s_resource('${pipelineArtifactId}', port_forwards=[port_forward(4747, 4747, 'debug')], auto_init=False, trigger_mode=TRIGGER_MODE_MANUAL)
diff --git a/...g/foundation-messaging-python/aissemble-foundation-messaging-python-client/pyproject.toml b/...g/foundation-messaging-python/aissemble-foundation-messaging-python-client/pyproject.toml
@@ -21,6 +21,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 

diff --git a/foundation/foundation-security/aissemble-foundation-pdp-client-python/pyproject.toml b/foundation/foundation-security/aissemble-foundation-pdp-client-python/pyproject.toml
@@ -18,6 +18,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/foundation/foundation-transform/aissemble-foundation-transform-core-python/pyproject.toml b/foundation/foundation-transform/aissemble-foundation-transform-core-python/pyproject.toml
@@ -19,6 +19,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/.../test/resources/test-files/TiltfileMigration/aissemble-version-aissemble-version-Tiltfile b/.../test/resources/test-files/TiltfileMigration/aissemble-version-aissemble-version-Tiltfile
@@ -70,7 +70,7 @@ yaml = helm(
 )
 k8s_yaml(yaml)
 
-yaml = local('helm template aissemble-spark-application --version %s --values pysparkdd-pipelines/py-spark-data-delivery/src/py_spark_data_delivery/resources/apps/py-spark-data-delivery-base-values.yaml,pysparkdd-pipelines/py-spark-data-delivery/src/py_spark_data_delivery/resources/apps/py-spark-data-delivery-dev-values.yaml --repo oci://ghcr.io/boozallen' % aissemble_version)
+yaml = local('helm template oci://ghcr.io/boozallen/aissemble-spark-application --version %s --values pysparkdd-pipelines/py-spark-data-delivery/src/py_spark_data_delivery/resources/apps/py-spark-data-delivery-base-values.yaml,pysparkdd-pipelines/py-spark-data-delivery/src/py_spark_data_delivery/resources/apps/py-spark-data-delivery-dev-values.yaml' % aissemble_version)
 k8s_yaml(yaml)
 k8s_resource('py-spark-data-delivery', port_forwards=[port_forward(4747, 4747, 'debug')], auto_init=False, trigger_mode=TRIGGER_MODE_MANUAL)
 yaml = helm(

diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pyproject.toml b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model-basic/pyproject.toml
@@ -36,6 +36,7 @@ behave = ">=1.2.6"
 nose = ">=1.3.7"
 testcontainers = ">=3.7.1"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pyproject.toml b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/pyproject.toml
@@ -36,6 +36,7 @@ behave = ">=1.2.6"
 nose = ">=1.3.7"
 testcontainers = ">=3.7.1"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/.../test-machine-learning-base-model/aissemble-machine-learning-training-base/pyproject.toml b/.../test-machine-learning-base-model/aissemble-machine-learning-training-base/pyproject.toml
@@ -40,6 +40,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/...da-models/test-machine-learning-model/aissemble-machine-learning-inference/pyproject.toml b/...da-models/test-machine-learning-model/aissemble-machine-learning-inference/pyproject.toml
@@ -37,6 +37,7 @@ nose = ">=1.3.7"
 grpcio-tools = "^1.50.0"
 grpcio-testing = "^1.50.0"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]

diff --git a/.../test-machine-learning-model/aissemble-machine-learning-sagemaker-training/pyproject.toml b/.../test-machine-learning-model/aissemble-machine-learning-sagemaker-training/pyproject.toml
@@ -40,6 +40,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 

diff --git a/...mda-models/test-machine-learning-model/aissemble-machine-learning-training/pyproject.toml b/...mda-models/test-machine-learning-model/aissemble-machine-learning-training/pyproject.toml
@@ -38,6 +38,7 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 kappa-maki = ">=1.0.1"
+pylint = "^3.1.0"
 
 
 [build-system]