Move MeshModel to Model. #468

gyohuangxin · 2024-02-28T08:59:06Z

Description

This PR fixes #467

Notes for Reviewers

Yes, I signed my commits.

welcome · 2024-02-28T08:59:10Z

Yay, your first pull request! 👍 A contributor will be by to give feedback soon. In the meantime, please review the Layer5 Community Welcome Guide and sure to join the community Slack.
Be sure to double-check that you have signed your commits. Here are instructions for making signing an implicit activity while peforming a commit.

gyohuangxin · 2024-02-29T03:03:25Z

models/model/core/v1alpha1/component.go

@@ -42,7 +42,7 @@ type ComponentDefinition struct {
 	UpdatedAt       time.Time              `json:"-"`
 }
 type ComponentDefinitionDB struct {
-	ID      uuid.UUID `json:"id"`
+	ID      uuid.UUID `json:"componentDefinitionId"`


@MUzairS15 @leecalcote To fix the golangci-lint issue, I renamed the Json tag. Will it have an impact on its dependencies?

@Yashsharma1911 Could confirm.

@Yashsharma1911 may be slow to response, therefore I revert this unpredictable modification so that we can keep going. // @MUzairS15 @leecalcote

@RipulHandoo, I wonder if you might be familiar here.

@leecalcote @MUzairS15 Can we go ahead, and I can create another issue mentioning @Yashsharma1911 @RipulHandoo to track it?

The issue created: #469

gyohuangxin · 2024-02-29T03:04:50Z

models/model/core/v1alpha1/models.go

@@ -60,7 +60,7 @@ type Model struct {
 }

 type ModelDB struct {
-	ID          uuid.UUID   `json:"id"`
+	ID          uuid.UUID   `json:"modelDBId"`


MUzairS15

Note: This will be a breaking change.

models/controllers/meshsync.go

models/controllers/meshery_broker.go

gyohuangxin · 2024-03-07T04:27:01Z

@leecalcote Do you have any comments?

leecalcote · 2024-03-07T05:23:56Z

models/oam/core/v1alpha1/application_component.go

@@ -35,7 +35,7 @@ type ComponentParameter struct {
 	Description *string  `json:"description,omitempty"`
 }

-const MesheryAnnotationPrefix = "design.meshmodel.io"
+const MesheryAnnotationPrefix = "design.model.io"


@MUzairS15 this is to be design.meshery.io, right?

leecalcote · 2024-03-07T05:29:03Z

@leecalcote Do you have any comments?

Thank you for asking. I only have two:

Is regarding a potential existing bug in the namspacing of the MesheryAnnotationPrefix, which might need to be addressed in Meshery Server as well.
Which leads us to my second comment, which is: @MUzairS15 what do we need to do in order to ensure that Server and the mesheryctl registry command and workflows, and the meshery/schemas are all in sync as we move forward with what will be a series of changes? Is there a specific sequence of next steps to follow? @gyohuangxin, I'm trying to remember where it is that I proposed what this sequence might be. Do you recall, by chance?

gyohuangxin · 2024-03-07T06:13:24Z

Which leads us to my second comment, which is: @MUzairS15 what do we need to do in order to ensure that Server and the mesheryctl registry command and workflows, and the meshery/schemas are all in sync as we move forward with what will be a series of changes? Is there a specific sequence of next steps to follow? @gyohuangxin, I'm trying to remember where it is that I proposed what this sequence might be. Do you recall, by chance?

IMO, the dependencies sequence should be meshkit <- meshery-adapter-library <- Meshery components (Adapters, Mesheryctl... )

In order to make the transformation seamlessly, we can create a release of meshkit, then validate the meshery-adapter-library can work if update the meshkit version. Then we can create the release of meshery-adapter-library to validate other Meshery components base on that. This is a process that requires care and patience. @MUzairS15 Please correct me if I missed something.

leecalcote · 2024-03-07T16:33:09Z

Here's a related / similar chore - meshery/meshery#9969

leecalcote · 2024-03-07T17:19:14Z

Which leads us to my second comment, which is: @MUzairS15 what do we need to do in order to ensure that Server and the mesheryctl registry command and workflows, and the meshery/schemas are all in sync as we move forward with what will be a series of changes? Is there a specific sequence of next steps to follow? @gyohuangxin, I'm trying to remember where it is that I proposed what this sequence might be. Do you recall, by chance?

IMO, the dependencies sequence should be meshkit <- meshery-adapter-library <- Meshery components (Adapters, Mesheryctl... )

In order to make the transformation seamlessly, we can create a release of meshkit, then validate the meshery-adapter-library can work if update the meshkit version. Then we can create the release of meshery-adapter-library to validate other Meshery components base on that. This is a process that requires care and patience. @MUzairS15 Please correct me if I missed something.

This is making sense to me, @gyohuangxin. @MUzairS15, sound about right?

MUzairS15 · 2024-03-07T17:22:22Z

@gyohuangxin Yes, its correct.
AdapterLibrary - adapters
Meshery Server, mesheryctl.

While adapter-library and server can be done in parallel.

MUzairS15 · 2024-03-07T17:23:45Z

While design.meshery.io change will affect UI clients.

I propose the change for this to be done, when the first iteration of the refactoring from meshmodels to models is complete.

I'll create a issue to track this item.

MUzairS15 · 2024-03-07T17:25:48Z

@gyohuangxin Since meshkit undergoes a release often, and merging the PR would block subsequent releases and upgrades.

Will you first start the migration in Meshery Server by using this branch as local go.mod reference?
When the server PR is up we can merge both of them.

gyohuangxin · 2024-03-08T02:58:31Z

@gyohuangxin Since meshkit undergoes a release often, and merging the PR would block subsequent releases and upgrades.

Will you first start the migration in Meshery Server by using this branch as local go.mod reference?
When the server PR is up we can merge both of them.

@MUzairS15 Got it. Will work on that.

Signed-off-by: Huang Xin <[email protected]>

Signed-off-by: Xin Huang <[email protected]>

Signed-off-by: Mohd Uzair <[email protected]>

leecalcote · 2024-03-12T17:40:28Z

Uh-oh. A merge conflict popped up.

stale · 2024-04-28T11:24:12Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

gyohuangxin commented Feb 29, 2024

View reviewed changes

gyohuangxin requested a review from leecalcote March 1, 2024 01:48

gyohuangxin mentioned this pull request Mar 4, 2024

golangci-lint issue: duplicate json tag issue #469

Closed

MUzairS15 approved these changes Mar 4, 2024

View reviewed changes

models/controllers/meshsync.go Outdated Show resolved Hide resolved

models/controllers/meshsync.go Outdated Show resolved Hide resolved

models/controllers/meshery_broker.go Outdated Show resolved Hide resolved

models/controllers/meshery_broker.go Outdated Show resolved Hide resolved

gyohuangxin force-pushed the meshmodel_to_model branch from cb3833a to b13db22 Compare March 7, 2024 02:14

leecalcote reviewed Mar 7, 2024

View reviewed changes

gyohuangxin and others added 7 commits March 12, 2024 01:34

Move MeshModel to Model.

d6ffcce

Signed-off-by: Huang Xin <[email protected]>

Fix golangci-lint

6ca73ea

Signed-off-by: Xin Huang <[email protected]>

Revert duplicate json tag changes.

bd07301

Signed-off-by: Xin Huang <[email protected]>

Update models/controllers/meshsync.go

7c32def

Signed-off-by: Mohd Uzair <[email protected]>

Update models/controllers/meshsync.go

8523577

Signed-off-by: Mohd Uzair <[email protected]>

Update models/controllers/meshery_broker.go

a17a155

Signed-off-by: Mohd Uzair <[email protected]>

Update models/controllers/meshery_broker.go

c753c2d

Signed-off-by: Mohd Uzair <[email protected]>

gyohuangxin force-pushed the meshmodel_to_model branch from b13db22 to c753c2d Compare March 13, 2024 01:12

stale bot added the issue/stale Issue has not had any activity for an extended period of time label Apr 28, 2024

Yashsharma1911 added issue/willfix This issue will be worked on and removed issue/stale Issue has not had any activity for an extended period of time labels Apr 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move MeshModel to Model. #468

Move MeshModel to Model. #468

gyohuangxin commented Feb 28, 2024

welcome bot commented Feb 28, 2024

gyohuangxin Feb 29, 2024

MUzairS15 Feb 29, 2024

gyohuangxin Mar 1, 2024

leecalcote Mar 1, 2024

gyohuangxin Mar 4, 2024

gyohuangxin Mar 4, 2024

gyohuangxin Feb 29, 2024

MUzairS15 left a comment

gyohuangxin commented Mar 7, 2024

leecalcote Mar 7, 2024

leecalcote commented Mar 7, 2024

gyohuangxin commented Mar 7, 2024

leecalcote commented Mar 7, 2024 •

edited

Loading

leecalcote commented Mar 7, 2024

MUzairS15 commented Mar 7, 2024

MUzairS15 commented Mar 7, 2024

MUzairS15 commented Mar 7, 2024

gyohuangxin commented Mar 8, 2024

leecalcote commented Mar 12, 2024

stale bot commented Apr 28, 2024

Move MeshModel to Model. #468

Are you sure you want to change the base?

Move MeshModel to Model. #468

Conversation

gyohuangxin commented Feb 28, 2024

welcome bot commented Feb 28, 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

MUzairS15 left a comment

Choose a reason for hiding this comment

gyohuangxin commented Mar 7, 2024

Choose a reason for hiding this comment

leecalcote commented Mar 7, 2024

gyohuangxin commented Mar 7, 2024

leecalcote commented Mar 7, 2024 • edited Loading

leecalcote commented Mar 7, 2024

MUzairS15 commented Mar 7, 2024

MUzairS15 commented Mar 7, 2024

MUzairS15 commented Mar 7, 2024

gyohuangxin commented Mar 8, 2024

leecalcote commented Mar 12, 2024

stale bot commented Apr 28, 2024

leecalcote commented Mar 7, 2024 •

edited

Loading