Merge branch 'master' into fix/aso-manifest-dedup

Author: simihablo

converter/tests/samples/edge-firewall-relationship.yml

@@ -1454,7 +1454,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -1582,7 +1582,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -1710,7 +1710,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -1838,7 +1838,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -1974,7 +1974,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -2127,7 +2127,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -2263,7 +2263,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:
@@ -2416,7 +2416,7 @@ relationships:
       relationships_count: 0
       components: null
       relationships: null
-    schemaVersion: relationships.meshery.io/v1alpha3
+    schemaVersion: relationships.meshery.io/v1beta2
     selectors:
       - allow:
           from:

files/error.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/meshery/meshkit/errors"
-	coreV1 "github.com/meshery/schemas/models/v1alpha1/core"
+	coreV1 "github.com/meshery/schemas/models/core"
 )
 
 var (

files/identification.go

@@ -16,7 +16,7 @@ import (
 	"github.com/meshery/meshkit/utils"
 	"github.com/meshery/meshkit/utils/kubernetes/kompose"
 	"github.com/meshery/meshkit/utils/walker"
-	coreV1 "github.com/meshery/schemas/models/v1alpha1/core"
+	coreV1 "github.com/meshery/schemas/models/core"
 	"github.com/meshery/schemas/models/v1beta1"
 	"github.com/meshery/schemas/models/v1beta1/pattern"
 

files/tests/samples/valid_design.yml

@@ -309,7 +309,7 @@ relationships:
     components_count: 0
     relationships_count: 0
   modelid: 00000000-0000-0000-0000-000000000000
-  schemaVersion: relationships.meshery.io/v1alpha3
+  schemaVersion: relationships.meshery.io/v1beta2
   selectors:
   - allow:
       from:

files/tests/sanitization_test.go

@@ -10,7 +10,7 @@ import (
 	"archive/zip"
 	"github.com/meshery/meshkit/errors"
 	"github.com/meshery/meshkit/files"
-	coreV1 "github.com/meshery/schemas/models/v1alpha1/core"
+	coreV1 "github.com/meshery/schemas/models/core"
 	"github.com/stretchr/testify/assert"
 )
 

generators/artifacthub/crossplane-types/CompositeResourceDefinition.json

@@ -46,16 +46,16 @@
 "relationships": null
 },
 "modelReference": {
-"version": "",
-"name": "",
 "displayName": "",
 "id": "00000000-0000-0000-0000-000000000000",
+"model": {
+"version": ""
+},
+"name": "",
 "registrant": {
 "kind": ""
 },
-"model": {
 "version": ""
-}
 },
 "styles": null,
 "capabilities": null,

generators/artifacthub/crossplane-types/Composition.json

@@ -46,16 +46,16 @@
 "relationships": null
 },
 "modelReference": {
-"version": "",
-"name": "",
 "displayName": "",
 "id": "00000000-0000-0000-0000-000000000000",
+"model": {
+"version": ""
+},
+"name": "",
 "registrant": {
 "kind": ""
 },
-"model": {
 "version": ""
-}
 },
 "styles": null,
 "capabilities": null,

generators/artifacthub/crossplane-types/Configuration.json

@@ -46,16 +46,16 @@
 "relationships": null
 },
 "modelReference": {
-"version": "",
-"name": "",
 "displayName": "",
 "id": "00000000-0000-0000-0000-000000000000",
+"model": {
+"version": ""
+},
+"name": "",
 "registrant": {
 "kind": ""
 },
-"model": {
 "version": ""
-}
 },
 "styles": null,
 "capabilities": null,

generators/artifacthub/crossplane-types/ConfigurationRevision.json

@@ -46,16 +46,16 @@
 "relationships": null
 },
 "modelReference": {
-"version": "",
-"name": "",
 "displayName": "",
 "id": "00000000-0000-0000-0000-000000000000",
+"model": {
+"version": ""
+},
+"name": "",
 "registrant": {
 "kind": ""
 },
-"model": {
 "version": ""
-}
 },
 "styles": null,
 "capabilities": null,

generators/artifacthub/crossplane-types/KubernetesApplication.json

@@ -46,16 +46,16 @@
 "relationships": null
 },
 "modelReference": {
-"version": "",
-"name": "",
 "displayName": "",
 "id": "00000000-0000-0000-0000-000000000000",
+"model": {
+"version": ""
+},
+"name": "",
 "registrant": {
 "kind": ""
 },
-"model": {
 "version": ""
-}
 },
 "styles": null,
 "capabilities": null,