Merge branch 'master' into release-2.8

.github/workflows/backend-lint-test.yml

@@ -25,7 +25,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 'stable'
+          # go-version: 'stable'
+          go-version-file: 'backend/go.mod'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:

README.md

@@ -12,7 +12,7 @@ https://user-images.githubusercontent.com/23424570/220130537-7b0b8596-0a06-4132-
 - **Message viewer:** Explore your topics' messages in our message viewer through ad-hoc queries and dynamic filters. Find any message you want using JavaScript functions to filter messages. Supported encodings are: JSON, Avro, Protobuf, CBOR, XML, MessagePack, Text and Binary (hex view). The used encoding (except Protobuf and CBOR) is recognized automatically.
 - **Consumer groups:** List all your active consumer groups along with their active group offsets, edit group offsets (by group, topic or partition) or delete a consumer group.
 - **Topic overview:** Browse through the list of your Kafka topics, check their configuration, space usage, list all consumers who consume a single topic or watch partition details (such as low and high water marks, message count, ...), embed topic documentation from a git repository and more.
-- **Cluster overview:** List vailable brokers, their space usage, rack id, health, configuration and other information to get a high level overview of your brokers in your cluster.
+- **Cluster overview:** List available brokers, their space usage, rack id, health, configuration and other information to get a high level overview of your brokers in your cluster.
 - **Security**: Create, list or edit Kafka ACLs and SASL-SCRAM users.
 - **Schema Registry:** List and manage all aspects of your Avro, Protobuf or JSON schemas within your schema registry.
 - **Kafka connect:** Manage connectors from multiple connect clusters, patch configs, view their current state or restart tasks.

backend/pkg/api/connect/errors/kafka.go

@@ -16,7 +16,7 @@ import (
 	"connectrpc.com/connect"
 	"github.com/twmb/franz-go/pkg/kerr"
 
-	v1alpha1 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha1"
+	v1alpha2 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha2"
 )
 
 // NewConnectErrorFromKafkaErrorCode creates a new connect.Error for a given Kafka error code.
@@ -31,7 +31,7 @@ func NewConnectErrorFromKafkaErrorCode(code int16, msg *string) *connect.Error {
 	return NewConnectError(
 		connect.CodeInternal,
 		errors.New(errMsg),
-		NewErrorInfo(v1alpha1.Reason_REASON_KAFKA_API_ERROR.String(), KeyValsFromKafkaError(kafkaErr)...),
+		NewErrorInfo(v1alpha2.Reason_REASON_KAFKA_API_ERROR.String(), KeyValsFromKafkaError(kafkaErr)...),
 	)
 }
 

backend/pkg/api/connect/errors/redpanda.go

@@ -19,7 +19,7 @@ import (
 	"connectrpc.com/connect"
 	adminapi "github.com/redpanda-data/common-go/rpadmin"
 
-	v1alpha1 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha1"
+	v1alpha2 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha2"
 )
 
 // NewConnectErrorFromRedpandaAdminAPIError enhances error handling by providing
@@ -39,7 +39,7 @@ func NewConnectErrorFromRedpandaAdminAPIError(err error, prefixErrMsg string) *c
 				connectCode,
 				errors.New(prefixErrMsg+httpErr.Error()),
 				NewErrorInfo(
-					v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(), KeyVal{
+					v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(), KeyVal{
 						Key:   "adminapi_status_code",
 						Value: strconv.Itoa(httpErr.Response.StatusCode),
 					},
@@ -59,7 +59,7 @@ func NewConnectErrorFromRedpandaAdminAPIError(err error, prefixErrMsg string) *c
 			connectCode,
 			errors.New(prefixErrMsg+adminAPIErr.Message),
 			NewErrorInfo(
-				v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(), KeyVal{
+				v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(), KeyVal{
 					Key:   "adminapi_status_code",
 					Value: strconv.Itoa(httpErr.Response.StatusCode),
 				},
@@ -72,14 +72,14 @@ func NewConnectErrorFromRedpandaAdminAPIError(err error, prefixErrMsg string) *c
 		return NewConnectError(
 			connect.CodeCanceled,
 			errors.New(prefixErrMsg+"the request to the Redpanda admin API timed out"),
-			NewErrorInfo(v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
+			NewErrorInfo(v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
 		)
 	}
 
 	return NewConnectError(
 		connect.CodeInternal,
 		fmt.Errorf("%v%w", prefixErrMsg, err),
-		NewErrorInfo(v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
+		NewErrorInfo(v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
 	)
 }
 

backend/pkg/api/connect/errors/redpanda_test.go

@@ -26,7 +26,7 @@ import (
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/testing/protocmp"
 
-	v1alpha1 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha1"
+	v1alpha2 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha2"
 )
 
 // Define the test cases
@@ -65,7 +65,7 @@ func TestNewConnectErrorFromRedpandaAdminAPIError(t *testing.T) {
 					Body: []byte("mock error message"),
 				},
 				NewErrorInfo(
-					v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(),
+					v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(),
 					KeyVal{
 						Key:   "adminapi_status_code",
 						Value: strconv.Itoa(http.StatusInternalServerError),
@@ -97,7 +97,7 @@ func TestNewConnectErrorFromRedpandaAdminAPIError(t *testing.T) {
 				connect.CodeNotFound,
 				errors.New("decoded message"),
 				NewErrorInfo(
-					v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(),
+					v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String(),
 					KeyVal{
 						Key:   "adminapi_status_code",
 						Value: strconv.Itoa(http.StatusNotFound),
@@ -114,7 +114,7 @@ func TestNewConnectErrorFromRedpandaAdminAPIError(t *testing.T) {
 			expectedResult: NewConnectError(
 				connect.CodeCanceled,
 				errors.New("listing transforms failed: the request to the Redpanda admin API timed out"),
-				NewErrorInfo(v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
+				NewErrorInfo(v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
 			),
 		},
 		{
@@ -126,7 +126,7 @@ func TestNewConnectErrorFromRedpandaAdminAPIError(t *testing.T) {
 			expectedResult: NewConnectError(
 				connect.CodeInternal,
 				errors.New("listing transforms failed: some random error message"),
-				NewErrorInfo(v1alpha1.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
+				NewErrorInfo(v1alpha2.Reason_REASON_REDPANDA_ADMIN_API_ERROR.String()),
 			),
 		},
 	}