Fixed logging type

Author: psav

bundle/tests/scorecard/kuttl/test-log-app-interface/00-install.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-log-app-interface
+spec:
+  finalizers:
+  - kubernetes

bundle/tests/scorecard/kuttl/test-log-app-interface/01-assert.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: puptoo
+  namespace: test-log-app-interface
+  labels:
+    app: puptoo
+  ownerReferences:
+  - apiVersion: cloud.redhat.com/v1alpha1
+    kind: ClowdApp
+    name: puptoo
+type: Opaque

bundle/tests/scorecard/kuttl/test-log-app-interface/01-pods.yaml

@@ -0,0 +1,66 @@
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdEnvironment
+metadata:
+  name: test-log-app-interface
+spec:
+  targetNamespace: test-log-app-interface
+  providers:
+    web:
+      port: 8000
+      mode: operator
+    metrics:
+      port: 9000
+      mode: operator
+      path: "/metrics"
+    kafka:
+      mode: none
+    db:
+      mode: none
+    logging:
+      mode: app-interface
+    objectStore:
+      mode: none
+    inMemoryDb:
+      mode: none
+  resourceDefaults:
+    limits:
+      cpu: 400m
+      memory: 1024Mi
+    requests:
+      cpu: 30m
+      memory: 512Mi
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdApp
+metadata:
+  name: puptoo
+  namespace: test-log-app-interface
+spec:
+  envName: test-log-app-interface
+  deployments:
+  - name: processor
+    podSpec:
+      image: quay.io/psav/clowder-hello
+      env: 
+        - name: ENV_VAR_1
+          value: env_var_1
+        - name: ENV_VAR_2
+          value: env_var_2
+    webServices:
+      public:
+        enabled: true
+      private:
+        enabled: true  
+---
+apiVersion: v1
+data:
+  aws_access_key_id: YXdzX2FjY2Vzc19rZXk=
+  aws_region: dXMtZWFzdA==
+  aws_secret_access_key: YXdzX3NlY3JldF9rZXk=
+  log_group_name: dGVzdC1hcHAtaW50ZXJmYWNlLXMz
+kind: Secret
+metadata:
+  name: cloudwatch
+  namespace: test-log-app-interface
+type: Opaque

bundle/tests/scorecard/kuttl/test-log-app-interface/02-json-asserts.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+- script: sleep 5
+- script: kubectl get secret --namespace=test-log-app-interface puptoo -o json > /tmp/test-log-app-interface
+- script: jq -r '.data["cdappconfig.json"]' < /tmp/test-log-app-interface | base64 -d > /tmp/test-log-app-interface-json
+
+- script: jq -r '.logging.type == "cloudwatch"' -e < /tmp/test-log-app-interface-json
+- script: jq -r '.logging.cloudwatch.region == "us-east"' -e < /tmp/test-log-app-interface-json

bundle/tests/scorecard/kuttl/test-log-app-interface/03-delete.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: v1
+  kind: Namespace
+  name: test-log-app-interface
+- apiVersion: cloud.redhat.com/v1alpha1
+  kind: ClowdEnvironment
+  name: test-log-app-interface
+- apiVersion: v1
+  kind: Namespace
+  name: test-log-app-interface-secret

bundle/tests/scorecard/kuttl/test-log-none/00-install.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-log-none
+spec:
+  finalizers:
+  - kubernetes

bundle/tests/scorecard/kuttl/test-log-none/01-assert.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: puptoo
+  namespace: test-log-none
+  labels:
+    app: puptoo
+  ownerReferences:
+  - apiVersion: cloud.redhat.com/v1alpha1
+    kind: ClowdApp
+    name: puptoo
+type: Opaque

bundle/tests/scorecard/kuttl/test-log-none/01-pods.yaml

@@ -0,0 +1,66 @@
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdEnvironment
+metadata:
+  name: test-log-none
+spec:
+  targetNamespace: test-log-none
+  providers:
+    web:
+      port: 8000
+      mode: operator
+    metrics:
+      port: 9000
+      mode: operator
+      path: "/metrics"
+    kafka:
+      mode: none
+    db:
+      mode: none
+    logging:
+      mode: none
+    objectStore:
+      mode: none
+    inMemoryDb:
+      mode: none
+  resourceDefaults:
+    limits:
+      cpu: 400m
+      memory: 1024Mi
+    requests:
+      cpu: 30m
+      memory: 512Mi
+---
+apiVersion: cloud.redhat.com/v1alpha1
+kind: ClowdApp
+metadata:
+  name: puptoo
+  namespace: test-log-none
+spec:
+  envName: test-log-none
+  deployments:
+  - name: processor
+    podSpec:
+      image: quay.io/psav/clowder-hello
+      env: 
+        - name: ENV_VAR_1
+          value: env_var_1
+        - name: ENV_VAR_2
+          value: env_var_2
+    webServices:
+      public:
+        enabled: true
+      private:
+        enabled: true  
+---
+apiVersion: v1
+data:
+  aws_access_key_id: YXdzX2FjY2Vzc19rZXk=
+  aws_region: dXMtZWFzdA==
+  aws_secret_access_key: YXdzX3NlY3JldF9rZXk=
+  log_group_name: dGVzdC1hcHAtaW50ZXJmYWNlLXMz
+kind: Secret
+metadata:
+  name: cloudwatch
+  namespace: test-log-none
+type: Opaque

bundle/tests/scorecard/kuttl/test-log-none/02-json-asserts.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+- script: sleep 5
+- script: kubectl get secret --namespace=test-log-none puptoo -o json > /tmp/test-log-none
+- script: jq -r '.data["cdappconfig.json"]' < /tmp/test-log-none | base64 -d > /tmp/test-log-none-json
+
+- script: jq -r '.logging.type == "null"' -e < /tmp/test-log-none-json

bundle/tests/scorecard/kuttl/test-log-none/03-delete.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: v1
+  kind: Namespace
+  name: test-log-none
+- apiVersion: cloud.redhat.com/v1alpha1
+  kind: ClowdEnvironment
+  name: test-log-none
+- apiVersion: v1
+  kind: Namespace
+  name: test-log-none-secret

controllers/cloud.redhat.com/providers/logging/appinterface.go

@@ -47,6 +47,7 @@ func setCloudwatchSecret(ns string, p *providers.Provider, c *config.LoggingConf
 		Region:          string(secret.Data["aws_region"]),
 		LogGroup:        string(secret.Data["log_group_name"]),
 	}
+	c.Type = "cloudwatch"
 
 	return nil
 }