feat: upgrade argo-dataflow to v0.0.90 (#6563)

Signed-off-by: Alex Collins <alex_collins@intuit.com>
argoproj · Aug 22, 2021 · b0e050e · b0e050e
1 parent 33b0f7a
commit b0e050e
Show file tree

Hide file tree

Showing 9 changed files with 725 additions and 21 deletions.
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/TwinProduction/go-color v0.0.3
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.8+incompatible
 	github.com/antonmedv/expr v1.8.9
-	github.com/argoproj-labs/argo-dataflow v0.0.88
+	github.com/argoproj-labs/argo-dataflow v0.0.91
 	github.com/argoproj/argo-events v1.4.0
 	github.com/argoproj/pkg v0.11.0
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect

diff --git a/go.sum b/go.sum
@@ -147,8 +147,8 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI=
 github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
-github.com/argoproj-labs/argo-dataflow v0.0.88 h1:Q7LwlK9FbNB00LzZ5/9Qcg3Im1t8/HyHhwVITVSMypY=
-github.com/argoproj-labs/argo-dataflow v0.0.88/go.mod h1:HOdmu21+Xx59R28S8+e+wMx+/ApHWNtglPqLvgLRI2E=
+github.com/argoproj-labs/argo-dataflow v0.0.91 h1:1YWbvGupcWInj4Jtdgsdci48GJEwv0WP4Bm7CVxXkew=
+github.com/argoproj-labs/argo-dataflow v0.0.91/go.mod h1:HOdmu21+Xx59R28S8+e+wMx+/ApHWNtglPqLvgLRI2E=
 github.com/argoproj/argo-events v1.4.0 h1:RIzAOomP/4rnv3X6KIDKzXZJ56JKFxSYmksoE98ILWI=
 github.com/argoproj/argo-events v1.4.0/go.mod h1:wI5A0U3Wj9ZvfPn3ioL18Dz29+7aibtlyU9pS0Ry+bg=
 github.com/argoproj/pkg v0.9.0/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=

diff --git a/test/e2e/ui/ui-pipeline.yaml b/test/e2e/ui/ui-pipeline.yaml
@@ -0,0 +1,128 @@
+apiVersion: dataflow.argoproj.io/v1alpha1
+kind: Pipeline
+metadata:
+  name: ui
+spec:
+  steps:
+    - name: code
+      code:
+        runtime: golang1-16
+        source: |
+          package main
+          import "context"
+          func Handler(ctx context.Context, m []byte) ([]byte, error) {
+            return m, nil
+          }
+      sources:
+        - cron:
+            schedule: "*/3 * * * *"
+      sinks:
+        - stan:
+            subject: event-bus
+
+    - name: container
+      container:
+        image: golang:1.16
+        args:
+          - sh
+          - -c
+          - exit 0
+      sources:
+        - name: kafka
+          kafka:
+            topic: input-topic
+        - name: stan
+          stan:
+            subject: input-subject
+      sinks:
+        - stan:
+            subject: event-bus
+
+    - name: git
+      git:
+        branch: main
+        command:
+          - go
+          - run
+          - .
+        env:
+          - name: GOCACHE
+            value: /tmp/.gocache
+        image: golang:1.16
+        path: examples/git
+        url: https://github.com/argoproj-labs/argo-dataflow
+      sources:
+        - name: http
+          http:
+            serviceName: my-service
+        - name: db
+          db:
+            query: "select 1"
+      sinks:
+        - stan:
+            subject: event-bus
+
+    - name: expand
+      expand: { }
+      sources:
+        - stan:
+            subject: event-bus
+      sinks:
+        - stan:
+            subject: expanded
+    - name: flatten
+      flatten: { }
+      sources:
+        - stan:
+            subject: expanded
+      sinks:
+        - name: kafka
+          kafka:
+            topic: output-topic
+        - name: stan
+          stan:
+            subject: output-subject
+    - name: filter
+      filter: "true"
+      sources:
+        - stan:
+            subject: event-bus
+      sinks:
+        - name: http
+          http:
+            url: http://external-service
+        - name: log
+          log: { }
+        - name: db
+          db:
+            actions:
+              - sql: "select 1"
+    - name: map
+      map: "true"
+      sources:
+        - stan:
+            subject: event-bus
+      sinks:
+        - name: s3
+          s3:
+            bucket: other-bucket
+        - name: disk
+          volume:
+            emptyDir: { }
+    - name: files
+      cat: { }
+      sources:
+        - name: s3
+          s3:
+            bucket: my-bucket
+        - name: disk
+          volume:
+            emptyDir: { }
+      sinks:
+        - stan:
+            subject: event-bus
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: ui-git
diff --git a/ui/src/app/pipelines/components/pipeline-details/pipeline-details.tsx b/ui/src/app/pipelines/components/pipeline-details/pipeline-details.tsx
@@ -134,7 +134,8 @@ export const PipelineDetails = ({history, match, location}: RouteComponentProps<
                                 map: true,
                                 s3: true,
                                 stan: true,
-                                unknown: true
+                                unknown: true,
+                                volume: true
                             }}
                             defaultIconShape='circle'
                             nodeClassNamesTitle='Status'

