allow * as service in microsegmentation

Signed-off-by: craman <[email protected]>
AthenZ · Jan 6, 2022 · d1502d4 · d1502d4
1 parent 1784c60
commit d1502d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 66 deletions.
diff --git a/ui/src/components/microsegmentation/AddSegmentation.js b/ui/src/components/microsegmentation/AddSegmentation.js
@@ -277,11 +277,9 @@ export default class AddSegmentation extends React.Component {
         }
         let names = NameUtils.splitNames(sourceServiceName);
         for (let i = 0; i < names.length; i++) {
-            if (!names[i].includes('*')) {
-                members.push({
-                    memberName: names[i],
-                });
-            }
+            members.push({
+                memberName: names[i],
+            });
         }
 
         if (this.state.isCategory) {
@@ -544,26 +542,6 @@ export default class AddSegmentation extends React.Component {
                 return 1;
             }
 
-            for (let member of this.state.members) {
-                if (member.memberName.includes('*')) {
-                    this.setState({
-                        errorMessage:
-                            'Service name cannot contain wildcard (*) characters',
-                        saving: 'todo',
-                    });
-                    return 1;
-                }
-            }
-
-            if (this.state.sourceServiceMembers.includes('*')) {
-                this.setState({
-                    errorMessage:
-                        'Service name cannot contain wildcard (*) characters',
-                    saving: 'todo',
-                });
-                return 1;
-            }
-
             if (!this.state.sourcePort || this.state.sourcePort === '') {
                 this.setState({
                     errorMessage: 'Source port is required.',
@@ -611,26 +589,6 @@ export default class AddSegmentation extends React.Component {
                 return 1;
             }
 
-            for (let member of this.state.members) {
-                if (member.memberName.includes('*')) {
-                    this.setState({
-                        errorMessage:
-                            'Service name cannot contain wildcard (*) characters',
-                        saving: 'todo',
-                    });
-                    return 1;
-                }
-            }
-
-            if (this.state.destinationServiceMembers.includes('*')) {
-                this.setState({
-                    errorMessage:
-                        'Service name cannot contain wildcard (*) characters',
-                    saving: 'todo',
-                });
-                return 1;
-            }
-
             if (
                 !this.state.destinationPort ||
                 this.state.destinationPort === ''

diff --git a/ui/src/components/microsegmentation/ServiceList.js b/ui/src/components/microsegmentation/ServiceList.js
@@ -64,9 +64,7 @@ const StyledLink = styled.a`
     cursor: pointer;
 `;
 
-const StyledInvalidLink = styled.a`
-    color: red;
-`;
+const StyledInvalidLink = styled.a``;
 
 const StyledMessageDiv = styled.div`
     min-width: 200px;
@@ -112,24 +110,7 @@ class ServiceList extends React.Component {
                             </StyledLink>
                         )}
 
-                        {item.includes('*') && (
-                            <StyledMenu
-                                placement='right'
-                                trigger={
-                                    <StyledInvalidLink>
-                                        {' '}
-                                        {item}{' '}
-                                    </StyledInvalidLink>
-                                }
-                            >
-                                <StyledMessageDiv>
-                                    <p>
-                                        Service is invalid as it contains
-                                        wildcard characters.
-                                    </p>
-                                </StyledMessageDiv>
-                            </StyledMenu>
-                        )}
+                        {item.includes('*') && <p>{item} </p>}
                     </StyledTd>
                 </StyledTr>
             );