[wip] Inspect frames for commands

Dockerfile.build

@@ -0,0 +1,18 @@
+FROM golang:1.12 AS builder
+
+ENV CGO_ENABLED=0
+
+WORKDIR /build
+
+COPY go.mod /build/go.mod
+RUN go mod download
+
+COPY cmd /build/cmd
+COPY pkg /build/pkg
+RUN go build -o mc-router cmd/mc-router/main.go
+
+FROM scratch
+
+COPY --from=builder /build/mc-router /bin/mc-router
+
+ENTRYPOINT ["/bin/mc-router"]

cmd/mc-router/main.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"github.com/itzg/mc-router/server"
+	"github.com/itzg/mc-router/pkg/server"
 	"github.com/sirupsen/logrus"
 	"net"
 	"os"

molecule/default/asserts.yml

@@ -0,0 +1,44 @@
+---
+
+- name: Verify
+  hosts: localhost
+  connection: local
+  vars:
+    ansible_python_interpreter: '{{ ansible_playbook_python }}'
+    deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
+  tasks:
+  - block:
+    - name: Assert that an address has been set on the custom resource
+      assert:
+        that: custom_resource.0.status.address is defined
+      vars:
+        custom_resource: "{{ q('k8s',
+          api_version='games.fabianism.us/v1alpha1',
+          kind='Minecraft',
+          resource_name='example-minecraft',
+          namespace=namespace
+        )}}"
+
+    - name: Store address
+      set_fact:
+        address: "{{ q('k8s',
+          api_version='games.fabianism.us/v1alpha1',
+          kind='Minecraft',
+          resource_name='example-minecraft',
+          namespace=namespace
+        ).0.status.address}}"
+    rescue:
+    - name: Output CR
+      debug: var=custom_resource
+      vars:
+        custom_resource: "{{ q('k8s',
+          api_version='games.fabianism.us/v1alpha1',
+          kind='Minecraft',
+          resource_name='example-minecraft',
+          namespace=namespace
+        )}}"
+
+    - fail:
+        msg: "Failed in asserts.yml"
+
+- import_playbook: '{{ playbook_dir }}/../default/asserts.yml'

molecule/default/molecule.yml

@@ -0,0 +1,54 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+  enabled: False
+platforms:
+- name: kind-test-local
+  groups:
+  - k8s
+  image: bsycorp/kind:latest-1.12
+  privileged: True
+  override_command: no
+  exposed_ports:
+    - 8443/tcp
+    - 10080/tcp
+  published_ports:
+    - 0.0.0.0:${TEST_CLUSTER_PORT:-10443}:8443/tcp
+  pre_build_image: yes
+  volumes:
+    - ${MOLECULE_PROJECT_DIRECTORY}:/src/mc-router:Z
+provisioner:
+  name: ansible
+  log: True
+  lint:
+    name: ansible-lint
+    enabled: False
+  inventory:
+    group_vars:
+      all:
+        namespace: ${TEST_NAMESPACE:-osdk-test}
+  env:
+    K8S_AUTH_KUBECONFIG: /tmp/molecule/kind-test-local/kubeconfig
+    KUBECONFIG: /tmp/molecule/kind-test-local/kubeconfig
+    KIND_PORT: '${TEST_CLUSTER_PORT:-10443}'
+scenario:
+  name: default
+  test_sequence:
+    - lint
+    - destroy
+    - dependency
+    - syntax
+    - create
+    - prepare
+    - converge
+    - side_effect
+    - verify
+    - destroy
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/playbook.yml

@@ -0,0 +1,81 @@
+---
+
+- name: Build Controller in Kubernetes docker container
+  hosts: k8s
+  vars:
+    image_name: games.fabianism.us/mc-router:testing
+  tasks:
+  # using command so we don't need to install any dependencies
+  - name: Get existing image hash
+    command: docker images -q {{image_name}}
+    register: prev_hash
+    changed_when: false
+
+  - name: Build Controller Image
+    command: docker build -f /src/mc-router/Dockerfile.build -t {{ image_name }} /src/mc-router
+    register: build_cmd
+    changed_when: not prev_hash.stdout or (prev_hash.stdout and prev_hash.stdout not in ''.join(build_cmd.stdout_lines[-2:]))
+
+- name: Converge
+  hosts: localhost
+  connection: local
+  vars:
+    ansible_python_interpreter: '{{ ansible_playbook_python }}'
+    image_name: games.fabianism.us/mc-router:testing
+  tasks:
+  - block:
+    - name: Delete the Operator Deployment
+      k8s:
+        state: absent
+        namespace: '{{ namespace }}'
+        name: mc-router
+        api_version: apps/v1
+        kind: Deployment
+      register: delete_deployment
+      when: hostvars[groups.k8s.0].build_cmd.changed
+
+    - name: Wait 30s for Operator Deployment to terminate
+      k8s_facts:
+        api_version: 'apps/v1'
+        kind: 'Deployment'
+        namespace: '{{ namespace }}'
+        name: 'mc-router'
+      register: deployment
+      until: not deployment.resources
+      delay: 3
+      retries: 10
+      when: delete_deployment.changed
+
+    - name: Create the Operator Deployment
+      k8s:
+        namespace: '{{ namespace }}'
+        definition:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            labels:
+              run: mc-router
+            name: mc-router
+          spec:
+            selector:
+              matchLabels:
+                run: mc-router
+            strategy:
+              type: Recreate
+            template:
+              metadata:
+                labels:
+                  run: mc-router
+              spec:
+                serviceAccountName: mc-router
+                containers:
+                - image: '{{ image_name }}'
+                  name: mc-router
+                  args: ["--api-binding", ":8080", "--in-kube-cluster"]
+                  ports:
+                  - name: proxy
+                    containerPort: 25565
+                  - name: web
+                    containerPort: 8080
+
+- import_playbook: verify.yml

