mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-11-04 01:51:04 +01:00 
			
		
		
		
	Remove always nil error
This commit is contained in:
		
							parent
							
								
									5b169010be
								
							
						
					
					
						commit
						c80e364f02
					
				
							
								
								
									
										10
									
								
								acls.go
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								acls.go
									
									
									
									
									
								
							@ -267,10 +267,8 @@ func expandAlias(
 | 
			
		||||
 | 
			
		||||
	// if alias is a namespace
 | 
			
		||||
	nodes := filterMachinesByNamespace(machines, alias)
 | 
			
		||||
	nodes, err := excludeCorrectlyTaggedNodes(aclPolicy, nodes, alias)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return ips, err
 | 
			
		||||
	}
 | 
			
		||||
	nodes = excludeCorrectlyTaggedNodes(aclPolicy, nodes, alias)
 | 
			
		||||
 | 
			
		||||
	for _, n := range nodes {
 | 
			
		||||
		ips = append(ips, n.IPAddresses.ToStringSlice()...)
 | 
			
		||||
	}
 | 
			
		||||
@ -305,7 +303,7 @@ func excludeCorrectlyTaggedNodes(
 | 
			
		||||
	aclPolicy ACLPolicy,
 | 
			
		||||
	nodes []Machine,
 | 
			
		||||
	namespace string,
 | 
			
		||||
) ([]Machine, error) {
 | 
			
		||||
) []Machine {
 | 
			
		||||
	out := []Machine{}
 | 
			
		||||
	tags := []string{}
 | 
			
		||||
	for tag, ns := range aclPolicy.TagOwners {
 | 
			
		||||
@ -330,7 +328,7 @@ func excludeCorrectlyTaggedNodes(
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return out, nil
 | 
			
		||||
	return out
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func expandPorts(portsStr string) (*[]tailcfg.PortRange, error) {
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										13
									
								
								acls_test.go
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								acls_test.go
									
									
									
									
									
								
							@ -1142,7 +1142,6 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) {
 | 
			
		||||
					Namespace:   Namespace{Name: "joe"},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
			wantErr: false,
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			name: "all nodes have invalid tags, don't exclude them",
 | 
			
		||||
@ -1212,25 +1211,15 @@ func Test_excludeCorrectlyTaggedNodes(t *testing.T) {
 | 
			
		||||
					Namespace: Namespace{Name: "joe"},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
			wantErr: false,
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
	for _, test := range tests {
 | 
			
		||||
		t.Run(test.name, func(t *testing.T) {
 | 
			
		||||
			got, err := excludeCorrectlyTaggedNodes(
 | 
			
		||||
			got := excludeCorrectlyTaggedNodes(
 | 
			
		||||
				test.args.aclPolicy,
 | 
			
		||||
				test.args.nodes,
 | 
			
		||||
				test.args.namespace,
 | 
			
		||||
			)
 | 
			
		||||
			if (err != nil) != test.wantErr {
 | 
			
		||||
				t.Errorf(
 | 
			
		||||
					"excludeCorrectlyTaggedNodes() error = %v, wantErr %v",
 | 
			
		||||
					err,
 | 
			
		||||
					test.wantErr,
 | 
			
		||||
				)
 | 
			
		||||
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
			if !reflect.DeepEqual(got, test.want) {
 | 
			
		||||
				t.Errorf("excludeCorrectlyTaggedNodes() = %v, want %v", got, test.want)
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user