[Server] Upgrade to `v1beta1` schema. #484

MUzairS15 · 2024-03-22T14:30:51Z

Description

This PR fixes #

Notes for Reviewers

Signed commits

Yes, I signed my commits.

leecalcote · 2024-04-30T03:12:51Z

A month old at this point…. Merge conflicts.

Signed-off-by: MUzairS15 <[email protected]>

MUzairS15 · 2024-04-30T12:45:22Z

// @leecalcote @Yashsharma1911

generators/artifacthub/package_test.go

models/meshmodel/core/policies/data_models.go

leecalcote · 2024-04-30T12:52:19Z

models/meshmodel/core/policies/rego_policy_relationship.go

@@ -26,7 +28,10 @@ func NewRegoInstance(policyDir string, regManager *registry.RegistryManager) (*R
 	var store storage.Store

 	ctx := context.Background()
-	registeredRelationships, _, _ := regManager.GetEntities(&v1alpha1.RelationshipFilter{})
+	registeredRelationships, _, _, err := regManager.GetEntities(&v1alpha2.RelationshipFilter{})


This is a concern separate from v1beta1 for Components.

Relationships v1alpha2 was to have been completely previously, right? Should this go forward independently?

Yes, v1alpha2 was completed, but the update was done inplace, i.e. v1alpha1 struct were simply updated in place.

If that work was done well and was completed, would we expect that the only change necessary here be that of a swap from “1 “to “2”?

leecalcote · 2024-04-30T12:53:53Z

models/meshmodel/core/policies/rego_policy_relationship.go

@@ -51,7 +56,10 @@ func (r *Rego) RegoPolicyHandler(regoQueryString string, designFile []byte) (int
 	}
 	regoEngine, err := rego.New(
 		rego.Query(regoQueryString),
-		rego.Load([]string{r.policyDir}, nil),
+		rego.Load([]string{r.policyDir}, func(abspath string, info fs.FileInfo, depth int) bool {


Please add comments here and update Meshery Docs.

Is this loading Rego policy from each individual model?

leecalcote · 2024-04-30T12:54:45Z

models/meshmodel/core/v1alpha2/relationship.go

+
+const SchemaVersion = "core.meshery.io/v1alpha2"
+
+type RelationshipDefinition struct {


Was this generated from schema?

models/meshmodel/core/v1alpha2/relationship.go

leecalcote · 2024-04-30T12:59:48Z

models/meshmodel/core/v1beta1/application_component.go


-// Component is the structure for the core OAM Application Component
+// Component is the structure for the core Application Component


What’s an Application Component?

leecalcote · 2024-04-30T13:00:00Z

models/meshmodel/core/v1beta1/application_component.go

 type Component struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

 	Spec ComponentSpec `json:"spec,omitempty"`
 }

-// ComponentSpec is the structure for the core OAM Application Component Spec
+// ComponentSpec is the structure for the core Application Component Spec


Clean this up, please.

File needs renamed?

What is metav1? Is there a schema for this?

No, the namings have been inspired from k8s packages, v1 in metav1 eflects the schema version.

These are OAM constructs that is most appropriate to address with v1beta1 version of design schema

leecalcote · 2024-04-30T13:00:42Z

models/meshmodel/core/v1beta1/application_component.go

@@ -46,7 +46,7 @@ func GetKindFromComponent(comp Component) string {
 	return kind
 }

-func GetAnnotationsForWorkload(w v1alpha1.ComponentDefinition) map[string]string {
+func GetAnnotationsForWorkload(w ComponentDefinition) map[string]string {


What’s a Workload?

models/meshmodel/core/v1beta1/component.go

leecalcote · 2024-04-30T13:07:54Z

What considerations need to be made for Meshery server upgrades and for Meshery design compatibility?

Is there a corresponding PR for Meshery extensions (e.g. MeshMap)? @aabidsofi19

MUzairS15 · 2024-04-30T13:09:46Z

What considerations need to be made for Meshery server upgrades and for Meshery design compatibility?

Is there a corresponding PR for Meshery extensions (e.g. MeshMap)? @aabidsofi19

Yes, there's a PR in meshery-extensions.

Signed-off-by: MUzairS15 <[email protected]>

MUzairS15 force-pushed the MUzairS15/feat/v1beta1 branch from e4e4670 to 210d03b Compare March 29, 2024 10:19

MUzairS15 added 26 commits April 30, 2024 18:10

change location for types package

e98053e

Signed-off-by: MUzairS15 <[email protected]>

implement Create function for entities

deff7f6

Signed-off-by: MUzairS15 <[email protected]>

add registrant/host as first class attribute for models

1735863

Signed-off-by: MUzairS15 <[email protected]>

complete v1beta1 for model

02ec85d

Signed-off-by: MUzairS15 <[email protected]>

complete v1beta1 for component

21b9b46

Signed-off-by: MUzairS15 <[email protected]>

update as per latest changes to schema

35d7e3e

Signed-off-by: MUzairS15 <[email protected]>

reorder

335ca45

Signed-off-by: MUzairS15 <[email protected]>

implement updateStatus for all entites

2b9672b

Signed-off-by: MUzairS15 <[email protected]>

implement Get function for comp

75a08ac

Signed-off-by: MUzairS15 <[email protected]>

implement Get function for relationships

3446a64

Signed-off-by: MUzairS15 <[email protected]>

implement Get function for relationships

c524f5a

Signed-off-by: MUzairS15 <[email protected]>

delete v1alpha1

0486120

Signed-off-by: MUzairS15 <[email protected]>

add getters to entity filter

ef4981f

Signed-off-by: MUzairS15 <[email protected]>

caategory

d56ae45

Signed-off-by: MUzairS15 <[email protected]>

finalize changes and package structure:

510b514

Signed-off-by: MUzairS15 <[email protected]>

move filters to their versioned packages

7c35024

Signed-off-by: MUzairS15 <[email protected]>

remove unneeded code

b8c056a

Signed-off-by: MUzairS15 <[email protected]>

run gofmt

ddd4ce3

Signed-off-by: MUzairS15 <[email protected]>

add hostID as param in interface function

b3d02d1

Signed-off-by: MUzairS15 <[email protected]>

cleanup:

89313ef

Signed-off-by: MUzairS15 <[email protected]>

fix tags

1e6a189

Signed-off-by: MUzairS15 <[email protected]>

register models in registres table, fix tags and sql

95dbd29

Signed-off-by: MUzairS15 <[email protected]>

update model unique hash generation

2302b3f

Signed-off-by: MUzairS15 <[email protected]>

finalize changes

7a8ff4e

Signed-off-by: MUzairS15 <[email protected]>

finalize changes

3911988

Signed-off-by: MUzairS15 <[email protected]>

fix merge conflicts

8c73a0d

Signed-off-by: MUzairS15 <[email protected]>

MUzairS15 force-pushed the MUzairS15/feat/v1beta1 branch from 2f61d4b to 8c73a0d Compare April 30, 2024 12:44

MUzairS15 marked this pull request as ready for review April 30, 2024 12:45

leecalcote reviewed Apr 30, 2024

View reviewed changes

generators/artifacthub/package_test.go Show resolved Hide resolved

leecalcote reviewed Apr 30, 2024

View reviewed changes

models/meshmodel/core/policies/data_models.go Outdated Show resolved Hide resolved

leecalcote reviewed Apr 30, 2024

View reviewed changes

models/meshmodel/core/v1alpha2/relationship.go Show resolved Hide resolved

leecalcote reviewed Apr 30, 2024

View reviewed changes

models/meshmodel/core/v1alpha2/relationship.go Show resolved Hide resolved

leecalcote requested changes Apr 30, 2024

View reviewed changes

leecalcote added kind/enhancement Improvement in current feature area/models labels Apr 30, 2024

leecalcote added this to the v0.8.0 milestone Apr 30, 2024

leecalcote requested a review from Yashsharma1911 April 30, 2024 13:10

MUzairS15 added 5 commits April 30, 2024 18:49

remove uneeded constructs

e02d271

Signed-off-by: MUzairS15 <[email protected]>

run gofmt

6e5402c

Signed-off-by: MUzairS15 <[email protected]>

preload category and initialize slice with cap instead of len

e7a46c6

Signed-off-by: MUzairS15 <[email protected]>

rmv logs

cb90654

Signed-off-by: MUzairS15 <[email protected]>

return comps and rels for model based on filter conds

2b55870

Signed-off-by: MUzairS15 <[email protected]>

MUzairS15 force-pushed the MUzairS15/feat/v1beta1 branch from 9de637b to 2b55870 Compare May 5, 2024 09:17

MUzairS15 and others added 2 commits May 5, 2024 19:13

initialize result slice

fb75883

Signed-off-by: MUzairS15 <[email protected]>

Merge branch 'master' into MUzairS15/feat/v1beta1

ab974c8

leecalcote approved these changes May 5, 2024

View reviewed changes

leecalcote merged commit 3da3150 into meshery:master May 5, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Server] Upgrade to `v1beta1` schema. #484

[Server] Upgrade to `v1beta1` schema. #484

MUzairS15 commented Mar 22, 2024

leecalcote commented Apr 30, 2024

MUzairS15 commented Apr 30, 2024

leecalcote Apr 30, 2024

MUzairS15 Apr 30, 2024

leecalcote Apr 30, 2024

leecalcote Apr 30, 2024

leecalcote Apr 30, 2024

leecalcote Apr 30, 2024

leecalcote Apr 30, 2024

leecalcote Apr 30, 2024

MUzairS15 Apr 30, 2024

leecalcote Apr 30, 2024

leecalcote commented Apr 30, 2024 •

edited

Loading

MUzairS15 commented Apr 30, 2024


		const SchemaVersion = "core.meshery.io/v1alpha2"

		type RelationshipDefinition struct {


		// Component is the structure for the core OAM Application Component
		// Component is the structure for the core Application Component

[Server] Upgrade to v1beta1 schema. #484

[Server] Upgrade to v1beta1 schema. #484

Conversation

MUzairS15 commented Mar 22, 2024

leecalcote commented Apr 30, 2024

MUzairS15 commented Apr 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leecalcote commented Apr 30, 2024 • edited Loading

MUzairS15 commented Apr 30, 2024

[Server] Upgrade to `v1beta1` schema. #484

[Server] Upgrade to `v1beta1` schema. #484

leecalcote commented Apr 30, 2024 •

edited

Loading