[CORE 8273] Adjust license warning text to include trial license links #24261

BenPope · 2024-11-22T16:07:56Z

Adjust license warning text to include trial license links.

Adjust CreateACLs response error to invalid_config from unknown_server_error, to match topic create/alter.

Backports Required

Release Notes

none

oleiman

few copy edits, otherwise looks awesome

src/v/features/enterprise_feature_messages.h

src/v/cluster/config_manager.cc

src/v/cluster/partition_balancer_backend.cc

IoannisRP

Very nice groupings!
just a couple of minor comments

src/v/cluster/config_manager.cc

src/v/features/enterprise_feature_messages.h

tests/rptest/tests/enterprise_features_license_test.py

vbotbuildovich · 2024-11-22T19:31:06Z

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58582#01935508-57f3-4541-b166-2b90a9d45266:

"rptest.tests.rbac_test.RBACLicenseTest.test_license_nag"
"rptest.tests.redpanda_kerberos_test.RedpandaKerberosLicenseTest.test_license_nag"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58582#01935508-57f0-4df5-8cc3-c097e9958120:

"rptest.tests.redpanda_oauth_test.OIDCLicenseTest.test_license_nag.authn_config=.http_authentication.OIDC.BASIC"
"rptest.tests.schema_registry_test.SchemaRegistryLicenseTest.test_license_nag.mode=SchemaIdValidationMode.COMPAT"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58582#0193551b-adc8-4142-97d1-71b888efb2f2:

"rptest.tests.rbac_test.RBACLicenseTest.test_license_nag"
"rptest.tests.redpanda_kerberos_test.RedpandaKerberosLicenseTest.test_license_nag"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58582#0193551b-adc3-48a2-9a12-8dbe27271910:

"rptest.tests.redpanda_oauth_test.OIDCLicenseTest.test_license_nag.authn_config=.http_authentication.OIDC.BASIC"
"rptest.tests.schema_registry_test.SchemaRegistryLicenseTest.test_license_nag.mode=SchemaIdValidationMode.COMPAT"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58582#0193551b-adc5-43e7-83d9-250a85272a8c:

"rptest.tests.redpanda_oauth_test.OIDCLicenseTest.test_license_nag.authn_config=.sasl_mechanisms.OAUTHBEARER.SCRAM"
"rptest.tests.schema_registry_test.SchemaRegistryLicenseTest.test_license_nag.mode=SchemaIdValidationMode.REDPANDA"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58582#01935508-57f2-4c09-8ecb-fd9e405f7558:

"rptest.tests.redpanda_oauth_test.OIDCLicenseTest.test_license_nag.authn_config=.sasl_mechanisms.OAUTHBEARER.SCRAM"
"rptest.tests.schema_registry_test.SchemaRegistryLicenseTest.test_license_nag.mode=SchemaIdValidationMode.REDPANDA"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/58599#019355e8-150d-4fc4-b6e5-533da9bca896:

"rptest.tests.datalake.coordinator_retention_test.CoordinatorRetentionTest.test_retention.cloud_storage_type=CloudStorageType.S3"

vbotbuildovich · 2024-11-22T19:31:18Z

Retry command for Build#58582

please wait until all jobs are finished before running the slash command

/ci-repeat 1
tests/rptest/tests/rbac_test.py::RBACLicenseTest.test_license_nag
tests/rptest/tests/redpanda_kerberos_test.py::RedpandaKerberosLicenseTest.test_license_nag
tests/rptest/tests/redpanda_oauth_test.py::OIDCLicenseTest.test_license_nag@{"authn_config":{"http_authentication":["OIDC","BASIC"]}}
tests/rptest/tests/schema_registry_test.py::SchemaRegistryLicenseTest.test_license_nag@{"mode":"compat"}
tests/rptest/tests/redpanda_oauth_test.py::OIDCLicenseTest.test_license_nag@{"authn_config":{"sasl_mechanisms":["OAUTHBEARER","SCRAM"]}}
tests/rptest/tests/schema_registry_test.py::SchemaRegistryLicenseTest.test_license_nag@{"mode":"redpanda"}

BenPope · 2024-11-22T20:16:08Z

Changes in force-push

Improve some formatting strings
Switch license strings for admin

oleiman

lgtm

BenPope · 2024-11-22T22:18:49Z

CI Failures:

The bazel failure appears to relate to Support TLS in datalake rest catalog #24226 - CI failed on it's merge

vbotbuildovich · 2024-11-22T22:51:24Z