diff --git a/ui/src/app/pipelines/components/pipeline-details/pipeline-graph.ts b/ui/src/app/pipelines/components/pipeline-details/pipeline-graph.ts
@@ -24,7 +24,7 @@ const stepIcon = (type: Type): Icon => {
         case 'flatten':
             return 'compress';
         case 'git':
-            return 'git-alt';
+            return 'code-branch';
         case 'group':
             return 'object-group';
         case 'split':
@@ -112,6 +112,10 @@ export const graph = (pipeline: Pipeline, steps: Step[]) => {
                 const id = 's3/' + bucket;
                 g.nodes.set(id, {genre: 's3', icon: 'hdd', label: bucket});
                 g.edges.set({v: id, w: stepId}, {classNames, label});
+            } else if (x.volume) {
+                const id = 'volume/' + stepId + '/sources/' + x.name;
+                g.nodes.set(id, {genre: 'volume', icon: 'hdd', label: x.name});
+                g.edges.set({v: id, w: stepId}, {classNames, label});
             } else {
                 const id = 'unknown/' + stepId + '/sources/' + x.name;
                 g.nodes.set(id, {genre: 'unknown', icon: 'square', label: x.name});
@@ -149,6 +153,10 @@ export const graph = (pipeline: Pipeline, steps: Step[]) => {
                 const id = 's3/' + bucket;
                 g.nodes.set(id, {genre: 's3', icon: 'hdd', label: bucket});
                 g.edges.set({v: stepId, w: id}, {classNames, label});
+            } else if (x.volume) {
+                const id = 'volume/' + stepId + '/sinks/' + x.name;
+                g.nodes.set(id, {genre: 'volume', icon: 'hdd', label: x.name});
+                g.edges.set({v: stepId, w: id}, {classNames, label});
             } else {
                 const id = 'unknown/' + stepId + '/sinks/' + x.name;
                 g.nodes.set(id, {genre: 'unknown', icon: 'square', label: x.name});

diff --git a/ui/src/app/shared/components/icon.ts b/ui/src/app/shared/components/icon.ts
@@ -35,7 +35,6 @@ export type Icon =
     | 'file-code'
     | 'filter'
     | 'forward'
-    | 'git-alt'
     | 'grip-vertical'
     | 'hdd'
     | 'inbox'

diff --git a/ui/src/models/step.ts b/ui/src/models/step.ts
@@ -38,6 +38,7 @@ export interface Step {
             s3?: {
                 bucket: string;
             };
+            volume?: {};
         }[];
         sinks: {
             name?: string;
@@ -53,6 +54,7 @@ export interface Step {
             s3?: {
                 bucket: string;
             };
+            volume?: {};
         }[];
     };
     status?: StepStatus;