fixed eventSource resources

codefresh-io · Jun 21, 2021 · 6742f49 · 6742f49
1 parent 72b953f
commit 6742f49
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -359,7 +359,7 @@ func createEventSource(repofs fs.FS, path, namespace string) error {
 			"components": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "Application",
+				Resource:  "applications",
 				Namespace: namespace,
 				Selectors: []eventUtils.CreateSelectorOptions{
 					{
@@ -372,7 +372,7 @@ func createEventSource(repofs fs.FS, path, namespace string) error {
 			"runtime": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "AppProject",
+				Resource:  "appprojects",
 				Namespace: namespace,
 				Selectors: []eventUtils.CreateSelectorOptions{
 					{
@@ -431,59 +431,66 @@ func createGitSource(ctx context.Context, insCloneOpts *git.CloneOptions, gsClon
 		ServiceAccountName: store.Get().ComponentsReporterSA,
 		EventBusName:       store.Get().EventBusName,
 		Resource: map[string]eventUtils.CreateResourceEventSourceOptions{
-			"clusterWorkflowTemplate": {
+			// "clusterWorkflowTemplate": {
+			// 	Group:     "argoproj.io",
+			// 	Version:   "v1alpha1",
+			// 	Resource:  "clusterworkflowtemplates",
+			// 	Namespace: runtimeName,
+			// 	Selectors: selectors,
+			// },
+			"cronWorkflow": {
 				Group:     "argoproj.io",
-				Version:   "v1",
-				Resource:  "ClusterWorkflowTemplate",
+				Version:   "v1alpha1",
+				Resource:  "cronworkflows",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"workflowTemplate": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "WorkflowTemplate",
+				Resource:  "workflowtemplates",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"workflow": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "Workflow",
+				Resource:  "workflows",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"appProject": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "AppProject",
+				Resource:  "appprojects",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"application": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "Application",
+				Resource:  "applications",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"eventBus": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "EventBus",
+				Resource:  "eventbus",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"eventSource": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "EventSource",
+				Resource:  "eventsources",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},
 			"sensor": {
 				Group:     "argoproj.io",
 				Version:   "v1alpha1",
-				Resource:  "Sensor",
+				Resource:  "sensors",
 				Namespace: runtimeName,
 				Selectors: selectors,
 			},

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/codefresh-io/go-sdk v0.26.2
 	github.com/fatih/color v1.12.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
-	github.com/go-git/go-billy/v5 v5.3.1 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1
 	github.com/gobuffalo/packr v1.30.1
 	github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
@@ -27,7 +27,7 @@ require (
 
 replace (
 	github.com/argoproj-labs/applicationset => github.com/argoproj-labs/applicationset v0.0.0-20210614145856-2c62537a8e5a
-	github.com/argoproj-labs/argocd-autopilot => ../argocd-autopilot
+	github.com/argoproj-labs/argocd-autopilot => github.com/argoproj-labs/argocd-autopilot v0.0.5-0.20210621142203-8a883a7232bb
 	k8s.io/api => k8s.io/api v0.21.1
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.1
 	k8s.io/apimachinery => k8s.io/apimachinery v0.21.1

diff --git a/go.sum b/go.sum
@@ -158,6 +158,8 @@ github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAF
 github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk=
 github.com/argoproj-labs/applicationset v0.0.0-20210614145856-2c62537a8e5a h1:8Nm2KtOu/G7NtoAgucj4TkX8rghzwgFJGXNrAmuz7gc=
 github.com/argoproj-labs/applicationset v0.0.0-20210614145856-2c62537a8e5a/go.mod h1:5rxggh8ymYXedQDIYylNzIHe6jdshDNasIBCVJuR1iU=
+github.com/argoproj-labs/argocd-autopilot v0.0.5-0.20210621142203-8a883a7232bb h1:mUG+AnStg/8HNXCBtSkFOX8QmVkwLjEfV8J9R020Z6E=
+github.com/argoproj-labs/argocd-autopilot v0.0.5-0.20210621142203-8a883a7232bb/go.mod h1:mFkBpj09ofv0oe4K7LcN3Ds1pAXUEOLum/Lk8KUJXH0=
 github.com/argoproj/argo-cd v1.8.1/go.mod h1:Vfl7OGgBC83dVWgq58wU6UR3kG864h0dtHEIQ8xqw4s=
 github.com/argoproj/argo-cd v1.8.7 h1:CkIu8p/gcTY/fOZWM2tHuSCIAV2HggXjJftrT1IIT3k=
 github.com/argoproj/argo-cd v1.8.7/go.mod h1:tqFZW5Lr9KBCDsvOaE5Fh8M1eJ1ThvR58pyyLv8Zqvs=