Update tests

Issue: #
TeaInSpace · Aug 3, 2023 · 3a79b55 · 3a79b55
1 parent 889ecf0
commit 3a79b55
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -48,7 +48,6 @@ humantime = {version = "2.1.0", optional = true}
 either = {version = "1.9.0", optional = true}
 rand = {version = "*", optional = true}
 cron-parser = "0.8.0"
-macros = { version = "0.1.0", path = "../macros" }
 anyhow = "1.0.72"
 serde_with = "3.1.0"
 

diff --git a/lib/src/custom_resources/new_task.rs b/lib/src/custom_resources/new_task.rs
@@ -497,7 +497,7 @@ mod test {
             executor_image: "myimage".to_string(),
             task_volume: "myvolume".to_string(),
             required_data_sets: vec![],
-            service_account: "ame-system".to_string(),
+            service_account: "ame-task".to_string(),
         };
 
         insta::assert_yaml_snapshot!(build_workflow(task, task_ctx)?);

diff --git a/...ustom_resources/snapshots/ame__custom_resources__new_task__test__snap_shot_task_yaml.snap b/...ustom_resources/snapshots/ame__custom_resources__new_task__test__snap_shot_task_yaml.snap
@@ -13,9 +13,6 @@ spec:
     project: ~
   resources:
     cpu: "2"
-  fromTemplate: ~
-  artifactCfg: ~
-  triggers: ~
   env:
     - key: SOME_VAR
       val: someval

diff --git a/...tom_resources/snapshots/ame__custom_resources__project__test__produces_valid_ingress.snap b/...tom_resources/snapshots/ame__custom_resources__project__test__produces_valid_ingress.snap
@@ -1,30 +1,31 @@
 ---
 source: lib/src/custom_resources/project.rs
-expression: "&project.spec.models.unwrap()[0].generate_model_ingress(&ctrl_cfg)?"
+expression: "&project.spec.cfg.models[0].generate_model_ingress(\"\".to_string(), None,\n            \"projectname\".to_string())?"
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
   labels:
     ame-model: test
   name: test
 spec:
   ingressClassName: nginx
   rules:
-    - host: testhost
+    - host: ""
       http:
         paths:
           - backend:
               service:
                 name: test
                 port:
                   number: 5000
-            path: /invocations
-            pathType: ImplementationSpecific
+            path: /projects/projectname/models/test(/|$)(.*)
+            pathType: Prefix
   tls:
     - hosts:
-        - testhost
+        - ""
       secretName: test-tls
 
diff --git a/...s/snapshots/ame__custom_resources__project__test__produces_valid_model_training_task.snap b/...s/snapshots/ame__custom_resources__project__test__produces_valid_model_training_task.snap
@@ -13,8 +13,9 @@ metadata:
       uid: ""
 spec:
   name: mytask
-  taskRef: ~
   resources: {}
+  env: []
+  secrets: []
   executor:
     pipEnv:
       command: test cmd

diff --git a/...tom_resources__project_source__test__can_extract_projects_from_public_git_repository.snap b/...tom_resources__project_source__test__can_extract_projects_from_public_git_repository.snap
@@ -5,10 +5,12 @@ expression: "&projects"
 - name: echo
   tasks:
     - name: echo
-      taskRef: ~
       resources:
-        memory: 4Gi
         cpu: "2"
+        memory: 4Gi
+      env: []
+      secrets: []
       executor: ~
   deletionApproved: false
+  enableTriggers: false
 
diff --git a/test_data/test_projects/invalid_project/ame.yaml b/test_data/test_projects/invalid_project/ame.yaml
@@ -1,6 +1,6 @@
 name: [poetry]
 models: 
-daa_sets:
+data_sets:
 templates:
 tasks:
  - name: crontraining