Merge pull request #905 from tylerslaton/refactor-perms-test

Refactor permissions tests to no longer duplicate expected resources

Author: cjellick

pkg/controller/appdefinition/testdata/permissions/both/expected.yaml

@@ -75,4 +75,9 @@ status:
         image: "image-name"
         build:
           dockerfile: "Dockerfile"
-          context: "."
+          context: "."
+  conditions:
+  - type: defined
+    reason: Success
+    status: "True"
+    success: true

pkg/controller/appdefinition/testdata/permissions/both/expected.yaml.d/appinstance.yaml

@@ -0,0 +1,53 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: twoimage
+  namespace: app-created-namespace
+  labels:
+    "acorn.io/app-namespace": "app-namespace"
+    "acorn.io/app-name": "app-name"
+    "acorn.io/container-name": "twoimage"
+    "acorn.io/managed": "true"
+spec:
+  selector:
+    matchLabels:
+      "acorn.io/app-namespace": "app-namespace"
+      "acorn.io/app-name": "app-name"
+      "acorn.io/container-name": "twoimage"
+      "acorn.io/managed": "true"
+  template:
+    metadata:
+      labels:
+        "acorn.io/app-namespace": "app-namespace"
+        "acorn.io/app-name": "app-name"
+        "acorn.io/container-name": "twoimage"
+        "acorn.io/managed": "true"
+        "service-name.acorn.io/twoimage": "true"
+        "port-number.acorn.io/81": "true"
+        "port-number.acorn.io/91": "true"
+      annotations:
+        acorn.io/container-spec: '{"build":{"context":".","dockerfile":"Dockerfile"},"image":"image-name","ports":[{"port":80,"protocol":"http","targetPort":81}],"probes":null,"sidecars":{"left":{"image":"foo","ports":[{"port":90,"protocol":"tcp","targetPort":91}],"probes":null}}}'
+    spec:
+      terminationGracePeriodSeconds: 5
+      enableServiceLinks: false
+      serviceAccountName: twoimage
+      hostname: twoimage
+      imagePullSecrets:
+        - name: twoimage-pull-1234567890ab
+      containers:
+        - name: twoimage
+          image: "image-name"
+          ports:
+          - containerPort: 81
+            protocol: "TCP"
+          readinessProbe:
+            tcpSocket:
+              port: 81
+        - name: left
+          image: "foo"
+          ports:
+          - containerPort: 91
+            protocol: "TCP"
+          readinessProbe:
+            tcpSocket:
+              port: 91

pkg/controller/appdefinition/testdata/permissions/both/expected.yaml.d/deployment.yaml

@@ -0,0 +1,46 @@
+kind: Job
+apiVersion: batch/v1
+metadata:
+  name: oneimage
+  namespace: app-created-namespace
+  labels:
+    "acorn.io/app-namespace": "app-namespace"
+    "acorn.io/app-name": "app-name"
+    "acorn.io/job-name": "oneimage"
+    "acorn.io/managed": "true"
+spec:
+  template:
+    metadata:
+      labels:
+        "acorn.io/app-namespace": "app-namespace"
+        "acorn.io/app-name": "app-name"
+        "acorn.io/job-name": "oneimage"
+        "acorn.io/managed": "true"
+      annotations:
+        acorn.io/container-spec: '{"build":{"context":".","dockerfile":"Dockerfile"},"image":"image-name","ports":[{"port":80,"protocol":"http","targetPort":81}],"probes":null,"sidecars":{"left":{"image":"foo","ports":[{"port":90,"protocol":"tcp","targetPort":91}],"probes":null}}}'
+    spec:
+      imagePullSecrets:
+        - name: oneimage-pull-1234567890ab
+      restartPolicy: Never
+      serviceAccountName: oneimage
+      enableServiceLinks: false
+      terminationGracePeriodSeconds: 5
+      containers:
+        - name: oneimage
+          image: "image-name"
+          readinessProbe:
+            tcpSocket:
+              port: 81
+          ports:
+            - containerPort: 81
+              protocol: "TCP"
+          terminationMessagePath: "/run/secrets/output"
+        - name: left
+          image: "foo"
+          readinessProbe:
+            tcpSocket:
+              port: 91
+          ports:
+            - containerPort: 91
+              protocol: "TCP"
+          terminationMessagePath: "/run/secrets/output"

pkg/controller/appdefinition/testdata/permissions/both/expected.yaml.d/jobs.yaml

@@ -0,0 +1,23 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: oneimage-pull-1234567890ab
+  namespace: app-created-namespace
+  labels:
+    acorn.io/managed: "true"
+    acorn.io/pull-secret: "true"
+type: "kubernetes.io/dockerconfigjson"
+data:
+  ".dockerconfigjson": eyJhdXRocyI6eyJpbmRleC5kb2NrZXIuaW8iOnsiYXV0aCI6Ik9nPT0ifX19
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: twoimage-pull-1234567890ab
+  namespace: app-created-namespace
+  labels:
+    acorn.io/managed: "true"
+    acorn.io/pull-secret: "true"
+type: "kubernetes.io/dockerconfigjson"
+data:
+  ".dockerconfigjson": eyJhdXRocyI6eyJpbmRleC5kb2NrZXIuaW8iOnsiYXV0aCI6Ik9nPT0ifX19