Remove CatalogSpec.SiteId (#236)

eclipse-symphony · May 8, 2024 · ed20922 · ed20922
1 parent 17392d8
commit ed20922
Show file tree

Hide file tree

Showing 40 changed files with 74 additions and 189 deletions.
diff --git a/agent/src/models.rs b/agent/src/models.rs
@@ -42,8 +42,6 @@ pub struct StagedProperties {
 }
 #[derive(Serialize, Deserialize)]
 pub struct CatalogSpec {
-    #[serde(rename = "siteId")]
-    site_id: String,
     #[serde(rename = "type")]
     pub catalog_type: String,
     pub properties: StagedProperties,

diff --git a/api/pkg/apis/v1alpha1/managers/catalogs/catalogs-manager_test.go b/api/pkg/apis/v1alpha1/managers/catalogs/catalogs-manager_test.go
@@ -32,8 +32,7 @@ var catalogState = model.CatalogState{
 		Name: "name1",
 	},
 	Spec: &model.CatalogSpec{
-		SiteId: "site1",
-		Type:   "catalog",
+		Type: "catalog",
 		Properties: map[string]interface{}{
 			"property1": "value1",
 			"property2": "value2",

diff --git a/api/pkg/apis/v1alpha1/managers/staging/staging-manager_test.go b/api/pkg/apis/v1alpha1/managers/staging/staging-manager_test.go
@@ -155,7 +155,6 @@ func InitializeMockSymphonyAPI() *httptest.Server {
 					Name: "catalog1",
 				},
 				Spec: &model.CatalogSpec{
-					SiteId:     "fake",
 					Generation: "1",
 					ParentName: "fakeparent",
 				},

diff --git a/api/pkg/apis/v1alpha1/managers/sync/sync-manager_test.go b/api/pkg/apis/v1alpha1/managers/sync/sync-manager_test.go
@@ -115,8 +115,7 @@ func InitiazlizeMockSymphonyAPI(siteId string) *httptest.Server {
 							Name: "catalog1",
 						},
 						Spec: &model.CatalogSpec{
-							SiteId: "parent",
-							Type:   "Instance",
+							Type: "Instance",
 							Properties: map[string]interface{}{
 								"foo": "bar",
 							},

diff --git a/api/pkg/apis/v1alpha1/model/catalog.go b/api/pkg/apis/v1alpha1/model/catalog.go
@@ -31,7 +31,6 @@ type ObjectRef struct {
 	Metadata   map[string]string `json:"metadata,omitempty"`
 }
 type CatalogSpec struct {
-	SiteId     string                 `json:"siteId"`
 	Type       string                 `json:"type"`
 	Metadata   map[string]string      `json:"metadata,omitempty"`
 	Properties map[string]interface{} `json:"properties"`
@@ -50,10 +49,6 @@ func (c CatalogSpec) DeepEquals(other IDeepEquals) (bool, error) {
 		return false, errors.New("parameter is not a CatalogSpec type")
 	}
 
-	if c.SiteId != otherC.SiteId {
-		return false, nil
-	}
-
 	if c.ParentName != otherC.ParentName {
 		return false, nil
 	}

diff --git a/api/pkg/apis/v1alpha1/model/catalog_test.go b/api/pkg/apis/v1alpha1/model/catalog_test.go
@@ -30,15 +30,13 @@ func TestIntefaceConvertion(t *testing.T) {
 }
 func TestCatalogMatch(t *testing.T) {
 	catalog1 := CatalogSpec{
-		SiteId:     "siteId",
 		ParentName: "parentName",
 		Generation: "1",
 		Properties: map[string]interface{}{
 			"key": "value",
 		},
 	}
 	catalog2 := CatalogSpec{
-		SiteId:     "siteId",
 		ParentName: "parentName",
 		Generation: "1",
 		Properties: map[string]interface{}{
@@ -63,25 +61,13 @@ func TestCatalogMatchOneEmpty(t *testing.T) {
 }
 
 func TestCatalogNotMatch(t *testing.T) {
-	catalog1 := CatalogSpec{
-		SiteId: "siteId",
-	}
-	catalog2 := CatalogSpec{
-		SiteId: "siteId2",
-	}
-
-	// siteId not match
-	catalog1.SiteId = "siteId"
-	catalog2.SiteId = "siteId2"
-	equal, err := catalog1.DeepEquals(catalog2)
-	assert.Nil(t, err)
-	assert.False(t, equal)
+	catalog1 := CatalogSpec{}
+	catalog2 := CatalogSpec{}
 
 	// parentName not match
-	catalog2.SiteId = "siteId"
 	catalog1.ParentName = "parentName"
 	catalog2.ParentName = "parentName2"
-	equal, err = catalog1.DeepEquals(catalog2)
+	equal, err := catalog1.DeepEquals(catalog2)
 	assert.Nil(t, err)
 	assert.False(t, equal)
 

diff --git a/api/pkg/apis/v1alpha1/providers/target/staging/staging.go b/api/pkg/apis/v1alpha1/providers/target/staging/staging.go
@@ -178,7 +178,6 @@ func (i *StagingTargetProvider) Apply(ctx context.Context, deployment model.Depl
 	if catalog.Spec == nil {
 		catalog.ObjectMeta.Name = deployment.Instance.ObjectMeta.Name + "-" + i.Config.TargetName
 		catalog.Spec = &model.CatalogSpec{
-			SiteId: i.Context.SiteInfo.SiteId,
 			Type:   "staged",
 		}
 	}

diff --git a/api/pkg/apis/v1alpha1/vendors/catalogs-vendor_test.go b/api/pkg/apis/v1alpha1/vendors/catalogs-vendor_test.go
@@ -28,8 +28,7 @@ var catalogState = model.CatalogState{
 		Name: "name1",
 	},
 	Spec: &model.CatalogSpec{
-		SiteId: "site1",
-		Type:   "catalog",
+		Type: "catalog",
 		Properties: map[string]interface{}{
 			"property1": "value1",
 			"property2": "value2",
@@ -174,8 +173,7 @@ func TestCatalogOnCheck(t *testing.T) {
 
 	var catalogState = model.CatalogState{
 		Spec: &model.CatalogSpec{
-			SiteId: "site1",
-			Type:   "catalog",
+			Type: "catalog",
 			Properties: map[string]interface{}{
 				"property1": "value1",
 				"property2": "value2",

diff --git a/api/pkg/apis/v1alpha1/vendors/federation-vendor_test.go b/api/pkg/apis/v1alpha1/vendors/federation-vendor_test.go
@@ -374,8 +374,7 @@ func TestFederationOnSyncGet(t *testing.T) {
 			Name: "catalog1",
 		},
 		Spec: &model.CatalogSpec{
-			SiteId: vendor.Config.SiteInfo.SiteId,
-			Type:   "catalog",
+			Type: "catalog",
 			Properties: map[string]interface{}{
 				"property1": "value1",
 				"property2": "value2",
@@ -470,8 +469,7 @@ func TestFederationOnK8SHook(t *testing.T) {
 			Name: "catalog1",
 		},
 		Spec: &model.CatalogSpec{
-			SiteId: vendor.Config.SiteInfo.SiteId,
-			Type:   "catalog",
+			Type: "catalog",
 			Properties: map[string]interface{}{
 				"property1": "value1",
 				"property2": "value2",

diff --git a/api/pkg/apis/v1alpha1/vendors/visualization-vendor.go b/api/pkg/apis/v1alpha1/vendors/visualization-vendor.go
@@ -199,8 +199,7 @@ func mergeCatalogs(existingCatalog, newCatalog model.CatalogState) (model.Catalo
 func convertVisualizationPacketToCatalog(site string, packet model.Packet) (model.CatalogState, error) {
 	catalog := model.CatalogState{
 		Spec: &model.CatalogSpec{
-			SiteId: site,
-			Type:   "topology",
+			Type: "topology",
 			Properties: map[string]interface{}{
 				packet.From: map[string]model.Packet{
 					packet.To: packet,

diff --git a/api/pkg/apis/v1alpha1/vendors/visualization-vendor_test.go b/api/pkg/apis/v1alpha1/vendors/visualization-vendor_test.go
@@ -112,7 +112,6 @@ func TestConvertVisualizationPacketToCatalog(t *testing.T) {
 		DataType: "bytes",
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, "fake-site", catalog.Spec.SiteId)
 	assert.Equal(t, "topology", catalog.Spec.Type)
 
 	v, ok := catalog.Spec.Properties["from-1"].(map[string]model.Packet)
@@ -131,7 +130,6 @@ func TestConvertVisualizationPacketToCatalogNoData(t *testing.T) {
 		To:       "to-1",
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, "fake-site", catalog.Spec.SiteId)
 	assert.Equal(t, "topology", catalog.Spec.Type)
 
 	v, ok := catalog.Spec.Properties["from-1"].(map[string]model.Packet)
@@ -150,7 +148,6 @@ func TestMergeCatalogsSameKey(t *testing.T) {
 		DataType: "bytes",
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, "fake-site", catalog1.Spec.SiteId)
 	assert.Equal(t, "topology", catalog1.Spec.Type)
 	catalog2, err := convertVisualizationPacketToCatalog("fake-site", model.Packet{
 		Solution: "solution-1",
@@ -162,7 +159,6 @@ func TestMergeCatalogsSameKey(t *testing.T) {
 		DataType: "bytes",
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, "fake-site", catalog2.Spec.SiteId)
 	assert.Equal(t, "topology", catalog2.Spec.Type)
 
 	mergedCatalog, err := mergeCatalogs(catalog1, catalog2)
@@ -190,7 +186,6 @@ func TestMergeCatalogsDifferentKey(t *testing.T) {
 		DataType: "bytes",
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, "fake-site", catalog1.Spec.SiteId)
 	assert.Equal(t, "topology", catalog1.Spec.Type)
 	catalog2, err := convertVisualizationPacketToCatalog("fake-site", model.Packet{
 		Solution: "solution-1",
@@ -202,7 +197,6 @@ func TestMergeCatalogsDifferentKey(t *testing.T) {
 		DataType: "bytes",
 	})
 	assert.Nil(t, err)
-	assert.Equal(t, "fake-site", catalog2.Spec.SiteId)
 	assert.Equal(t, "topology", catalog2.Spec.Type)
 
 	mergedCatalog, err := mergeCatalogs(catalog1, catalog2)

diff --git a/docs/samples/approval/logicapp/instance-catalog.yaml b/docs/samples/approval/logicapp/instance-catalog.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: gated-prometheus-instance
-spec:  
-  siteId: hq
+spec:
   type: instance
   properties:
     spec: 

diff --git a/docs/samples/approval/script/instance-catalog.yaml b/docs/samples/approval/script/instance-catalog.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: gated-prometheus-instance
-spec:  
-  siteId: hq
+spec:
   type: instance
   properties:
     spec: 

diff --git a/docs/samples/multisite/catalog-catalog.yaml b/docs/samples/multisite/catalog-catalog.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: site-catalog
-spec:  
-  siteId: hq
+spec:
   type: catalog
   properties:
     metadata: 

diff --git a/docs/samples/multisite/instance-catalog.yaml b/docs/samples/multisite/instance-catalog.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: site-instance
-spec:  
-  siteId: hq
+spec:
   type: instance
   properties:
     spec: 

diff --git a/docs/samples/multisite/solution-catalog.yaml b/docs/samples/multisite/solution-catalog.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: site-app
-spec:  
-  siteId: hq
+spec:
   type: solution
   properties:
     spec:   

diff --git a/docs/samples/multisite/target-catalog.yaml b/docs/samples/multisite/target-catalog.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: site-k8s-target
-spec:  
-  siteId: hq
+spec: 
   type: target
   properties:
     spec:

diff --git a/docs/samples/opera/app/types.d.ts b/docs/samples/opera/app/types.d.ts
@@ -46,7 +46,7 @@ export interface CampaignSpec {
 }
 
 export interface ObjectRef {
-	siteId: string;
+    siteId: string;
     name: string;
     group: string;
     version: string;
@@ -58,7 +58,6 @@ export interface ObjectRef {
 }
 
 export interface CatalogSpec {
-    siteId: string;
     name: string;
     type: string;
     properties: Record<string, any>;

diff --git a/docs/samples/opera/components/editors/CatalogEditor.tsx b/docs/samples/opera/components/editors/CatalogEditor.tsx
@@ -42,7 +42,6 @@ function CatalogEditor(props: CatalogEditorProps) {
         const formData = new FormData(event.currentTarget);
         const data = Object.fromEntries(formData.entries());
         const catalog = {
-            siteId : process.env.SYMPHONY_SITE,
             name: data.name,
             type: "config"
         };

diff --git a/docs/samples/universe-data/chemical-factory-2/catalogs/assets.yaml b/docs/samples/universe-data/chemical-factory-2/catalogs/assets.yaml
@@ -2,8 +2,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: hq
-spec:  
-  siteId: hq
+spec:
   type: asset
   properties:
     name: HQ
@@ -21,8 +20,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: infrastructure
-spec:  
-  siteId: hq
+spec:
   type: asset
   properties:
     name: "Infrastructure"    
@@ -32,8 +30,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: l3
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "Level 3"    
@@ -43,8 +40,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: l4
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "Level 4"    
@@ -54,8 +50,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: use-cases
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "Use Cases"    
@@ -65,8 +60,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: csad
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "CSAD"    
@@ -76,8 +70,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: site
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "Site"    
@@ -87,8 +80,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: line-a
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "Line A"    
@@ -98,8 +90,7 @@ apiVersion: federation.symphony/v1
 kind: Catalog
 metadata:
   name: line-b
-spec:  
-  siteId: hq
+spec: 
   type: asset
   properties:
     name: "Line B"