CH-87 Add tests for wrong generation of "overrides"

aranega · aranega · commit f210c6b6f832 · 2023-10-12T04:41:03.000-06:00
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/.dockerignore b/tools/deployment-cli-tools/tests/resources_buggy/.dockerignore
@@ -0,0 +1,22 @@
+**/node_modules
+.tox
+docs
+applications
+/infrastructure
+/blueprint
+test
+/tools/deployment-cli-tools
+.github
+.git
+.vscode
+/deployment
+skaffold.yaml
+*.egg-info
+__pycache__
+.hypothesis
+.coverage
+.pytest_cache
+/application-templates
+/deployment-configuration
+/cloud-harness
+.openapi-generator
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/events/deploy/values-prod.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/events/deploy/values-prod.yaml
@@ -0,0 +1,7 @@
+kafka:
+  resources:
+    limits:
+      cpu: overridden-prod
+    requests:
+      cpu: 50m
+      memory: 100Mi
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/events/deploy/values.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/events/deploy/values.yaml
@@ -0,0 +1,8 @@
+kafka:
+  resources:
+    limits:
+      cpu: 600m
+      memory: overridden
+    requests:
+      cpu: 50m
+      memory: 100Mi
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/.dockerignore b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/.dockerignore
@@ -0,0 +1 @@
+*.ignored
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/Dockerfile b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/Dockerfile
@@ -0,0 +1,2 @@
+ARG CLOUDHARNESS_FLASK
+FROM $CLOUDHARNESS_FLASK
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/resources/aresource.txt b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/resources/aresource.txt
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/templates/mytemplate.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/templates/mytemplate.yaml
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-dev.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-dev.yaml
@@ -0,0 +1,11 @@
+harness:
+  name: "I'm useless"
+  subdomain: mysubdomain
+  dependencies:
+    soft:
+      - legacy
+    build:
+      - cloudharness-flask
+      - my-common
+a: b
+dev: true
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-test.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-test.yaml
@@ -0,0 +1,2 @@
+a: test
+test: true
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-withmongo.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-withmongo.yaml
@@ -0,0 +1,4 @@
+harness:
+  database:
+    auto: true
+    type: mongo
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-withoutdb.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-withoutdb.yaml
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-withpostgres.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values-withpostgres.yaml
@@ -0,0 +1,2 @@
+harness:
+  database: {auto: true, type: postgres}
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values.yaml b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/deploy/values.yaml
@@ -0,0 +1,14 @@
+harness:
+  name: "I'm useless"
+  subdomain: mysubdomain
+  dependencies:
+    soft:
+      - legacy
+    build:
+      - cloudharness-flask
+  test:
+    unit:
+      commands:
+      - tox
+      - echo "hello"
+a: b
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/myapp_code/__main__.py b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/myapp_code/__main__.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+
+from cloudharness.utils.server import init_flask, main
+
+
+app = init_flask(title="Cloudharness sample application", webapp=True)
+
+if __name__ == '__main__':
+    main()
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/tasks/mytask/Dockerfile b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/tasks/mytask/Dockerfile
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/venv/matplotlib/__main__.py b/tools/deployment-cli-tools/tests/resources_buggy/applications/myapp/venv/matplotlib/__main__.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python3
+
+from something import something_else
+
+
+def fake_content():
+    ...
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/infrastructure/base-images/cloudharness-base/testfile b/tools/deployment-cli-tools/tests/resources_buggy/infrastructure/base-images/cloudharness-base/testfile
diff --git a/tools/deployment-cli-tools/tests/resources_buggy/infrastructure/common-images/my-common/Dockerfile b/tools/deployment-cli-tools/tests/resources_buggy/infrastructure/common-images/my-common/Dockerfile
diff --git a/tools/deployment-cli-tools/tests/test_skaffold.py b/tools/deployment-cli-tools/tests/test_skaffold.py
@@ -7,6 +7,7 @@
 
 HERE = os.path.dirname(os.path.realpath(__file__))
 RESOURCES = os.path.join(HERE, 'resources')
+RESOURCES_BUGGY = os.path.join(HERE, 'resources_buggy')
 OUT = '/tmp/deployment'
 CLOUDHARNESS_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
 
@@ -70,7 +71,7 @@ def test_create_skaffold_configuration():
         a for a in sk['build']['artifacts'] if a['image'] == 'reg/cloudharness/cloudharness-flask')
 
 
-    assert os.path.samefile(cloudharness_flask_artifact['context'], 
+    assert os.path.samefile(cloudharness_flask_artifact['context'],
        join(CLOUDHARNESS_ROOT, 'infrastructure/common-images/cloudharness-flask')
     )
 
@@ -102,3 +103,39 @@ def test_create_skaffold_configuration():
 
     shutil.rmtree(OUT)
     shutil.rmtree(BUILD_DIR)
+
+
+def test_create_skaffold_configuration_with_conflicting_dependencies(tmp_path):
+    values = create_helm_chart(
+        [CLOUDHARNESS_ROOT, RESOURCES_BUGGY],
+        output_path=OUT,
+        include=['myapp'],
+        exclude=['events'],
+        domain="my.local",
+        namespace='test',
+        env='dev',
+        local=False,
+        tag=1,
+        registry='reg'
+    )
+    root_paths = preprocess_build_overrides(
+        root_paths=[CLOUDHARNESS_ROOT, RESOURCES_BUGGY],
+        helm_values=values,
+        merge_build_path=str(tmp_path)
+    )
+
+    sk = create_skaffold_configuration(
+        root_paths=root_paths,
+        helm_values=values,
+        output_path=OUT
+    )
+
+    releases = sk['deploy']['helm']['releases']
+    assert len(releases) == 1  # Ensure we only found 1 deployment (for myapp)
+
+    release = releases[0]
+    assert 'myapp' in release['overrides']['apps']
+    assert 'matplotlib' not in release['overrides']['apps']
+
+    myapp_config = release['overrides']['apps']['myapp']
+    assert myapp_config['harness']['deployment']['args'][0] == '/usr/src/app/myapp_code/__main__.py'

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ARG CLOUDHARNESS_FLASK`
	`2`	`+FROM $CLOUDHARNESS_FLASK`