diff --git a/generators/artifacthub/package.go b/generators/artifacthub/package.go index f37e94b2..a62da045 100644 --- a/generators/artifacthub/package.go +++ b/generators/artifacthub/package.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" + "github.com/layer5io/meshkit/models/model/core/v1alpha1" "github.com/layer5io/meshkit/utils" "github.com/layer5io/meshkit/utils/component" "github.com/layer5io/meshkit/utils/manifests" diff --git a/generators/github/package.go b/generators/github/package.go index ba570eec..042d0418 100644 --- a/generators/github/package.go +++ b/generators/github/package.go @@ -4,7 +4,7 @@ import ( "bytes" "os" - "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" + "github.com/layer5io/meshkit/models/model/core/v1alpha1" "github.com/layer5io/meshkit/utils" "github.com/layer5io/meshkit/utils/component" "github.com/layer5io/meshkit/utils/manifests" diff --git a/models/controllers/meshery_broker.go b/models/controllers/meshery_broker.go index 93f83cb3..f2be3c10 100644 --- a/models/controllers/meshery_broker.go +++ b/models/controllers/meshery_broker.go @@ -45,8 +45,8 @@ func (mb *mesheryBroker) GetStatus() MesheryControllerStatus { // TODO: Confirm if the presence of operator is needed to use the operator client sdk _, err = operatorClient.CoreV1Alpha1().Brokers("meshery").Get(context.TODO(), "meshery-broker", metav1.GetOptions{}) if err == nil { - monitoringEndpoint, err := mb.GetEndpointForPort(brokerMonitoringPortName) - if err == nil { + monitoringEndpoint, endpointErr := mb.GetEndpointForPort(brokerMonitoringPortName) + if endpointErr == nil { if ConnectivityTest(MesheryServer, monitoringEndpoint) { mb.status = Connected return mb.status diff --git a/models/controllers/meshsync.go b/models/controllers/meshsync.go index 7f8859df..21db61f9 100644 --- a/models/controllers/meshsync.go +++ b/models/controllers/meshsync.go @@ -49,8 +49,8 @@ func (ms *meshsync) GetStatus() MesheryControllerStatus { case v1.PodRunning: ms.status = Running broker := NewMesheryBrokerHandler(ms.kclient) - brokerEndpoint, err := broker.GetEndpointForPort(brokerMonitoringPortName) - if err != nil { + brokerEndpoint, endpointErr := broker.GetEndpointForPort(brokerMonitoringPortName) + if endpointErr != nil { return ms.status } isConnected := ConnectivityTest(MeshSync, brokerEndpoint) diff --git a/models/interfaces.go b/models/interfaces.go index 3c89fd54..d1b3d2f1 100644 --- a/models/interfaces.go +++ b/models/interfaces.go @@ -1,6 +1,6 @@ package models -import "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" +import "github.com/layer5io/meshkit/models/model/core/v1alpha1" // anything that can be validated is a Validator type Validator interface { diff --git a/models/meshmodel/core/policies/data_models.go b/models/model/core/policies/data_models.go similarity index 100% rename from models/meshmodel/core/policies/data_models.go rename to models/model/core/policies/data_models.go diff --git a/models/meshmodel/core/policies/error.go b/models/model/core/policies/error.go similarity index 100% rename from models/meshmodel/core/policies/error.go rename to models/model/core/policies/error.go diff --git a/models/meshmodel/core/policies/rego_policy_relationship.go b/models/model/core/policies/rego_policy_relationship.go similarity index 100% rename from models/meshmodel/core/policies/rego_policy_relationship.go rename to models/model/core/policies/rego_policy_relationship.go diff --git a/models/meshmodel/core/types/types.go b/models/model/core/types/types.go similarity index 100% rename from models/meshmodel/core/types/types.go rename to models/model/core/types/types.go diff --git a/models/meshmodel/core/v1alpha1/category.go b/models/model/core/v1alpha1/category.go similarity index 100% rename from models/meshmodel/core/v1alpha1/category.go rename to models/model/core/v1alpha1/category.go diff --git a/models/meshmodel/core/v1alpha1/component.go b/models/model/core/v1alpha1/component.go similarity index 97% rename from models/meshmodel/core/v1alpha1/component.go rename to models/model/core/v1alpha1/component.go index bb1eed17..e51faa58 100644 --- a/models/meshmodel/core/v1alpha1/component.go +++ b/models/model/core/v1alpha1/component.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/layer5io/meshkit/database" - "github.com/layer5io/meshkit/models/meshmodel/core/types" + "github.com/layer5io/meshkit/models/model/core/types" "github.com/layer5io/meshkit/utils" "gorm.io/gorm/clause" ) @@ -86,7 +86,7 @@ func CreateComponent(db *database.Handler, c ComponentDefinition) (uuid.UUID, uu err = db.Create(&cdb).Error return c.ID, mid, err } -func GetMeshModelComponents(db *database.Handler, f ComponentFilter) (c []ComponentDefinition, count int64, unique int) { +func GetModelComponents(db *database.Handler, f ComponentFilter) (c []ComponentDefinition, count int64, unique int) { type componentDefinitionWithModel struct { ComponentDefinitionDB ModelDB diff --git a/models/meshmodel/core/v1alpha1/host.go b/models/model/core/v1alpha1/host.go similarity index 96% rename from models/meshmodel/core/v1alpha1/host.go rename to models/model/core/v1alpha1/host.go index fd3ece5c..0239c779 100644 --- a/models/meshmodel/core/v1alpha1/host.go +++ b/models/model/core/v1alpha1/host.go @@ -2,7 +2,7 @@ package v1alpha1 import "github.com/google/uuid" -type MeshModelHostsWithEntitySummary struct { +type ModelHostsWithEntitySummary struct { ID uuid.UUID `json:"id"` Hostname string `json:"hostname"` Port int `json:"port"` diff --git a/models/meshmodel/core/v1alpha1/models.go b/models/model/core/v1alpha1/models.go similarity index 98% rename from models/meshmodel/core/v1alpha1/models.go rename to models/model/core/v1alpha1/models.go index cffb71d0..06076627 100644 --- a/models/meshmodel/core/v1alpha1/models.go +++ b/models/model/core/v1alpha1/models.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/layer5io/meshkit/database" - "github.com/layer5io/meshkit/models/meshmodel/core/types" + "github.com/layer5io/meshkit/models/model/core/types" "github.com/layer5io/meshkit/utils" "gorm.io/gorm" ) diff --git a/models/meshmodel/core/v1alpha1/policy.go b/models/model/core/v1alpha1/policy.go similarity index 95% rename from models/meshmodel/core/v1alpha1/policy.go rename to models/model/core/v1alpha1/policy.go index 0791b705..30bf5205 100644 --- a/models/meshmodel/core/v1alpha1/policy.go +++ b/models/model/core/v1alpha1/policy.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/layer5io/meshkit/database" - "github.com/layer5io/meshkit/models/meshmodel/core/types" + "github.com/layer5io/meshkit/models/model/core/types" ) type PolicyDefinition struct { @@ -55,7 +55,7 @@ func (p PolicyDefinition) Type() types.CapabilityType { return types.PolicyDefinition } -func GetMeshModelPolicy(db *database.Handler, f PolicyFilter) (pl []PolicyDefinition) { +func GetModelPolicy(db *database.Handler, f PolicyFilter) (pl []PolicyDefinition) { type componentDefinitionWithModel struct { PolicyDefinitionDB Model diff --git a/models/meshmodel/core/v1alpha1/relationship.go b/models/model/core/v1alpha1/relationship.go similarity index 96% rename from models/meshmodel/core/v1alpha1/relationship.go rename to models/model/core/v1alpha1/relationship.go index b27155e0..2aaf8a54 100644 --- a/models/meshmodel/core/v1alpha1/relationship.go +++ b/models/model/core/v1alpha1/relationship.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/layer5io/meshkit/database" - "github.com/layer5io/meshkit/models/meshmodel/core/types" + "github.com/layer5io/meshkit/models/model/core/types" "gorm.io/gorm/clause" ) @@ -63,7 +63,7 @@ func (rf *RelationshipFilter) Create(m map[string]interface{}) { return } } -func GetMeshModelRelationship(db *database.Handler, f RelationshipFilter) (r []RelationshipDefinition, count int64) { +func GetModelRelationship(db *database.Handler, f RelationshipFilter) (r []RelationshipDefinition, count int64) { type componentDefinitionWithModel struct { RelationshipDefinitionDB ModelDB diff --git a/models/meshmodel/registry/error.go b/models/model/registry/error.go similarity index 100% rename from models/meshmodel/registry/error.go rename to models/model/registry/error.go diff --git a/models/meshmodel/registry/host.go b/models/model/registry/host.go similarity index 97% rename from models/meshmodel/registry/host.go rename to models/model/registry/host.go index cbc1350d..12d55fd2 100644 --- a/models/meshmodel/registry/host.go +++ b/models/model/registry/host.go @@ -65,7 +65,7 @@ func (h *Host) AfterFind(tx *gorm.DB) error { return nil } -// Each host from where meshmodels can be generated needs to implement this interface +// Each host from where models can be generated needs to implement this interface // HandleDependents, contains host specific logic for provisioning required CRDs/operators for corresponding components. type IHost interface { HandleDependents(comp v1alpha1.Component, kc *kubernetes.Client, isDeploy bool) (string, error) diff --git a/models/meshmodel/registry/registry.go b/models/model/registry/registry.go similarity index 95% rename from models/meshmodel/registry/registry.go rename to models/model/registry/registry.go index 911a5aa1..55aee064 100644 --- a/models/meshmodel/registry/registry.go +++ b/models/model/registry/registry.go @@ -8,22 +8,22 @@ import ( "github.com/google/uuid" "github.com/layer5io/meshkit/database" - "github.com/layer5io/meshkit/models/meshmodel/core/types" - "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" + "github.com/layer5io/meshkit/models/model/core/types" + "github.com/layer5io/meshkit/models/model/core/v1alpha1" "golang.org/x/text/cases" "golang.org/x/text/language" "gorm.io/gorm" "gorm.io/gorm/clause" ) -// MeshModelRegistrantData struct defines the body of the POST request that is sent to the capability +// ModelRegistrantData struct defines the body of the POST request that is sent to the capability // registry (Meshery) // // The body contains the // 1. Host information // 2. Entity type // 3. Entity -type MeshModelRegistrantData struct { +type ModelRegistrantData struct { Host Host `json:"host"` EntityType types.CapabilityType `json:"entityType"` Entity []byte `json:"entity"` //This will be type converted to appropriate entity on server based on passed entity type @@ -223,7 +223,7 @@ func (rm *RegistryManager) UpdateEntityStatus(ID string, status string, entity s } } -func (rm *RegistryManager) GetRegistrants(f *v1alpha1.HostFilter) ([]v1alpha1.MeshModelHostsWithEntitySummary, int64, error) { +func (rm *RegistryManager) GetRegistrants(f *v1alpha1.HostFilter) ([]v1alpha1.ModelHostsWithEntitySummary, int64, error) { var result []v1alpha1.MesheryHostSummaryDB var totalcount int64 db := rm.db @@ -263,10 +263,10 @@ func (rm *RegistryManager) GetRegistrants(f *v1alpha1.HostFilter) ([]v1alpha1.Me return nil, 0, err } - var response []v1alpha1.MeshModelHostsWithEntitySummary + var response []v1alpha1.ModelHostsWithEntitySummary for _, r := range result { - res := v1alpha1.MeshModelHostsWithEntitySummary{ + res := v1alpha1.ModelHostsWithEntitySummary{ ID: r.HostID, Hostname: HostnameToPascalCase(r.Hostname), Port: r.Port, @@ -285,21 +285,21 @@ func (rm *RegistryManager) GetEntities(f types.Filter) ([]Entity, *int64, *int) switch filter := f.(type) { case *v1alpha1.ComponentFilter: en := make([]Entity, 0) - comps, count, unique := v1alpha1.GetMeshModelComponents(rm.db, *filter) + comps, count, unique := v1alpha1.GetModelComponents(rm.db, *filter) for _, comp := range comps { en = append(en, comp) } return en, &count, &unique case *v1alpha1.RelationshipFilter: en := make([]Entity, 0) - relationships, count := v1alpha1.GetMeshModelRelationship(rm.db, *filter) + relationships, count := v1alpha1.GetModelRelationship(rm.db, *filter) for _, rel := range relationships { en = append(en, rel) } return en, &count, nil case *v1alpha1.PolicyFilter: en := make([]Entity, 0) - policies := v1alpha1.GetMeshModelPolicy(rm.db, *filter) + policies := v1alpha1.GetModelPolicy(rm.db, *filter) for _, pol := range policies { en = append(en, pol) } diff --git a/models/oam/core/v1alpha1/application_component.go b/models/oam/core/v1alpha1/application_component.go index 505e9d37..e63c4f41 100644 --- a/models/oam/core/v1alpha1/application_component.go +++ b/models/oam/core/v1alpha1/application_component.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" + "github.com/layer5io/meshkit/models/model/core/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -35,7 +35,7 @@ type ComponentParameter struct { Description *string `json:"description,omitempty"` } -const MesheryAnnotationPrefix = "design.meshmodel.io" +const MesheryAnnotationPrefix = "design.model.io" func GetAPIVersionFromComponent(comp Component) string { return comp.Annotations[MesheryAnnotationPrefix+".k8s.APIVersion"] diff --git a/utils/component/generator.go b/utils/component/generator.go index 1a14dbd3..471ec6b7 100644 --- a/utils/component/generator.go +++ b/utils/component/generator.go @@ -6,7 +6,7 @@ import ( "fmt" "cuelang.org/go/cue" - "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" + "github.com/layer5io/meshkit/models/model/core/v1alpha1" "github.com/layer5io/meshkit/utils" "github.com/layer5io/meshkit/utils/manifests" ) diff --git a/utils/component/generator_test.go b/utils/component/generator_test.go index a8de77a9..f65fc936 100644 --- a/utils/component/generator_test.go +++ b/utils/component/generator_test.go @@ -3,7 +3,7 @@ package component import ( "testing" - "github.com/layer5io/meshkit/models/meshmodel/core/v1alpha1" + "github.com/layer5io/meshkit/models/model/core/v1alpha1" "github.com/layer5io/meshkit/utils/manifests" )