fix: pr 68 merge and added interfaces

Signed-off-by: mbwhite <[email protected]>

no-duplicate-env.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: no-duplicate-env-3
+spec:
+  stepTemplate:
+    env:
+      - name: FOO
+        value: foo
+  steps:
+    - name: step-1
+      image: alpine
+      env:
+        - name: FOO
+          value: foo
+      script: |
+        #!/bin/sh
+
+        echo ${FOO}

regression-tests/general/no-duplicate-env.yaml.expect.json

@@ -1 +1 @@
-[{"message":"Step 'step-2' has env variable 'FOO' duplicated in task 'no-duplicate-env-1'.","rule":"no-duplicate-env","level":"error","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[393,396,397],"startLine":25,"startColumn":17,"endLine":25,"endColumn":20}},{"message":"StepTemplate has env variable 'FOO' duplicated in task 'no-duplicate-env-2'.","rule":"no-duplicate-env","level":"error","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[733,736,737],"startLine":48,"startColumn":15,"endLine":48,"endColumn":18}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[130,136,137],"startLine":9,"startColumn":14,"endLine":9,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[318,324,325],"startLine":21,"startColumn":14,"endLine":21,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[506,512,513],"startLine":33,"startColumn":14,"endLine":33,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[797,803,804],"startLine":52,"startColumn":14,"endLine":52,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[1051,1057,1058],"startLine":69,"startColumn":14,"endLine":69,"endColumn":20}}]
+[{"message":"Step 'step-2' has env variable 'FOO' duplicated in task 'no-duplicate-env-1'.","rule":"no-duplicate-env","level":"error","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[393,396,397],"startLine":25,"startColumn":17,"endLine":25,"endColumn":20}},{"message":"StepTemplate has env variable 'FOO' duplicated in task 'no-duplicate-env-2'.","rule":"no-duplicate-env","level":"error","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[733,736,737],"startLine":48,"startColumn":15,"endLine":48,"endColumn":18}},{"message":"StepTemplate in task 'no-duplicate-env-3' and Step 'step-1' define the same env variable.","rule":"no-duplicate-env","level":"error","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[1085,1088,1089],"startLine":71,"startColumn":17,"endLine":71,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[130,136,137],"startLine":9,"startColumn":14,"endLine":9,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[318,324,325],"startLine":21,"startColumn":14,"endLine":21,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[506,512,513],"startLine":33,"startColumn":14,"endLine":33,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[797,803,804],"startLine":52,"startColumn":14,"endLine":52,"endColumn":20}},{"message":"Invalid image: 'alpine'. Specify the image tag instead of using ':latest'","rule":"no-latest-image","level":"warning","path":"./regression-tests/general/no-duplicate-env.yaml","loc":{"range":[1051,1057,1058],"startLine":69,"startColumn":14,"endLine":69,"endColumn":20}}]

src/interfaces/common.ts

@@ -24,7 +24,7 @@ interface ValueParam {
     value: string;
 }
 
-type listResources = {
+type ListResources = {
     [key: string]: Base;
 };
 
@@ -35,12 +35,12 @@ interface ExternalResource {
 }
 
 interface Tekton {
-    tasks?: listResources;
-    pipelines?: listResources;
-    listeners?: listResources;
-    triggerTemplates?: listResources;
-    triggerBindings?: listResources;
-    conditions?: listResources;
+    tasks?: { [key: string]: Base };
+    pipelines?: ListResources;
+    listeners?: ListResources;
+    triggerTemplates?: ListResources;
+    triggerBindings?: ListResources;
+    conditions?: ListResources;
     externaltasks?: ExternalResource[];
 }
 
@@ -83,4 +83,4 @@ export type Problem = {
     loc: Location;
 };
 
-export { Tekton, Base, Param, BaseName, ValueParam, ExternalResource };
+export { Tekton, Base, Param, BaseName, ValueParam, ExternalResource, ListResources };

src/interfaces/event-listener/index.ts

@@ -0,0 +1,13 @@
+import Trigger from './trigger.js';
+
+import { Base } from '../common.js';
+
+interface EventListener extends Base {
+    kind: 'EventListener';
+    spec: {
+        triggers: Trigger[];
+    };
+    serviceType?: string;
+}
+
+export default EventListener;

interfaces/event-listener/trigger.ts → src/interfaces/event-listener/trigger.ts

@@ -1,19 +1,19 @@
-import { BaseName } from '../common';
+import { BaseName } from '../common.js';
 
 interface BaseTrigger {
-  name? : string;
-  template: BaseName;
+    name?: string;
+    template: BaseName;
 }
 
 interface BindingTrigger extends BaseTrigger {
-  binding: BaseName;
+    binding: BaseName;
 }
 
 interface BindingsTrigger extends BaseTrigger {
-  bindings: {
-    name?: string;
-    ref?: string;
-  }[];
+    bindings: {
+        name?: string;
+        ref?: string;
+    }[];
 }
 
 type Trigger = BindingTrigger | BindingsTrigger;

src/interfaces/pipeline/condition.ts

@@ -0,0 +1,10 @@
+import { TaskResource } from './resources.js';
+import { Base, ValueParam } from '../common.js';
+
+interface Condition extends Base {
+    conditionRef: string;
+    params?: ValueParam[];
+    resources?: TaskResource[];
+}
+
+export default Condition;