re-add tests, rm src foldeR

Author: argonaut0

src/adapters/echo_zerolog.go adapters/echo_zerolog.go

@@ -0,0 +1,151 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: instanced
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: instanced
+    app.kubernetes.io/name: instanced
+    app.kubernetes.io/part-of: maplectf-instancing
+  name: instanced
+  namespace: instanced
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: challenge-instancer
+  labels:
+    app.kubernetes.io/component: instanced
+    app.kubernetes.io/name: instanced
+    app.kubernetes.io/part-of: maplectf-instancing
+rules:
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: [""]
+    resources: ["services"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: ["k8s.maplebacon.org"]
+    resources:
+      - '*'
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: manage-challenges
+  namespace: challenges
+  labels:
+    app.kubernetes.io/component: instanced
+    app.kubernetes.io/name: instanced
+    app.kubernetes.io/part-of: maplectf-instancing
+subjects:
+  - kind: ServiceAccount
+    name: instanced
+    namespace: instanced
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: challenge-instancer
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: instanced-config
+  namespace: instanced
+data:
+  config.yaml: |
+    listenAddr: ":8080"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: instanced
+  name: instanced
+  namespace: instanced
+spec:
+  ports:
+    - name: http
+      port: 80
+      protocol: TCP
+      targetPort: 8080
+  selector:
+    app.kubernetes.io/name: instanced
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: instanced
+  namespace: instanced
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: instanced
+  serviceName: instanced
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: instanced
+    spec:
+      serviceAccountName: instanced
+      automountServiceAccountToken: true
+      containers:
+        - image: us.gcr.io/maplectf/instanced:latest
+          name: instanced
+          ports:
+            - name: http-port
+              containerPort: 8080
+              hostPort: 8080
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: http-port
+            initialDelaySeconds: 20
+            periodSeconds: 10
+          volumeMounts:
+            - name: data
+              mountPath: /data
+            - name: config
+              mountPath: "/config"
+              readOnly: true
+          resources:
+            requests:
+              cpu: "10m"
+              memory: "20Mi"
+        - image: alpine/curl:latest
+          name: client
+          command: ["sleep"]
+          args: ["infinity"]
+          resources:
+            requests:
+              cpu: "1m"
+              memory: "2Mi"
+      volumes:
+        - name: config
+          configMap:
+            name: instanced-config
+            items:
+              - key: "config.yaml"
+                path: "config.yaml"
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      spec:
+        accessModes: ["ReadWriteOnce"]
+        resources:
+          requests:
+            storage: 200Mi
+        storageClassName: standard-rwo

operator-experiment/0-instanced-challenge-crd.yaml crd/0-instanced-challenge-crd.yaml

@@ -10,7 +10,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/rs/zerolog"
-	"github.com/ubcctf/instanced/src/adapters"
+	"github.com/ubcctf/instanced/adapters"
 )
 
 type InstancesResponse struct {

crd/instanced-deploy.yaml

@@ -10,8 +10,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/rs/zerolog"
-	"github.com/ubcctf/instanced/src/db"
-	"github.com/ubcctf/instanced/src/k8s"
+	"github.com/ubcctf/instanced/db"
+	"github.com/ubcctf/instanced/k8s"
 )
 
 type Instancer struct {

src/db/db.go db/db.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/ubcctf/instanced/src/db"
-	"github.com/ubcctf/instanced/src/k8s"
+	"github.com/ubcctf/instanced/db"
+	"github.com/ubcctf/instanced/k8s"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 

src/db/schema.go db/schema.go

@@ -1,14 +1,13 @@
-package main
+package k8s_test
 
 import (
+	"fmt"
 	"log"
-	"time"
 
-	"github.com/google/uuid"
+	"github.com/ubcctf/instanced/k8s"
 )
 
 func ExampleUnmarshalSingleManifest() {
-	log.Println("Running: ExampleUnmarshalSingleManifest")
 	manifest := `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -30,16 +29,15 @@ spec:
         ports:
         - containerPort: 80
 `
-	obj, err := UnmarshalSingleManifest(manifest)
+	obj, err := k8s.UnmarshalSingleManifest(manifest)
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	log.Println(obj)
-	// Output:
+	fmt.Println(obj)
+	// Output: &{map[apiVersion:apps/v1 kind:Deployment metadata:map[name:nginx-instance-test-deployment namespace:challenges] spec:map[matchLabels:map[app:nginx-instance-test] replicas:1 selector:<nil> template:map[app:nginx-instance-test metadata:map[labels:<nil>] spec:map[containers:[map[image:nginx:1.14.2 name:nginx ports:[map[containerPort:80]]]]]]]]}
 }
 
 func ExampleUnmarshalManifestFile() {
-	log.Println("Running: ExampleUnmarshalManifestFile")
 	manifest := `---
 apiVersion: apps/v1
 kind: Deployment
@@ -77,20 +75,20 @@ spec:
       targetPort: 80
 ---
 `
-	objs, err := UnmarshalManifestFile(manifest)
+	objs, err := k8s.UnmarshalManifestFile(manifest)
 	if err != nil {
 		log.Fatal(err.Error())
 	}
 	for _, v := range objs {
 		if v.GetName() != "" {
-			log.Println(v.GetKind(), v.GetName())
+			fmt.Println(v.GetKind(), v.GetName())
 		}
 	}
-	// Output:
+	// Output: Deployment nginx-instance-test-deployment
+	// Service nginx-instance-test
 }
 
 func ExampleUnmarshalChallenges() {
-	log.Println("Running: ExampleUnmarshalChallenges")
 	chals := make(map[string]string, 2)
 	chals["nginx"] = `---
 apiVersion: apps/v1
@@ -129,80 +127,14 @@ spec:
       targetPort: 80
 ---
 `
-	chalMap, err := UnmarshalChallenges(chals)
+	chalMap, err := k8s.UnmarshalChallenges(chals)
 	if err != nil {
 		log.Fatal(err)
 	}
 	obj, ok := chalMap["nginx"]
 	if !ok {
 		log.Fatal("key does not exist")
 	}
-	log.Println(obj)
-	// Output:
-}
-
-func ExampleGetChalObjsFromTemplate() {
-	log.Println("Running: ExampleGetChalObjsFromTemplate")
-	in := Instancer{}
-	in.conf = &Config{}
-	in.conf.Challenges = make(map[string]string, 2)
-	in.conf.Challenges["nginx"] = `---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx-instance-{{.ID}}-deployment
-  namespace: challenges
-spec:
-  selector:
-    matchLabels:
-      app: nginx-instance-{{.ID}}
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: nginx-instance-{{.ID}}
-    spec:
-      containers:
-        - name: nginx
-          image: nginx:1.14.2
-          ports:
-            - containerPort: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: nginx-instance-{{.ID}}
-  namespace: challenges
-spec:
-  selector:
-    app: nginx-instance-{{.ID}}
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: 80
----
-`
-	in.ParseTemplates()
-	chal, err := in.GetChalObjsFromTemplate("nginx", uuid.NewString()[0:8])
-	if err != nil {
-		log.Fatal(err)
-	}
-	log.Println(len(chal))
-	log.Println(chal)
-	// Output:
-}
-
-func ExampleInsertInstanceRecord() {
-	in := Instancer{}
-	in.InitDB("./tmp/test.db")
-	in.InsertInstanceRecord(time.Hour, "1", "test_challenge", "abcdefg")
-	recs, err := in.ReadInstanceRecords()
-	if err != nil {
-		log.Fatal(err)
-	}
-	for _, v := range recs {
-		log.Println(v)
-	}
-	// Output:
+	fmt.Println(obj)
+	// Output: [{map[apiVersion:apps/v1 kind:Deployment metadata:map[name:nginx-instance-test-deployment namespace:challenges] spec:map[replicas:1 selector:map[matchLabels:map[app:nginx-instance-test]] template:map[metadata:map[labels:map[app:nginx-instance-test]] spec:map[containers:[map[image:nginx:1.14.2 name:nginx ports:[map[containerPort:80]]]]]]]]} {map[apiVersion:v1 kind:Service metadata:map[name:nginx-instance-test namespace:challenges] spec:map[ports:[map[name:http port:8080 protocol:TCP targetPort:80]] selector:map[app:nginx-instance-test]]]}]
 }

src/instancer/api.go instancer/api.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/ubcctf/instanced/src/instancer"
+	"github.com/ubcctf/instanced/instancer"
 )
 
 func main() {