claim file: move data structs and handlers to the CNF repo (#1607)

redhat-best-practices-for-k8s · Nov 13, 2023 · 933e1bc · 933e1bc
1 parent 78628ae
commit 933e1bc
Show file tree

Hide file tree

Showing 13 changed files with 253 additions and 21 deletions.
diff --git a/cmd/tnf/claim/add/add_test.go b/cmd/tnf/claim/add/add_test.go
@@ -13,7 +13,7 @@ func TestReadClaim(t *testing.T) {
 		expectedClaimRoot *claim.Root
 	}{
 		{ // Test Case #1 - Happy path
-			testContents: `{"claim":{"versions":{"k8s":"1.23.1","tnf":"0.3.1", "claimFormat":"v0.0.1"},"configurations":{},"metadata":{"endTime":"1:33:00","startTime":"2:33:00"},"nodes":{},"results":{},"rawResults":{}}}`,
+			testContents: `{"claim":{"versions":{"k8s":"1.23.1","tnf":"0.3.1"},"configurations":{},"metadata":{"endTime":"1:33:00","startTime":"2:33:00"},"nodes":{},"results":{},"rawResults":{}}}`,
 			expectedClaimRoot: &claim.Root{
 				Claim: &claim.Claim{
 					Versions: &claim.Versions{

diff --git a/cmd/tnf/claim/compare/testdata/claim_access_control.json b/cmd/tnf/claim/compare/testdata/claim_access_control.json
@@ -11851,7 +11851,6 @@
       ]
     },
     "versions": {
-      "claimFormat": "v0.1.0",
       "k8s": "v1.26.3+b404935",
       "ocClient": "n/a, (not using oc or kubectl client)",
       "ocp": "4.13.0",

diff --git a/cmd/tnf/claim/compare/testdata/claim_observability.json b/cmd/tnf/claim/compare/testdata/claim_observability.json
@@ -11877,7 +11877,6 @@
       ]
     },
     "versions": {
-      "claimFormat": "v0.1.0",
       "k8s": "v1.26.4+c343423",
       "ocClient": "n/a, (not using oc or kubectl client)",
       "ocp": "4.13.1",

diff --git a/cmd/tnf/claim/show/failures/testdata/claim1.json b/cmd/tnf/claim/show/failures/testdata/claim1.json
@@ -119,7 +119,6 @@
       ]
     },
     "versions": {
-      "claimFormat": "v0.0.1",
       "k8s": "v1.27.3",
       "ocClient": "n/a, (not using oc or kubectl client)",
       "ocp": "n/a, (non-OpenShift cluster)",

diff --git a/cmd/tnf/claim/show/failures/testdata/claim2.json b/cmd/tnf/claim/show/failures/testdata/claim2.json
@@ -119,7 +119,6 @@
       ]
     },
     "versions": {
-      "claimFormat": "v0.0.1",
       "k8s": "v1.27.3",
       "ocClient": "n/a, (not using oc or kubectl client)",
       "ocp": "n/a, (non-OpenShift cluster)",

diff --git a/cnf-certification-test/results/html/results.html b/cnf-certification-test/results/html/results.html
diff --git a/internal/version/version_test.go b/internal/version/version_test.go
@@ -0,0 +1,17 @@
+// Copyright (C) 2020-2023 Red Hat, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+package version
diff --git a/pkg/claim/schema.go b/pkg/claim/schema.go
diff --git a/pkg/claim/testdata/claim-invalid-additional-property.json b/pkg/claim/testdata/claim-invalid-additional-property.json
@@ -6,8 +6,7 @@
       "endTime": "1970-01-01T10:05:08+01:00"
     },
     "versions": {
-      "tnf": "v0.0.1",
-      "claimFormat":"v0.0.1"
+      "tnf": "v0.0.1"
     },
     "configurations": {},
     "rawResults": {

diff --git a/pkg/claim/testdata/claim-invalid-bool-results.json b/pkg/claim/testdata/claim-invalid-bool-results.json
@@ -212,8 +212,7 @@
       }
     },
     "versions": {
-      "tnf": "v0.0.3",
-      "claimFormat":"v0.0.1"
+      "tnf": "v0.0.3"
     },
     "results": false
   }

diff --git a/pkg/claim/testdata/claim-invalid-junit-payload.json b/pkg/claim/testdata/claim-invalid-junit-payload.json
@@ -5,8 +5,7 @@
       "endTime": "1970-01-01T10:05:08+01:00"
     },
     "versions": {
-      "tnf": "v0.0.1",
-      "claimFormat":"v0.0.1"
+      "tnf": "v0.0.1"
     },
     "configurations": {},
     "rawResults": false,

diff --git a/pkg/claim/testdata/claim-invalid-non-result-result.json b/pkg/claim/testdata/claim-invalid-non-result-result.json
@@ -212,8 +212,7 @@
       }
     },
     "versions": {
-      "tnf": "v0.0.3",
-      "claimFormat":"v0.0.1"
+      "tnf": "v0.0.3"
     },
     "results": {
       "{\"url\":\"https://test-network-function.com/tnf/test\",{\"version\":\"v1.0.0\"}": [

diff --git a/pkg/claim/testdata/claim-valid.json b/pkg/claim/testdata/claim-valid.json
@@ -212,8 +212,7 @@
       }
     },
     "versions": {
-      "tnf": "v0.0.3",
-      "claimFormat":"v0.0.1"
+      "tnf": "v0.0.3"
     },
     "results": {
       "{\"url\":\"https://test-network-function.com/tnf/test\",{\"version\":\"v1.0.0\"}": [