the below tests from https://buildkite.com/redpanda/redpanda/builds/58599#0193558e-8be9-460e-ad15-7de7661242ba have failed and will be retried

gtest_raft_rpunit

vbotbuildovich · 2024-11-22T23:19:33Z

Retry command for Build#58599

please wait until all jobs are finished before running the slash command

/ci-repeat 1
tests/rptest/tests/datalake/coordinator_retention_test.py::CoordinatorRetentionTest.test_retention@{"cloud_storage_type":1}

vbotbuildovich · 2024-11-22T23:37:02Z

ducktape was retried in https://buildkite.com/redpanda/redpanda/builds/58599#019355d4-876a-4024-b029-41989a7c63db
ducktape was retried in https://buildkite.com/redpanda/redpanda/builds/58599#019355e8-1511-4e16-819c-34813a3326da

Signed-off-by: Ben Pope <ben@redpanda.com>

BenPope · 2024-11-25T10:54:36Z

Changes in force-push

Ducktape: Moved has_license_nag to redpanda
Redpanda: Removed fmt::runtime
Redpanda: Changed CreateACL responseerror_code from unknown_server_error to invalid_config

Signed-off-by: Ben Pope <ben@redpanda.com>

For CreateACLs over the Kafka API, the error code is changed to invalid_config to match topic create/alter. Signed-off-by: Ben Pope <ben@redpanda.com>

Signed-off-by: Ben Pope <ben@redpanda.com>

IoannisRP

lgtm

vbotbuildovich · 2024-11-25T14:40:06Z

/backport v24.3.x

vbotbuildovich · 2024-11-25T14:41:19Z

Failed to create a backport PR to v24.3.x branch. I tried:

git remote add upstream https://github.com/redpanda-data/redpanda.git
git fetch --all
git checkout -b backport-pr-24261-v24.3.x-509 remotes/upstream/v24.3.x
git cherry-pick -x 5d58e71fbd c97b39fd34 32c2577ac8 fb700d90ba f599d83e5b eeb149d069 f705decd6e

Workflow run logs.

oleiman

lgtm

oleiman · 2024-11-25T17:12:24Z

src/v/kafka/server/server.cc

-              auto ec = map_topic_error_code(results[i]);
-              response.data.results.push_back(
-                creatable_acl_result{.error_code = ec});
              if (results[i] == cluster::errc::feature_disabled) {
-                  response.data.results.back().error_message.emplace(
-                    "An enterprise license is required to create an ACL with a "
-                    "role binding");
+                  response.data.results.emplace_back(
+                    error_code::invalid_config,
+                    features::enterprise_error_message::acl_with_rbac());
+              } else {
+                  response.data.results.emplace_back(
+                    map_topic_error_code(results[i]));


BenPope requested a review from oleiman November 22, 2024 16:08

BenPope self-assigned this Nov 22, 2024

github-actions bot added area/build area/redpanda labels Nov 22, 2024

BenPope added this to the v24.3.1-RC8 milestone Nov 22, 2024

BenPope marked this pull request as ready for review November 22, 2024 16:25

BenPope requested a review from IoannisRP November 22, 2024 16:26

BenPope force-pushed the core-8273-license-wording branch from 8c3aa1d to b4209a4 Compare November 22, 2024 16:35

oleiman reviewed Nov 22, 2024

View reviewed changes

IoannisRP reviewed Nov 22, 2024

View reviewed changes

src/v/cluster/config_manager.cc Outdated Show resolved Hide resolved

src/v/features/enterprise_feature_messages.h Outdated Show resolved Hide resolved

tests/rptest/tests/enterprise_features_license_test.py Outdated Show resolved Hide resolved

BenPope force-pushed the core-8273-license-wording branch from b4209a4 to 0f27174 Compare November 22, 2024 20:14

BenPope requested review from oleiman and IoannisRP November 22, 2024 20:15

oleiman previously approved these changes Nov 22, 2024

View reviewed changes

BenPope enabled auto-merge November 22, 2024 20:19

BenPope dismissed oleiman’s stale review via edb62f0 November 22, 2024 20:22

BenPope force-pushed the core-8273-license-wording branch from 0f27174 to edb62f0 Compare November 22, 2024 20:22

BenPope requested a review from oleiman November 22, 2024 20:22

oleiman previously approved these changes Nov 22, 2024

View reviewed changes

BenPope added 2 commits November 25, 2024 10:52

ducktape: Centralise has_license_nag

5d58e71

Signed-off-by: Ben Pope <ben@redpanda.com>

features: Introduce enterprise_feature_messages

c97b39f

Signed-off-by: Ben Pope <ben@redpanda.com>

BenPope dismissed oleiman’s stale review via 78a0d9d November 25, 2024 10:52

BenPope force-pushed the core-8273-license-wording branch from edb62f0 to 78a0d9d Compare November 25, 2024 10:52

BenPope added 5 commits November 25, 2024 10:59

c/feature_manager: Switch license strings

32c2577

Signed-off-by: Ben Pope <ben@redpanda.com>

config/property: Switch license strings

fb700d9

Signed-off-by: Ben Pope <ben@redpanda.com>

cluster: Switch license strings

f599d83

Signed-off-by: Ben Pope <ben@redpanda.com>

kafka: Switch license strings

eeb149d

For CreateACLs over the Kafka API, the error code is changed to invalid_config to match topic create/alter. Signed-off-by: Ben Pope <ben@redpanda.com>

admin: Switch license strings

f705dec

Signed-off-by: Ben Pope <ben@redpanda.com>

BenPope force-pushed the core-8273-license-wording branch from 78a0d9d to f705dec Compare November 25, 2024 10:59

BenPope requested a review from oleiman November 25, 2024 11:07

IoannisRP approved these changes Nov 25, 2024

View reviewed changes

BenPope merged commit 8a30b96 into redpanda-data:dev Nov 25, 2024
19 checks passed

vbotbuildovich mentioned this pull request Nov 25, 2024

[v24.3.x] [CORE 8273] Adjust license warning text to include trial license links #24279

Closed

BenPope removed this from the v24.3.1-RC8 milestone Nov 25, 2024

BenPope mentioned this pull request Nov 25, 2024

[v24.3.x] [CORE 8273] Adjust license warning text to include trial license links #24287

Merged

oleiman reviewed Nov 25, 2024

View reviewed changes

r-vasquez mentioned this pull request Nov 25, 2024

rpk: improve error messages in security/acl #24296

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CORE 8273] Adjust license warning text to include trial license links #24261