molecule/default/prepare.yml

@@ -0,0 +1,93 @@
+---
+
+- name: Prepare
+  hosts: k8s
+  gather_facts: no
+  vars:
+    kubeconfig: "{{ lookup('env', 'KUBECONFIG') }}"
+  tasks:
+    - name: delete the kubeconfig if present
+      file:
+        path: '{{ kubeconfig }}'
+        state: absent
+      delegate_to: localhost
+
+    - name: Fetch the kubeconfig
+      fetch:
+        dest: '{{ kubeconfig }}'
+        flat: yes
+        src: /root/.kube/config
+
+    - name: Change the kubeconfig port to the proper value
+      replace:
+        regexp: 8443
+        replace: "{{ lookup('env', 'KIND_PORT') }}"
+        path: '{{ kubeconfig }}'
+      delegate_to: localhost
+
+    - name: Wait for the Kubernetes API to become available (this could take a minute)
+      uri:
+        url: "https://localhost:8443/apis"
+        status_code: 200
+        validate_certs: no
+      register: result
+      until: (result.status|default(-1)) == 200
+      retries: 60
+      delay: 5
+
+- name: Prepare operator resources
+  hosts: localhost
+  connection: local
+  vars:
+    ansible_python_interpreter: '{{ ansible_playbook_python }}'
+    deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
+  tasks:
+  - name: Ensure specified namespace is present
+    k8s:
+      api_version: v1
+      kind: Namespace
+      name: '{{ namespace }}'
+
+  - name: Create RBAC resources and Service
+    k8s:
+      namespace: '{{ namespace }}'
+      definition:
+      - apiVersion: v1
+        kind: ServiceAccount
+        metadata:
+          name: mc-router
+      - apiVersion: rbac.authorization.k8s.io/v1
+        kind: ClusterRole
+        metadata:
+          name: services-watcher
+        rules:
+        - apiGroups: [""]
+          resources: ["services"]
+          verbs: ["watch","list"]
+      - apiVersion: rbac.authorization.k8s.io/v1
+        kind: ClusterRoleBinding
+        metadata:
+          name: mc-router-services-watcher
+        subjects:
+        - kind: ServiceAccount
+          name: mc-router
+          namespace: '{{ namespace }}'
+        roleRef:
+          kind: ClusterRole
+          name: services-watcher
+          apiGroup: rbac.authorization.k8s.io
+      - apiVersion: v1
+        kind: Service
+        metadata:
+          name: mc-router
+        spec:
+          type: NodePort
+          ports:
+          - targetPort: web
+            name: web
+            port: 8080
+          - targetPort: proxy
+            name: proxy
+            port: 25565
+          selector:
+            run: mc-router

molecule/default/verify.yml

@@ -0,0 +1,48 @@
+---
+
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  vars:
+    ansible_python_interpreter: '{{ ansible_playbook_python }}'
+  tasks:
+  - name: Wait for minecraft deployment to report ready
+    k8s_facts:
+      api_version: 'apps/v1'
+      kind: 'Deployment'
+      namespace: '{{ namespace }}'
+      label_selectors:
+      - 'app=example-minecraft'
+    register: deployment
+    until: "'MinimumReplicasAvailable' in (deployment | json_query('resources[].status.conditions[].reason'))"
+    delay: 10
+    retries: 60
+
+  - set_fact:
+      address: 172.17.0.2:{{ node_port }}
+    vars:
+      node_port: "{{ q('k8s',
+        api_version='v1',
+        kind='Service',
+        namespace=namespace,
+        resource_name='mc-router'
+      ).0.spec.ports.1.nodePort }}"
+
+  - debug: var=address
+
+  - name: Wait two minutes to confirm server is reachable
+    command: 'mcstatus {{ address }} ping'
+    changed_when: false
+    retries: 24
+    delay: 5
+    register: result
+    until: not (result is failed)
+
+  - name: Fetch status of server
+    command: 'mcstatus {{ address }} status'
+    changed_when: false
+    register: mcstatus
+
+  - name: Output status of server
+    debug:
+      var: mcstatus.stdout_lines

mcproto/types.go → pkg/mcproto/types.go

@@ -5,6 +5,8 @@ import (
 	"errors"
 	"io"
 	"strings"
+
+	"github.com/sirupsen/logrus"
 )
 
 type Frame struct {
@@ -38,6 +40,12 @@ func ReadVarInt(reader io.Reader) (int, error) {
 	for numRead <= 5 {
 		n, err := reader.Read(b)
 		if err != nil {
+			logrus.WithError(err).WithFields(logrus.Fields{
+				"b":       b,
+				"numRead": numRead,
+				"result":  result,
+				"n":       n,
+			}).Infof("")
 			return 0, err
 		}
 		if n == 0 {
@@ -131,6 +139,7 @@ func ReadPacket(reader io.Reader) (*Packet, error) {
 
 	packet.PacketID, err = ReadVarInt(remainder)
 	if err != nil {
+		logrus.WithField("remainder", remainder.String()).Info("Failed to find PacketID")
 		return nil, err
 	}