Handle when there are 0 ConfigNames

IBM · Jan 14, 2018 · be19b6a · be19b6a
1 parent 0bbd549
commit be19b6a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/describe_configs_request.go b/describe_configs_request.go
@@ -20,6 +20,11 @@ func (r *DescribeConfigsRequest) encode(pe packetEncoder) error {
 		if err := pe.putString(c.Name); err != nil {
 			return err
 		}
+
+		if len(c.ConfigNames) == 0 {
+			pe.putInt32(-1)
+			continue
+		}
 		if err := pe.putStringArray(c.ConfigNames); err != nil {
 			return err
 		}
@@ -48,11 +53,26 @@ func (r *DescribeConfigsRequest) decode(pd packetDecoder, version int16) (err er
 			return err
 		}
 		r.Resources[i].Name = name
-		s, err := pd.getStringArray()
+
+		confLength, err := pd.getArrayLength()
+
 		if err != nil {
 			return err
 		}
-		r.Resources[i].ConfigNames = s
+
+		if confLength == -1 {
+			continue
+		}
+
+		cfnames := make([]string, confLength)
+		for i := 0; i < confLength; i++ {
+			s, err := pd.getString()
+			if err != nil {
+				return err
+			}
+			cfnames[i] = s
+		}
+		r.Resources[i].ConfigNames = cfnames
 	}
 
 	return nil

diff --git a/describe_configs_request_test.go b/describe_configs_request_test.go
@@ -31,6 +31,13 @@ var (
 		0, 10, // 10 chars
 		's', 'e', 'g', 'm', 'e', 'n', 't', '.', 'm', 's',
 	}
+
+	singleDescribeConfigsRequestAllConfigs = []byte{
+		0, 0, 0, 1, // 1 config
+		2,                   // a topic
+		0, 3, 'f', 'o', 'o', // topic name: foo
+		255, 255, 255, 255, // no configs
+	}
 )
 
 func TestDescribeConfigsRequest(t *testing.T) {
@@ -41,12 +48,13 @@ func TestDescribeConfigsRequest(t *testing.T) {
 	}
 	testRequest(t, "no requests", request, emptyDescribeConfigsRequest)
 
+	configs := []string{"segment.ms"}
 	request = &DescribeConfigsRequest{
 		Resources: []*Resource{
 			&Resource{
 				Type:        TopicResource,
 				Name:        "foo",
-				ConfigNames: []string{"segment.ms"},
+				ConfigNames: configs,
 			},
 		},
 	}
@@ -68,4 +76,15 @@ func TestDescribeConfigsRequest(t *testing.T) {
 		},
 	}
 	testRequest(t, "two configs", request, doubleDescribeConfigsRequest)
+
+	request = &DescribeConfigsRequest{
+		Resources: []*Resource{
+			&Resource{
+				Type: TopicResource,
+				Name: "foo",
+			},
+		},
+	}
+
+	testRequest(t, "one topic, all configs", request, singleDescribeConfigsRequestAllConfigs)
 }