Skip to content

Commit dd5e295

Browse files
author
Brian Strauch
authored
bump sdk to fix kafka link update (#1197)
1 parent ceb2412 commit dd5e295

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/confluentinc/go-netrc v0.0.0-20211121160620-ec37f663ea18
2424
github.com/confluentinc/go-printer v0.16.0
2525
github.com/confluentinc/go-ps1 v1.0.2
26-
github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.1.2-0.20220216032718-75a89b3fd89b
26+
github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.1.2-0.20220218025201-8726fa846a9f
2727
github.com/confluentinc/mds-sdk-go/mdsv1 v0.0.40
2828
github.com/confluentinc/mds-sdk-go/mdsv2alpha1 v0.0.40
2929
github.com/confluentinc/properties v0.0.0-20190814194548-42c10394a787

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,8 +658,8 @@ github.com/confluentinc/go-printer v0.16.0 h1:V6QyEiN39zzcHY7zzMP5ClJYxBLbZshP1A
658658
github.com/confluentinc/go-printer v0.16.0/go.mod h1:o2sfQSpLyisht0oQqXN6WT/MgmLqUbtH+hOHBwaXe/c=
659659
github.com/confluentinc/go-ps1 v1.0.2 h1:+4cKOzWs3AWmxL2s96oHu0QutZESDRXECnhFzm2ic4o=
660660
github.com/confluentinc/go-ps1 v1.0.2/go.mod h1:qmgG9xQgFd4u7/CS6eA9nNP8eQqOtXuRHmZ4+w7Vprs=
661-
github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.1.2-0.20220216032718-75a89b3fd89b h1:izNjengnSpr5qX6Cg7m5KH6iqJmIAhGIFrwgDjsuqtw=
662-
github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.1.2-0.20220216032718-75a89b3fd89b/go.mod h1:qJAUraWU9BERQWyalrPsxt+ECELWPV+qsyOaP00VidY=
661+
github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.1.2-0.20220218025201-8726fa846a9f h1:sRmGPwuRhcZyAQJbnqghybJlgJbRM4OB2XvOVRCmOEk=
662+
github.com/confluentinc/kafka-rest-sdk-go/kafkarestv3 v0.1.2-0.20220218025201-8726fa846a9f/go.mod h1:qJAUraWU9BERQWyalrPsxt+ECELWPV+qsyOaP00VidY=
663663
github.com/confluentinc/mds-sdk-go/mdsv1 v0.0.40 h1:sitY5c+efIA1sQspTrlWM0YSEMDIibQJVZHnoXJjsCo=
664664
github.com/confluentinc/mds-sdk-go/mdsv1 v0.0.40/go.mod h1:8uhp3pNJttGbFtDGWlSBgf57OxGOPh8BvVOonoGhV1o=
665665
github.com/confluentinc/mds-sdk-go/mdsv2alpha1 v0.0.4/go.mod h1:WimNyaI+msAxUXsM2oRMarBdkod/cnsQeWSbtXi0kGg=

‎internal/cmd/kafka/command_mirror.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ type listMirrorWrite struct {
2929
MirrorTopicName string
3030
SourceTopicName string
3131
MirrorStatus string
32-
StatusTimeMs int32
32+
StatusTimeMs int64
3333
NumPartition int32
34-
MaxPerPartitionMirrorLag int32
34+
MaxPerPartitionMirrorLag int64
3535
}
3636

3737
type describeMirrorWrite struct {
3838
LinkName string
3939
MirrorTopicName string
4040
SourceTopicName string
4141
MirrorStatus string
42-
StatusTimeMs int32
42+
StatusTimeMs int64
4343
Partition int32
44-
PartitionMirrorLag int32
44+
PartitionMirrorLag int64
4545
LastSourceFetchOffset int64
4646
}
4747

‎internal/cmd/kafka/command_mirror_describe.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (c *mirrorCommand) describe(cmd *cobra.Command, args []string) error {
7070
LinkName: mirror.LinkName,
7171
MirrorTopicName: mirror.MirrorTopicName,
7272
SourceTopicName: mirror.SourceTopicName,
73-
MirrorStatus: string(mirror.MirrorTopicStatus),
73+
MirrorStatus: string(mirror.MirrorStatus),
7474
StatusTimeMs: mirror.StateTimeMs,
7575
Partition: partitionLag.Partition,
7676
PartitionMirrorLag: partitionLag.Lag,

‎internal/cmd/kafka/command_mirror_list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (c *mirrorCommand) list(cmd *cobra.Command, _ []string) error {
8686
}
8787

8888
for _, mirror := range listMirrorTopicsResponseDataList.Data {
89-
var maxLag int32 = 0
89+
var maxLag int64 = 0
9090
for _, mirrorLag := range mirror.MirrorLags {
9191
if mirrorLag.Lag > maxLag {
9292
maxLag = mirrorLag.Lag
@@ -97,7 +97,7 @@ func (c *mirrorCommand) list(cmd *cobra.Command, _ []string) error {
9797
LinkName: mirror.LinkName,
9898
MirrorTopicName: mirror.MirrorTopicName,
9999
SourceTopicName: mirror.SourceTopicName,
100-
MirrorStatus: string(mirror.MirrorTopicStatus),
100+
MirrorStatus: string(mirror.MirrorStatus),
101101
StatusTimeMs: mirror.StateTimeMs,
102102
NumPartition: mirror.NumPartitions,
103103
MaxPerPartitionMirrorLag: maxLag,

‎mock/kafka_rest.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -630,17 +630,17 @@ func (m *ClusterLinking) ListKafkaMirrorTopics(_ context.Context, _ string, loca
630630
Lag: 571428,
631631
},
632632
},
633-
MirrorTopicStatus: "active",
634-
StateTimeMs: 44444444,
633+
MirrorStatus: "active",
634+
StateTimeMs: 44444444,
635635
},
636636
{
637-
Kind: "",
638-
Metadata: krsdk.ResourceMetadata{},
639-
LinkName: "link-1",
640-
MirrorTopicName: "mirror-topic-2",
641-
SourceTopicName: "src-topic-2",
642-
MirrorTopicStatus: "active",
643-
StateTimeMs: 55555555,
637+
Kind: "",
638+
Metadata: krsdk.ResourceMetadata{},
639+
LinkName: "link-1",
640+
MirrorTopicName: "mirror-topic-2",
641+
SourceTopicName: "src-topic-2",
642+
MirrorStatus: "active",
643+
StateTimeMs: 55555555,
644644
MirrorLags: []krsdk.MirrorLag{
645645
{
646646
Partition: 0,
@@ -887,8 +887,8 @@ func (m *ClusterLinking) ReadKafkaMirrorTopic(_ context.Context, _ string, linkN
887887
Lag: 571428,
888888
},
889889
},
890-
MirrorTopicStatus: "active",
891-
StateTimeMs: 44444444,
890+
MirrorStatus: "active",
891+
StateTimeMs: 44444444,
892892
}, httpResp, nil
893893
}
894894

@@ -952,17 +952,17 @@ func (m *ClusterLinking) ListKafkaMirrorTopicsUnderLink(_ context.Context, _ str
952952
Lag: 571428,
953953
},
954954
},
955-
MirrorTopicStatus: "active",
956-
StateTimeMs: 44444444,
955+
MirrorStatus: "active",
956+
StateTimeMs: 44444444,
957957
},
958958
{
959-
Kind: "",
960-
Metadata: krsdk.ResourceMetadata{},
961-
LinkName: "link-1",
962-
MirrorTopicName: "mirror-topic-2",
963-
SourceTopicName: "src-topic-2",
964-
MirrorTopicStatus: "active",
965-
StateTimeMs: 55555555,
959+
Kind: "",
960+
Metadata: krsdk.ResourceMetadata{},
961+
LinkName: "link-1",
962+
MirrorTopicName: "mirror-topic-2",
963+
SourceTopicName: "src-topic-2",
964+
MirrorStatus: "active",
965+
StateTimeMs: 55555555,
966966
MirrorLags: []krsdk.MirrorLag{
967967
{
968968
Partition: 0,

‎test/test-server/kafka_rest_handlers.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,8 @@ func (r KafkaRestProxyRouter) HandleKafkaRPAllMirrors(t *testing.T) func(http.Re
663663
LastSourceFetchOffset: 5739304,
664664
},
665665
},
666-
MirrorTopicStatus: "active",
667-
StateTimeMs: 111111111,
666+
MirrorStatus: "active",
667+
StateTimeMs: 111111111,
668668
},
669669
{
670670
Kind: "",
@@ -685,8 +685,8 @@ func (r KafkaRestProxyRouter) HandleKafkaRPAllMirrors(t *testing.T) func(http.Re
685685
LastSourceFetchOffset: 0,
686686
},
687687
},
688-
MirrorTopicStatus: "stopped",
689-
StateTimeMs: 222222222,
688+
MirrorStatus: "stopped",
689+
StateTimeMs: 222222222,
690690
},
691691
}})
692692
require.NoError(t, err)
@@ -770,8 +770,8 @@ func (r KafkaRestProxyRouter) HandleKafkaRPMirrors(t *testing.T) func(http.Respo
770770
LastSourceFetchOffset: 5739304,
771771
},
772772
},
773-
MirrorTopicStatus: "active",
774-
StateTimeMs: 111111111,
773+
MirrorStatus: "active",
774+
StateTimeMs: 111111111,
775775
},
776776
{
777777
Kind: "",
@@ -792,8 +792,8 @@ func (r KafkaRestProxyRouter) HandleKafkaRPMirrors(t *testing.T) func(http.Respo
792792
LastSourceFetchOffset: 0,
793793
},
794794
},
795-
MirrorTopicStatus: "stopped",
796-
StateTimeMs: 222222222,
795+
MirrorStatus: "stopped",
796+
StateTimeMs: 222222222,
797797
},
798798
}})
799799
require.NoError(t, err)
@@ -1018,8 +1018,8 @@ func (r KafkaRestProxyRouter) HandleKafkaRPMirror(t *testing.T) func(http.Respon
10181018
LastSourceFetchOffset: 5739304,
10191019
},
10201020
},
1021-
MirrorTopicStatus: "active",
1022-
StateTimeMs: 111111111,
1021+
MirrorStatus: "active",
1022+
StateTimeMs: 111111111,
10231023
})
10241024
require.NoError(t, err)
10251025
}

0 commit comments

Comments
 (0)