From 35db6bc5543d352ea7e54375ba12acd70033a7f9 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 26 Feb 2021 20:03:50 +0900
Subject: [PATCH] nixos/tests/elk: remove OSS ELK-7 test

---
 nixos/tests/elk.nix | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 7225ae1f823d..f0ec06195a72 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -216,7 +216,7 @@ let
           )
     '';
   }) { inherit pkgs system; };
-in pkgs.lib.mapAttrs mkElkTest {
+in pkgs.lib.mapAttrs mkElkTest ({
   ELK-6 =
     if enableUnfree
     then {
@@ -233,20 +233,13 @@ in pkgs.lib.mapAttrs mkElkTest {
       journalbeat   = pkgs.journalbeat6;
       metricbeat    = pkgs.metricbeat6;
     };
-  ELK-7 =
-    if enableUnfree
-    then {
-      elasticsearch = pkgs.elasticsearch7;
-      logstash      = pkgs.logstash7;
-      kibana        = pkgs.kibana7;
-      journalbeat   = pkgs.journalbeat7;
-      metricbeat    = pkgs.metricbeat7;
-    }
-    else {
-      elasticsearch = pkgs.elasticsearch7-oss;
-      logstash      = pkgs.logstash7-oss;
-      kibana        = pkgs.kibana7-oss;
-      journalbeat   = pkgs.journalbeat7;
-      metricbeat    = pkgs.metricbeat7;
-    };
-}
+} // pkgs.lib.optionalAttrs enableUnfree {
+    ELK-7 =
+      {
+        elasticsearch = pkgs.elasticsearch7;
+        logstash      = pkgs.logstash7;
+        kibana        = pkgs.kibana7;
+        journalbeat   = pkgs.journalbeat7;
+        metricbeat    = pkgs.metricbeat7;
+      };
+})