Add INET column type. Closes #22

turbot · Feb 22, 2021 · 9cbf9de · 9cbf9de
1 parent 31164f2
commit 9cbf9de
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 24 deletions.
diff --git a/grpc/proto/plugin.pb.go b/grpc/proto/plugin.pb.go
diff --git a/grpc/proto/plugin.proto b/grpc/proto/plugin.proto
@@ -156,5 +156,6 @@ enum ColumnType {
   IPADDR = 6;
   CIDR = 7;
   TIMESTAMP = 8;
+  INET = 9;
   UNKNOWN = -1;
 }
diff --git a/plugin/table_column.go b/plugin/table_column.go
@@ -160,7 +160,7 @@ func (t *Table) interfaceToColumnValue(column *Column, val interface{}) (*proto.
 		break
 	case proto.ColumnType_IPADDR:
 		ipString := types.SafeString(val)
-		// tread an empty string as a null ip address
+		// treat an empty string as a null ip address
 		if ipString == "" {
 			columnValue = &proto.Column{Value: &proto.Column_NullValue{}}
 		} else {
@@ -172,16 +172,30 @@ func (t *Table) interfaceToColumnValue(column *Column, val interface{}) (*proto.
 		break
 	case proto.ColumnType_CIDR:
 		cidrRangeString := types.SafeString(val)
-		// tread an empty string as a null ip address
+		// treat an empty string as a null ip address
 		if cidrRangeString == "" {
 			columnValue = &proto.Column{Value: &proto.Column_NullValue{}}
 		} else {
 			if _, _, err := net.ParseCIDR(cidrRangeString); err != nil {
-				return nil, fmt.Errorf("interfaceToColumnValue failed for column '%s': %v", column.Name, err)
+				return nil, fmt.Errorf("%s: invalid ip address %s", column.Name, cidrRangeString)
 			}
 			columnValue = &proto.Column{Value: &proto.Column_CidrRangeValue{CidrRangeValue: cidrRangeString}}
 		}
 		break
+	case proto.ColumnType_INET:
+		inetString := types.SafeString(val)
+		// treat an empty string as a null ip address
+		if inetString == "" {
+			columnValue = &proto.Column{Value: &proto.Column_NullValue{}}
+		} else {
+			if ip := net.ParseIP(inetString); ip == nil {
+				if _, _, err := net.ParseCIDR(inetString); err != nil {
+					return nil, fmt.Errorf("%s: invalid ip address %s", column.Name, inetString)
+				}
+			}
+			columnValue = &proto.Column{Value: &proto.Column_CidrRangeValue{CidrRangeValue: inetString}}
+		}
+		break
 	default:
 		return nil, fmt.Errorf("unrecognised columnValue type '%s'", column.Type)
 	}

diff --git a/plugin/table_quals.go b/plugin/table_quals.go
@@ -89,7 +89,7 @@ func ColumnQualValue(qv *proto.QualValue, column *Column) interface{} {
 		return qv.GetTimestampValue()
 	case proto.ColumnType_JSON:
 		return qv.GetJsonbValue()
-	case proto.ColumnType_IPADDR, proto.ColumnType_CIDR:
+	case proto.ColumnType_IPADDR, proto.ColumnType_CIDR, proto.ColumnType_INET:
 		return qv.GetInetValue()
 	default:
 		return nil

diff --git a/plugin/table_validate.go b/plugin/table_validate.go
@@ -66,6 +66,8 @@ func columnTypeToString(columnType proto.ColumnType) string {
 		return "ColumnType_IPADDR"
 	case proto.ColumnType_CIDR:
 		return "ColumnType_CIDR"
+	case proto.ColumnType_INET:
+		return "ColumnType_INET"
 	case proto.ColumnType_TIMESTAMP:
 		return "ColumnType_TIMESTAMP"
 	default: