Add inline plugins for the groups (#52)

* Add inline plugin

So we can mix existing groups with inline definition

* Rebased

Author: Gsantomaggio

cmd/tools/cli/apply.go

@@ -42,6 +42,14 @@ func applyGroup(config kctl.Config, groupName string) error {
 				}
 			}
 		}
+
+		for _, inlinePlugin := range group.InlinePlugins {
+			err = kctl.Apply(config, inlinePlugin, nil)
+			if err != nil {
+				return err
+			}
+		}
+
 	}
 
 	return nil

cmd/tools/cli/delete.go

@@ -43,6 +43,13 @@ func deleteGroup(config kctl.Config, groupName string) error {
 				}
 			}
 		}
+
+		for _, inlinePlugin := range group.InlinePlugins {
+			err = kctl.Delete(config, inlinePlugin)
+			if err != nil {
+				return err
+			}
+		}
 	}
 	return nil
 }

cmd/tools/cli/integration_test.go

@@ -67,7 +67,7 @@ func TestLocalDelete(t *testing.T) {
 
 func TestLocalGroupApply(t *testing.T) {
 	cmd, out := setUp()
-	cmd.SetArgs([]string{"apply", "-g", "argo", "--kubectl", "--group-repo", joinWithRootData("groups")})
+	cmd.SetArgs([]string{"apply", "-g", "argo-workflow", "--kubectl", "--group-repo", joinWithRootData("groups")})
 	if err := cmd.Execute(); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}
@@ -76,7 +76,7 @@ func TestLocalGroupApply(t *testing.T) {
 
 func TestLocalGroupDelete(t *testing.T) {
 	cmd, out := setUp()
-	cmd.SetArgs([]string{"delete", "-g", "argo", "--kubectl", "--group-repo", joinWithRootData("groups")})
+	cmd.SetArgs([]string{"delete", "-g", "argo-workflow", "--kubectl", "--group-repo", joinWithRootData("groups")})
 	if err := cmd.Execute(); err != nil {
 		t.Fatalf("unexpected error %v", err)
 	}

internal/plugins/groups.go

@@ -14,9 +14,10 @@ type PluginGroup struct {
 
 //Group is the specification of each k3ai plugins group
 type Group struct {
-	PluginType string        `yaml:"plugin-type"`
-	GroupName  string        `yaml:"group-name"`
-	Plugins    []PluginGroup `yaml:"plugins,flow"`
+	PluginType    string        `yaml:"plugin-type"`
+	GroupName     string        `yaml:"group-name"`
+	Plugins       []PluginGroup `yaml:"plugins,flow"`
+	InlinePlugins []Plugin      `yaml:"inline-plugins,flow"`
 }
 
 //Groups is the specification of each k3ai plugins group

internal/plugins/groups_test.go

@@ -7,7 +7,7 @@ import (
 
 func TestValidatePluginsGroupSpec(t *testing.T) {
 	var group Group
-	testPluginsGroupsSpec, err := group.Encode(joinWithRootData("groups/argo/group.yaml"))
+	testPluginsGroupsSpec, err := group.Encode(joinWithRootData("groups/argo-workflow/group.yaml"))
 
 	if err != nil {
 		t.Fatalf("failed to unmarshal test file: %s", err)

internal/plugins/remote_contents_test.go

@@ -55,7 +55,7 @@ func TestPluginYamls(t *testing.T) {
 }
 
 func TestGroupsYamls(t *testing.T) {
-	var server = mockPluginsServer(t, joinWithRootData("groups/argo/group.yaml"), GroupType)
+	var server = mockPluginsServer(t, joinWithRootData("groups/argo-workflow/group.yaml"), GroupType)
 	defer server.Close()
 	var groups Groups
 	r, err := groups.Encode(server.URL, "/test")

local_repo/core/groups/argo-workflow/group.yaml

@@ -0,0 +1,11 @@
+plugin-type: group
+group-name: argo-workflow
+plugins:
+  - name: test
+    enabled: false
+  - name: argo-workflow
+    enabled: true
+inline-plugins:
+  - plugin-name: Argo-bind-traefik
+    yaml:
+      - url: "https://raw.githubusercontent.com/kf5i/k3ai-plugins/main/common/traefik/argo-bind.yaml"