Merge pull request #21 from RedHatInsights/psav/fix_rdsbug

RDS bug if content blank

.github/workflows/package.yml

@@ -16,4 +16,4 @@ jobs:
         run: |
           sudo apt-get install golang-1.13
       - name: Run Tests
-        run: ACG_CONFIG="../../../test.json" go test -v ./pkg/api/v1/...
+        run: ACG_CONFIG="../../../tests/test.json" go test -v ./pkg/api/v1/...

pkg/api/v1/config.go

@@ -108,6 +108,10 @@ func writeContent(dir string, file string, contentString *string) (string, error
 		return "", err
 	}
 
+	if contentString == nil {
+		return "", fmt.Errorf("No RDS available")
+	}
+
 	content := []byte(*contentString)
 
 	fil, err := ioutil.TempFile(dir, file)

pkg/api/v1/config_test.go

@@ -10,6 +10,7 @@ func TestClientLoad(t *testing.T) {
 	if LoadedConfig == nil {
 		log.Fatal("Config didn't load in init()")
 	}
+
 	if len(LoadedConfig.Kafka.Brokers) < 1 {
 		log.Fatal("Kafka brokers not loaded")
 	}
@@ -70,3 +71,17 @@ func TestClientLoad(t *testing.T) {
 		log.Fatal("ca didn't match")
 	}
 }
+
+func TestEmptyRDSCa(t *testing.T) {
+	cfg, err := loadConfig("../../../tests/nordsca.json")
+	if err != nil {
+		log.Fatalf("can't load config: %s", err)
+	}
+
+	_, err = cfg.RdsCa()
+
+	if err == nil {
+		log.Fatal("error should have been created")
+	}
+
+}

tests/nordsca.json

@@ -0,0 +1,27 @@
+{
+    "BOPURL": "bopurl",
+    "database": {
+        "adminPassword": "pass",
+        "adminUsername": "user",
+        "hostname": "dbhost",
+        "name": "dbname",
+        "password": "dbpass",
+        "port": 5432,
+        "sslMode": "disable",
+        "username": "dbuser"
+    },
+    "logging": {
+        "cloudwatch": {
+            "accessKeyId": "",
+            "logGroup": "",
+            "region": "",
+            "secretAccessKey": ""
+        },
+        "type": "null"
+    },
+    "metricsPath": "/metrics",
+    "metricsPort": 9000,
+    "privatePort": 10000,
+    "publicPort": 8000,
+    "webPort": 8000
+}