update generated packages

elastic · Jun 30, 2020 · 6f0f3dc · 6f0f3dc
1 parent b7c5e4d
commit 6f0f3dc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/testdata/generated/package.json b/testdata/generated/package.json
@@ -26,7 +26,7 @@
     }
   },
   "conditions": {
-    "kibana.version": "~7.0.0"
+    "kibana.version": "~7.x.x"
   },
   "screenshots": [
     {

diff --git a/testdata/generated/package/example/1.0.0/index.json b/testdata/generated/package/example/1.0.0/index.json
@@ -26,7 +26,7 @@
     }
   },
   "conditions": {
-    "kibana.version": "~7.0.0"
+    "kibana.version": "~7.x.x"
   },
   "screenshots": [
     {

diff --git a/testdata/generated/search-kibana721.json b/testdata/generated/search-kibana721.json
@@ -46,18 +46,18 @@
   },
   {
     "name": "example",
-    "title": "Example",
-    "version": "0.0.2",
-    "description": "This is the example integration.",
+    "title": "Example Integration",
+    "version": "1.0.0",
+    "description": "This is the example integration",
     "type": "integration",
-    "download": "/epr/example/example-0.0.2.tar.gz",
+    "download": "/epr/example/example-1.0.0.tar.gz",
     "downloads": [
       {
-        "path": "/epr/example/example-0.0.2.tar.gz",
+        "path": "/epr/example/example-1.0.0.tar.gz",
         "type": "tar"
       }
     ],
-    "path": "/package/example/0.0.2"
+    "path": "/package/example/1.0.0"
   },
   {
     "name": "foo",

diff --git a/testdata/package/example/1.0.0/manifest.yml b/testdata/package/example/1.0.0/manifest.yml
@@ -11,7 +11,7 @@ release: ga
 owner.github: "ruflin"
 
 conditions:
-  kibana.version: "~7.0.0"
+  kibana.version: "~7.x.x"
 
 requirement:
   kibana:

diff --git a/util/package.go b/util/package.go
@@ -6,7 +6,6 @@ package util
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -162,8 +161,6 @@ func NewPackage(basePath string) (*Package, error) {
 		return nil, err
 	}
 
-	log.Println(p.Conditions)
-
 	// Default for the multiple flags is true.
 	trueValue := true
 	for i, _ := range p.Datasources {
@@ -273,14 +270,9 @@ func (p *Package) HasKibanaVersion(version *semver.Version) bool {
 
 	// If the version is not specified, it is for all versions
 	if p.Conditions == nil || version == nil {
-		log.Println("TRUE")
 		return true
 	}
-	//if p.Conditions.KibanaVersion == "" {
-	//	return true
-	//}
 
-	log.Println(p.Conditions.kibanaVersion, version)
 	return p.Conditions.kibanaVersion.Check(version)
 }