[CORE 8273] Adjust license warning text to include trial license links #24261

BenPope commented Nov 22, 2024 •

edited

Loading

oleiman left a comment

IoannisRP left a comment

vbotbuildovich commented Nov 22, 2024 •

edited

Loading

vbotbuildovich commented Nov 22, 2024 •

edited

Loading

BenPope commented Nov 22, 2024

oleiman left a comment

BenPope commented Nov 22, 2024

vbotbuildovich commented Nov 22, 2024

vbotbuildovich commented Nov 22, 2024

vbotbuildovich commented Nov 22, 2024 •

edited

Loading

BenPope commented Nov 25, 2024 •

edited

Loading

IoannisRP left a comment

vbotbuildovich commented Nov 25, 2024

vbotbuildovich commented Nov 25, 2024

oleiman left a comment

oleiman Nov 25, 2024

[CORE 8273] Adjust license warning text to include trial license links #24261

[CORE 8273] Adjust license warning text to include trial license links #24261

Conversation

BenPope commented Nov 22, 2024 • edited Loading

Backports Required

Release Notes

oleiman left a comment

Choose a reason for hiding this comment

IoannisRP left a comment

Choose a reason for hiding this comment

vbotbuildovich commented Nov 22, 2024 • edited Loading

vbotbuildovich commented Nov 22, 2024 • edited Loading

Retry command for Build#58582

BenPope commented Nov 22, 2024

oleiman left a comment

Choose a reason for hiding this comment

BenPope commented Nov 22, 2024

vbotbuildovich commented Nov 22, 2024

vbotbuildovich commented Nov 22, 2024

Retry command for Build#58599

vbotbuildovich commented Nov 22, 2024 • edited Loading

BenPope commented Nov 25, 2024 • edited Loading

IoannisRP left a comment

Choose a reason for hiding this comment

vbotbuildovich commented Nov 25, 2024

vbotbuildovich commented Nov 25, 2024

oleiman left a comment

Choose a reason for hiding this comment

oleiman Nov 25, 2024

Choose a reason for hiding this comment

BenPope commented Nov 22, 2024 •

edited

Loading

vbotbuildovich commented Nov 22, 2024 •

edited

Loading

vbotbuildovich commented Nov 22, 2024 •

edited

Loading

vbotbuildovich commented Nov 22, 2024 •

edited

Loading

BenPope commented Nov 25, 2024 •

edited

Loading