Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: bump default version to 1.0.0 #1791

Merged
merged 7 commits into from Sep 24, 2020
Merged

fix: bump default version to 1.0.0 #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
921cf9c
Bump default version to 1.0.0
stanislavkozlovski Aug 26, 2020
91e853d
Use MetadataResponse V5 in tests
stanislavkozlovski Aug 27, 2020
d3a58e4
Revert "Use MetadataResponse V5 in tests"
stanislavkozlovski Aug 27, 2020
df30c62
Set Kafka version to 0.8 in tests
stanislavkozlovski Aug 27, 2020
583203d
Fix compilation issues in functional tests
stanislavkozlovski Sep 1, 2020
c61d5b6
gofmt
stanislavkozlovski Sep 1, 2020
5ab6809
gofmt
stanislavkozlovski Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 36 additions & 36 deletions admin_test.go
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ func TestClusterAdmin(t *testing.T) {
SetBroker(seedBroker.Addr(), seedBroker.BrokerID()),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand All @@ -38,7 +38,7 @@ func TestClusterAdminInvalidController(t *testing.T) {
SetBroker(seedBroker.Addr(), seedBroker.BrokerID()),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
_, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err == nil {
Expand All @@ -61,7 +61,7 @@ func TestClusterAdminCreateTopic(t *testing.T) {
"CreateTopicsRequest": NewMockCreateTopicsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_10_2_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -89,7 +89,7 @@ func TestClusterAdminCreateTopicWithInvalidTopicDetail(t *testing.T) {
"CreateTopicsRequest": NewMockCreateTopicsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_10_2_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -117,7 +117,7 @@ func TestClusterAdminCreateTopicWithoutAuthorization(t *testing.T) {
"CreateTopicsRequest": NewMockCreateTopicsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_11_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -148,7 +148,7 @@ func TestClusterAdminListTopics(t *testing.T) {
"DescribeConfigsRequest": NewMockDescribeConfigsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_1_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -198,7 +198,7 @@ func TestClusterAdminDeleteTopic(t *testing.T) {
"DeleteTopicsRequest": NewMockDeleteTopicsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_10_2_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestClusterAdminDeleteEmptyTopic(t *testing.T) {
"DeleteTopicsRequest": NewMockDeleteTopicsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_10_2_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -256,7 +256,7 @@ func TestClusterAdminCreatePartitions(t *testing.T) {
"CreatePartitionsRequest": NewMockCreatePartitionsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -285,7 +285,7 @@ func TestClusterAdminCreatePartitionsWithDiffVersion(t *testing.T) {
"CreatePartitionsRequest": NewMockCreatePartitionsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_10_2_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -314,7 +314,7 @@ func TestClusterAdminCreatePartitionsWithoutAuthorization(t *testing.T) {
"CreatePartitionsRequest": NewMockCreatePartitionsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -350,7 +350,7 @@ func TestClusterAdminAlterPartitionReassignments(t *testing.T) {
"AlterPartitionReassignmentsRequest": NewMockAlterPartitionReassignmentsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V2_4_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -388,7 +388,7 @@ func TestClusterAdminAlterPartitionReassignmentsWithDiffVersion(t *testing.T) {
"AlterPartitionReassignmentsRequest": NewMockAlterPartitionReassignmentsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V2_3_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -427,7 +427,7 @@ func TestClusterAdminListPartitionReassignments(t *testing.T) {
"ListPartitionReassignmentsRequest": NewMockListPartitionReassignmentsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V2_4_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -472,7 +472,7 @@ func TestClusterAdminListPartitionReassignmentsWithDiffVersion(t *testing.T) {
"ListPartitionReassignmentsRequest": NewMockListPartitionReassignmentsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V2_3_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -508,7 +508,7 @@ func TestClusterAdminDeleteRecords(t *testing.T) {
"DeleteRecordsRequest": NewMockDeleteRecordsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -567,7 +567,7 @@ func TestClusterAdminDeleteRecordsWithInCorrectBroker(t *testing.T) {
"DeleteRecordsRequest": NewMockDeleteRecordsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -604,7 +604,7 @@ func TestClusterAdminDeleteRecordsWithDiffVersion(t *testing.T) {
"DeleteRecordsRequest": NewMockDeleteRecordsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_10_2_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -660,7 +660,7 @@ func TestClusterAdminDescribeConfig(t *testing.T) {
{V2_0_0_0, 2, true},
}
for _, tt := range tests {
config := NewConfig()
config := NewTestConfig()
config.Version = tt.saramaVersion
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -715,7 +715,7 @@ func TestClusterAdminDescribeConfigWithErrorCode(t *testing.T) {
"DescribeConfigsRequest": NewMockDescribeConfigsResponseWithErrorCode(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_1_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -760,7 +760,7 @@ func TestClusterAdminDescribeBrokerConfig(t *testing.T) {
"DescribeConfigsRequest": NewMockDescribeConfigsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin(
[]string{
Expand Down Expand Up @@ -800,7 +800,7 @@ func TestClusterAdminAlterConfig(t *testing.T) {
"AlterConfigsRequest": NewMockAlterConfigsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -833,7 +833,7 @@ func TestClusterAdminAlterConfigWithErrorCode(t *testing.T) {
"AlterConfigsRequest": NewMockAlterConfigsResponseWithErrorCode(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -873,7 +873,7 @@ func TestClusterAdminAlterBrokerConfig(t *testing.T) {
"AlterConfigsRequest": NewMockAlterConfigsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin(
[]string{
Expand Down Expand Up @@ -918,7 +918,7 @@ func TestClusterAdminCreateAcl(t *testing.T) {
"CreateAclsRequest": NewMockCreateAclsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -951,7 +951,7 @@ func TestClusterAdminListAcls(t *testing.T) {
"CreateAclsRequest": NewMockCreateAclsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -997,7 +997,7 @@ func TestClusterAdminDeleteAcl(t *testing.T) {
"DeleteAclsRequest": NewMockDeleteAclsResponse(t),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0
admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
if err != nil {
Expand Down Expand Up @@ -1033,7 +1033,7 @@ func TestDescribeTopic(t *testing.T) {
SetBroker(seedBroker.Addr(), seedBroker.BrokerID()),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1071,7 +1071,7 @@ func TestDescribeTopicWithVersion0_11(t *testing.T) {
SetBroker(seedBroker.Addr(), seedBroker.BrokerID()),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V0_11_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1114,7 +1114,7 @@ func TestDescribeConsumerGroup(t *testing.T) {
"FindCoordinatorRequest": NewMockFindCoordinatorResponse(t).SetCoordinator(CoordinatorGroup, expectedGroupID, seedBroker),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1153,7 +1153,7 @@ func TestListConsumerGroups(t *testing.T) {
AddGroup("my-group", "consumer"),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1215,7 +1215,7 @@ func TestListConsumerGroupsMultiBroker(t *testing.T) {
AddGroup(secondGroup, "consumer"),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1267,7 +1267,7 @@ func TestListConsumerGroupOffsets(t *testing.T) {
"FindCoordinatorRequest": NewMockFindCoordinatorResponse(t).SetCoordinator(CoordinatorGroup, group, seedBroker),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1312,7 +1312,7 @@ func TestDeleteConsumerGroup(t *testing.T) {
"FindCoordinatorRequest": NewMockFindCoordinatorResponse(t).SetCoordinator(CoordinatorGroup, group, seedBroker),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_1_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down Expand Up @@ -1341,7 +1341,7 @@ func TestRefreshMetaDataWithDifferentController(t *testing.T) {
SetBroker(seedBroker2.Addr(), seedBroker2.BrokerID()),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_1_0_0

client, err := NewClient([]string{seedBroker1.Addr()}, config)
Expand Down Expand Up @@ -1386,7 +1386,7 @@ func TestDescribeLogDirs(t *testing.T) {
SetLogDirs("/tmp/logs", map[string]int{"topic1": 2, "topic2": 2}),
})

config := NewConfig()
config := NewTestConfig()
config.Version = V1_0_0_0

admin, err := NewClusterAdmin([]string{seedBroker.Addr()}, config)
Expand Down