Merge pull request #22 from beclab/fix/nats-export

fix: change nats export to array
beclab · Aug 2, 2024 · cfd4f3e · cfd4f3e
2 parents 06348c5 + 3e648a2
commit cfd4f3e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/config/crds/apr.bytetrade.io_middlewarerequests.yaml b/config/crds/apr.bytetrade.io_middlewarerequests.yaml
@@ -173,18 +173,20 @@ spec:
                     items:
                       properties:
                         export:
-                          properties:
-                            appName:
-                              type: string
-                            pub:
-                              description: default is deny
-                              type: string
-                            sub:
-                              type: string
-                          required:
-                          - pub
-                          - sub
-                          type: object
+                          items:
+                            properties:
+                              appName:
+                                type: string
+                              pub:
+                                description: default is deny
+                                type: string
+                              sub:
+                                type: string
+                            required:
+                            - pub
+                            - sub
+                            type: object
+                          type: array
                         name:
                           type: string
                         permission:

diff --git a/pkg/apis/apr/v1alpha1/types.go b/pkg/apis/apr/v1alpha1/types.go
@@ -161,8 +161,8 @@ type Subject struct {
 	//// default allow for appName equals spec.App, others is deny
 	//Sub string `json:"sub"`
 	// Permissions indicates the permission that app can perform on this subject
-	Permission Permission  `json:"permission"`
-	Export     *Permission `json:"export,omitempty"`
+	Permission Permission   `json:"permission"`
+	Export     []Permission `json:"export,omitempty"`
 }
 
 type Permission struct {

diff --git a/pkg/apis/apr/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/apr/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/workload/nats/helper.go b/pkg/workload/nats/helper.go
@@ -123,22 +123,24 @@ func getAllowPubSubSubjectFromMR(request *aprv1.MiddlewareRequest, namespace str
 		pub         string
 		sub         string
 	}
+
 	appExportMap := make(map[string][]export)
 	for _, mr := range mrs.Items {
 		if mr.Spec.Middleware != aprv1.TypeNats {
 			continue
 		}
 		for _, s := range mr.Spec.Nats.Subjects {
-			if s.Export != nil && s.Export.AppName != "" {
-				appExportMap[s.Export.AppName] = append(appExportMap[s.Export.AppName],
+			for _, e := range s.Export {
+				appExportMap[e.AppName] = append(appExportMap[e.AppName],
 					export{
 						subjectName: MakeRealSubjectName(s.Name, mr.Spec.AppNamespace),
-						appName:     s.Export.AppName,
-						pub:         s.Export.Pub,
-						sub:         s.Export.Sub,
+						appName:     e.AppName,
+						pub:         e.Pub,
+						sub:         e.Sub,
 					},
 				)
 			}
+
 		}
 	}
 	klog.Infof("appExportMap: %#v", appExportMap)